diff --git a/webapp/src/edu/cornell/mannlib/vedit/beans/Checkbox.java b/webapp/src/edu/cornell/mannlib/vedit/beans/Checkbox.java
index b68768b12..1c5256068 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/beans/Checkbox.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/beans/Checkbox.java
@@ -1,44 +1,44 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.beans;
-
-public class Checkbox {
-
-    private String name = null;
-    private String value = null;
-    private String body = null;
-    private boolean checked = false;
-
-    public String getName(){
-        return name;
-    }
-
-    private void setName(String name){
-        this.name = name;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public String getBody() {
-        return body;
-    }
-
-    public void setBody(String body) {
-        this.body = body;
-    }
-
-    public boolean getChecked (){
-        return checked;
-    }
-
-    public void setChecked (boolean checked){
-        this.checked = checked;
-    }
-
-}
+package edu.cornell.mannlib.vedit.beans;
+
+public class Checkbox {
+
+    private String name = null;
+    private String value = null;
+    private String body = null;
+    private boolean checked = false;
+
+    public String getName(){
+        return name;
+    }
+
+    private void setName(String name){
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getBody() {
+        return body;
+    }
+
+    public void setBody(String body) {
+        this.body = body;
+    }
+
+    public boolean getChecked (){
+        return checked;
+    }
+
+    public void setChecked (boolean checked){
+        this.checked = checked;
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/beans/DynamicField.java b/webapp/src/edu/cornell/mannlib/vedit/beans/DynamicField.java
index 4f8495d02..b12244c6b 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/beans/DynamicField.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/beans/DynamicField.java
@@ -1,98 +1,98 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.beans;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-public class DynamicField {
-
-    private String name = null;
-
-    private String table = null;
-
-    private int maxCardinality = 1;
-    private int minCardinality = -1;
-    private int visible = -1;
-
-    private List<DynamicFieldRow> rowList = null;
-    private DynamicFieldRow rowTemplate = null;
-
-    private HashMap metadata = new HashMap();
-
-    private Boolean deleteable = true;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getTable() {
-        return table;
-    }
-
-    public void setTable(String table) {
-        this.table = table;
-    }
-
-    public int getMaxCardinality() {
-        return maxCardinality;
-    }
-
-    public void setMaxCardinality (int maxCardinality) {
-        this.maxCardinality = maxCardinality;
-    }
-
-    public int getMinCardinality () {
-        return minCardinality;
-    }
-
-    public void setMinCardinality(int minCardinality) {
-        this.minCardinality = minCardinality;
-    }
-
-    public int getVisible() {
-        return visible;
-    }
-
-    public void setVisible(int visible) {
-        this.visible = visible;
-    }
-
-    public boolean getDeleteable() {
-        return deleteable;
-    }
-
-    public void setDeleteable(boolean deleteable) {
-        this.deleteable = deleteable;
-    }
-
-    public HashMap getMetadata() {
-        return metadata;
-    }
-
-    public void setMetadata(HashMap metadata) {
-        this.metadata = metadata;
-    }
-
-    public List<DynamicFieldRow> getRowList() {
-        return rowList;
-    }
-
-    public void setRowList (List<DynamicFieldRow> rowList) {
-        this.rowList = rowList;
-    }
-
-    public DynamicFieldRow getRowTemplate() {
-        return rowTemplate;
-    }
-
-    public void setRowTemplate(DynamicFieldRow dfr) {
-        rowTemplate = dfr;
-    }
-
-}
+package edu.cornell.mannlib.vedit.beans;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class DynamicField {
+
+    private String name = null;
+
+    private String table = null;
+
+    private int maxCardinality = 1;
+    private int minCardinality = -1;
+    private int visible = -1;
+
+    private List<DynamicFieldRow> rowList = null;
+    private DynamicFieldRow rowTemplate = null;
+
+    private HashMap metadata = new HashMap();
+
+    private Boolean deleteable = true;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getTable() {
+        return table;
+    }
+
+    public void setTable(String table) {
+        this.table = table;
+    }
+
+    public int getMaxCardinality() {
+        return maxCardinality;
+    }
+
+    public void setMaxCardinality (int maxCardinality) {
+        this.maxCardinality = maxCardinality;
+    }
+
+    public int getMinCardinality () {
+        return minCardinality;
+    }
+
+    public void setMinCardinality(int minCardinality) {
+        this.minCardinality = minCardinality;
+    }
+
+    public int getVisible() {
+        return visible;
+    }
+
+    public void setVisible(int visible) {
+        this.visible = visible;
+    }
+
+    public boolean getDeleteable() {
+        return deleteable;
+    }
+
+    public void setDeleteable(boolean deleteable) {
+        this.deleteable = deleteable;
+    }
+
+    public HashMap getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(HashMap metadata) {
+        this.metadata = metadata;
+    }
+
+    public List<DynamicFieldRow> getRowList() {
+        return rowList;
+    }
+
+    public void setRowList (List<DynamicFieldRow> rowList) {
+        this.rowList = rowList;
+    }
+
+    public DynamicFieldRow getRowTemplate() {
+        return rowTemplate;
+    }
+
+    public void setRowTemplate(DynamicFieldRow dfr) {
+        rowTemplate = dfr;
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/beans/DynamicFieldRow.java b/webapp/src/edu/cornell/mannlib/vedit/beans/DynamicFieldRow.java
index c045e283a..c99505fd2 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/beans/DynamicFieldRow.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/beans/DynamicFieldRow.java
@@ -1,37 +1,37 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.beans;
-
-import java.util.Map;
-
-public class DynamicFieldRow {
-
-    private int id = -1;
-    private String value = null;
-    private Map parameterMap = null;
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public Map getParameterMap() {
-        return parameterMap;
-    }
-
-    public void setParameterMap(Map parameterMap) {
-        this.parameterMap = parameterMap;
-    }
-
-}
+package edu.cornell.mannlib.vedit.beans;
+
+import java.util.Map;
+
+public class DynamicFieldRow {
+
+    private int id = -1;
+    private String value = null;
+    private Map parameterMap = null;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public Map getParameterMap() {
+        return parameterMap;
+    }
+
+    public void setParameterMap(Map parameterMap) {
+        this.parameterMap = parameterMap;
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/beans/FieldHelp.java b/webapp/src/edu/cornell/mannlib/vedit/beans/FieldHelp.java
index b96d53871..5032d91d8 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/beans/FieldHelp.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/beans/FieldHelp.java
@@ -1,54 +1,54 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.beans;
-
-public class FieldHelp {
-
-    private String description = null;
-    private String descriptionUri = null;
-    private String examples = null;
-    private String examplesUri = null;
-
-    private String helpUri = null;
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getDescriptionUri() {
-        return descriptionUri;
-    }
-
-    public void setDescriptionUri(String descriptionUri) {
-        this.descriptionUri = descriptionUri;
-    }
-
-    public String getExamples() {
-        return examples;
-    }
-
-    public void setExamples(String examples) {
-        this.examples = examples;
-    }
-
-    public String getExamplesUri() {
-        return examplesUri;
-    }
-
-    public void setExamplesUri(String examplesUri) {
-        this.examplesUri = examplesUri;
-    }
-
-    public String getHelpUri() {
-        return helpUri;
-    }
-
-    public void setHelpUri(String helpUri) {
-        this.helpUri = helpUri;
-    }
-
-}
+package edu.cornell.mannlib.vedit.beans;
+
+public class FieldHelp {
+
+    private String description = null;
+    private String descriptionUri = null;
+    private String examples = null;
+    private String examplesUri = null;
+
+    private String helpUri = null;
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getDescriptionUri() {
+        return descriptionUri;
+    }
+
+    public void setDescriptionUri(String descriptionUri) {
+        this.descriptionUri = descriptionUri;
+    }
+
+    public String getExamples() {
+        return examples;
+    }
+
+    public void setExamples(String examples) {
+        this.examples = examples;
+    }
+
+    public String getExamplesUri() {
+        return examplesUri;
+    }
+
+    public void setExamplesUri(String examplesUri) {
+        this.examplesUri = examplesUri;
+    }
+
+    public String getHelpUri() {
+        return helpUri;
+    }
+
+    public void setHelpUri(String helpUri) {
+        this.helpUri = helpUri;
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/beans/FormObject.java b/webapp/src/edu/cornell/mannlib/vedit/beans/FormObject.java
index cf758759c..7d538027d 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/beans/FormObject.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/beans/FormObject.java
@@ -1,63 +1,63 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.beans;
-
+package edu.cornell.mannlib.vedit.beans;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
-public class FormObject implements Serializable {
-
-    private HashMap<String, String> values = new HashMap<String, String>();
-    private HashMap<String, List<Option>> optionLists = new HashMap<String, List<Option>>();
-    private HashMap<String, List<Checkbox>> checkboxLists = new HashMap<String, List<Checkbox>>();
-    private Map<String, String> errorMap = new HashMap<String, String>();
-    private List<DynamicField> dynamicFields = new ArrayList<DynamicField>();
-
-    public HashMap<String, String> getValues(){
-        return values;
-    }
-
-    public void setValues(HashMap<String, String> values){
-        this.values = values;
-    }
-
-    public String valueByName(String name){
-        return values.get(name);
-    }
-
-    public HashMap<String, List<Option>> getOptionLists() {
-        return optionLists;
-    }
-
-    public void setOptionLists(HashMap<String, List<Option>> optionLists) {
-        this.optionLists = optionLists;
-    }
-
-    public List<Option> optionListByName(String key){
-        return optionLists.get(key);
-    }
-
-    public HashMap<String, List<Checkbox>> getCheckboxLists(){
-        return checkboxLists;
-    }
-
-    public Map<String, String> getErrorMap(){
-        return errorMap;
-    }
-
-    public void setErrorMap(Map<String, String> errorMap){
-        this.errorMap = errorMap;
-    }
-
-    public List<DynamicField> getDynamicFields() {
-        return dynamicFields;
-    }
-
-    public void setDynamicFields(List<DynamicField> dynamicFields){
-        this.dynamicFields = dynamicFields;
-    }
-
-}
+
+public class FormObject implements Serializable {
+
+    private HashMap<String, String> values = new HashMap<String, String>();
+    private HashMap<String, List<Option>> optionLists = new HashMap<String, List<Option>>();
+    private HashMap<String, List<Checkbox>> checkboxLists = new HashMap<String, List<Checkbox>>();
+    private Map<String, String> errorMap = new HashMap<String, String>();
+    private List<DynamicField> dynamicFields = new ArrayList<DynamicField>();
+
+    public HashMap<String, String> getValues(){
+        return values;
+    }
+
+    public void setValues(HashMap<String, String> values){
+        this.values = values;
+    }
+
+    public String valueByName(String name){
+        return values.get(name);
+    }
+
+    public HashMap<String, List<Option>> getOptionLists() {
+        return optionLists;
+    }
+
+    public void setOptionLists(HashMap<String, List<Option>> optionLists) {
+        this.optionLists = optionLists;
+    }
+
+    public List<Option> optionListByName(String key){
+        return optionLists.get(key);
+    }
+
+    public HashMap<String, List<Checkbox>> getCheckboxLists(){
+        return checkboxLists;
+    }
+
+    public Map<String, String> getErrorMap(){
+        return errorMap;
+    }
+
+    public void setErrorMap(Map<String, String> errorMap){
+        this.errorMap = errorMap;
+    }
+
+    public List<DynamicField> getDynamicFields() {
+        return dynamicFields;
+    }
+
+    public void setDynamicFields(List<DynamicField> dynamicFields){
+        this.dynamicFields = dynamicFields;
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/beans/Option.java b/webapp/src/edu/cornell/mannlib/vedit/beans/Option.java
index 2b1dbfe7f..75681f497 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/beans/Option.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/beans/Option.java
@@ -1,59 +1,59 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.beans;
-
-import java.io.Serializable;
-
-public class Option implements Serializable {
-
-    private String value = null;
-    private String body = null;
-    private boolean selected = false;
-
-    public String getValue() {
-        return value;
-    }
-
-    public void setValue(String value) {
-        this.value = value;
-    }
-
-    public String getBody() {
-        return body;
-    }
-
-    public void setBody(String body) {
-        this.body = body;
-    }
-
-    public boolean getSelected (){
-        return selected;
-    }
-
-    public void setSelected (boolean selected){
-        this.selected = selected;
-    }
-
-    //default constructor
-    public Option() {
-    }
-    
-    public Option (String value, String body, boolean selected) {
-        this.value = value;
-        this.body = body;
-        this.selected = selected;
-    }
-
-    // construct an Option with body and value
-    public Option(String value, String body) {
-        this(value, body, false);
-    }
-
-    // construct an Option with equal body and value
-    public Option (String name){
-    	this(name, name, false);
-    }
-
-
-
-}
+package edu.cornell.mannlib.vedit.beans;
+
+import java.io.Serializable;
+
+public class Option implements Serializable {
+
+    private String value = null;
+    private String body = null;
+    private boolean selected = false;
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getBody() {
+        return body;
+    }
+
+    public void setBody(String body) {
+        this.body = body;
+    }
+
+    public boolean getSelected (){
+        return selected;
+    }
+
+    public void setSelected (boolean selected){
+        this.selected = selected;
+    }
+
+    //default constructor
+    public Option() {
+    }
+    
+    public Option (String value, String body, boolean selected) {
+        this.value = value;
+        this.body = body;
+        this.selected = selected;
+    }
+
+    // construct an Option with body and value
+    public Option(String value, String body) {
+        this(value, body, false);
+    }
+
+    // construct an Option with equal body and value
+    public Option (String name){
+    	this(name, name, false);
+    }
+
+
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/controller/BaseEditController.java b/webapp/src/edu/cornell/mannlib/vedit/controller/BaseEditController.java
index 0a0bd6b87..9f1cc9c65 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/controller/BaseEditController.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/controller/BaseEditController.java
@@ -1,7 +1,7 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.controller;
-
+package edu.cornell.mannlib.vedit.controller;
+
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
@@ -29,150 +29,150 @@ import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess.ModelID;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.ModelContext;
-
-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/";
-	
+
+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;
-
-    private static final Log log = LogFactory.getLog(BaseEditController.class.getName());
-    private static final String DEFAULT_LANDING_PAGE = Controllers.SITE_ADMIN;
-    protected static final String MULTIPLEXED_PARAMETER_NAME = "multiplexedParam";
-    private final String EPO_HASH_ATTR = "epoHash";
-    private final String EPO_KEYLIST_ATTR = "epoKeylist";
-    private final int MAX_EPOS = 5;
-    private final Calendar cal = Calendar.getInstance();
-
-    /* EPO is reused if the controller is passed an epoKey, e.g.
-      if a previous form submission failed validation, or the edit is a multistage process. */
-
-    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 */
-        EditProcessObject epo = null;
-        HashMap epoHash = getEpoHash(request);
-        String existingEpoKey = request.getParameter("_epoKey");
-        if (!forceNew && existingEpoKey != null && epoHash.get(existingEpoKey) != null)  {
-            epo = (EditProcessObject) epoHash.get(existingEpoKey);
-            epo.setKey(existingEpoKey);
-            epo.setUseRecycledBean(true);
-        } else {
-            LinkedList epoKeylist = getEpoKeylist(request);
-            if (epoHash.size() == MAX_EPOS) {
-            	try {
-            		epoHash.remove(epoKeylist.getFirst());
-            		epoKeylist.removeFirst();
-            	} catch (Exception e) {
-            		// see JIRA issue VITRO-340, "Odd exception from backend editing"
-            		// possible rare concurrency issue here
-            		log.error("Error removing old EPO", e);
-            	}
-            }
-            Random rand = new Random();
-            String epoKey = createEpoKey();
-            while (epoHash.get(epoKey) != null) {
-                epoKey+=Integer.toHexString(rand.nextInt());
-            }
-            epo = new EditProcessObject();
-            epoHash.put (epoKey,epo);
-            epoKeylist.add(epoKey);
-            epo.setKey(epoKey);
-            epo.setReferer( (forceNew) ? request.getRequestURL().append('?').append(request.getQueryString()).toString() : request.getHeader("Referer") );
-            epo.setSession(request.getSession());
-        }
-        return epo;
-    }
-
-    private LinkedList getEpoKeylist(HttpServletRequest request){
-        return (LinkedList) request.getSession().getAttribute(EPO_KEYLIST_ATTR);
-    }
-
-    private HashMap getEpoHash(HttpServletRequest request){
-        HashMap epoHash = (HashMap) request.getSession().getAttribute(EPO_HASH_ATTR);
-        if (epoHash == null) {
-            epoHash = new HashMap();
-            request.getSession().setAttribute(EPO_HASH_ATTR,epoHash);
-            //since we're making a new EPO hash, we should also make a new keylist.
-            LinkedList epoKeylist = new LinkedList();
-            request.getSession().setAttribute(EPO_KEYLIST_ATTR,epoKeylist);
-        }
-        return epoHash;
-    }
-
-    private String createEpoKey(){
-        return Long.toHexString(cal.getTimeInMillis());
-    }
+    protected static final int BASE_10 = 10;
+
+    private static final Log log = LogFactory.getLog(BaseEditController.class.getName());
+    private static final String DEFAULT_LANDING_PAGE = Controllers.SITE_ADMIN;
+    protected static final String MULTIPLEXED_PARAMETER_NAME = "multiplexedParam";
+    private final String EPO_HASH_ATTR = "epoHash";
+    private final String EPO_KEYLIST_ATTR = "epoKeylist";
+    private final int MAX_EPOS = 5;
+    private final Calendar cal = Calendar.getInstance();
+
+    /* EPO is reused if the controller is passed an epoKey, e.g.
+      if a previous form submission failed validation, or the edit is a multistage process. */
+
+    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 */
+        EditProcessObject epo = null;
+        HashMap epoHash = getEpoHash(request);
+        String existingEpoKey = request.getParameter("_epoKey");
+        if (!forceNew && existingEpoKey != null && epoHash.get(existingEpoKey) != null)  {
+            epo = (EditProcessObject) epoHash.get(existingEpoKey);
+            epo.setKey(existingEpoKey);
+            epo.setUseRecycledBean(true);
+        } else {
+            LinkedList epoKeylist = getEpoKeylist(request);
+            if (epoHash.size() == MAX_EPOS) {
+            	try {
+            		epoHash.remove(epoKeylist.getFirst());
+            		epoKeylist.removeFirst();
+            	} catch (Exception e) {
+            		// see JIRA issue VITRO-340, "Odd exception from backend editing"
+            		// possible rare concurrency issue here
+            		log.error("Error removing old EPO", e);
+            	}
+            }
+            Random rand = new Random();
+            String epoKey = createEpoKey();
+            while (epoHash.get(epoKey) != null) {
+                epoKey+=Integer.toHexString(rand.nextInt());
+            }
+            epo = new EditProcessObject();
+            epoHash.put (epoKey,epo);
+            epoKeylist.add(epoKey);
+            epo.setKey(epoKey);
+            epo.setReferer( (forceNew) ? request.getRequestURL().append('?').append(request.getQueryString()).toString() : request.getHeader("Referer") );
+            epo.setSession(request.getSession());
+        }
+        return epo;
+    }
+
+    private LinkedList getEpoKeylist(HttpServletRequest request){
+        return (LinkedList) request.getSession().getAttribute(EPO_KEYLIST_ATTR);
+    }
+
+    private HashMap getEpoHash(HttpServletRequest request){
+        HashMap epoHash = (HashMap) request.getSession().getAttribute(EPO_HASH_ATTR);
+        if (epoHash == null) {
+            epoHash = new HashMap();
+            request.getSession().setAttribute(EPO_HASH_ATTR,epoHash);
+            //since we're making a new EPO hash, we should also make a new keylist.
+            LinkedList epoKeylist = new LinkedList();
+            request.getSession().setAttribute(EPO_KEYLIST_ATTR,epoKeylist);
+        }
+        return epoHash;
+    }
+
+    private String createEpoKey(){
+        return Long.toHexString(cal.getTimeInMillis());
+    }
 
     protected void setRequestAttributes(HttpServletRequest request, EditProcessObject epo){
-    	VitroRequest vreq = new VitroRequest(request);
-        request.setAttribute("epoKey",epo.getKey());
-        request.setAttribute("epo",epo);
-        request.setAttribute("globalErrorMsg",epo.getAttribute("globalErrorMsg"));
-        request.setAttribute("css", "<link rel=\"stylesheet\" type=\"text/css\" href=\""+vreq.getAppBean().getThemeDir()+"css/edit.css\"/>");
-    }
-
-    protected void populateBeanFromParams(Object bean, HttpServletRequest request) {
-        Map params = request.getParameterMap();
-        Enumeration paramNames = request.getParameterNames();
-        while (paramNames.hasMoreElements()){
-            String key = "";
-            try {
-                key = (String) paramNames.nextElement();
-            } catch (ClassCastException cce) {
-                log.error("populateBeanFromParams() could not cast parameter name to String");
-            }
-            String value = "";
-            if (key.equals(MULTIPLEXED_PARAMETER_NAME)) {
-                String multiplexedStr = request.getParameterValues(key)[0];
-                Map paramMap = FormUtils.beanParamMapFromString(multiplexedStr);
-                Iterator paramIt = paramMap.keySet().iterator();
-                while (paramIt.hasNext()) {
-                    String param = (String) paramIt.next();
-                    String demultiplexedValue = (String) paramMap.get(param);
-                    FormUtils.beanSet(bean, param, demultiplexedValue);
-                }
-
-            } else {
-                try {
-                    value = (String) request.getParameterValues(key)[0];
-                } catch (ClassCastException cce) {
-                    try {
-                        value = ((Integer) params.get(key)).toString();
-                    } catch (ClassCastException ccf) {
-                        log.error("populateBeanFromParams() could not cast parameter name to String");
-                    }
-                }
-                FormUtils.beanSet(bean, key, value);
-            }
-        }
-    }
-    
-    protected OntModel getOntModel( HttpServletRequest request, ServletContext ctx ) {
+    	VitroRequest vreq = new VitroRequest(request);
+        request.setAttribute("epoKey",epo.getKey());
+        request.setAttribute("epo",epo);
+        request.setAttribute("globalErrorMsg",epo.getAttribute("globalErrorMsg"));
+        request.setAttribute("css", "<link rel=\"stylesheet\" type=\"text/css\" href=\""+vreq.getAppBean().getThemeDir()+"css/edit.css\"/>");
+    }
+
+    protected void populateBeanFromParams(Object bean, HttpServletRequest request) {
+        Map params = request.getParameterMap();
+        Enumeration paramNames = request.getParameterNames();
+        while (paramNames.hasMoreElements()){
+            String key = "";
+            try {
+                key = (String) paramNames.nextElement();
+            } catch (ClassCastException cce) {
+                log.error("populateBeanFromParams() could not cast parameter name to String");
+            }
+            String value = "";
+            if (key.equals(MULTIPLEXED_PARAMETER_NAME)) {
+                String multiplexedStr = request.getParameterValues(key)[0];
+                Map paramMap = FormUtils.beanParamMapFromString(multiplexedStr);
+                Iterator paramIt = paramMap.keySet().iterator();
+                while (paramIt.hasNext()) {
+                    String param = (String) paramIt.next();
+                    String demultiplexedValue = (String) paramMap.get(param);
+                    FormUtils.beanSet(bean, param, demultiplexedValue);
+                }
+
+            } else {
+                try {
+                    value = (String) request.getParameterValues(key)[0];
+                } catch (ClassCastException cce) {
+                    try {
+                        value = ((Integer) params.get(key)).toString();
+                    } catch (ClassCastException ccf) {
+                        log.error("populateBeanFromParams() could not cast parameter name to String");
+                    }
+                }
+                FormUtils.beanSet(bean, key, value);
+            }
+        }
+    }
+    
+    protected OntModel getOntModel( HttpServletRequest request, ServletContext ctx ) {
 
     	// TODO: JB - This method gets the UNION FULL model from the session, if there is one, 
-    	// TODO and the BASE_TBOX model otherwise.
-    	OntModel ontModel = null;
+    	// TODO and the BASE_TBOX model otherwise.
+    	OntModel ontModel = null;
     	try {
-    		ontModel = ModelAccess.on(request.getSession()).getJenaOntModel();
+    		ontModel = ModelAccess.on(request.getSession()).getJenaOntModel();
     	} catch (Exception e) {
     	    // ignoring any problems here - we're not really expecting
     	    // this attribute to be populated anyway
-    	}
-    	
-    	if ( ontModel == null ) {
-            ontModel = ModelAccess.on(ctx).getOntModel(ModelID.BASE_TBOX);
-    	}
-    	
-    	return ontModel;
-    	
+    	}
+    	
+    	if ( ontModel == null ) {
+            ontModel = ModelAccess.on(ctx).getOntModel(ModelID.BASE_TBOX);
+    	}
+    	
+    	return ontModel;
+    	
     }
     
     protected WebappDaoFactory getWebappDaoFactory() {
@@ -181,10 +181,10 @@ public class BaseEditController extends VitroHttpServlet {
     
     protected WebappDaoFactory getWebappDaoFactory(String userURI) {
         return getWebappDaoFactory().getUserAwareDaoFactory(userURI);
-    }
-    
-    public String getDefaultLandingPage(HttpServletRequest request) {
-    	return(request.getContextPath() + DEFAULT_LANDING_PAGE);
-    }
-
-}
+    }
+    
+    public String getDefaultLandingPage(HttpServletRequest request) {
+    	return(request.getContextPath() + DEFAULT_LANDING_PAGE);
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/forwarder/PageForwarder.java b/webapp/src/edu/cornell/mannlib/vedit/forwarder/PageForwarder.java
index 70493549d..e3d0ecfb5 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/forwarder/PageForwarder.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/forwarder/PageForwarder.java
@@ -1,12 +1,12 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.forwarder;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import edu.cornell.mannlib.vedit.beans.EditProcessObject;
-
-public interface PageForwarder {
-
-    public void doForward(HttpServletRequest request, HttpServletResponse response, EditProcessObject epo);
-}
+package edu.cornell.mannlib.vedit.forwarder;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import edu.cornell.mannlib.vedit.beans.EditProcessObject;
+
+public interface PageForwarder {
+
+    public void doForward(HttpServletRequest request, HttpServletResponse response, EditProcessObject epo);
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/forwarder/impl/UrlForwarder.java b/webapp/src/edu/cornell/mannlib/vedit/forwarder/impl/UrlForwarder.java
index d53cc7867..3dbe4fb3f 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/forwarder/impl/UrlForwarder.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/forwarder/impl/UrlForwarder.java
@@ -1,37 +1,37 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.forwarder.impl;
-
-import java.io.IOException;
-
-import java.net.URLEncoder;
-
-import edu.cornell.mannlib.vedit.forwarder.PageForwarder;
-import edu.cornell.mannlib.vedit.beans.EditProcessObject;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-public class UrlForwarder implements PageForwarder {
-    private static final Log log = LogFactory.getLog(UrlForwarder.class.getName());
-
-    private String theUrl = null;
-
-    public UrlForwarder (String theUrl) {
-        this.theUrl = theUrl;
-    }
-
-
-    public void doForward(HttpServletRequest request, HttpServletResponse response, EditProcessObject epo) {
-        try {
-            response.sendRedirect(response.encodeRedirectURL(theUrl));
-        } catch (IOException ioe) {
-            log.error("doForward() could not send redirect.");
-        }
-    }
-
-}
+package edu.cornell.mannlib.vedit.forwarder.impl;
+
+import java.io.IOException;
+
+import java.net.URLEncoder;
+
+import edu.cornell.mannlib.vedit.forwarder.PageForwarder;
+import edu.cornell.mannlib.vedit.beans.EditProcessObject;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class UrlForwarder implements PageForwarder {
+    private static final Log log = LogFactory.getLog(UrlForwarder.class.getName());
+
+    private String theUrl = null;
+
+    public UrlForwarder (String theUrl) {
+        this.theUrl = theUrl;
+    }
+
+
+    public void doForward(HttpServletRequest request, HttpServletResponse response, EditProcessObject epo) {
+        try {
+            response.sendRedirect(response.encodeRedirectURL(theUrl));
+        } catch (IOException ioe) {
+            log.error("doForward() could not send redirect.");
+        }
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/listener/ChangeListener.java b/webapp/src/edu/cornell/mannlib/vedit/listener/ChangeListener.java
index da55c8b40..91654a2e9 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/listener/ChangeListener.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/listener/ChangeListener.java
@@ -1,15 +1,15 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.listener;
-
-import edu.cornell.mannlib.vedit.beans.EditProcessObject;
-
-public interface ChangeListener {
-
-    public void doInserted(Object newObj, EditProcessObject epo);
-
-    public void doUpdated(Object oldObj, Object newObj, EditProcessObject epo);
-
-    public void doDeleted(Object oldObj, EditProcessObject epo);
-
-}
+package edu.cornell.mannlib.vedit.listener;
+
+import edu.cornell.mannlib.vedit.beans.EditProcessObject;
+
+public interface ChangeListener {
+
+    public void doInserted(Object newObj, EditProcessObject epo);
+
+    public void doUpdated(Object oldObj, Object newObj, EditProcessObject epo);
+
+    public void doDeleted(Object oldObj, EditProcessObject epo);
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/tags/DynamicFieldsTag.java b/webapp/src/edu/cornell/mannlib/vedit/tags/DynamicFieldsTag.java
index 6ef88d50b..d9920ae8e 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/tags/DynamicFieldsTag.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/tags/DynamicFieldsTag.java
@@ -1,223 +1,223 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.tags;
-
-import java.util.HashMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Iterator;
-
-import java.io.File;
-import java.io.BufferedOutputStream;
-import java.io.InputStream;
-import java.io.FileInputStream;
-import java.io.BufferedInputStream;
-import java.io.InputStreamReader;
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.ServletException;
-import edu.cornell.mannlib.vedit.beans.FormObject;
-import edu.cornell.mannlib.vedit.beans.DynamicField;
-import edu.cornell.mannlib.vedit.beans.DynamicFieldRow;
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang.StringEscapeUtils;
-import edu.cornell.mannlib.vedit.tags.EditTag;
-
-public class DynamicFieldsTag extends EditTag {
-
-    private char PATH_SEP = File.separatorChar;
-
-    public final String MARKUP_FILE_PATH = "templates"+PATH_SEP+"edit"+PATH_SEP+"specific"+PATH_SEP;
-
-    private String name = null;
-    private String type = null;
-    private String usePage = null;
-
-    private String preMarkup = null;
-    private String templateMarkup = null;
-    private String postMarkup = null;
-
-    public void setName( String name ) {
-        this.name = name;
-    }
-
-    public void setType( String type ) {
-        this.type = type;
-    }
-
-    public void setUsePage( String usePage ) {
-        this.usePage = usePage;
-    }
-
-    public void parseMarkup() throws JspException{
-        try {
-
-            int preStart = -1;
-            int templateStart = -1;
-            int postStart = -1;
-
-            InputStream fis = new FileInputStream (pageContext.getServletContext().getRealPath(new String())+PATH_SEP+MARKUP_FILE_PATH+usePage);
-            InputStream bis = new BufferedInputStream(fis);
-            BufferedReader in = new BufferedReader(new InputStreamReader(bis));
-            List<String> lines = new ArrayList<String>();
-            lines.add(""); // 0th line
-            int lineIndex = 0;
-            while (in.ready()) {
-                ++lineIndex;
-                String currentLine = in.readLine();
-                if (currentLine != null && currentLine.indexOf("<!--") ==0 && currentLine.indexOf("@pre")>0  ) {
-                   preStart = lineIndex;
-                } else if (currentLine != null && currentLine.indexOf("<!--") ==0 && currentLine.indexOf("@template")>0 ) {
-                   templateStart = lineIndex;
-                } else if (currentLine != null && currentLine.indexOf("<!--") ==0 && currentLine.indexOf("@post")>0 ) {
-                   postStart = lineIndex;
-                }
-                lines.add(currentLine);
-            }
-            in.close();
-
-            StringBuffer preMarkupB = new StringBuffer();
-            StringBuffer postMarkupB = new StringBuffer();
-            StringBuffer templateMarkupB = new StringBuffer();
-
-            if (templateStart>preStart  && preStart>0) {
-                for (int i=preStart+1; i<templateStart; i++) {
-                    preMarkupB.append(lines.get(i)).append("\n");
-                }
-            } else {
-                System.out.println("DynamicFieldsTag could not find @pre markup in "+MARKUP_FILE_PATH+usePage);
-                throw new JspException("DynamicFieldsTag could not parse @pre markup section");
-            }
-            preMarkup = preMarkupB.toString();
-
-
-            if (postStart>templateStart && templateStart>0) {
-                for (int i=templateStart+1; i<postStart; i++) {
-                    templateMarkupB.append(lines.get(i)).append("\n");
-                }
-            } else {
-                System.out.println("DynamicFieldsTag could not find @template markup in "+MARKUP_FILE_PATH+usePage);
-                throw new JspException("DynamicFieldsTag could not parse @template markup section");
-            }
-            templateMarkup = templateMarkupB.toString();
-
-            if (postStart>0) {
-                for (int i=postStart+1; i<lines.size(); i++) {
-                    postMarkupB.append(lines.get(i)).append("\n");
-                }
-            } else {
-                System.out.println("DynamicFieldsTag could not find @post markup in "+MARKUP_FILE_PATH+usePage);
-                throw new JspException("DynamicFieldsTag could not parse @post markup section");
-            }
-            postMarkup = postMarkupB.toString();
-
-        } catch (FileNotFoundException e) {
-            System.out.println("DynamicFieldsTag could not find markup file at "+pageContext.getServletContext().getRealPath(new String())+"\\"+MARKUP_FILE_PATH+usePage);
-        } catch (IOException ioe) {
-            System.out.println("DynamicFieldsTag encountered IOException reading "+pageContext.getServletContext().getRealPath(new String())+"\\"+MARKUP_FILE_PATH+usePage);
-        }
-
-    }
-
-    public String strReplace(String input, String pattern, String replacement) {
-        String[] piece = input.split(pattern);
-        StringBuffer output = new StringBuffer();
-        for (int i=0; i<piece.length; i++) {
-            output.append(piece[i]);
-            if (i<piece.length-1)
-                output.append(replacement);
-        }
-        return output.toString();
-    }
-
-    public int doEndTag() throws JspException {
-        try {
-            parseMarkup();
-            JspWriter out = pageContext.getOut();
-            HashMap values = null;
-            try {
-                FormObject foo = getFormObject();
-                List<DynamicField> dynfs = foo.getDynamicFields();
-                Iterator<DynamicField> dynIt = dynfs.iterator();
-                int i = 9899;
-                while (dynIt.hasNext()) {
-                    DynamicField dynf = dynIt.next();
-                    StringBuffer genTaName = new StringBuffer().append("_").append(dynf.getTable()).append("_");
-                    genTaName.append("-1").append("_");
-                    Iterator pparamIt = dynf.getRowTemplate().getParameterMap().keySet().iterator();
-                    while(pparamIt.hasNext()) {
-                        String key = (String) pparamIt.next();
-                        String value = (String) dynf.getRowTemplate().getParameterMap().get(key);
-                        byte[] valueInBase64 = Base64.encodeBase64(value.getBytes());
-                        genTaName.append(key).append(":").append(new String(valueInBase64)).append(";");
-                    }
-
-
-                    String preWithVars = new String(preMarkup);
-                    preWithVars = strReplace(preWithVars,type+"NN",Integer.toString(i));
-                    preWithVars = strReplace(preWithVars,"\\$genTaName",genTaName.toString());
-                    preWithVars = strReplace(preWithVars,"\\$fieldName",dynf.getName());
-
-                    out.print(preWithVars);
-
-                    Iterator<DynamicFieldRow> rowIt = dynf.getRowList().iterator();
-                     while (rowIt.hasNext()) {
-                        ++i;
-                        DynamicFieldRow row = rowIt.next();
-                        if (row.getValue()==null)
-                            row.setValue("");
-                        if (row.getValue().length()>0) {
-                            StringBuffer taName = new StringBuffer().append("_").append(dynf.getTable()).append("_");
-                            taName.append(row.getId()).append("_");
-                            Iterator paramIt = row.getParameterMap().keySet().iterator();
-                            while(paramIt.hasNext()) {
-                                String key = (String) paramIt.next();
-                                String value = (String) row.getParameterMap().get(key);
-                                byte[] valueInBase64 = Base64.encodeBase64(value.getBytes());
-                                taName.append(key).append(":").append(new String(valueInBase64)).append(";");
-                            }
-                            if (row.getValue().length()>0) {
-                                String templateWithVars = new String(templateMarkup);
-                                templateWithVars = strReplace(templateWithVars,type+"NN",Integer.toString(i));
-                                templateWithVars = strReplace(templateWithVars,"\\$taName",taName.toString());
-                                templateWithVars = strReplace(templateWithVars,"\\$\\$",row.getValue());
-                                out.print(templateWithVars);
-                            }
-                        }
-                    }
-
-
-                    out.print(postMarkup);
-                }
-                // output the row template for the javascript to clone
-
-                out.println("<!-- row template inserted by DynamicFieldsTag  -->");
-                String hiddenTemplatePreMarkup = new String(preMarkup);
-                // bit of a hack to hide the template from the user:
-                hiddenTemplatePreMarkup = strReplace(hiddenTemplatePreMarkup,"display\\:none\\;","");
-                hiddenTemplatePreMarkup = strReplace(hiddenTemplatePreMarkup,"display\\:block\\;","");
-                hiddenTemplatePreMarkup = strReplace(hiddenTemplatePreMarkup,"display\\:inline\\;","");
-                hiddenTemplatePreMarkup = strReplace(hiddenTemplatePreMarkup,"style\\=\\\"","style=\"display:none;");
-                out.print(hiddenTemplatePreMarkup);
-                String hiddenTemplateTemplateMarkup = new String(templateMarkup);
-                hiddenTemplateTemplateMarkup = strReplace(hiddenTemplateTemplateMarkup, "\\$\\$", "");
-                out.print(hiddenTemplateTemplateMarkup);
-                out.print(postMarkup);
-
-            } catch (Exception e){
-                System.out.println("DynamicFieldsTag could not get the form object");
-            }
-
-        } catch(Exception ex) {
-            throw new JspException(ex.getMessage());
-        }
-        return SKIP_BODY;
-    }
-}
+package edu.cornell.mannlib.vedit.tags;
+
+import java.util.HashMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Iterator;
+
+import java.io.File;
+import java.io.BufferedOutputStream;
+import java.io.InputStream;
+import java.io.FileInputStream;
+import java.io.BufferedInputStream;
+import java.io.InputStreamReader;
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.ServletException;
+import edu.cornell.mannlib.vedit.beans.FormObject;
+import edu.cornell.mannlib.vedit.beans.DynamicField;
+import edu.cornell.mannlib.vedit.beans.DynamicFieldRow;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang.StringEscapeUtils;
+import edu.cornell.mannlib.vedit.tags.EditTag;
+
+public class DynamicFieldsTag extends EditTag {
+
+    private char PATH_SEP = File.separatorChar;
+
+    public final String MARKUP_FILE_PATH = "templates"+PATH_SEP+"edit"+PATH_SEP+"specific"+PATH_SEP;
+
+    private String name = null;
+    private String type = null;
+    private String usePage = null;
+
+    private String preMarkup = null;
+    private String templateMarkup = null;
+    private String postMarkup = null;
+
+    public void setName( String name ) {
+        this.name = name;
+    }
+
+    public void setType( String type ) {
+        this.type = type;
+    }
+
+    public void setUsePage( String usePage ) {
+        this.usePage = usePage;
+    }
+
+    public void parseMarkup() throws JspException{
+        try {
+
+            int preStart = -1;
+            int templateStart = -1;
+            int postStart = -1;
+
+            InputStream fis = new FileInputStream (pageContext.getServletContext().getRealPath(new String())+PATH_SEP+MARKUP_FILE_PATH+usePage);
+            InputStream bis = new BufferedInputStream(fis);
+            BufferedReader in = new BufferedReader(new InputStreamReader(bis));
+            List<String> lines = new ArrayList<String>();
+            lines.add(""); // 0th line
+            int lineIndex = 0;
+            while (in.ready()) {
+                ++lineIndex;
+                String currentLine = in.readLine();
+                if (currentLine != null && currentLine.indexOf("<!--") ==0 && currentLine.indexOf("@pre")>0  ) {
+                   preStart = lineIndex;
+                } else if (currentLine != null && currentLine.indexOf("<!--") ==0 && currentLine.indexOf("@template")>0 ) {
+                   templateStart = lineIndex;
+                } else if (currentLine != null && currentLine.indexOf("<!--") ==0 && currentLine.indexOf("@post")>0 ) {
+                   postStart = lineIndex;
+                }
+                lines.add(currentLine);
+            }
+            in.close();
+
+            StringBuffer preMarkupB = new StringBuffer();
+            StringBuffer postMarkupB = new StringBuffer();
+            StringBuffer templateMarkupB = new StringBuffer();
+
+            if (templateStart>preStart  && preStart>0) {
+                for (int i=preStart+1; i<templateStart; i++) {
+                    preMarkupB.append(lines.get(i)).append("\n");
+                }
+            } else {
+                System.out.println("DynamicFieldsTag could not find @pre markup in "+MARKUP_FILE_PATH+usePage);
+                throw new JspException("DynamicFieldsTag could not parse @pre markup section");
+            }
+            preMarkup = preMarkupB.toString();
+
+
+            if (postStart>templateStart && templateStart>0) {
+                for (int i=templateStart+1; i<postStart; i++) {
+                    templateMarkupB.append(lines.get(i)).append("\n");
+                }
+            } else {
+                System.out.println("DynamicFieldsTag could not find @template markup in "+MARKUP_FILE_PATH+usePage);
+                throw new JspException("DynamicFieldsTag could not parse @template markup section");
+            }
+            templateMarkup = templateMarkupB.toString();
+
+            if (postStart>0) {
+                for (int i=postStart+1; i<lines.size(); i++) {
+                    postMarkupB.append(lines.get(i)).append("\n");
+                }
+            } else {
+                System.out.println("DynamicFieldsTag could not find @post markup in "+MARKUP_FILE_PATH+usePage);
+                throw new JspException("DynamicFieldsTag could not parse @post markup section");
+            }
+            postMarkup = postMarkupB.toString();
+
+        } catch (FileNotFoundException e) {
+            System.out.println("DynamicFieldsTag could not find markup file at "+pageContext.getServletContext().getRealPath(new String())+"\\"+MARKUP_FILE_PATH+usePage);
+        } catch (IOException ioe) {
+            System.out.println("DynamicFieldsTag encountered IOException reading "+pageContext.getServletContext().getRealPath(new String())+"\\"+MARKUP_FILE_PATH+usePage);
+        }
+
+    }
+
+    public String strReplace(String input, String pattern, String replacement) {
+        String[] piece = input.split(pattern);
+        StringBuffer output = new StringBuffer();
+        for (int i=0; i<piece.length; i++) {
+            output.append(piece[i]);
+            if (i<piece.length-1)
+                output.append(replacement);
+        }
+        return output.toString();
+    }
+
+    public int doEndTag() throws JspException {
+        try {
+            parseMarkup();
+            JspWriter out = pageContext.getOut();
+            HashMap values = null;
+            try {
+                FormObject foo = getFormObject();
+                List<DynamicField> dynfs = foo.getDynamicFields();
+                Iterator<DynamicField> dynIt = dynfs.iterator();
+                int i = 9899;
+                while (dynIt.hasNext()) {
+                    DynamicField dynf = dynIt.next();
+                    StringBuffer genTaName = new StringBuffer().append("_").append(dynf.getTable()).append("_");
+                    genTaName.append("-1").append("_");
+                    Iterator pparamIt = dynf.getRowTemplate().getParameterMap().keySet().iterator();
+                    while(pparamIt.hasNext()) {
+                        String key = (String) pparamIt.next();
+                        String value = (String) dynf.getRowTemplate().getParameterMap().get(key);
+                        byte[] valueInBase64 = Base64.encodeBase64(value.getBytes());
+                        genTaName.append(key).append(":").append(new String(valueInBase64)).append(";");
+                    }
+
+
+                    String preWithVars = new String(preMarkup);
+                    preWithVars = strReplace(preWithVars,type+"NN",Integer.toString(i));
+                    preWithVars = strReplace(preWithVars,"\\$genTaName",genTaName.toString());
+                    preWithVars = strReplace(preWithVars,"\\$fieldName",dynf.getName());
+
+                    out.print(preWithVars);
+
+                    Iterator<DynamicFieldRow> rowIt = dynf.getRowList().iterator();
+                     while (rowIt.hasNext()) {
+                        ++i;
+                        DynamicFieldRow row = rowIt.next();
+                        if (row.getValue()==null)
+                            row.setValue("");
+                        if (row.getValue().length()>0) {
+                            StringBuffer taName = new StringBuffer().append("_").append(dynf.getTable()).append("_");
+                            taName.append(row.getId()).append("_");
+                            Iterator paramIt = row.getParameterMap().keySet().iterator();
+                            while(paramIt.hasNext()) {
+                                String key = (String) paramIt.next();
+                                String value = (String) row.getParameterMap().get(key);
+                                byte[] valueInBase64 = Base64.encodeBase64(value.getBytes());
+                                taName.append(key).append(":").append(new String(valueInBase64)).append(";");
+                            }
+                            if (row.getValue().length()>0) {
+                                String templateWithVars = new String(templateMarkup);
+                                templateWithVars = strReplace(templateWithVars,type+"NN",Integer.toString(i));
+                                templateWithVars = strReplace(templateWithVars,"\\$taName",taName.toString());
+                                templateWithVars = strReplace(templateWithVars,"\\$\\$",row.getValue());
+                                out.print(templateWithVars);
+                            }
+                        }
+                    }
+
+
+                    out.print(postMarkup);
+                }
+                // output the row template for the javascript to clone
+
+                out.println("<!-- row template inserted by DynamicFieldsTag  -->");
+                String hiddenTemplatePreMarkup = new String(preMarkup);
+                // bit of a hack to hide the template from the user:
+                hiddenTemplatePreMarkup = strReplace(hiddenTemplatePreMarkup,"display\\:none\\;","");
+                hiddenTemplatePreMarkup = strReplace(hiddenTemplatePreMarkup,"display\\:block\\;","");
+                hiddenTemplatePreMarkup = strReplace(hiddenTemplatePreMarkup,"display\\:inline\\;","");
+                hiddenTemplatePreMarkup = strReplace(hiddenTemplatePreMarkup,"style\\=\\\"","style=\"display:none;");
+                out.print(hiddenTemplatePreMarkup);
+                String hiddenTemplateTemplateMarkup = new String(templateMarkup);
+                hiddenTemplateTemplateMarkup = strReplace(hiddenTemplateTemplateMarkup, "\\$\\$", "");
+                out.print(hiddenTemplateTemplateMarkup);
+                out.print(postMarkup);
+
+            } catch (Exception e){
+                System.out.println("DynamicFieldsTag could not get the form object");
+            }
+
+        } catch(Exception ex) {
+            throw new JspException(ex.getMessage());
+        }
+        return SKIP_BODY;
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/tags/EditTag.java b/webapp/src/edu/cornell/mannlib/vedit/tags/EditTag.java
index cb61cf22d..5ff13b6b3 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/tags/EditTag.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/tags/EditTag.java
@@ -1,58 +1,58 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.tags;
-
-import java.util.HashMap;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.TagSupport;
-import javax.servlet.jsp.JspWriter;
-
-import edu.cornell.mannlib.vedit.beans.EditProcessObject;
-import edu.cornell.mannlib.vedit.beans.FormObject;
-import org.apache.commons.lang.StringEscapeUtils;
-
-public class EditTag extends TagSupport {
-    private String name = null;
-
-    public void setName( String name ) {
-        this.name = name;
-    }
-
-    public int doEndTag() throws JspException {
-        return SKIP_BODY;
-    }
-
-    public EditProcessObject getEpo() {
-        EditProcessObject epo = null;
-        String epoKey = null;
-        String epoKeyAttr = (String) pageContext.getRequest().getAttribute("epoKey");
-        if (epoKeyAttr != null) {
-            epoKey = epoKeyAttr;
-        }
-        else {
-            String epoKeyParam = (String) pageContext.getRequest().getParameter("epoKey");
-            if (epoKeyParam != null) {
-                epoKey = epoKeyParam;
-            }
-        }
-        HashMap epoHash = (HashMap) pageContext.getSession().getAttribute("epoHash");
-        try {
-            epo = (EditProcessObject) epoHash.get(epoKey);
-        } catch (NullPointerException npe) {
-            System.out.println("Null epoHash in edu.cornell.mannlib.vitro.edu.tags.utils.TagUtils.getEpo()");
-        }
-        return epo;
-    }
-
-    public FormObject getFormObject() {
-        FormObject foo=null;
-        try {
-            foo=getEpo().getFormObject();
-        } catch (NullPointerException npe) {
-            System.out.println("Null epo in edu.cornell.mannlib.vitro.edit.tags.utils.TagUtils.getFormObject()");
-        }
-        return foo;
-    }
-}
+package edu.cornell.mannlib.vedit.tags;
+
+import java.util.HashMap;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.TagSupport;
+import javax.servlet.jsp.JspWriter;
+
+import edu.cornell.mannlib.vedit.beans.EditProcessObject;
+import edu.cornell.mannlib.vedit.beans.FormObject;
+import org.apache.commons.lang.StringEscapeUtils;
+
+public class EditTag extends TagSupport {
+    private String name = null;
+
+    public void setName( String name ) {
+        this.name = name;
+    }
+
+    public int doEndTag() throws JspException {
+        return SKIP_BODY;
+    }
+
+    public EditProcessObject getEpo() {
+        EditProcessObject epo = null;
+        String epoKey = null;
+        String epoKeyAttr = (String) pageContext.getRequest().getAttribute("epoKey");
+        if (epoKeyAttr != null) {
+            epoKey = epoKeyAttr;
+        }
+        else {
+            String epoKeyParam = (String) pageContext.getRequest().getParameter("epoKey");
+            if (epoKeyParam != null) {
+                epoKey = epoKeyParam;
+            }
+        }
+        HashMap epoHash = (HashMap) pageContext.getSession().getAttribute("epoHash");
+        try {
+            epo = (EditProcessObject) epoHash.get(epoKey);
+        } catch (NullPointerException npe) {
+            System.out.println("Null epoHash in edu.cornell.mannlib.vitro.edu.tags.utils.TagUtils.getEpo()");
+        }
+        return epo;
+    }
+
+    public FormObject getFormObject() {
+        FormObject foo=null;
+        try {
+            foo=getEpo().getFormObject();
+        } catch (NullPointerException npe) {
+            System.out.println("Null epo in edu.cornell.mannlib.vitro.edit.tags.utils.TagUtils.getFormObject()");
+        }
+        return foo;
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/tags/ErrorTag.java b/webapp/src/edu/cornell/mannlib/vedit/tags/ErrorTag.java
index 1e303151c..5b9f533dc 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/tags/ErrorTag.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/tags/ErrorTag.java
@@ -1,40 +1,40 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.tags;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-import javax.servlet.jsp.JspWriter;
-import edu.cornell.mannlib.vedit.beans.FormObject;
-import edu.cornell.mannlib.vedit.tags.EditTag;
-import org.apache.commons.lang.StringEscapeUtils;
-
-/** This tag allows validation error messages to be displayed on a form JSP **/
-public class ErrorTag extends EditTag {
-    private String name = null;
-
-    public void setName( String name ) {
-        this.name = name;
-    }
-
-    public int doEndTag() throws JspException {
-        try {
-            JspWriter out = pageContext.getOut();
-
-            String errors = null;
-            try {
-                errors = (String) getFormObject().getErrorMap().get(name);
-            } catch (Exception e){
-                System.out.println("Could not get the form object from which to extract validation error message.");
-            }
-
-            if (errors != null){
-                out.print(StringEscapeUtils.escapeHtml((String) errors));
-            }
-
-        } catch(Exception ex) {
-            throw new JspException(ex.getMessage());
-        }
-        return SKIP_BODY;
-    }
-}
+package edu.cornell.mannlib.vedit.tags;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+import javax.servlet.jsp.JspWriter;
+import edu.cornell.mannlib.vedit.beans.FormObject;
+import edu.cornell.mannlib.vedit.tags.EditTag;
+import org.apache.commons.lang.StringEscapeUtils;
+
+/** This tag allows validation error messages to be displayed on a form JSP **/
+public class ErrorTag extends EditTag {
+    private String name = null;
+
+    public void setName( String name ) {
+        this.name = name;
+    }
+
+    public int doEndTag() throws JspException {
+        try {
+            JspWriter out = pageContext.getOut();
+
+            String errors = null;
+            try {
+                errors = (String) getFormObject().getErrorMap().get(name);
+            } catch (Exception e){
+                System.out.println("Could not get the form object from which to extract validation error message.");
+            }
+
+            if (errors != null){
+                out.print(StringEscapeUtils.escapeHtml((String) errors));
+            }
+
+        } catch(Exception ex) {
+            throw new JspException(ex.getMessage());
+        }
+        return SKIP_BODY;
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/tags/OptionTag.java b/webapp/src/edu/cornell/mannlib/vedit/tags/OptionTag.java
index 2cf3fab0d..8036c3082 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/tags/OptionTag.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/tags/OptionTag.java
@@ -1,70 +1,70 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.tags;
-
-import org.apache.commons.collections.map.ListOrderedMap;
-import org.apache.commons.collections.OrderedMapIterator;
-import java.util.List;
-import java.util.Iterator;
-import java.io.IOException;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-
-import edu.cornell.mannlib.vedit.beans.Option;
-import edu.cornell.mannlib.vedit.tags.EditTag;
-import org.apache.commons.lang.StringEscapeUtils;
-
-public class OptionTag extends EditTag {
-    private String name = null;
-
-    public void setName( String name ) {
-        this.name = name;
-    }
-
-    private void outputOptionsMarkup(List optList, JspWriter out) throws IOException {
-        Iterator it = optList.iterator();
-        while (it.hasNext()){
-            Option opt = (Option) it.next();
-            if (opt.getValue() == null)
-                opt.setValue("");
-            if (opt.getBody() == null)
-                opt.setBody("");
-            out.print("<option value=\""+StringEscapeUtils.escapeHtml(opt.getValue())+"\"");
-            if (opt.getSelected())
-                out.print(" selected=\"selected\"");
-            out.print(">");
-            out.print(StringEscapeUtils.escapeHtml(opt.getBody()));
-            out.print("</option>\n");
-        }
-    }
-
-    public int doEndTag() throws JspException {
-        try {
-            JspWriter out = pageContext.getOut();
-
-            List optList = null;
-            ListOrderedMap optGroups = null;
-
-            try {
-                optList = (List) getFormObject().getOptionLists().get(name);
-                outputOptionsMarkup(optList,out);
-            } catch (ClassCastException e){
-                // maybe it's a ListOrderedMap of optgroups
-                optGroups = (ListOrderedMap) getFormObject().getOptionLists().get(name);
-                OrderedMapIterator ogKey = optGroups.orderedMapIterator();
-                while (ogKey.hasNext()) {
-                    String optGroupName = (String) ogKey.next();
-                    out.println("<optgroup label=\""+StringEscapeUtils.escapeHtml(optGroupName)+"\">");
-                    outputOptionsMarkup((List)optGroups.get(optGroupName),out);
-                    out.println("</optgroup>");
-                }
-            } catch (NullPointerException npe) {
-                System.out.println("OptionTag could not find option list for "+name);
-            }
-        } catch(Exception ex) {
-            ex.printStackTrace();
-            throw new JspException(ex.getMessage());
-        }
-        return SKIP_BODY; // EVAL_PAGE; did colnames only //EVAL_PAGE in connection pooled version;
-    }
-}
+package edu.cornell.mannlib.vedit.tags;
+
+import org.apache.commons.collections.map.ListOrderedMap;
+import org.apache.commons.collections.OrderedMapIterator;
+import java.util.List;
+import java.util.Iterator;
+import java.io.IOException;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+
+import edu.cornell.mannlib.vedit.beans.Option;
+import edu.cornell.mannlib.vedit.tags.EditTag;
+import org.apache.commons.lang.StringEscapeUtils;
+
+public class OptionTag extends EditTag {
+    private String name = null;
+
+    public void setName( String name ) {
+        this.name = name;
+    }
+
+    private void outputOptionsMarkup(List optList, JspWriter out) throws IOException {
+        Iterator it = optList.iterator();
+        while (it.hasNext()){
+            Option opt = (Option) it.next();
+            if (opt.getValue() == null)
+                opt.setValue("");
+            if (opt.getBody() == null)
+                opt.setBody("");
+            out.print("<option value=\""+StringEscapeUtils.escapeHtml(opt.getValue())+"\"");
+            if (opt.getSelected())
+                out.print(" selected=\"selected\"");
+            out.print(">");
+            out.print(StringEscapeUtils.escapeHtml(opt.getBody()));
+            out.print("</option>\n");
+        }
+    }
+
+    public int doEndTag() throws JspException {
+        try {
+            JspWriter out = pageContext.getOut();
+
+            List optList = null;
+            ListOrderedMap optGroups = null;
+
+            try {
+                optList = (List) getFormObject().getOptionLists().get(name);
+                outputOptionsMarkup(optList,out);
+            } catch (ClassCastException e){
+                // maybe it's a ListOrderedMap of optgroups
+                optGroups = (ListOrderedMap) getFormObject().getOptionLists().get(name);
+                OrderedMapIterator ogKey = optGroups.orderedMapIterator();
+                while (ogKey.hasNext()) {
+                    String optGroupName = (String) ogKey.next();
+                    out.println("<optgroup label=\""+StringEscapeUtils.escapeHtml(optGroupName)+"\">");
+                    outputOptionsMarkup((List)optGroups.get(optGroupName),out);
+                    out.println("</optgroup>");
+                }
+            } catch (NullPointerException npe) {
+                System.out.println("OptionTag could not find option list for "+name);
+            }
+        } catch(Exception ex) {
+            ex.printStackTrace();
+            throw new JspException(ex.getMessage());
+        }
+        return SKIP_BODY; // EVAL_PAGE; did colnames only //EVAL_PAGE in connection pooled version;
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/tags/ValueTag.java b/webapp/src/edu/cornell/mannlib/vedit/tags/ValueTag.java
index dc2986e67..92619693d 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/tags/ValueTag.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/tags/ValueTag.java
@@ -1,48 +1,48 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.tags;
-
-import java.util.HashMap;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
-import javax.servlet.jsp.JspWriter;
-import edu.cornell.mannlib.vedit.beans.FormObject;
-import org.apache.commons.lang.StringEscapeUtils;
-import edu.cornell.mannlib.vedit.tags.EditTag;
-
-public class ValueTag extends EditTag {
-    private String name = null;
-
-    public void setName( String name ) {
-        this.name = name;
-    }
-
-    public int doEndTag() throws JspException {
-        try {
-            JspWriter out = pageContext.getOut();
-
-            HashMap values = null;
-            try {
-                // FormObject foo = (FormObject) pageContext.getSession().getAttribute("FormObject");
-                // FormObject foo = TagUtils.getFormObject(pageContext);
-                FormObject foo = getFormObject();
-                values = foo.getValues();
-            } catch (Exception e){
-                System.out.println("Could not get the form object from which to build an option list");
-            }
-
-            if (values != null){
-                String value = (String) values.get(name);
-                if (value != null)
-                    out.print(StringEscapeUtils.escapeHtml(value));
-            } else {
-                System.out.println("ValueTag unable to get HashMap of form values");
-            }
-
-        } catch(Exception ex) {
-            throw new JspException(ex.getMessage());
-        }
-        return SKIP_BODY;
-    }
-}
+package edu.cornell.mannlib.vedit.tags;
+
+import java.util.HashMap;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.tagext.TagSupport;
+import javax.servlet.jsp.JspWriter;
+import edu.cornell.mannlib.vedit.beans.FormObject;
+import org.apache.commons.lang.StringEscapeUtils;
+import edu.cornell.mannlib.vedit.tags.EditTag;
+
+public class ValueTag extends EditTag {
+    private String name = null;
+
+    public void setName( String name ) {
+        this.name = name;
+    }
+
+    public int doEndTag() throws JspException {
+        try {
+            JspWriter out = pageContext.getOut();
+
+            HashMap values = null;
+            try {
+                // FormObject foo = (FormObject) pageContext.getSession().getAttribute("FormObject");
+                // FormObject foo = TagUtils.getFormObject(pageContext);
+                FormObject foo = getFormObject();
+                values = foo.getValues();
+            } catch (Exception e){
+                System.out.println("Could not get the form object from which to build an option list");
+            }
+
+            if (values != null){
+                String value = (String) values.get(name);
+                if (value != null)
+                    out.print(StringEscapeUtils.escapeHtml(value));
+            } else {
+                System.out.println("ValueTag unable to get HashMap of form values");
+            }
+
+        } catch(Exception ex) {
+            throw new JspException(ex.getMessage());
+        }
+        return SKIP_BODY;
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/util/FormUtils.java b/webapp/src/edu/cornell/mannlib/vedit/util/FormUtils.java
index 15f7cb932..5c65da7c0 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/util/FormUtils.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/util/FormUtils.java
@@ -1,372 +1,372 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vedit.util;
-
-import java.lang.reflect.Method;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.codec.binary.Base64;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vedit.beans.EditProcessObject;
-import edu.cornell.mannlib.vedit.beans.FormObject;
-import edu.cornell.mannlib.vedit.beans.Option;
-import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-
-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 List<Class> SUPPORTED_TYPE_LIST = Arrays
-            .asList(SUPPORTED_TYPES);
-
-    /* this class needs to be reworked */
-
-    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, 
-    		                                 Map<String, String> badValuesHash) {
-        populateFormFromBean(bean,action,null,foo,badValuesHash);
-    }
-
-    /**
-     * Populates form objects with bean values
-     */
-    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() 
-        	            : bean.getClass();
-
-        Method[] meths = beanClass.getMethods();
-
-        for (int i=0; i<meths.length; i++) {
-
-            if (meths[i].getName().indexOf("set") == 0) {
-
-                // we have a setter method
-                Method currMeth = meths[i];
-                Class[] currMethParamTypes = currMeth.getParameterTypes();
-                Class currMethType = currMethParamTypes[0];
-                
-                if (SUPPORTED_TYPE_LIST.contains(currMethType)) {
-                	//we only want people directly to type in ints, strings, and dates
-                	//of course, most of the ints are probably foreign keys anyway...
-
-                    String elementName = currMeth.getName().substring(
-                    		3,currMeth.getName().length());
-
-                    //see if there's something in the bean using
-                    //the related getter method
-
-                    Class[] paramClass = new Class[1];
-                    paramClass[0] = currMethType;
-                    try {
-                        Method getter = beanClass.getMethod(
-                        		"get" + elementName, (Class[]) null);
-                        Object existingData = null;
-                        try {
-                            existingData = getter.invoke(bean, (Object[]) null);
-                        } catch (Exception e) {
-                            log.error ("Exception invoking getter method");
-                        }
-                        String value = "";
-                        if (existingData != null){
-                            if (existingData instanceof String){
-                                value += existingData;
-                            }
-                            else if (!(existingData instanceof Integer 
-                            		&& (Integer)existingData < 0)) {
-                                value += existingData.toString();
-                            }
-                        }
-                        String badValue = (String) BadValuesHash.get(elementName);
-                        if (badValue != null) {
-                            value = badValue;
-                        }
-                        foo.getValues().put(elementName, value);
-                    } catch (NoSuchMethodException e) {
-                        //ignore it
-                    }
-                }
-            }
-        }
-    }
-
-    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, 
-    		                                           boolean forceSelectedInclusion) {
-        List<Option> optList = new LinkedList();
-
-        if (beanList == null)
-            return optList;
-
-        Iterator beanIt = beanList.iterator();
-        boolean foundSelectedValueInBeans = false;
-
-        while (beanIt.hasNext()){
-            Object bean = beanIt.next();
-
-            String value="";
-            Method valueMeth = null;
-            Object valueObj = null;
-            try {
-                valueMeth = bean.getClass().getMethod(
-                		"get" + valueField, (Class[]) null);
-                valueObj = valueMeth.invoke(bean, (Object[]) null);
-            } catch (Exception e) {
-                log.warn("Could not find method get" + valueField + " on " + 
-                		bean.getClass());
-            }
-
-            if (valueObj != null){
-                value = valueObj.toString();
-            }
-
-            String body="";
-            Method bodyMeth = null;
-            Object bodyObj = null;
-            try {
-                bodyMeth = bean.getClass().getMethod(
-                		"get" + bodyField, (Class[]) null);
-                bodyObj = bodyMeth.invoke(bean, (Object[]) null);
-            } catch (Exception e) {
-                log.warn(" could not find method get"+bodyField);
-            }
-
-            if (bodyObj != null){
-                body = bodyObj.toString();
-            }
-
-            Option opt = new Option();
-            opt.setValue(value);
-            opt.setBody(body);
-
-            if (selectedValue != null){
-                if (selectedValue.equals(value)) {
-                    opt.setSelected(true);
-                    foundSelectedValueInBeans = true;
-                }
-            } else {
-                if (selectedBody != null){
-                    if (selectedBody.equals(body)) {
-                        opt.setSelected(true);
-                        foundSelectedValueInBeans = true;
-                    }
-                }
-            }
-
-            optList.add(opt);
-
-        }
-
-        // 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 
-        boolean skipThisStep = !forceSelectedInclusion;
-        // 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) {
-            skipThisStep = true;
-        } else {
-            try {
-                int selectedValueInt = Integer.decode(selectedValue);
-                if (selectedValueInt < 0)
-                    skipThisStep = true;
-            } catch (NumberFormatException e) {}
-        }
-        if (!foundSelectedValueInBeans && !skipThisStep) {
-            log.trace("Adding the selected option!");
-            Option sOpt = new Option();
-            sOpt.setValue(selectedValue);
-            if (selectedBody == null || selectedBody.length() == 0)
-                sOpt.setBody(selectedValue.toString());
-            else
-                sOpt.setBody(selectedBody);
-            sOpt.setSelected(true);
-            optList.add(sOpt);
-        }
-
-        return optList;
-
-    }
-    
-    public static List<Option> makeVClassOptionList(WebappDaoFactory wadf, 
-    		                                        String selectedVClassURI) {
-        List<Option> vclassOptionList = new LinkedList<Option>();
-        for (VClass vclass : wadf.getVClassDao().getAllVclasses()) {
-        	Option option = new Option();
-        	option.setValue(vclass.getURI());
-        	if ( (selectedVClassURI != null) 
-        			&& (vclass.getURI() != null) 
-        			&& (selectedVClassURI.equals(vclass.getURI())) ) {
-        		option.setSelected(true);
-        	}
-        	String ontologyPrefix = null;
-        	if (vclass.getNamespace() != null) {
-        		Ontology ont = wadf.getOntologyDao().getOntologyByURI(
-        				vclass.getNamespace());
-        		if ( (ont != null) && (ont.getPrefix() != null) ) {
-        			ontologyPrefix = ont.getPrefix();
-        		}
-        	}
-        	StringBuffer classNameBuffer = new StringBuffer();
-        	if (ontologyPrefix != null) {
-        		classNameBuffer.append(ontologyPrefix).append(":");
-        	}
-        	if (vclass.getName() != null) {
-        		classNameBuffer.append(vclass.getName());
-        	}
-        	option.setBody(classNameBuffer.toString());
-        	vclassOptionList.add(option);
-        }
-        return vclassOptionList;
-    }
-
-    public static void beanSet(Object newObj, String field, String value) {
-        beanSet (newObj, field, value, null);
-    }
-
-    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() 
-        	            : 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 " 
-        			+ cls.getName());
-        	return;
-        }
-        Class argumentType = setterMethod.getParameterTypes()[0];   
-        Object[] arglist = new Object[1];
-        if (int.class.equals(argumentType) 
-        		|| Integer.class.equals(argumentType)) {
-            arglist[0] = (int.class.equals(argumentType)) ? -1 : null;
-            if (!value.isEmpty()) { 
-                int parsedInt = Integer.parseInt(value, BASE_10);
-                if (parsedInt < 0) {
-                	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) {
-                value += " 00:00:00";
-            }
-            if (value != null && value.length()>0) {
-                try {
-                    arglist[0] = standardDateFormat.parse(value);
-                } catch (ParseException p) {
-                    try {
-                        arglist[0] = minutesOnlyDateFormat.parse(value);
-                    } catch (ParseException q) {
-                        log.error(FormUtils.class.getName()+" could not parse" +
-                        		value + " to a Date object.");
-                        throw new IllegalArgumentException(
-                        		"Please enter a date/time in one of these " +
-                        		"formats: '2007-07-07', '2007-07-07 07:07' " +
-                        		"or '2007-07-07 07:07:07'");
-                    }
-                }
-            } else {
-                arglist[0] = null;
-            }
-        } else if (boolean.class.equals(argumentType)) {      	
-            arglist[0] = (value.equalsIgnoreCase("true"));
-        } else {
-            arglist[0] = value;
-        }
-        try {
-            setterMethod.invoke(newObj,arglist);
-        } catch (Exception e) {
-        	log.error(e,e);
-        }
-    }
-
-    private static Method getSetterMethod(Class beanClass, 
-    		                              String fieldName, 
-    		                              List<Class> supportedTypes) {
-    	for (Class clazz : supportedTypes) {
-    		try {
-    			Class[] argList = new Class[1];
-    			argList[0] = clazz;
-    			return beanClass.getMethod("set" + fieldName, argList);
-    		} catch (NoSuchMethodException nsme) {
-    			// just try the next type
-    		}
-     	} 
-    	return null;
-    }
-
-    /**
-     * 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
-     * @return
-     */
-    public static Map beanParamMapFromString(String params) {
-        String[] param = params.split(";");
-        Map beanParamMap = new HashMap();
-        for (int i=0; i<param.length; i++) {
-            String[] p = param[i].split(":");
-            beanParamMap.put(p[0],new String(Base64.decodeBase64(p[1].getBytes())));
-        }
-        return beanParamMap;
-    }
-    
-    public static class NegativeIntegerException extends RuntimeException {}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vedit.util;
+
+import java.lang.reflect.Method;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang.StringEscapeUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vedit.beans.EditProcessObject;
+import edu.cornell.mannlib.vedit.beans.FormObject;
+import edu.cornell.mannlib.vedit.beans.Option;
+import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+
+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 List<Class> SUPPORTED_TYPE_LIST = Arrays
+            .asList(SUPPORTED_TYPES);
+
+    /* this class needs to be reworked */
+
+    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, 
+    		                                 Map<String, String> badValuesHash) {
+        populateFormFromBean(bean,action,null,foo,badValuesHash);
+    }
+
+    /**
+     * Populates form objects with bean values
+     */
+    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() 
+        	            : bean.getClass();
+
+        Method[] meths = beanClass.getMethods();
+
+        for (int i=0; i<meths.length; i++) {
+
+            if (meths[i].getName().indexOf("set") == 0) {
+
+                // we have a setter method
+                Method currMeth = meths[i];
+                Class[] currMethParamTypes = currMeth.getParameterTypes();
+                Class currMethType = currMethParamTypes[0];
+                
+                if (SUPPORTED_TYPE_LIST.contains(currMethType)) {
+                	//we only want people directly to type in ints, strings, and dates
+                	//of course, most of the ints are probably foreign keys anyway...
+
+                    String elementName = currMeth.getName().substring(
+                    		3,currMeth.getName().length());
+
+                    //see if there's something in the bean using
+                    //the related getter method
+
+                    Class[] paramClass = new Class[1];
+                    paramClass[0] = currMethType;
+                    try {
+                        Method getter = beanClass.getMethod(
+                        		"get" + elementName, (Class[]) null);
+                        Object existingData = null;
+                        try {
+                            existingData = getter.invoke(bean, (Object[]) null);
+                        } catch (Exception e) {
+                            log.error ("Exception invoking getter method");
+                        }
+                        String value = "";
+                        if (existingData != null){
+                            if (existingData instanceof String){
+                                value += existingData;
+                            }
+                            else if (!(existingData instanceof Integer 
+                            		&& (Integer)existingData < 0)) {
+                                value += existingData.toString();
+                            }
+                        }
+                        String badValue = (String) BadValuesHash.get(elementName);
+                        if (badValue != null) {
+                            value = badValue;
+                        }
+                        foo.getValues().put(elementName, value);
+                    } catch (NoSuchMethodException e) {
+                        //ignore it
+                    }
+                }
+            }
+        }
+    }
+
+    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, 
+    		                                           boolean forceSelectedInclusion) {
+        List<Option> optList = new LinkedList();
+
+        if (beanList == null)
+            return optList;
+
+        Iterator beanIt = beanList.iterator();
+        boolean foundSelectedValueInBeans = false;
+
+        while (beanIt.hasNext()){
+            Object bean = beanIt.next();
+
+            String value="";
+            Method valueMeth = null;
+            Object valueObj = null;
+            try {
+                valueMeth = bean.getClass().getMethod(
+                		"get" + valueField, (Class[]) null);
+                valueObj = valueMeth.invoke(bean, (Object[]) null);
+            } catch (Exception e) {
+                log.warn("Could not find method get" + valueField + " on " + 
+                		bean.getClass());
+            }
+
+            if (valueObj != null){
+                value = valueObj.toString();
+            }
+
+            String body="";
+            Method bodyMeth = null;
+            Object bodyObj = null;
+            try {
+                bodyMeth = bean.getClass().getMethod(
+                		"get" + bodyField, (Class[]) null);
+                bodyObj = bodyMeth.invoke(bean, (Object[]) null);
+            } catch (Exception e) {
+                log.warn(" could not find method get"+bodyField);
+            }
+
+            if (bodyObj != null){
+                body = bodyObj.toString();
+            }
+
+            Option opt = new Option();
+            opt.setValue(value);
+            opt.setBody(body);
+
+            if (selectedValue != null){
+                if (selectedValue.equals(value)) {
+                    opt.setSelected(true);
+                    foundSelectedValueInBeans = true;
+                }
+            } else {
+                if (selectedBody != null){
+                    if (selectedBody.equals(body)) {
+                        opt.setSelected(true);
+                        foundSelectedValueInBeans = true;
+                    }
+                }
+            }
+
+            optList.add(opt);
+
+        }
+
+        // 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 
+        boolean skipThisStep = !forceSelectedInclusion;
+        // 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) {
+            skipThisStep = true;
+        } else {
+            try {
+                int selectedValueInt = Integer.decode(selectedValue);
+                if (selectedValueInt < 0)
+                    skipThisStep = true;
+            } catch (NumberFormatException e) {}
+        }
+        if (!foundSelectedValueInBeans && !skipThisStep) {
+            log.trace("Adding the selected option!");
+            Option sOpt = new Option();
+            sOpt.setValue(selectedValue);
+            if (selectedBody == null || selectedBody.length() == 0)
+                sOpt.setBody(selectedValue.toString());
+            else
+                sOpt.setBody(selectedBody);
+            sOpt.setSelected(true);
+            optList.add(sOpt);
+        }
+
+        return optList;
+
+    }
+    
+    public static List<Option> makeVClassOptionList(WebappDaoFactory wadf, 
+    		                                        String selectedVClassURI) {
+        List<Option> vclassOptionList = new LinkedList<Option>();
+        for (VClass vclass : wadf.getVClassDao().getAllVclasses()) {
+        	Option option = new Option();
+        	option.setValue(vclass.getURI());
+        	if ( (selectedVClassURI != null) 
+        			&& (vclass.getURI() != null) 
+        			&& (selectedVClassURI.equals(vclass.getURI())) ) {
+        		option.setSelected(true);
+        	}
+        	String ontologyPrefix = null;
+        	if (vclass.getNamespace() != null) {
+        		Ontology ont = wadf.getOntologyDao().getOntologyByURI(
+        				vclass.getNamespace());
+        		if ( (ont != null) && (ont.getPrefix() != null) ) {
+        			ontologyPrefix = ont.getPrefix();
+        		}
+        	}
+        	StringBuffer classNameBuffer = new StringBuffer();
+        	if (ontologyPrefix != null) {
+        		classNameBuffer.append(ontologyPrefix).append(":");
+        	}
+        	if (vclass.getName() != null) {
+        		classNameBuffer.append(vclass.getName());
+        	}
+        	option.setBody(classNameBuffer.toString());
+        	vclassOptionList.add(option);
+        }
+        return vclassOptionList;
+    }
+
+    public static void beanSet(Object newObj, String field, String value) {
+        beanSet (newObj, field, value, null);
+    }
+
+    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() 
+        	            : 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 " 
+        			+ cls.getName());
+        	return;
+        }
+        Class argumentType = setterMethod.getParameterTypes()[0];   
+        Object[] arglist = new Object[1];
+        if (int.class.equals(argumentType) 
+        		|| Integer.class.equals(argumentType)) {
+            arglist[0] = (int.class.equals(argumentType)) ? -1 : null;
+            if (!value.isEmpty()) { 
+                int parsedInt = Integer.parseInt(value, BASE_10);
+                if (parsedInt < 0) {
+                	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) {
+                value += " 00:00:00";
+            }
+            if (value != null && value.length()>0) {
+                try {
+                    arglist[0] = standardDateFormat.parse(value);
+                } catch (ParseException p) {
+                    try {
+                        arglist[0] = minutesOnlyDateFormat.parse(value);
+                    } catch (ParseException q) {
+                        log.error(FormUtils.class.getName()+" could not parse" +
+                        		value + " to a Date object.");
+                        throw new IllegalArgumentException(
+                        		"Please enter a date/time in one of these " +
+                        		"formats: '2007-07-07', '2007-07-07 07:07' " +
+                        		"or '2007-07-07 07:07:07'");
+                    }
+                }
+            } else {
+                arglist[0] = null;
+            }
+        } else if (boolean.class.equals(argumentType)) {      	
+            arglist[0] = (value.equalsIgnoreCase("true"));
+        } else {
+            arglist[0] = value;
+        }
+        try {
+            setterMethod.invoke(newObj,arglist);
+        } catch (Exception e) {
+        	log.error(e,e);
+        }
+    }
+
+    private static Method getSetterMethod(Class beanClass, 
+    		                              String fieldName, 
+    		                              List<Class> supportedTypes) {
+    	for (Class clazz : supportedTypes) {
+    		try {
+    			Class[] argList = new Class[1];
+    			argList[0] = clazz;
+    			return beanClass.getMethod("set" + fieldName, argList);
+    		} catch (NoSuchMethodException nsme) {
+    			// just try the next type
+    		}
+     	} 
+    	return null;
+    }
+
+    /**
+     * 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
+     * @return
+     */
+    public static Map beanParamMapFromString(String params) {
+        String[] param = params.split(";");
+        Map beanParamMap = new HashMap();
+        for (int i=0; i<param.length; i++) {
+            String[] p = param[i].split(":");
+            beanParamMap.put(p[0],new String(Base64.decodeBase64(p[1].getBytes())));
+        }
+        return beanParamMap;
+    }
+    
+    public static class NegativeIntegerException extends RuntimeException {}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/validator/ValidationObject.java b/webapp/src/edu/cornell/mannlib/vedit/validator/ValidationObject.java
index 40af12617..f50361d53 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/validator/ValidationObject.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/validator/ValidationObject.java
@@ -1,7 +1,7 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.validator;
-
+package edu.cornell.mannlib.vedit.validator;
+
 /**
  * Output from a {@link Validator}. Holds the value that was tested, whether it
  * was valid or not, and an optional message.
@@ -29,34 +29,34 @@ public class ValidationObject {
 		vo.setValidatedObject(validatedObject);
 		return vo;
 	}
-
-    private boolean valid = false;
-    private String message;
-    private Object validatedObject = null;
-
-    public boolean getValid(){
-        return valid;
-    }
-
-    public void setValid(boolean valid){
-        this.valid = valid;
-    }
-
-    public String getMessage(){
-        return message;
-    }
-
-    public void setMessage(String message){
-        this.message = message;
-    }
-
-    public Object getValidatedObject(){
-        return validatedObject;
-    }
-
-    public void setValidatedObject(Object validatedObject){
-        this.validatedObject = validatedObject;
-    }
-
-
-}
+
+    private boolean valid = false;
+    private String message;
+    private Object validatedObject = null;
+
+    public boolean getValid(){
+        return valid;
+    }
+
+    public void setValid(boolean valid){
+        this.valid = valid;
+    }
+
+    public String getMessage(){
+        return message;
+    }
+
+    public void setMessage(String message){
+        this.message = message;
+    }
+
+    public Object getValidatedObject(){
+        return validatedObject;
+    }
+
+    public void setValidatedObject(Object validatedObject){
+        this.validatedObject = validatedObject;
+    }
+
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/validator/Validator.java b/webapp/src/edu/cornell/mannlib/vedit/validator/Validator.java
index bddb39f7d..ed194eec4 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/validator/Validator.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/validator/Validator.java
@@ -1,9 +1,9 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.validator;
-
-public interface Validator {
-
-    public ValidationObject validate(Object obj) throws IllegalArgumentException;
-
-}
+package edu.cornell.mannlib.vedit.validator;
+
+public interface Validator {
+
+    public ValidationObject validate(Object obj) throws IllegalArgumentException;
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/validator/impl/EnumValuesValidator.java b/webapp/src/edu/cornell/mannlib/vedit/validator/impl/EnumValuesValidator.java
index e2f7520ba..5b976adee 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/validator/impl/EnumValuesValidator.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/validator/impl/EnumValuesValidator.java
@@ -1,44 +1,44 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.validator.impl;
-
-import edu.cornell.mannlib.vedit.validator.*;
-import java.util.HashSet;
-import java.util.Iterator;
-
-public class EnumValuesValidator implements Validator {
-
-    private HashSet legalValues = new HashSet();
-
-    public ValidationObject validate(Object obj){
-        ValidationObject vo = new ValidationObject();
-        if (legalValues.contains((String)obj)){
-            vo.setValid(true);
-        } else {
-            vo.setValid(false);
-            if (legalValues.size()<7){
-                String msgString = "Please enter one of ";
-                Iterator valuesIt = legalValues.iterator();
-                while (valuesIt.hasNext()) {
-                    String legalValue = (String) valuesIt.next();
-                    msgString += "'"+legalValue+"'";
-                    if (valuesIt.hasNext())
-                        msgString += ", ";
-                    else
-                        msgString += ".";
-                }
-                vo.setMessage(msgString);
-            }
-            else {
-                vo.setMessage("Please enter a legal value.");
-            }
-        }
-        vo.setValidatedObject(obj);
-        return vo;
-    }
-
-    public EnumValuesValidator (String[] legalValues){
-        for (int i=0; i<legalValues.length; i++)
-            this.legalValues.add(legalValues[i]);
-    }
-}
+package edu.cornell.mannlib.vedit.validator.impl;
+
+import edu.cornell.mannlib.vedit.validator.*;
+import java.util.HashSet;
+import java.util.Iterator;
+
+public class EnumValuesValidator implements Validator {
+
+    private HashSet legalValues = new HashSet();
+
+    public ValidationObject validate(Object obj){
+        ValidationObject vo = new ValidationObject();
+        if (legalValues.contains((String)obj)){
+            vo.setValid(true);
+        } else {
+            vo.setValid(false);
+            if (legalValues.size()<7){
+                String msgString = "Please enter one of ";
+                Iterator valuesIt = legalValues.iterator();
+                while (valuesIt.hasNext()) {
+                    String legalValue = (String) valuesIt.next();
+                    msgString += "'"+legalValue+"'";
+                    if (valuesIt.hasNext())
+                        msgString += ", ";
+                    else
+                        msgString += ".";
+                }
+                vo.setMessage(msgString);
+            }
+            else {
+                vo.setMessage("Please enter a legal value.");
+            }
+        }
+        vo.setValidatedObject(obj);
+        return vo;
+    }
+
+    public EnumValuesValidator (String[] legalValues){
+        for (int i=0; i<legalValues.length; i++)
+            this.legalValues.add(legalValues[i]);
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/validator/impl/IntValidator.java b/webapp/src/edu/cornell/mannlib/vedit/validator/impl/IntValidator.java
index c5c7742ed..08ae16243 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/validator/impl/IntValidator.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/validator/impl/IntValidator.java
@@ -1,56 +1,56 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.validator.impl;
-
-import edu.cornell.mannlib.vedit.validator.Validator;
-import edu.cornell.mannlib.vedit.validator.ValidationObject;
-
-public class IntValidator implements Validator {
-
-    protected int minVal = 0; // the edit framework doesn't handle negative ints
-    protected int maxVal = Integer.MAX_VALUE;
-
-    public ValidationObject validate (Object obj) throws IllegalArgumentException {
-
-        ValidationObject vo = new ValidationObject();
-        int theInt = -1;
-
-        if (obj instanceof String) {
-            try {
-                theInt = Integer.parseInt((String) obj);
-            } catch (NumberFormatException e) {
-                vo.setValid(false);
-                vo.setMessage("Please enter an integer");
-                vo.setValidatedObject(obj);
-                return vo;
-            }
-        } else {
-            try {
-                theInt = ((Integer) obj).intValue();
-            } catch (Exception e) {
-                vo.setValid(false);
-                vo.setMessage("Please enter an integer");
-                vo.setValidatedObject(obj);
-                return vo;
-            }
-        }
-
-        if ( theInt < minVal || theInt > maxVal ) {
-            vo.setValid(false);
-            vo.setMessage("Enter a number between "+minVal+" and "+maxVal);
-        } else {
-            vo.setValid(true);
-        }
-
-        vo.setValidatedObject(obj);
-
-        return vo;
-    }
+package edu.cornell.mannlib.vedit.validator.impl;
+
+import edu.cornell.mannlib.vedit.validator.Validator;
+import edu.cornell.mannlib.vedit.validator.ValidationObject;
+
+public class IntValidator implements Validator {
+
+    protected int minVal = 0; // the edit framework doesn't handle negative ints
+    protected int maxVal = Integer.MAX_VALUE;
+
+    public ValidationObject validate (Object obj) throws IllegalArgumentException {
+
+        ValidationObject vo = new ValidationObject();
+        int theInt = -1;
+
+        if (obj instanceof String) {
+            try {
+                theInt = Integer.parseInt((String) obj);
+            } catch (NumberFormatException e) {
+                vo.setValid(false);
+                vo.setMessage("Please enter an integer");
+                vo.setValidatedObject(obj);
+                return vo;
+            }
+        } else {
+            try {
+                theInt = ((Integer) obj).intValue();
+            } catch (Exception e) {
+                vo.setValid(false);
+                vo.setMessage("Please enter an integer");
+                vo.setValidatedObject(obj);
+                return vo;
+            }
+        }
+
+        if ( theInt < minVal || theInt > maxVal ) {
+            vo.setValid(false);
+            vo.setMessage("Enter a number between "+minVal+" and "+maxVal);
+        } else {
+            vo.setValid(true);
+        }
+
+        vo.setValidatedObject(obj);
+
+        return vo;
+    }
 
     public IntValidator(){}
-    
-    public IntValidator (int minVal, int maxVal){
-        this.minVal = minVal;
-        this.maxVal = maxVal;
-    }
-}
+    
+    public IntValidator (int minVal, int maxVal){
+        this.minVal = minVal;
+        this.maxVal = maxVal;
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/validator/impl/UrlValidator.java b/webapp/src/edu/cornell/mannlib/vedit/validator/impl/UrlValidator.java
index 497d93dc7..5d580f58e 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/validator/impl/UrlValidator.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/validator/impl/UrlValidator.java
@@ -1,32 +1,32 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.validator.impl;
-
-import edu.cornell.mannlib.vedit.validator.Validator;
-import edu.cornell.mannlib.vedit.validator.ValidationObject;
-import java.util.regex.*;
-
-public class UrlValidator implements Validator {
-
-    public ValidationObject validate (Object obj) throws IllegalArgumentException {
-
-        ValidationObject vo = new ValidationObject();
-        String theString = null;
-
-        if (!(obj instanceof String)){
-            throw new IllegalArgumentException("Expected instance of String");
-        }
-
-        Pattern pat = Pattern.compile("[a-z]{3,5}*://.*\\.[a-z]{2,4}");
-        Matcher mat = pat.matcher(theString);
-        if (mat.matches()){
-            vo.setValid(true);
-        } else {
-            vo.setValid(false);
-            vo.setMessage("Please enter a valid URL");
-        }
-
-        vo.setValidatedObject(obj);
-        return vo;
-    }
-}
+package edu.cornell.mannlib.vedit.validator.impl;
+
+import edu.cornell.mannlib.vedit.validator.Validator;
+import edu.cornell.mannlib.vedit.validator.ValidationObject;
+import java.util.regex.*;
+
+public class UrlValidator implements Validator {
+
+    public ValidationObject validate (Object obj) throws IllegalArgumentException {
+
+        ValidationObject vo = new ValidationObject();
+        String theString = null;
+
+        if (!(obj instanceof String)){
+            throw new IllegalArgumentException("Expected instance of String");
+        }
+
+        Pattern pat = Pattern.compile("[a-z]{3,5}*://.*\\.[a-z]{2,4}");
+        Matcher mat = pat.matcher(theString);
+        if (mat.matches()){
+            vo.setValid(true);
+        } else {
+            vo.setValid(false);
+            vo.setMessage("Please enter a valid URL");
+        }
+
+        vo.setValidatedObject(obj);
+        return vo;
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vedit/validator/impl/XMLNameValidator.java b/webapp/src/edu/cornell/mannlib/vedit/validator/impl/XMLNameValidator.java
index 504ce3322..68025bdcb 100644
--- a/webapp/src/edu/cornell/mannlib/vedit/validator/impl/XMLNameValidator.java
+++ b/webapp/src/edu/cornell/mannlib/vedit/validator/impl/XMLNameValidator.java
@@ -1,53 +1,53 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vedit.validator.impl;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import edu.cornell.mannlib.vedit.validator.Validator;
-import edu.cornell.mannlib.vedit.validator.ValidationObject;
-
-public class XMLNameValidator implements Validator {
-
-    private final static String ERR_MSG = "Must start with a letter or '_' and use only letters, digits, '.', '-' or '_'. No spaces allowed.";
-
-    Pattern pat = null;
-    boolean permitEmpty = false;
-
-    public XMLNameValidator() {
-        pat = Pattern.compile("[A-Za-z_][A-Za-z0-9_\\-\\.]*");
-    }
-
-    public XMLNameValidator(boolean permitEmpty) {
-	this();
-	this.permitEmpty = permitEmpty;
-    }
-
-    public ValidationObject validate (Object obj) throws IllegalArgumentException {
-        ValidationObject vo = new ValidationObject();
-        String theString = null;
-
-        try {
-            theString = (String) obj;
-        } catch (ClassCastException e) {
-            throw new IllegalArgumentException("Expected instance of String");
-        }
-
-	if (permitEmpty && (theString == null || "".equals(theString))) {
-	    vo.setValid(true);
-	} else {
-            Matcher mat = pat.matcher(theString);
-            if (mat.matches()){
-                vo.setValid(true);
-            } else {
-                vo.setValid(false);
-                vo.setMessage(ERR_MSG);
-            }
-        }
-
-        vo.setValidatedObject(obj);
-        return vo;
-    }
-
-}
+package edu.cornell.mannlib.vedit.validator.impl;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import edu.cornell.mannlib.vedit.validator.Validator;
+import edu.cornell.mannlib.vedit.validator.ValidationObject;
+
+public class XMLNameValidator implements Validator {
+
+    private final static String ERR_MSG = "Must start with a letter or '_' and use only letters, digits, '.', '-' or '_'. No spaces allowed.";
+
+    Pattern pat = null;
+    boolean permitEmpty = false;
+
+    public XMLNameValidator() {
+        pat = Pattern.compile("[A-Za-z_][A-Za-z0-9_\\-\\.]*");
+    }
+
+    public XMLNameValidator(boolean permitEmpty) {
+	this();
+	this.permitEmpty = permitEmpty;
+    }
+
+    public ValidationObject validate (Object obj) throws IllegalArgumentException {
+        ValidationObject vo = new ValidationObject();
+        String theString = null;
+
+        try {
+            theString = (String) obj;
+        } catch (ClassCastException e) {
+            throw new IllegalArgumentException("Expected instance of String");
+        }
+
+	if (permitEmpty && (theString == null || "".equals(theString))) {
+	    vo.setValid(true);
+	} else {
+            Matcher mat = pat.matcher(theString);
+            if (mat.matches()){
+                vo.setValid(true);
+            } else {
+                vo.setValid(false);
+                vo.setMessage(ERR_MSG);
+            }
+        }
+
+        vo.setValidatedObject(obj);
+        return vo;
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/ActiveIdentifierBundleFactories.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/ActiveIdentifierBundleFactories.java
index 02e9b927e..15ddf272f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/ActiveIdentifierBundleFactories.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/ActiveIdentifierBundleFactories.java
@@ -1,163 +1,163 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.identifier;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.http.HttpServletRequest;
-
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-
-/**
- * Keep a list of the active IdentifierBundleFactories in the context.
- */
-public class ActiveIdentifierBundleFactories {
-	private static final String ATTRIBUTE_ACTIVE_FACTORIES = ActiveIdentifierBundleFactories.class
-			.getName();
-
-	// ----------------------------------------------------------------------
-	// static methods
-	// ----------------------------------------------------------------------
-
-	/**
-	 * Add a new IdentifierBundleFactory to the list.
-	 */
-	public static void addFactory(ServletContextEvent sce,
-			IdentifierBundleFactory factory) {
-		if (sce == null) {
-			throw new NullPointerException("sce may not be null.");
-		}
-		if (factory == null) {
-			throw new NullPointerException("factory may not be null.");
-		}
-
-		addFactory(sce.getServletContext(), factory);
-	}
-
-	/**
-	 * Add a new IdentifierBundleFactory to the list.
-	 */
-	public static void addFactory(ServletContext ctx,
-			IdentifierBundleFactory factory) {
-		if (ctx == null) {
-			throw new NullPointerException("ctx may not be null.");
-		}
-		if (factory == null) {
-			throw new NullPointerException("factory may not be null.");
-		}
-
-		getActiveFactories(ctx).addFactory(factory);
-	}
-
-	/**
-	 * Just for diagnostics. Don't expose the factories themselves, only their
-	 * names.
-	 */
-	public static List<String> getFactoryNames(ServletContext ctx) {
-		List<String> names = new ArrayList<String>();
-		ActiveIdentifierBundleFactories actFact = getActiveFactories(ctx);
-		for (IdentifierBundleFactory factory : actFact.factories) {
-			names.add(factory.toString());
-		}
-		return names;
-	}
-
-	/**
-	 * 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.
-	 */
-	static IdentifierBundle getIdentifierBundle(HttpServletRequest request) {
-		return getActiveFactories(request).getBundleForRequest(request);
-	}
-
-	/**
-	 * Get the Identifiers that would be created if this user were to log in.
-	 */
-	public static IdentifierBundle getUserIdentifierBundle(
-			HttpServletRequest request, UserAccount userAccount) {
-		return getActiveFactories(request).getBundleForUser(userAccount);
-	}
-
-	/**
-	 * Get the singleton instance from the servlet context. If there isn't one,
-	 * create one. This never returns null.
-	 */
-	private static ActiveIdentifierBundleFactories getActiveFactories(
-			HttpServletRequest req) {
-		if (req == null) {
-			throw new NullPointerException("req may not be null.");
-		}
-		
-		return getActiveFactories(req.getSession().getServletContext());
-	}
-
-	/**
-	 * Get the singleton instance from the servlet context. If there isn't one,
-	 * create one. This never returns null.
-	 */
-	private static ActiveIdentifierBundleFactories getActiveFactories(
-			ServletContext ctx) {
-		if (ctx == null) {
-			throw new NullPointerException("ctx may not be null.");
-		}
-
-		Object obj = ctx.getAttribute(ATTRIBUTE_ACTIVE_FACTORIES);
-		if (obj == null) {
-			obj = new ActiveIdentifierBundleFactories();
-			ctx.setAttribute(ATTRIBUTE_ACTIVE_FACTORIES, obj);
-		}
-
-		if (!(obj instanceof ActiveIdentifierBundleFactories)) {
-			throw new IllegalStateException("Expected to find an instance of "
-					+ ActiveIdentifierBundleFactories.class.getName()
-					+ " in the context, but found an instance of "
-					+ obj.getClass().getName() + " instead.");
-		}
-
-		return (ActiveIdentifierBundleFactories) obj;
-	}
-
-	// ----------------------------------------------------------------------
-	// the instance
-	// ----------------------------------------------------------------------
-
-	private final List<IdentifierBundleFactory> factories = new ArrayList<IdentifierBundleFactory>();
-
-	private void addFactory(IdentifierBundleFactory factory) {
-		factories.add(factory);
-	}
-
-	/**
-	 * Run through the active factories and get all Identifiers for this
-	 * request.
-	 */
-	private IdentifierBundle getBundleForRequest(HttpServletRequest request) {
-		IdentifierBundle ib = new ArrayIdentifierBundle();
-		for (IdentifierBundleFactory ibf : factories) {
-			ib.addAll(ibf.getIdentifierBundle(request));
-		}
-		return ib;
-	}
-
-	/**
-	 * Get all Identifiers that would be created if this User logged in.
-	 */
-	private IdentifierBundle getBundleForUser(UserAccount userAccount) {
-		IdentifierBundle ib = new ArrayIdentifierBundle();
-		for (IdentifierBundleFactory ibf : factories) {
-			if (ibf instanceof UserBasedIdentifierBundleFactory) {
-				UserBasedIdentifierBundleFactory ubibf = (UserBasedIdentifierBundleFactory) ibf;
-				ib.addAll(ubibf.getIdentifierBundleForUser(userAccount));
-			}
-		}
-		return ib;
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.identifier;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.http.HttpServletRequest;
+
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+
+/**
+ * Keep a list of the active IdentifierBundleFactories in the context.
+ */
+public class ActiveIdentifierBundleFactories {
+	private static final String ATTRIBUTE_ACTIVE_FACTORIES = ActiveIdentifierBundleFactories.class
+			.getName();
+
+	// ----------------------------------------------------------------------
+	// static methods
+	// ----------------------------------------------------------------------
+
+	/**
+	 * Add a new IdentifierBundleFactory to the list.
+	 */
+	public static void addFactory(ServletContextEvent sce,
+			IdentifierBundleFactory factory) {
+		if (sce == null) {
+			throw new NullPointerException("sce may not be null.");
+		}
+		if (factory == null) {
+			throw new NullPointerException("factory may not be null.");
+		}
+
+		addFactory(sce.getServletContext(), factory);
+	}
+
+	/**
+	 * Add a new IdentifierBundleFactory to the list.
+	 */
+	public static void addFactory(ServletContext ctx,
+			IdentifierBundleFactory factory) {
+		if (ctx == null) {
+			throw new NullPointerException("ctx may not be null.");
+		}
+		if (factory == null) {
+			throw new NullPointerException("factory may not be null.");
+		}
+
+		getActiveFactories(ctx).addFactory(factory);
+	}
+
+	/**
+	 * Just for diagnostics. Don't expose the factories themselves, only their
+	 * names.
+	 */
+	public static List<String> getFactoryNames(ServletContext ctx) {
+		List<String> names = new ArrayList<String>();
+		ActiveIdentifierBundleFactories actFact = getActiveFactories(ctx);
+		for (IdentifierBundleFactory factory : actFact.factories) {
+			names.add(factory.toString());
+		}
+		return names;
+	}
+
+	/**
+	 * 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.
+	 */
+	static IdentifierBundle getIdentifierBundle(HttpServletRequest request) {
+		return getActiveFactories(request).getBundleForRequest(request);
+	}
+
+	/**
+	 * Get the Identifiers that would be created if this user were to log in.
+	 */
+	public static IdentifierBundle getUserIdentifierBundle(
+			HttpServletRequest request, UserAccount userAccount) {
+		return getActiveFactories(request).getBundleForUser(userAccount);
+	}
+
+	/**
+	 * Get the singleton instance from the servlet context. If there isn't one,
+	 * create one. This never returns null.
+	 */
+	private static ActiveIdentifierBundleFactories getActiveFactories(
+			HttpServletRequest req) {
+		if (req == null) {
+			throw new NullPointerException("req may not be null.");
+		}
+		
+		return getActiveFactories(req.getSession().getServletContext());
+	}
+
+	/**
+	 * Get the singleton instance from the servlet context. If there isn't one,
+	 * create one. This never returns null.
+	 */
+	private static ActiveIdentifierBundleFactories getActiveFactories(
+			ServletContext ctx) {
+		if (ctx == null) {
+			throw new NullPointerException("ctx may not be null.");
+		}
+
+		Object obj = ctx.getAttribute(ATTRIBUTE_ACTIVE_FACTORIES);
+		if (obj == null) {
+			obj = new ActiveIdentifierBundleFactories();
+			ctx.setAttribute(ATTRIBUTE_ACTIVE_FACTORIES, obj);
+		}
+
+		if (!(obj instanceof ActiveIdentifierBundleFactories)) {
+			throw new IllegalStateException("Expected to find an instance of "
+					+ ActiveIdentifierBundleFactories.class.getName()
+					+ " in the context, but found an instance of "
+					+ obj.getClass().getName() + " instead.");
+		}
+
+		return (ActiveIdentifierBundleFactories) obj;
+	}
+
+	// ----------------------------------------------------------------------
+	// the instance
+	// ----------------------------------------------------------------------
+
+	private final List<IdentifierBundleFactory> factories = new ArrayList<IdentifierBundleFactory>();
+
+	private void addFactory(IdentifierBundleFactory factory) {
+		factories.add(factory);
+	}
+
+	/**
+	 * Run through the active factories and get all Identifiers for this
+	 * request.
+	 */
+	private IdentifierBundle getBundleForRequest(HttpServletRequest request) {
+		IdentifierBundle ib = new ArrayIdentifierBundle();
+		for (IdentifierBundleFactory ibf : factories) {
+			ib.addAll(ibf.getIdentifierBundle(request));
+		}
+		return ib;
+	}
+
+	/**
+	 * Get all Identifiers that would be created if this User logged in.
+	 */
+	private IdentifierBundle getBundleForUser(UserAccount userAccount) {
+		IdentifierBundle ib = new ArrayIdentifierBundle();
+		for (IdentifierBundleFactory ibf : factories) {
+			if (ibf instanceof UserBasedIdentifierBundleFactory) {
+				UserBasedIdentifierBundleFactory ubibf = (UserBasedIdentifierBundleFactory) ibf;
+				ib.addAll(ubibf.getIdentifierBundleForUser(userAccount));
+			}
+		}
+		return ib;
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/RequestIdentifiers.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/RequestIdentifiers.java
index d94433bc5..5d3736a8d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/RequestIdentifiers.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/RequestIdentifiers.java
@@ -1,56 +1,56 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.identifier;
-
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * Build a list of Identifiers that apply to the current request and cache them
- * in the request.
- */
-public class RequestIdentifiers {
-	private static final String ATTRIBUTE_ID_BUNDLE = RequestIdentifiers.class
-			.getName();
-
-	// ----------------------------------------------------------------------
-	// static methods
-	// ----------------------------------------------------------------------
-
-	/**
-	 * 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) {
-		if (!(request instanceof HttpServletRequest)) {
-			return new ArrayIdentifierBundle();
-		}
-		HttpServletRequest hreq = (HttpServletRequest) request;
-
-		Object obj = hreq.getAttribute(ATTRIBUTE_ID_BUNDLE);
-		if (obj == null) {
-			obj = ActiveIdentifierBundleFactories.getIdentifierBundle(hreq);
-			hreq.setAttribute(ATTRIBUTE_ID_BUNDLE, obj);
-		}
-
-		if (!(obj instanceof IdentifierBundle)) {
-			throw new IllegalStateException("Expected to find an instance of "
-					+ IdentifierBundle.class.getName()
-					+ " in the request, but found an instance of "
-					+ obj.getClass().getName() + " instead.");
-		}
-
-		return (IdentifierBundle) obj;
-	}
-
-	/**
-	 * The login status has changed, so discard the cached Identifiers.
-	 */
-	public static void resetIdentifiers(ServletRequest request) {
-		request.removeAttribute(ATTRIBUTE_ID_BUNDLE);
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.identifier;
+
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Build a list of Identifiers that apply to the current request and cache them
+ * in the request.
+ */
+public class RequestIdentifiers {
+	private static final String ATTRIBUTE_ID_BUNDLE = RequestIdentifiers.class
+			.getName();
+
+	// ----------------------------------------------------------------------
+	// static methods
+	// ----------------------------------------------------------------------
+
+	/**
+	 * 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) {
+		if (!(request instanceof HttpServletRequest)) {
+			return new ArrayIdentifierBundle();
+		}
+		HttpServletRequest hreq = (HttpServletRequest) request;
+
+		Object obj = hreq.getAttribute(ATTRIBUTE_ID_BUNDLE);
+		if (obj == null) {
+			obj = ActiveIdentifierBundleFactories.getIdentifierBundle(hreq);
+			hreq.setAttribute(ATTRIBUTE_ID_BUNDLE, obj);
+		}
+
+		if (!(obj instanceof IdentifierBundle)) {
+			throw new IllegalStateException("Expected to find an instance of "
+					+ IdentifierBundle.class.getName()
+					+ " in the request, but found an instance of "
+					+ obj.getClass().getName() + " instead.");
+		}
+
+		return (IdentifierBundle) obj;
+	}
+
+	/**
+	 * The login status has changed, so discard the cached Identifiers.
+	 */
+	public static void resetIdentifiers(ServletRequest request) {
+		request.removeAttribute(ATTRIBUTE_ID_BUNDLE);
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/AbstractCommonIdentifier.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/AbstractCommonIdentifier.java
index 5b7d95948..e55d9dccd 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/AbstractCommonIdentifier.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/AbstractCommonIdentifier.java
@@ -1,36 +1,36 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.identifier.common;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-
-/**
- * A base class for the Identifiers created by the
- * CommonIdentifierBundleFactory.
- */
-public abstract class AbstractCommonIdentifier {
-
-	/**
-	 * Get all of the instances of this class of Identifier from this bundle.
-	 */
-	protected static <T extends Identifier> Collection<T> getIdentifiersForClass(
-			IdentifierBundle ids, Class<T> clazz) {
-		if ((ids == null) || (clazz == null)) {
-			return Collections.emptySet();
-		}
-
-		Set<T> set = new HashSet<T>();
-		for (Identifier id : ids) {
-			if (clazz.isAssignableFrom(id.getClass())) {
-				set.add(clazz.cast(id));
-			}
-		}
-		return set;
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.identifier.common;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+
+/**
+ * A base class for the Identifiers created by the
+ * CommonIdentifierBundleFactory.
+ */
+public abstract class AbstractCommonIdentifier {
+
+	/**
+	 * Get all of the instances of this class of Identifier from this bundle.
+	 */
+	protected static <T extends Identifier> Collection<T> getIdentifiersForClass(
+			IdentifierBundle ids, Class<T> clazz) {
+		if ((ids == null) || (clazz == null)) {
+			return Collections.emptySet();
+		}
+
+		Set<T> set = new HashSet<T>();
+		for (Identifier id : ids) {
+			if (clazz.isAssignableFrom(id.getClass())) {
+				set.add(clazz.cast(id));
+			}
+		}
+		return set;
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/HasAssociatedIndividual.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/HasAssociatedIndividual.java
index 5747a02fe..68122a7d5 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/HasAssociatedIndividual.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/HasAssociatedIndividual.java
@@ -1,45 +1,45 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.identifier.common;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
-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.
- */
-public abstract class HasAssociatedIndividual extends AbstractCommonIdentifier
-		implements Identifier {
-
-	private static Collection<HasAssociatedIndividual> getIdentifiers(
-			IdentifierBundle ids) {
-		return getIdentifiersForClass(ids, HasAssociatedIndividual.class);
-	}
-
-	public static Collection<String> getIndividualUris(IdentifierBundle ids) {
-		Set<String> set = new HashSet<String>();
-		for (HasAssociatedIndividual id : getIdentifiers(ids)) {
-			set.add(id.getAssociatedIndividualUri());
-		}
-		return set;
-	}
-
-	private final String associatedIndividualUri;
-
-	public HasAssociatedIndividual(String associatedIndividualUri) {
-		this.associatedIndividualUri = associatedIndividualUri;
-	}
-
-	public String getAssociatedIndividualUri() {
-		return associatedIndividualUri;
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.identifier.common;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
+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.
+ */
+public abstract class HasAssociatedIndividual extends AbstractCommonIdentifier
+		implements Identifier {
+
+	private static Collection<HasAssociatedIndividual> getIdentifiers(
+			IdentifierBundle ids) {
+		return getIdentifiersForClass(ids, HasAssociatedIndividual.class);
+	}
+
+	public static Collection<String> getIndividualUris(IdentifierBundle ids) {
+		Set<String> set = new HashSet<String>();
+		for (HasAssociatedIndividual id : getIdentifiers(ids)) {
+			set.add(id.getAssociatedIndividualUri());
+		}
+		return set;
+	}
+
+	private final String associatedIndividualUri;
+
+	public HasAssociatedIndividual(String associatedIndividualUri) {
+		this.associatedIndividualUri = associatedIndividualUri;
+	}
+
+	public String getAssociatedIndividualUri() {
+		return associatedIndividualUri;
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsBlacklisted.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsBlacklisted.java
index ea00f16d7..21e19433e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsBlacklisted.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsBlacklisted.java
@@ -1,232 +1,232 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.identifier.common;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
-
-/**
- * The current user is blacklisted for this reason.
- */
-public class IsBlacklisted extends AbstractCommonIdentifier implements
-		Identifier {
-	private static final Log log = LogFactory.getLog(IsBlacklisted.class);
-
-	private final static String BLACKLIST_SPARQL_DIR = "/admin/selfEditBlacklist";
-	private static final String NOT_BLACKLISTED = null;
-
-	// ----------------------------------------------------------------------
-	// static methods
-	// ----------------------------------------------------------------------
-
-	/**
-	 * If this individual is blacklisted, return an appropriate Identifier.
-	 * Otherwise, return null.
-	 */
-	public static IsBlacklisted getInstance(Individual individual,
-			ServletContext context) {
-		if (individual == null) {
-			throw new NullPointerException("individual may not be null.");
-		}
-		if (context == null) {
-			throw new NullPointerException("context may not be null.");
-		}
-
-		String reasonForBlacklisting = checkForBlacklisted(individual, context);
-		IsBlacklisted id = new IsBlacklisted(individual.getURI(),
-				reasonForBlacklisting);
-		if (id.isBlacklisted()) {
-			return id;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * 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,
-			ServletContext context) {
-		String realPath = context.getRealPath(BLACKLIST_SPARQL_DIR);
-		File blacklistDir = new File(realPath);
-		if (!blacklistDir.isDirectory() || !blacklistDir.canRead()) {
-			log.debug("cannot read blacklist directory " + realPath);
-			return NOT_BLACKLISTED;
-		}
-
-		log.debug("checking directlry " + realPath
-				+ " for blacklisting sparql query files");
-		File[] files = blacklistDir.listFiles(new FileFilter() {
-			@Override
-			public boolean accept(File pathname) {
-				return pathname.getName().endsWith(".sparql");
-			}
-		});
-
-		String reasonForBlacklist = NOT_BLACKLISTED;
-		for (File file : files) {
-			try {
-				reasonForBlacklist = runSparqlFileForBlacklist(file, ind,
-						context);
-				if (reasonForBlacklist != NOT_BLACKLISTED)
-					break;
-			} catch (RuntimeException ex) {
-				log.error(
-						"Could not run blacklist check query for file "
-								+ file.getAbsolutePath() + File.separatorChar
-								+ file.getName(), ex);
-			}
-		}
-		return reasonForBlacklist;
-	}
-
-	/**
-	 * 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.
-	 */
-	private static String runSparqlFileForBlacklist(File file, Individual ind,
-			ServletContext context) {
-		if (!file.canRead()) {
-			log.debug("cannot read blacklisting SPARQL file " + file.getName());
-			return NOT_BLACKLISTED;
-		}
-
-		String queryString = null;
-		FileInputStream fis = null;
-		try {
-			fis = new FileInputStream(file);
-			byte b[] = new byte[fis.available()];
-			fis.read(b);
-			queryString = new String(b);
-		} catch (IOException ioe) {
-			log.debug(ioe);
-			return NOT_BLACKLISTED;
-		} finally {
-			if (fis != null) {
-				try {
-					fis.close();
-				} catch (IOException e) {
-					log.warn("could not close file", e);
-				}
-			}
-		}
-
-		if (StringUtils.isEmpty(queryString)) {
-			log.debug(file.getName() + " is empty");
-			return NOT_BLACKLISTED;
-		}
-
-		OntModel model = ModelAccess.on(context).getJenaOntModel();
-
-		queryString = queryString.replaceAll("\\?individualURI",
-				"<" + ind.getURI() + ">");
-		log.debug(queryString);
-
-		Query query = QueryFactory.create(queryString);
-		QueryExecution qexec = QueryExecutionFactory.create(query, model);
-		try {
-			ResultSet results = qexec.execSelect();
-			while (results.hasNext()) {
-				QuerySolution solution = results.nextSolution();
-				if (solution.contains("cause")) {
-					RDFNode node = solution.get("cause");
-					if (node.isResource()) {
-						return node.asResource().getURI();
-					} else if (node.isLiteral()) {
-						return node.asLiteral().getString();
-					}
-				} else {
-					log.error("Query solution must contain a variable "
-							+ "\"cause\" of type Resource or Literal.");
-					return NOT_BLACKLISTED;
-				}
-			}
-		} finally {
-			qexec.close();
-		}
-		return NOT_BLACKLISTED;
-	}
-
-	public static Collection<IsBlacklisted> getIdentifiers(IdentifierBundle ids) {
-		return getIdentifiersForClass(ids, IsBlacklisted.class);
-	}
-
-	public static Collection<String> getBlacklistReasons(IdentifierBundle ids) {
-		Set<String> set = new HashSet<String>();
-		for (IsBlacklisted id : getIdentifiers(ids)) {
-			if (id.isBlacklisted()) {
-				set.add(id.getReasonForBlacklisting());
-			}
-		}
-		return set;
-	}
-
-	// ----------------------------------------------------------------------
-	// the Identifier
-	// ----------------------------------------------------------------------
-
-	private final String associatedIndividualUri;
-	private final String reasonForBlacklisting;
-
-	public IsBlacklisted(String associatedIndividualUri,
-			String reasonForBlacklisting) {
-		this.associatedIndividualUri = associatedIndividualUri;
-		this.reasonForBlacklisting = reasonForBlacklisting;
-	}
-
-	public String getAssociatedIndividualUri() {
-		return associatedIndividualUri;
-	}
-
-	public boolean isBlacklisted() {
-		return reasonForBlacklisting != NOT_BLACKLISTED;
-	}
-
-	public String getReasonForBlacklisting() {
-		return reasonForBlacklisting;
-	}
-
-	@Override
-	public String toString() {
-		return "IsBlacklisted[" + associatedIndividualUri + ", "
-				+ reasonForBlacklisting + "]";
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.identifier.common;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+
+/**
+ * The current user is blacklisted for this reason.
+ */
+public class IsBlacklisted extends AbstractCommonIdentifier implements
+		Identifier {
+	private static final Log log = LogFactory.getLog(IsBlacklisted.class);
+
+	private final static String BLACKLIST_SPARQL_DIR = "/admin/selfEditBlacklist";
+	private static final String NOT_BLACKLISTED = null;
+
+	// ----------------------------------------------------------------------
+	// static methods
+	// ----------------------------------------------------------------------
+
+	/**
+	 * If this individual is blacklisted, return an appropriate Identifier.
+	 * Otherwise, return null.
+	 */
+	public static IsBlacklisted getInstance(Individual individual,
+			ServletContext context) {
+		if (individual == null) {
+			throw new NullPointerException("individual may not be null.");
+		}
+		if (context == null) {
+			throw new NullPointerException("context may not be null.");
+		}
+
+		String reasonForBlacklisting = checkForBlacklisted(individual, context);
+		IsBlacklisted id = new IsBlacklisted(individual.getURI(),
+				reasonForBlacklisting);
+		if (id.isBlacklisted()) {
+			return id;
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * 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,
+			ServletContext context) {
+		String realPath = context.getRealPath(BLACKLIST_SPARQL_DIR);
+		File blacklistDir = new File(realPath);
+		if (!blacklistDir.isDirectory() || !blacklistDir.canRead()) {
+			log.debug("cannot read blacklist directory " + realPath);
+			return NOT_BLACKLISTED;
+		}
+
+		log.debug("checking directlry " + realPath
+				+ " for blacklisting sparql query files");
+		File[] files = blacklistDir.listFiles(new FileFilter() {
+			@Override
+			public boolean accept(File pathname) {
+				return pathname.getName().endsWith(".sparql");
+			}
+		});
+
+		String reasonForBlacklist = NOT_BLACKLISTED;
+		for (File file : files) {
+			try {
+				reasonForBlacklist = runSparqlFileForBlacklist(file, ind,
+						context);
+				if (reasonForBlacklist != NOT_BLACKLISTED)
+					break;
+			} catch (RuntimeException ex) {
+				log.error(
+						"Could not run blacklist check query for file "
+								+ file.getAbsolutePath() + File.separatorChar
+								+ file.getName(), ex);
+			}
+		}
+		return reasonForBlacklist;
+	}
+
+	/**
+	 * 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.
+	 */
+	private static String runSparqlFileForBlacklist(File file, Individual ind,
+			ServletContext context) {
+		if (!file.canRead()) {
+			log.debug("cannot read blacklisting SPARQL file " + file.getName());
+			return NOT_BLACKLISTED;
+		}
+
+		String queryString = null;
+		FileInputStream fis = null;
+		try {
+			fis = new FileInputStream(file);
+			byte b[] = new byte[fis.available()];
+			fis.read(b);
+			queryString = new String(b);
+		} catch (IOException ioe) {
+			log.debug(ioe);
+			return NOT_BLACKLISTED;
+		} finally {
+			if (fis != null) {
+				try {
+					fis.close();
+				} catch (IOException e) {
+					log.warn("could not close file", e);
+				}
+			}
+		}
+
+		if (StringUtils.isEmpty(queryString)) {
+			log.debug(file.getName() + " is empty");
+			return NOT_BLACKLISTED;
+		}
+
+		OntModel model = ModelAccess.on(context).getJenaOntModel();
+
+		queryString = queryString.replaceAll("\\?individualURI",
+				"<" + ind.getURI() + ">");
+		log.debug(queryString);
+
+		Query query = QueryFactory.create(queryString);
+		QueryExecution qexec = QueryExecutionFactory.create(query, model);
+		try {
+			ResultSet results = qexec.execSelect();
+			while (results.hasNext()) {
+				QuerySolution solution = results.nextSolution();
+				if (solution.contains("cause")) {
+					RDFNode node = solution.get("cause");
+					if (node.isResource()) {
+						return node.asResource().getURI();
+					} else if (node.isLiteral()) {
+						return node.asLiteral().getString();
+					}
+				} else {
+					log.error("Query solution must contain a variable "
+							+ "\"cause\" of type Resource or Literal.");
+					return NOT_BLACKLISTED;
+				}
+			}
+		} finally {
+			qexec.close();
+		}
+		return NOT_BLACKLISTED;
+	}
+
+	public static Collection<IsBlacklisted> getIdentifiers(IdentifierBundle ids) {
+		return getIdentifiersForClass(ids, IsBlacklisted.class);
+	}
+
+	public static Collection<String> getBlacklistReasons(IdentifierBundle ids) {
+		Set<String> set = new HashSet<String>();
+		for (IsBlacklisted id : getIdentifiers(ids)) {
+			if (id.isBlacklisted()) {
+				set.add(id.getReasonForBlacklisting());
+			}
+		}
+		return set;
+	}
+
+	// ----------------------------------------------------------------------
+	// the Identifier
+	// ----------------------------------------------------------------------
+
+	private final String associatedIndividualUri;
+	private final String reasonForBlacklisting;
+
+	public IsBlacklisted(String associatedIndividualUri,
+			String reasonForBlacklisting) {
+		this.associatedIndividualUri = associatedIndividualUri;
+		this.reasonForBlacklisting = reasonForBlacklisting;
+	}
+
+	public String getAssociatedIndividualUri() {
+		return associatedIndividualUri;
+	}
+
+	public boolean isBlacklisted() {
+		return reasonForBlacklisting != NOT_BLACKLISTED;
+	}
+
+	public String getReasonForBlacklisting() {
+		return reasonForBlacklisting;
+	}
+
+	@Override
+	public String toString() {
+		return "IsBlacklisted[" + associatedIndividualUri + ", "
+				+ reasonForBlacklisting + "]";
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsRootUser.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsRootUser.java
index 01c47322e..189cf97b5 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsRootUser.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsRootUser.java
@@ -1,28 +1,28 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.identifier.common;
-
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-
-/**
- * The current user is a root user.
- */
-public class IsRootUser extends AbstractCommonIdentifier implements Identifier {
-	public static final IsRootUser INSTANCE = new IsRootUser();
-
-	public static boolean isRootUser(IdentifierBundle ids) {
-		return !getIdentifiersForClass(ids, IsRootUser.class).isEmpty();
-	}
-
-	/** Enforce the singleton pattern. */
-	private IsRootUser() {
-		// Nothing to initialize.
-	}
-
-	@Override
-	public String toString() {
-		return "IsRootUser";
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.identifier.common;
+
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+
+/**
+ * The current user is a root user.
+ */
+public class IsRootUser extends AbstractCommonIdentifier implements Identifier {
+	public static final IsRootUser INSTANCE = new IsRootUser();
+
+	public static boolean isRootUser(IdentifierBundle ids) {
+		return !getIdentifiersForClass(ids, IsRootUser.class).isEmpty();
+	}
+
+	/** Enforce the singleton pattern. */
+	private IsRootUser() {
+		// Nothing to initialize.
+	}
+
+	@Override
+	public String toString() {
+		return "IsRootUser";
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsUser.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsUser.java
index 220e814af..27af30fb8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsUser.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/identifier/common/IsUser.java
@@ -1,66 +1,66 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.identifier.common;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-
-/**
- * The current user has this URI.
- */
-public class IsUser extends AbstractCommonIdentifier implements Identifier {
-	public static Collection<IsUser> getIdentifiers(IdentifierBundle ids) {
-		return getIdentifiersForClass(ids, IsUser.class);
-	}
-
-	public static Collection<String> getUserUris(IdentifierBundle ids) {
-		Set<String> set = new HashSet<String>();
-		for (IsUser id : getIdentifiers(ids)) {
-			set.add(id.getUri());
-		}
-		return set;
-	}
-
-	private final String uri; // never null
-
-	public IsUser(String uri) {
-		if (uri == null) {
-			throw new NullPointerException("uri may not be null.");
-		}
-
-		this.uri = uri;
-	}
-
-	public String getUri() {
-		return uri;
-	}
-
-	@Override
-	public int hashCode() {
-		return uri.hashCode();
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj == this) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (!(obj instanceof IsUser)) {
-			return false;
-		}
-		IsUser that = (IsUser) obj;
-		return this.uri.equals(that.uri);
-	}
-
-	@Override
-	public String toString() {
-		return "IsUser[" + uri + "]";
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.identifier.common;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+
+/**
+ * The current user has this URI.
+ */
+public class IsUser extends AbstractCommonIdentifier implements Identifier {
+	public static Collection<IsUser> getIdentifiers(IdentifierBundle ids) {
+		return getIdentifiersForClass(ids, IsUser.class);
+	}
+
+	public static Collection<String> getUserUris(IdentifierBundle ids) {
+		Set<String> set = new HashSet<String>();
+		for (IsUser id : getIdentifiers(ids)) {
+			set.add(id.getUri());
+		}
+		return set;
+	}
+
+	private final String uri; // never null
+
+	public IsUser(String uri) {
+		if (uri == null) {
+			throw new NullPointerException("uri may not be null.");
+		}
+
+		this.uri = uri;
+	}
+
+	public String getUri() {
+		return uri;
+	}
+
+	@Override
+	public int hashCode() {
+		return uri.hashCode();
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == this) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (!(obj instanceof IsUser)) {
+			return false;
+		}
+		IsUser that = (IsUser) obj;
+		return this.uri.equals(that.uri);
+	}
+
+	@Override
+	public String toString() {
+		return "IsUser[" + uri + "]";
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/Permission.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/Permission.java
index c81bdd98c..a94571851 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/Permission.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/Permission.java
@@ -1,76 +1,76 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.permissions;
-
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-
-/**
- * Interface that describes a unit of authorization, or permission to perform
- * requested actions.
- */
-public abstract class Permission implements Comparable<Permission> {
-	protected final String uri;
-
-	protected Permission(String uri) {
-		if (uri == null) {
-			throw new NullPointerException("uri may not be null.");
-		}
-		this.uri = uri;
-	}
-
-	/**
-	 * Get the URI that identifies this Permission object.
-	 */
-	public String getUri() {
-		return uri;
-	}
-
-	/**
-	 * Is a user with this Permission authorized to perform this
-	 * RequestedAction?
-	 */
-	public abstract boolean isAuthorized(RequestedAction whatToAuth);
-
-	@Override
-	public int compareTo(Permission that) {
-		return this.uri.compareTo(that.uri);
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj == this) {
-			return true;
-		}
-		if (obj == null) {
-			return false;
-		}
-		if (!obj.getClass().equals(this.getClass())) {
-			return false;
-		}
-		Permission that = (Permission) obj;
-		return this.uri.equals(that.uri);
-	}
-
-	@Override
-	public int hashCode() {
-		return uri.hashCode();
-	}
-
-	@Override
-	public String toString() {
-		return this.getClass().getSimpleName() + "['" + uri + "']";
-	}
-
-	/**
-	 * A concrete Permission instance that authorizes nothing.
-	 */
-	static Permission NOT_AUTHORIZED = new Permission("java:"
-			+ Permission.class.getName() + "#NOT_AUTHORIZED") {
-
-		@Override
-		public boolean isAuthorized(RequestedAction whatToAuth) {
-			return false;
-		}
-
-	};
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.permissions;
+
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+
+/**
+ * Interface that describes a unit of authorization, or permission to perform
+ * requested actions.
+ */
+public abstract class Permission implements Comparable<Permission> {
+	protected final String uri;
+
+	protected Permission(String uri) {
+		if (uri == null) {
+			throw new NullPointerException("uri may not be null.");
+		}
+		this.uri = uri;
+	}
+
+	/**
+	 * Get the URI that identifies this Permission object.
+	 */
+	public String getUri() {
+		return uri;
+	}
+
+	/**
+	 * Is a user with this Permission authorized to perform this
+	 * RequestedAction?
+	 */
+	public abstract boolean isAuthorized(RequestedAction whatToAuth);
+
+	@Override
+	public int compareTo(Permission that) {
+		return this.uri.compareTo(that.uri);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == this) {
+			return true;
+		}
+		if (obj == null) {
+			return false;
+		}
+		if (!obj.getClass().equals(this.getClass())) {
+			return false;
+		}
+		Permission that = (Permission) obj;
+		return this.uri.equals(that.uri);
+	}
+
+	@Override
+	public int hashCode() {
+		return uri.hashCode();
+	}
+
+	@Override
+	public String toString() {
+		return this.getClass().getSimpleName() + "['" + uri + "']";
+	}
+
+	/**
+	 * A concrete Permission instance that authorizes nothing.
+	 */
+	static Permission NOT_AUTHORIZED = new Permission("java:"
+			+ Permission.class.getName() + "#NOT_AUTHORIZED") {
+
+		@Override
+		public boolean isAuthorized(RequestedAction whatToAuth) {
+			return false;
+		}
+
+	};
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionSetsLoader.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionSetsLoader.java
index 94608e5a1..cb2598e6f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionSetsLoader.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/permissions/PermissionSetsLoader.java
@@ -1,355 +1,355 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.permissions;
-
-import static edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary.VITRO_AUTH;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Selector;
-import com.hp.hpl.jena.rdf.model.SimpleSelector;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.shared.Lock;
-import com.hp.hpl.jena.util.iterator.ClosableIterator;
-import com.hp.hpl.jena.vocabulary.RDF;
-import com.hp.hpl.jena.vocabulary.RDFS;
-
-import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
-import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-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 PermissionSetsLoader implements ServletContextListener {
-	private static final Log log = LogFactory
-			.getLog(PermissionSetsLoader.class);
-
-	public static final String FILE_OF_PERMISSION_SETS_INFO = "/WEB-INF/resources/permission_config.n3";
-
-	public static final String URI_SELF_EDITOR = VITRO_AUTH + "SELF_EDITOR";
-	public static final String URI_EDITOR = VITRO_AUTH + "EDITOR";
-	public static final String URI_CURATOR = VITRO_AUTH + "CURATOR";
-	public static final String URI_DBA = VITRO_AUTH + "ADMIN";
-
-	@Override
-	public void contextInitialized(ServletContextEvent sce) {
-		ServletContext ctx = sce.getServletContext();
-		StartupStatus ss = StartupStatus.getBean(ctx);
-
-		try {
-			new Loader(this, ctx, ss).load();
-			new SmokeTester(this, ctx, ss).test();
-		} catch (Exception e) {
-			ss.fatal(this, "Failed to load the PermissionSets", e);
-		}
-	}
-
-	@Override
-	public void contextDestroyed(ServletContextEvent sce) {
-		// Nothing to tear down.
-	}
-
-	// ----------------------------------------------------------------------
-	// Loader class
-	// ----------------------------------------------------------------------
-
-	private static class Loader {
-		private static final int MAX_STATEMENTS_IN_WARNING = 5;
-
-		private ServletContextListener listener;
-		private final ServletContext ctx;
-		private final StartupStatus ss;
-
-		private final OntModel userAccountsModel;
-		private final Property permissionSetType;
-
-		private Model modelFromFile;
-		private Model filteredModel;
-
-		private int howManyNewPermissionSets;
-		private int howManyOldPermissionSets;
-
-		public Loader(ServletContextListener listener, ServletContext ctx,
-				StartupStatus ss) {
-			this.listener = listener;
-			this.ctx = ctx;
-			this.ss = ss;
-
-			this.userAccountsModel = ModelAccess.on(ctx).getUserAccountsModel();
-			this.permissionSetType = this.userAccountsModel
-					.getProperty(VitroVocabulary.PERMISSIONSET);
-
-		}
-
-		public void load() {
-			try {
-				createModelFromFile();
-				filterModelFromFile();
-				checkForLeftoverStatements();
-				removeExistingPermissionSetsFromUserAccountsModel();
-				addNewStatementsToUserAccountsModel();
-
-				ss.info(listener, buildInfoMessage());
-			} catch (LoaderException e) {
-				Throwable cause = e.getCause();
-				if (cause == null) {
-					ss.warning(listener, e.getMessage());
-				} else {
-					ss.warning(listener, e.getMessage(), e.getCause());
-				}
-			}
-		}
-
-		private void createModelFromFile() throws LoaderException {
-			InputStream stream = ctx
-					.getResourceAsStream(FILE_OF_PERMISSION_SETS_INFO);
-
-			if (stream == null) {
-				throw new LoaderException("The permission sets config file "
-						+ "doesn't exist in the servlet context: '"
-						+ FILE_OF_PERMISSION_SETS_INFO + "'");
-			}
-
-			try {
-				modelFromFile = ModelFactory.createDefaultModel();
-				modelFromFile.read(stream, null, "N3");
-			} finally {
-				try {
-					stream.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-
-			log.debug("Loaded " + modelFromFile.size() + " statements");
-		}
-
-		/**
-		 * Move all statements that relate to PermissionSets from the loaded
-		 * model to the filtered model.
-		 */
-		private void filterModelFromFile() {
-			filteredModel = ModelFactory.createDefaultModel();
-
-			for (Resource r : iterable(modelFromFile.listResourcesWithProperty(
-					RDF.type, permissionSetType))) {
-				moveStatementsToFilteredModel(r);
-				howManyNewPermissionSets++;
-			}
-
-			log.debug("Filtered " + filteredModel.size() + " statements for "
-					+ howManyNewPermissionSets + " PermissionSets; "
-					+ modelFromFile.size() + " extraneous statements.");
-		}
-
-		/**
-		 * Move the statements about this PermissionSet from the loaded model to
-		 * the filtered model.
-		 */
-		private void moveStatementsToFilteredModel(Resource ps) {
-			Selector sel = new SimpleSelector(ps, null, (String) null);
-			for (Statement stmt : iterable(modelFromFile.listStatements(sel))) {
-				filteredModel.add(stmt);
-				modelFromFile.remove(stmt);
-			}
-		}
-
-		/**
-		 * Complain about any statements that were not moved to the filtered
-		 * model.
-		 */
-		private void checkForLeftoverStatements() {
-			List<Statement> list = iterable(modelFromFile.listStatements());
-			if (list.isEmpty()) {
-				return;
-			}
-
-			String message = "The PermissionSets configuration file contained "
-					+ list.size()
-					+ " statements that didn't describe PermissionSets: ";
-			for (int i = 0; i < Math
-					.min(list.size(), MAX_STATEMENTS_IN_WARNING); i++) {
-				Statement stmt = list.get(i);
-				message += "(" + stmt.asTriple() + ") ";
-			}
-			if (list.size() > MAX_STATEMENTS_IN_WARNING) {
-				message += ", ...";
-			}
-
-			ss.warning(listener, message);
-		}
-
-		private void removeExistingPermissionSetsFromUserAccountsModel() {
-			userAccountsModel.enterCriticalSection(Lock.WRITE);
-			try {
-				for (Resource r : iterable(userAccountsModel
-						.listResourcesWithProperty(RDF.type, permissionSetType))) {
-					Selector sel = new SimpleSelector(r, null, (String) null);
-					StmtIterator stmts = userAccountsModel.listStatements(sel);
-					userAccountsModel.remove(stmts);
-					howManyOldPermissionSets++;
-				}
-			} finally {
-				userAccountsModel.leaveCriticalSection();
-			}
-
-			log.debug("Deleted " + howManyOldPermissionSets
-					+ " old PermissionSets from the user model.");
-		}
-
-		private void addNewStatementsToUserAccountsModel() {
-			userAccountsModel.enterCriticalSection(Lock.WRITE);
-			try {
-				userAccountsModel.add(filteredModel);
-			} finally {
-				userAccountsModel.leaveCriticalSection();
-			}
-		}
-
-		private String buildInfoMessage() {
-			String message = "Loaded " + howManyNewPermissionSets
-					+ " PermissionSets: ";
-			Selector sel = new SimpleSelector(null, RDFS.label, (String) null);
-			for (Statement stmt : iterable(filteredModel.listStatements(sel))) {
-				String label = stmt.getObject().asLiteral().getString();
-				message += "'" + label + "' ";
-			}
-			return message;
-		}
-
-		private <T> List<T> iterable(ClosableIterator<T> iterator) {
-			List<T> list = new ArrayList<T>();
-			try {
-				while (iterator.hasNext()) {
-					list.add(iterator.next());
-				}
-			} finally {
-				iterator.close();
-			}
-			return list;
-		}
-
-	}
-
-	// ----------------------------------------------------------------------
-	// SmokeTester class
-	// ----------------------------------------------------------------------
-
-	private static class SmokeTester {
-		private ServletContextListener listener;
-		private final ServletContext ctx;
-		private final StartupStatus ss;
-
-		private final UserAccountsDao uaDao;
-
-		public SmokeTester(ServletContextListener listener, ServletContext ctx,
-				StartupStatus ss) {
-			this.listener = listener;
-			this.ctx = ctx;
-			this.ss = ss;
-
-			WebappDaoFactory wadf = ModelAccess.on(ctx).getWebappDaoFactory();
-			if (wadf == null) {
-				throw new IllegalStateException(
-						"No webappDaoFactory on the servlet context");
-			}
-			this.uaDao = wadf.getUserAccountsDao();
-		}
-
-		public void test() {
-			checkForPermissionSetsWithoutLabels();
-			checkForReferencesToNonexistentPermissionSets();
-			checkForReferencesToNonexistentPermissions();
-			warnIfNoPermissionSetsForNewUsers();
-		}
-
-		private void checkForPermissionSetsWithoutLabels() {
-			for (PermissionSet ps : uaDao.getAllPermissionSets()) {
-				if (ps.getLabel().isEmpty()) {
-					ss.warning(listener, "This PermissionSet has no label: "
-							+ ps.getUri());
-				}
-			}
-		}
-
-		private void checkForReferencesToNonexistentPermissionSets() {
-			for (UserAccount user : uaDao.getAllUserAccounts()) {
-				for (String psUri : user.getPermissionSetUris()) {
-					if (uaDao.getPermissionSetByUri(psUri) == null) {
-						ss.warning(listener, "The user '" + user.getFirstName()
-								+ " " + user.getLastName()
-								+ "' has the PermissionSet '" + psUri
-								+ "', but the PermissionSet doesn't exist.");
-					}
-				}
-			}
-		}
-
-		private void checkForReferencesToNonexistentPermissions() {
-			PermissionRegistry registry = PermissionRegistry.getRegistry(ctx);
-			for (PermissionSet ps : uaDao.getAllPermissionSets()) {
-				for (String pUri : ps.getPermissionUris()) {
-					if (!registry.isPermission(pUri)) {
-						ss.warning(listener,
-								"The PermissionSet '" + ps.getLabel()
-										+ "' has the Permission '" + pUri
-										+ "', but the Permission "
-										+ "is not found in the registry.");
-					}
-				}
-			}
-		}
-
-		private void warnIfNoPermissionSetsForNewUsers() {
-			for (PermissionSet ps : uaDao.getAllPermissionSets()) {
-				if (ps.isForNewUsers()) {
-					return;
-				}
-			}
-			ss.warning(listener, "No PermissionSet has been declared to be a "
-					+ "PermissionSet for new users.");
-		}
-
-	}
-
-	// ----------------------------------------------------------------------
-	// Handy dandy exception.
-	// ----------------------------------------------------------------------
-
-	private static class LoaderException extends Exception {
-
-		public LoaderException(String message) {
-			super(message);
-		}
-
-		public LoaderException(String message, Throwable cause) {
-			super(message, cause);
-		}
-
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.permissions;
+
+import static edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary.VITRO_AUTH;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.Selector;
+import com.hp.hpl.jena.rdf.model.SimpleSelector;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.rdf.model.StmtIterator;
+import com.hp.hpl.jena.shared.Lock;
+import com.hp.hpl.jena.util.iterator.ClosableIterator;
+import com.hp.hpl.jena.vocabulary.RDF;
+import com.hp.hpl.jena.vocabulary.RDFS;
+
+import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+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 PermissionSetsLoader implements ServletContextListener {
+	private static final Log log = LogFactory
+			.getLog(PermissionSetsLoader.class);
+
+	public static final String FILE_OF_PERMISSION_SETS_INFO = "/WEB-INF/resources/permission_config.n3";
+
+	public static final String URI_SELF_EDITOR = VITRO_AUTH + "SELF_EDITOR";
+	public static final String URI_EDITOR = VITRO_AUTH + "EDITOR";
+	public static final String URI_CURATOR = VITRO_AUTH + "CURATOR";
+	public static final String URI_DBA = VITRO_AUTH + "ADMIN";
+
+	@Override
+	public void contextInitialized(ServletContextEvent sce) {
+		ServletContext ctx = sce.getServletContext();
+		StartupStatus ss = StartupStatus.getBean(ctx);
+
+		try {
+			new Loader(this, ctx, ss).load();
+			new SmokeTester(this, ctx, ss).test();
+		} catch (Exception e) {
+			ss.fatal(this, "Failed to load the PermissionSets", e);
+		}
+	}
+
+	@Override
+	public void contextDestroyed(ServletContextEvent sce) {
+		// Nothing to tear down.
+	}
+
+	// ----------------------------------------------------------------------
+	// Loader class
+	// ----------------------------------------------------------------------
+
+	private static class Loader {
+		private static final int MAX_STATEMENTS_IN_WARNING = 5;
+
+		private ServletContextListener listener;
+		private final ServletContext ctx;
+		private final StartupStatus ss;
+
+		private final OntModel userAccountsModel;
+		private final Property permissionSetType;
+
+		private Model modelFromFile;
+		private Model filteredModel;
+
+		private int howManyNewPermissionSets;
+		private int howManyOldPermissionSets;
+
+		public Loader(ServletContextListener listener, ServletContext ctx,
+				StartupStatus ss) {
+			this.listener = listener;
+			this.ctx = ctx;
+			this.ss = ss;
+
+			this.userAccountsModel = ModelAccess.on(ctx).getUserAccountsModel();
+			this.permissionSetType = this.userAccountsModel
+					.getProperty(VitroVocabulary.PERMISSIONSET);
+
+		}
+
+		public void load() {
+			try {
+				createModelFromFile();
+				filterModelFromFile();
+				checkForLeftoverStatements();
+				removeExistingPermissionSetsFromUserAccountsModel();
+				addNewStatementsToUserAccountsModel();
+
+				ss.info(listener, buildInfoMessage());
+			} catch (LoaderException e) {
+				Throwable cause = e.getCause();
+				if (cause == null) {
+					ss.warning(listener, e.getMessage());
+				} else {
+					ss.warning(listener, e.getMessage(), e.getCause());
+				}
+			}
+		}
+
+		private void createModelFromFile() throws LoaderException {
+			InputStream stream = ctx
+					.getResourceAsStream(FILE_OF_PERMISSION_SETS_INFO);
+
+			if (stream == null) {
+				throw new LoaderException("The permission sets config file "
+						+ "doesn't exist in the servlet context: '"
+						+ FILE_OF_PERMISSION_SETS_INFO + "'");
+			}
+
+			try {
+				modelFromFile = ModelFactory.createDefaultModel();
+				modelFromFile.read(stream, null, "N3");
+			} finally {
+				try {
+					stream.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+
+			log.debug("Loaded " + modelFromFile.size() + " statements");
+		}
+
+		/**
+		 * Move all statements that relate to PermissionSets from the loaded
+		 * model to the filtered model.
+		 */
+		private void filterModelFromFile() {
+			filteredModel = ModelFactory.createDefaultModel();
+
+			for (Resource r : iterable(modelFromFile.listResourcesWithProperty(
+					RDF.type, permissionSetType))) {
+				moveStatementsToFilteredModel(r);
+				howManyNewPermissionSets++;
+			}
+
+			log.debug("Filtered " + filteredModel.size() + " statements for "
+					+ howManyNewPermissionSets + " PermissionSets; "
+					+ modelFromFile.size() + " extraneous statements.");
+		}
+
+		/**
+		 * Move the statements about this PermissionSet from the loaded model to
+		 * the filtered model.
+		 */
+		private void moveStatementsToFilteredModel(Resource ps) {
+			Selector sel = new SimpleSelector(ps, null, (String) null);
+			for (Statement stmt : iterable(modelFromFile.listStatements(sel))) {
+				filteredModel.add(stmt);
+				modelFromFile.remove(stmt);
+			}
+		}
+
+		/**
+		 * Complain about any statements that were not moved to the filtered
+		 * model.
+		 */
+		private void checkForLeftoverStatements() {
+			List<Statement> list = iterable(modelFromFile.listStatements());
+			if (list.isEmpty()) {
+				return;
+			}
+
+			String message = "The PermissionSets configuration file contained "
+					+ list.size()
+					+ " statements that didn't describe PermissionSets: ";
+			for (int i = 0; i < Math
+					.min(list.size(), MAX_STATEMENTS_IN_WARNING); i++) {
+				Statement stmt = list.get(i);
+				message += "(" + stmt.asTriple() + ") ";
+			}
+			if (list.size() > MAX_STATEMENTS_IN_WARNING) {
+				message += ", ...";
+			}
+
+			ss.warning(listener, message);
+		}
+
+		private void removeExistingPermissionSetsFromUserAccountsModel() {
+			userAccountsModel.enterCriticalSection(Lock.WRITE);
+			try {
+				for (Resource r : iterable(userAccountsModel
+						.listResourcesWithProperty(RDF.type, permissionSetType))) {
+					Selector sel = new SimpleSelector(r, null, (String) null);
+					StmtIterator stmts = userAccountsModel.listStatements(sel);
+					userAccountsModel.remove(stmts);
+					howManyOldPermissionSets++;
+				}
+			} finally {
+				userAccountsModel.leaveCriticalSection();
+			}
+
+			log.debug("Deleted " + howManyOldPermissionSets
+					+ " old PermissionSets from the user model.");
+		}
+
+		private void addNewStatementsToUserAccountsModel() {
+			userAccountsModel.enterCriticalSection(Lock.WRITE);
+			try {
+				userAccountsModel.add(filteredModel);
+			} finally {
+				userAccountsModel.leaveCriticalSection();
+			}
+		}
+
+		private String buildInfoMessage() {
+			String message = "Loaded " + howManyNewPermissionSets
+					+ " PermissionSets: ";
+			Selector sel = new SimpleSelector(null, RDFS.label, (String) null);
+			for (Statement stmt : iterable(filteredModel.listStatements(sel))) {
+				String label = stmt.getObject().asLiteral().getString();
+				message += "'" + label + "' ";
+			}
+			return message;
+		}
+
+		private <T> List<T> iterable(ClosableIterator<T> iterator) {
+			List<T> list = new ArrayList<T>();
+			try {
+				while (iterator.hasNext()) {
+					list.add(iterator.next());
+				}
+			} finally {
+				iterator.close();
+			}
+			return list;
+		}
+
+	}
+
+	// ----------------------------------------------------------------------
+	// SmokeTester class
+	// ----------------------------------------------------------------------
+
+	private static class SmokeTester {
+		private ServletContextListener listener;
+		private final ServletContext ctx;
+		private final StartupStatus ss;
+
+		private final UserAccountsDao uaDao;
+
+		public SmokeTester(ServletContextListener listener, ServletContext ctx,
+				StartupStatus ss) {
+			this.listener = listener;
+			this.ctx = ctx;
+			this.ss = ss;
+
+			WebappDaoFactory wadf = ModelAccess.on(ctx).getWebappDaoFactory();
+			if (wadf == null) {
+				throw new IllegalStateException(
+						"No webappDaoFactory on the servlet context");
+			}
+			this.uaDao = wadf.getUserAccountsDao();
+		}
+
+		public void test() {
+			checkForPermissionSetsWithoutLabels();
+			checkForReferencesToNonexistentPermissionSets();
+			checkForReferencesToNonexistentPermissions();
+			warnIfNoPermissionSetsForNewUsers();
+		}
+
+		private void checkForPermissionSetsWithoutLabels() {
+			for (PermissionSet ps : uaDao.getAllPermissionSets()) {
+				if (ps.getLabel().isEmpty()) {
+					ss.warning(listener, "This PermissionSet has no label: "
+							+ ps.getUri());
+				}
+			}
+		}
+
+		private void checkForReferencesToNonexistentPermissionSets() {
+			for (UserAccount user : uaDao.getAllUserAccounts()) {
+				for (String psUri : user.getPermissionSetUris()) {
+					if (uaDao.getPermissionSetByUri(psUri) == null) {
+						ss.warning(listener, "The user '" + user.getFirstName()
+								+ " " + user.getLastName()
+								+ "' has the PermissionSet '" + psUri
+								+ "', but the PermissionSet doesn't exist.");
+					}
+				}
+			}
+		}
+
+		private void checkForReferencesToNonexistentPermissions() {
+			PermissionRegistry registry = PermissionRegistry.getRegistry(ctx);
+			for (PermissionSet ps : uaDao.getAllPermissionSets()) {
+				for (String pUri : ps.getPermissionUris()) {
+					if (!registry.isPermission(pUri)) {
+						ss.warning(listener,
+								"The PermissionSet '" + ps.getLabel()
+										+ "' has the Permission '" + pUri
+										+ "', but the Permission "
+										+ "is not found in the registry.");
+					}
+				}
+			}
+		}
+
+		private void warnIfNoPermissionSetsForNewUsers() {
+			for (PermissionSet ps : uaDao.getAllPermissionSets()) {
+				if (ps.isForNewUsers()) {
+					return;
+				}
+			}
+			ss.warning(listener, "No PermissionSet has been declared to be a "
+					+ "PermissionSet for new users.");
+		}
+
+	}
+
+	// ----------------------------------------------------------------------
+	// Handy dandy exception.
+	// ----------------------------------------------------------------------
+
+	private static class LoaderException extends Exception {
+
+		public LoaderException(String message) {
+			super(message);
+		}
+
+		public LoaderException(String message, Throwable cause) {
+			super(message, cause);
+		}
+
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/BaseSelfEditingPolicy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/BaseSelfEditingPolicy.java
index 70319776f..7d1563d0a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/BaseSelfEditingPolicy.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/BaseSelfEditingPolicy.java
@@ -1,60 +1,60 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.policy;
-
-import javax.servlet.ServletContext;
-
-import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
-import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
-
-/**
- * A base class with utility methods for policies involving self-editing.
- */
-public abstract class BaseSelfEditingPolicy {
-	protected final ServletContext ctx;
-	protected final RoleLevel roleLevel;
-
-	public BaseSelfEditingPolicy(ServletContext ctx, RoleLevel roleLevel) {
-		this.ctx = ctx;
-		this.roleLevel = roleLevel;
-	}
-
-	protected boolean canModifyResource(String uri) {
-		return PropertyRestrictionPolicyHelper.getBean(ctx).canModifyResource(
-				uri, roleLevel);
-	}
-
-	protected boolean canModifyPredicate(String uri) {
-		return PropertyRestrictionPolicyHelper.getBean(ctx).canModifyPredicate(
-				uri, roleLevel);
-	}
-
-	protected PolicyDecision cantModifyResource(String uri) {
-		return inconclusiveDecision("No access to admin resources; cannot modify "
-				+ uri);
-	}
-
-	protected PolicyDecision cantModifyPredicate(String uri) {
-		return inconclusiveDecision("No access to admin predicates; cannot modify "
-				+ uri);
-	}
-
-	protected PolicyDecision userNotAuthorizedToStatement() {
-		return inconclusiveDecision("User has no access to this statement.");
-	}
-
-	/** An INCONCLUSIVE decision with a message like "PolicyClass: message". */
-	protected PolicyDecision inconclusiveDecision(String message) {
-		return new BasicPolicyDecision(Authorization.INCONCLUSIVE, getClass()
-				.getSimpleName() + ": " + message);
-	}
-
-	/** An AUTHORIZED decision with a message like "PolicyClass: message". */
-	protected PolicyDecision authorizedDecision(String message) {
-		return new BasicPolicyDecision(Authorization.AUTHORIZED, getClass()
-				.getSimpleName() + ": " + message);
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy;
+
+import javax.servlet.ServletContext;
+
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
+
+/**
+ * A base class with utility methods for policies involving self-editing.
+ */
+public abstract class BaseSelfEditingPolicy {
+	protected final ServletContext ctx;
+	protected final RoleLevel roleLevel;
+
+	public BaseSelfEditingPolicy(ServletContext ctx, RoleLevel roleLevel) {
+		this.ctx = ctx;
+		this.roleLevel = roleLevel;
+	}
+
+	protected boolean canModifyResource(String uri) {
+		return PropertyRestrictionPolicyHelper.getBean(ctx).canModifyResource(
+				uri, roleLevel);
+	}
+
+	protected boolean canModifyPredicate(String uri) {
+		return PropertyRestrictionPolicyHelper.getBean(ctx).canModifyPredicate(
+				uri, roleLevel);
+	}
+
+	protected PolicyDecision cantModifyResource(String uri) {
+		return inconclusiveDecision("No access to admin resources; cannot modify "
+				+ uri);
+	}
+
+	protected PolicyDecision cantModifyPredicate(String uri) {
+		return inconclusiveDecision("No access to admin predicates; cannot modify "
+				+ uri);
+	}
+
+	protected PolicyDecision userNotAuthorizedToStatement() {
+		return inconclusiveDecision("User has no access to this statement.");
+	}
+
+	/** An INCONCLUSIVE decision with a message like "PolicyClass: message". */
+	protected PolicyDecision inconclusiveDecision(String message) {
+		return new BasicPolicyDecision(Authorization.INCONCLUSIVE, getClass()
+				.getSimpleName() + ": " + message);
+	}
+
+	/** An AUTHORIZED decision with a message like "PolicyClass: message". */
+	protected PolicyDecision authorizedDecision(String message) {
+		return new BasicPolicyDecision(Authorization.AUTHORIZED, getClass()
+				.getSimpleName() + ": " + message);
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/DisplayRestrictedDataToSelfPolicy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/DisplayRestrictedDataToSelfPolicy.java
index e1af1c68b..0f3e5e2bc 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/DisplayRestrictedDataToSelfPolicy.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/DisplayRestrictedDataToSelfPolicy.java
@@ -1,177 +1,177 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.policy;
-
-import java.util.Collection;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.HasAssociatedIndividual;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayDataProperty;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayDataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
-
-/**
- * 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.
- */
-public class DisplayRestrictedDataToSelfPolicy implements PolicyIface {
-	private static final Log log = LogFactory
-			.getLog(DisplayRestrictedDataToSelfPolicy.class);
-
-	private final ServletContext ctx;
-
-	public DisplayRestrictedDataToSelfPolicy(ServletContext ctx) {
-		this.ctx = ctx;
-	}
-
-	/**
-	 * If the requested action is to display a property or a property statement,
-	 * we might authorize it based on their role level.
-	 */
-	@Override
-	public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
-			RequestedAction whatToAuth) {
-		if (whoToAuth == null) {
-			return defaultDecision("whomToAuth was null");
-		}
-		if (whatToAuth == null) {
-			return defaultDecision("whatToAuth was null");
-		}
-
-		Collection<String> associated = HasAssociatedIndividual
-				.getIndividualUris(whoToAuth);
-		if (associated.isEmpty()) {
-			return defaultDecision("not self-editing for anyone");
-		}
-
-		if (whatToAuth instanceof DisplayDataProperty) {
-			return defaultDecision("DataProperties have no associated 'self'");
-		} else if (whatToAuth instanceof DisplayObjectProperty) {
-			return defaultDecision("ObjectProperties have no associated 'self'");
-		}
-
-		PolicyDecision result;
-		if (whatToAuth instanceof DisplayDataPropertyStatement) {
-			result = isAuthorized((DisplayDataPropertyStatement) whatToAuth,
-					associated);
-		} else if (whatToAuth instanceof DisplayObjectPropertyStatement) {
-			result = isAuthorized((DisplayObjectPropertyStatement) whatToAuth,
-					associated);
-		} else {
-			result = defaultDecision("Unrecognized action");
-		}
-
-		log.debug("decision for '" + whatToAuth + "' is " + result);
-		return result;
-	}
-
-	/**
-	 * The user may see this data property statement if the subject and the
-	 * predicate are both viewable by self-editors, and the subject is one of
-	 * the associated individuals (the "selves").
-	 */
-	private PolicyDecision isAuthorized(DisplayDataPropertyStatement action,
-			Collection<String> individuals) {
-		DataPropertyStatement stmt = action.getDataPropertyStatement();
-		String subjectUri = stmt.getIndividualURI();
-		String predicateUri = stmt.getDatapropURI();
-		if (canDisplayResource(subjectUri) && canDisplayPredicate(predicateUri)
-				&& isAboutAssociatedIndividual(individuals, stmt)) {
-			return authorized("user may view DataPropertyStatement "
-					+ subjectUri + " ==> " + predicateUri);
-		} else {
-			return defaultDecision("user may not view DataPropertyStatement "
-					+ subjectUri + " ==> " + predicateUri);
-		}
-	}
-
-	/**
-	 * The user may see this data property statement if the subject, the
-	 * predicate, and the object are all viewable by self-editors, and either
-	 * the subject or the object is one of the associated individuals (the
-	 * "selves").
-	 */
-	private PolicyDecision isAuthorized(DisplayObjectPropertyStatement action,
-			Collection<String> individuals) {
-		ObjectPropertyStatement stmt = action.getObjectPropertyStatement();
-		String subjectUri = stmt.getSubjectURI();
-		String predicateUri = stmt.getPropertyURI();
-		String objectUri = stmt.getObjectURI();
-		if (canDisplayResource(subjectUri) && canDisplayPredicate(predicateUri)
-				&& canDisplayResource(objectUri)
-				&& isAboutAssociatedIndividual(individuals, stmt)) {
-			return authorized("user may view ObjectPropertyStatement "
-					+ subjectUri + " ==> " + predicateUri + " ==> " + objectUri);
-		} else {
-			return defaultDecision("user may not view ObjectPropertyStatement "
-					+ subjectUri + " ==> " + predicateUri + " ==> " + objectUri);
-		}
-	}
-
-	/** If the user is explicitly authorized, return this. */
-	private PolicyDecision authorized(String message) {
-		String className = this.getClass().getSimpleName();
-		return new BasicPolicyDecision(Authorization.AUTHORIZED, className
-				+ ": " + message);
-	}
-
-	/** If the user isn't explicitly authorized, return this. */
-	private PolicyDecision defaultDecision(String message) {
-		return new BasicPolicyDecision(Authorization.INCONCLUSIVE, message);
-	}
-
-	private boolean canDisplayResource(String uri) {
-		return PropertyRestrictionPolicyHelper.getBean(ctx).canDisplayResource(
-				uri, RoleLevel.SELF);
-	}
-
-	private boolean canDisplayPredicate(String uri) {
-		return PropertyRestrictionPolicyHelper.getBean(ctx)
-				.canDisplayPredicate(uri, RoleLevel.SELF);
-	}
-
-	private boolean isAboutAssociatedIndividual(Collection<String> selves,
-			DataPropertyStatement stmt) {
-		for (String self : selves) {
-			if (self.equals(stmt.getIndividualURI())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private boolean isAboutAssociatedIndividual(Collection<String> selves,
-			ObjectPropertyStatement stmt) {
-		for (String self : selves) {
-			if (self.equals(stmt.getSubjectURI())
-					|| self.equals(stmt.getObjectURI())) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public String toString() {
-		return this.getClass().getSimpleName() + " - " + hashCode();
-	}
-
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy;
+
+import java.util.Collection;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.HasAssociatedIndividual;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayDataProperty;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayDataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
+
+/**
+ * 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.
+ */
+public class DisplayRestrictedDataToSelfPolicy implements PolicyIface {
+	private static final Log log = LogFactory
+			.getLog(DisplayRestrictedDataToSelfPolicy.class);
+
+	private final ServletContext ctx;
+
+	public DisplayRestrictedDataToSelfPolicy(ServletContext ctx) {
+		this.ctx = ctx;
+	}
+
+	/**
+	 * If the requested action is to display a property or a property statement,
+	 * we might authorize it based on their role level.
+	 */
+	@Override
+	public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
+			RequestedAction whatToAuth) {
+		if (whoToAuth == null) {
+			return defaultDecision("whomToAuth was null");
+		}
+		if (whatToAuth == null) {
+			return defaultDecision("whatToAuth was null");
+		}
+
+		Collection<String> associated = HasAssociatedIndividual
+				.getIndividualUris(whoToAuth);
+		if (associated.isEmpty()) {
+			return defaultDecision("not self-editing for anyone");
+		}
+
+		if (whatToAuth instanceof DisplayDataProperty) {
+			return defaultDecision("DataProperties have no associated 'self'");
+		} else if (whatToAuth instanceof DisplayObjectProperty) {
+			return defaultDecision("ObjectProperties have no associated 'self'");
+		}
+
+		PolicyDecision result;
+		if (whatToAuth instanceof DisplayDataPropertyStatement) {
+			result = isAuthorized((DisplayDataPropertyStatement) whatToAuth,
+					associated);
+		} else if (whatToAuth instanceof DisplayObjectPropertyStatement) {
+			result = isAuthorized((DisplayObjectPropertyStatement) whatToAuth,
+					associated);
+		} else {
+			result = defaultDecision("Unrecognized action");
+		}
+
+		log.debug("decision for '" + whatToAuth + "' is " + result);
+		return result;
+	}
+
+	/**
+	 * The user may see this data property statement if the subject and the
+	 * predicate are both viewable by self-editors, and the subject is one of
+	 * the associated individuals (the "selves").
+	 */
+	private PolicyDecision isAuthorized(DisplayDataPropertyStatement action,
+			Collection<String> individuals) {
+		DataPropertyStatement stmt = action.getDataPropertyStatement();
+		String subjectUri = stmt.getIndividualURI();
+		String predicateUri = stmt.getDatapropURI();
+		if (canDisplayResource(subjectUri) && canDisplayPredicate(predicateUri)
+				&& isAboutAssociatedIndividual(individuals, stmt)) {
+			return authorized("user may view DataPropertyStatement "
+					+ subjectUri + " ==> " + predicateUri);
+		} else {
+			return defaultDecision("user may not view DataPropertyStatement "
+					+ subjectUri + " ==> " + predicateUri);
+		}
+	}
+
+	/**
+	 * The user may see this data property statement if the subject, the
+	 * predicate, and the object are all viewable by self-editors, and either
+	 * the subject or the object is one of the associated individuals (the
+	 * "selves").
+	 */
+	private PolicyDecision isAuthorized(DisplayObjectPropertyStatement action,
+			Collection<String> individuals) {
+		ObjectPropertyStatement stmt = action.getObjectPropertyStatement();
+		String subjectUri = stmt.getSubjectURI();
+		String predicateUri = stmt.getPropertyURI();
+		String objectUri = stmt.getObjectURI();
+		if (canDisplayResource(subjectUri) && canDisplayPredicate(predicateUri)
+				&& canDisplayResource(objectUri)
+				&& isAboutAssociatedIndividual(individuals, stmt)) {
+			return authorized("user may view ObjectPropertyStatement "
+					+ subjectUri + " ==> " + predicateUri + " ==> " + objectUri);
+		} else {
+			return defaultDecision("user may not view ObjectPropertyStatement "
+					+ subjectUri + " ==> " + predicateUri + " ==> " + objectUri);
+		}
+	}
+
+	/** If the user is explicitly authorized, return this. */
+	private PolicyDecision authorized(String message) {
+		String className = this.getClass().getSimpleName();
+		return new BasicPolicyDecision(Authorization.AUTHORIZED, className
+				+ ": " + message);
+	}
+
+	/** If the user isn't explicitly authorized, return this. */
+	private PolicyDecision defaultDecision(String message) {
+		return new BasicPolicyDecision(Authorization.INCONCLUSIVE, message);
+	}
+
+	private boolean canDisplayResource(String uri) {
+		return PropertyRestrictionPolicyHelper.getBean(ctx).canDisplayResource(
+				uri, RoleLevel.SELF);
+	}
+
+	private boolean canDisplayPredicate(String uri) {
+		return PropertyRestrictionPolicyHelper.getBean(ctx)
+				.canDisplayPredicate(uri, RoleLevel.SELF);
+	}
+
+	private boolean isAboutAssociatedIndividual(Collection<String> selves,
+			DataPropertyStatement stmt) {
+		for (String self : selves) {
+			if (self.equals(stmt.getIndividualURI())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	private boolean isAboutAssociatedIndividual(Collection<String> selves,
+			ObjectPropertyStatement stmt) {
+		for (String self : selves) {
+			if (self.equals(stmt.getSubjectURI())
+					|| self.equals(stmt.getObjectURI())) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public String toString() {
+		return this.getClass().getSimpleName() + " - " + hashCode();
+	}
+
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper.java
index 0f432cf0c..ec9611df3 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper.java
@@ -1,270 +1,270 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.policy;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddDataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.DropDataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.DropObjectPropertyStatement;
-
-/**
- * A collection of static methods to help determine whether requested actions
- * are authorized by current policy.
- */
-public class PolicyHelper {
-	private static final Log log = LogFactory.getLog(PolicyHelper.class);
-
-	/**
-	 * Are these actions authorized for the current user by the current
-	 * policies?
-	 */
-	public static boolean isAuthorizedForActions(HttpServletRequest req,
-			RequestedAction... actions) {
-		return isAuthorizedForActions(req, new Actions(actions));
-	}
-
-	/**
-	 * Are these actions authorized for the current user by the current
-	 * policies?
-	 */
-	public static boolean isAuthorizedForActions(HttpServletRequest req,
-			Actions actions) {
-		PolicyIface policy = ServletPolicyList.getPolicies(req);
-		IdentifierBundle ids = RequestIdentifiers.getIdBundleForRequest(req);
-		return isAuthorizedForActions(ids, policy, actions);
-	}
-
-	/**
-	 * Are these actions authorized for these identifiers by these policies?
-	 */
-	public static boolean isAuthorizedForActions(IdentifierBundle ids,
-			PolicyIface policy, Actions actions) {
-		return Actions.notNull(actions).isAuthorized(policy, ids);
-	}
-
-	/**
-	 * 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,
-			Statement stmt, OntModel modelToBeModified) {
-		if ((req == null) || (stmt == null) || (modelToBeModified == null)) {
-			return false;
-		}
-
-		Resource subject = stmt.getSubject();
-		Property predicate = stmt.getPredicate();
-		RDFNode objectNode = stmt.getObject();
-		if ((subject == null) || (predicate == null) || (objectNode == null)) {
-			return false;
-		}
-
-		RequestedAction action;
-		if (objectNode.isResource()) {
-			action = new AddObjectPropertyStatement(modelToBeModified,
-					subject.getURI(), predicate.getURI(), objectNode
-							.asResource().getURI());
-		} else {
-			action = new AddDataPropertyStatement(modelToBeModified,
-					subject.getURI(), predicate.getURI());
-		}
-		return isAuthorizedForActions(req, action);
-	}
-
-	/**
-	 * 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,
-			Statement stmt, OntModel modelToBeModified) {
-		if ((req == null) || (stmt == null) || (modelToBeModified == null)) {
-			return false;
-		}
-
-		Resource subject = stmt.getSubject();
-		Property predicate = stmt.getPredicate();
-		RDFNode objectNode = stmt.getObject();
-		if ((subject == null) || (predicate == null) || (objectNode == null)) {
-			return false;
-		}
-
-		RequestedAction action;
-		if (objectNode.isResource()) {
-			action = new DropObjectPropertyStatement(modelToBeModified,
-					subject.getURI(), predicate.getURI(), objectNode
-							.asResource().getURI());
-		} else {
-			action = new DropDataPropertyStatement(modelToBeModified,
-					subject.getURI(), predicate.getURI());
-		}
-		return isAuthorizedForActions(req, action);
-	}
-
-	/**
-	 * 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.
-	 */
-	public static boolean isAuthorizedAsExpected(HttpServletRequest req,
-			Model additions, Model retractions, OntModel modelBeingModified) {
-		if (req == null) {
-			log.warn("Can't evaluate authorization if req is null");
-			return false;
-		}
-		if (additions == null) {
-			log.warn("Can't evaluate authorization if additions model is null");
-			return false;
-		}
-		if (retractions == null) {
-			log.warn("Can't evaluate authorization if retractions model is null");
-			return false;
-		}
-		if (modelBeingModified == null) {
-			log.warn("Can't evaluate authorization if model being modified is null");
-			return false;
-		}
-
-		/*
-		 * The naive way to test the additions is to test each statement against
-		 * the JenaOntModel. However, some of the statements may not be
-		 * 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
-		 * modelBeingModified. Now try the remaining statements against that
-		 * temporary model, adding the statement each time we are successful. If
-		 * 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
-		 * statements pass this test, declare success. This is logically flawed
-		 * since it is possible that two statements would circularly authorize
-		 * 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.
-		 */
-
-		boolean result = true;
-
-		OntModel modelToTestAgainst = ModelFactory
-				.createOntologyModel(OntModelSpec.OWL_MEM);
-		modelToTestAgainst.addSubModel(additions);
-		modelToTestAgainst.addSubModel(modelBeingModified);
-
-		StmtIterator addStmts = additions.listStatements();
-		try {
-			while (addStmts.hasNext()) {
-				Statement stmt = addStmts.next();
-				if (isAuthorizedToAdd(req, stmt, modelToTestAgainst)) {
-					if (log.isDebugEnabled()) {
-						log.debug("Last-chance authorization check: "
-								+ "authorized to add statement: "
-								+ formatStatement(stmt));
-					}
-				} else {
-					log.warn("Last-chance authorization check reveals not "
-							+ "authorized to add statement: "
-							+ formatStatement(stmt));
-					result = false;
-				}
-			}
-		} finally {
-			addStmts.close();
-		}
-
-		/*
-		 * For retractions, there is no such conundrum. Assume that all of the
-		 * additions have been added, and check the authorization of each
-		 * retraction.
-		 */
-
-		StmtIterator dropStmts = retractions.listStatements();
-		try {
-			while (dropStmts.hasNext()) {
-				Statement stmt = dropStmts.next();
-				if (isAuthorizedToDrop(req, stmt, modelToTestAgainst)) {
-					if (log.isDebugEnabled()) {
-						log.debug("Last-chance authorization check: "
-								+ "authorized to drop statement: "
-								+ formatStatement(stmt));
-					}
-				} else {
-					log.warn("Last-chance authorization check reveals not "
-							+ "authorized to drop statement: "
-							+ formatStatement(stmt));
-					result = false;
-				}
-			}
-		} finally {
-			dropStmts.close();
-		}
-
-		return result;
-	}
-
-	private static String formatStatement(Statement stmt) {
-		if (stmt == null) {
-			return "null statement";
-		}
-		return "<" + stmt.getSubject() + "> <" + stmt.getPredicate() + "> <"
-				+ stmt.getObject() + ">";
-	}
-
-	/**
-	 * No need to instantiate this helper class - all methods are static.
-	 */
-	private PolicyHelper() {
-		// nothing to do.
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.rdf.model.StmtIterator;
+
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddDataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.DropDataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.DropObjectPropertyStatement;
+
+/**
+ * A collection of static methods to help determine whether requested actions
+ * are authorized by current policy.
+ */
+public class PolicyHelper {
+	private static final Log log = LogFactory.getLog(PolicyHelper.class);
+
+	/**
+	 * Are these actions authorized for the current user by the current
+	 * policies?
+	 */
+	public static boolean isAuthorizedForActions(HttpServletRequest req,
+			RequestedAction... actions) {
+		return isAuthorizedForActions(req, new Actions(actions));
+	}
+
+	/**
+	 * Are these actions authorized for the current user by the current
+	 * policies?
+	 */
+	public static boolean isAuthorizedForActions(HttpServletRequest req,
+			Actions actions) {
+		PolicyIface policy = ServletPolicyList.getPolicies(req);
+		IdentifierBundle ids = RequestIdentifiers.getIdBundleForRequest(req);
+		return isAuthorizedForActions(ids, policy, actions);
+	}
+
+	/**
+	 * Are these actions authorized for these identifiers by these policies?
+	 */
+	public static boolean isAuthorizedForActions(IdentifierBundle ids,
+			PolicyIface policy, Actions actions) {
+		return Actions.notNull(actions).isAuthorized(policy, ids);
+	}
+
+	/**
+	 * 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,
+			Statement stmt, OntModel modelToBeModified) {
+		if ((req == null) || (stmt == null) || (modelToBeModified == null)) {
+			return false;
+		}
+
+		Resource subject = stmt.getSubject();
+		Property predicate = stmt.getPredicate();
+		RDFNode objectNode = stmt.getObject();
+		if ((subject == null) || (predicate == null) || (objectNode == null)) {
+			return false;
+		}
+
+		RequestedAction action;
+		if (objectNode.isResource()) {
+			action = new AddObjectPropertyStatement(modelToBeModified,
+					subject.getURI(), predicate.getURI(), objectNode
+							.asResource().getURI());
+		} else {
+			action = new AddDataPropertyStatement(modelToBeModified,
+					subject.getURI(), predicate.getURI());
+		}
+		return isAuthorizedForActions(req, action);
+	}
+
+	/**
+	 * 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,
+			Statement stmt, OntModel modelToBeModified) {
+		if ((req == null) || (stmt == null) || (modelToBeModified == null)) {
+			return false;
+		}
+
+		Resource subject = stmt.getSubject();
+		Property predicate = stmt.getPredicate();
+		RDFNode objectNode = stmt.getObject();
+		if ((subject == null) || (predicate == null) || (objectNode == null)) {
+			return false;
+		}
+
+		RequestedAction action;
+		if (objectNode.isResource()) {
+			action = new DropObjectPropertyStatement(modelToBeModified,
+					subject.getURI(), predicate.getURI(), objectNode
+							.asResource().getURI());
+		} else {
+			action = new DropDataPropertyStatement(modelToBeModified,
+					subject.getURI(), predicate.getURI());
+		}
+		return isAuthorizedForActions(req, action);
+	}
+
+	/**
+	 * 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.
+	 */
+	public static boolean isAuthorizedAsExpected(HttpServletRequest req,
+			Model additions, Model retractions, OntModel modelBeingModified) {
+		if (req == null) {
+			log.warn("Can't evaluate authorization if req is null");
+			return false;
+		}
+		if (additions == null) {
+			log.warn("Can't evaluate authorization if additions model is null");
+			return false;
+		}
+		if (retractions == null) {
+			log.warn("Can't evaluate authorization if retractions model is null");
+			return false;
+		}
+		if (modelBeingModified == null) {
+			log.warn("Can't evaluate authorization if model being modified is null");
+			return false;
+		}
+
+		/*
+		 * The naive way to test the additions is to test each statement against
+		 * the JenaOntModel. However, some of the statements may not be
+		 * 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
+		 * modelBeingModified. Now try the remaining statements against that
+		 * temporary model, adding the statement each time we are successful. If
+		 * 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
+		 * statements pass this test, declare success. This is logically flawed
+		 * since it is possible that two statements would circularly authorize
+		 * 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.
+		 */
+
+		boolean result = true;
+
+		OntModel modelToTestAgainst = ModelFactory
+				.createOntologyModel(OntModelSpec.OWL_MEM);
+		modelToTestAgainst.addSubModel(additions);
+		modelToTestAgainst.addSubModel(modelBeingModified);
+
+		StmtIterator addStmts = additions.listStatements();
+		try {
+			while (addStmts.hasNext()) {
+				Statement stmt = addStmts.next();
+				if (isAuthorizedToAdd(req, stmt, modelToTestAgainst)) {
+					if (log.isDebugEnabled()) {
+						log.debug("Last-chance authorization check: "
+								+ "authorized to add statement: "
+								+ formatStatement(stmt));
+					}
+				} else {
+					log.warn("Last-chance authorization check reveals not "
+							+ "authorized to add statement: "
+							+ formatStatement(stmt));
+					result = false;
+				}
+			}
+		} finally {
+			addStmts.close();
+		}
+
+		/*
+		 * For retractions, there is no such conundrum. Assume that all of the
+		 * additions have been added, and check the authorization of each
+		 * retraction.
+		 */
+
+		StmtIterator dropStmts = retractions.listStatements();
+		try {
+			while (dropStmts.hasNext()) {
+				Statement stmt = dropStmts.next();
+				if (isAuthorizedToDrop(req, stmt, modelToTestAgainst)) {
+					if (log.isDebugEnabled()) {
+						log.debug("Last-chance authorization check: "
+								+ "authorized to drop statement: "
+								+ formatStatement(stmt));
+					}
+				} else {
+					log.warn("Last-chance authorization check reveals not "
+							+ "authorized to drop statement: "
+							+ formatStatement(stmt));
+					result = false;
+				}
+			}
+		} finally {
+			dropStmts.close();
+		}
+
+		return result;
+	}
+
+	private static String formatStatement(Statement stmt) {
+		if (stmt == null) {
+			return "null statement";
+		}
+		return "<" + stmt.getSubject() + "> <" + stmt.getPredicate() + "> <"
+				+ stmt.getObject() + ">";
+	}
+
+	/**
+	 * No need to instantiate this helper class - all methods are static.
+	 */
+	private PolicyHelper() {
+		// nothing to do.
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/RestrictHomeMenuItemEditingPolicy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/RestrictHomeMenuItemEditingPolicy.java
index 25795b470..d94665a80 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/RestrictHomeMenuItemEditingPolicy.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/RestrictHomeMenuItemEditingPolicy.java
@@ -1,70 +1,70 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.policy;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AbstractObjectPropertyStatementAction;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.DropObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
-
-/**
- * Don't allow user to edit or drop the HomeMenuItem statement.
- */
-public class RestrictHomeMenuItemEditingPolicy implements PolicyIface {
-
-	@Override
-	public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
-			RequestedAction whatToAuth) {
-		if (whatToAuth instanceof EditObjectPropertyStatement) {
-			return isAuthorized((EditObjectPropertyStatement) whatToAuth);
-		} else if (whatToAuth instanceof DropObjectPropertyStatement) {
-			return isAuthorized((DropObjectPropertyStatement) whatToAuth);
-		} else {
-			return notHandled();
-		}
-	}
-
-	private PolicyDecision isAuthorized(
-			AbstractObjectPropertyStatementAction whatToAuth) {
-		if (whatToAuth.getPredicateUri()
-				.equals(DisplayVocabulary.HAS_ELEMENT)
-				&& whatToAuth.getObjectUri().equals(
-						DisplayVocabulary.HOME_MENU_ITEM)) {
-			return notAuthorized();
-		} else {
-			return notHandled();
-		}
-	}
-
-	private BasicPolicyDecision notHandled() {
-		return new BasicPolicyDecision(Authorization.INCONCLUSIVE,
-				"Doesn't handle this type of request");
-	}
-
-	private BasicPolicyDecision notAuthorized() {
-		return new BasicPolicyDecision(Authorization.UNAUTHORIZED,
-				"Can't edit home menu item.");
-	}
-
-	public static class Setup implements ServletContextListener {
-		@Override
-		public void contextInitialized(ServletContextEvent sce) {
-			ServletPolicyList.addPolicyAtFront(sce.getServletContext(),
-					new RestrictHomeMenuItemEditingPolicy());
-		}
-
-		@Override
-		public void contextDestroyed(ServletContextEvent ctx) {
-			// Nothing to do here.
-		}
-
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AbstractObjectPropertyStatementAction;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.DropObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+
+/**
+ * Don't allow user to edit or drop the HomeMenuItem statement.
+ */
+public class RestrictHomeMenuItemEditingPolicy implements PolicyIface {
+
+	@Override
+	public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
+			RequestedAction whatToAuth) {
+		if (whatToAuth instanceof EditObjectPropertyStatement) {
+			return isAuthorized((EditObjectPropertyStatement) whatToAuth);
+		} else if (whatToAuth instanceof DropObjectPropertyStatement) {
+			return isAuthorized((DropObjectPropertyStatement) whatToAuth);
+		} else {
+			return notHandled();
+		}
+	}
+
+	private PolicyDecision isAuthorized(
+			AbstractObjectPropertyStatementAction whatToAuth) {
+		if (whatToAuth.getPredicateUri()
+				.equals(DisplayVocabulary.HAS_ELEMENT)
+				&& whatToAuth.getObjectUri().equals(
+						DisplayVocabulary.HOME_MENU_ITEM)) {
+			return notAuthorized();
+		} else {
+			return notHandled();
+		}
+	}
+
+	private BasicPolicyDecision notHandled() {
+		return new BasicPolicyDecision(Authorization.INCONCLUSIVE,
+				"Doesn't handle this type of request");
+	}
+
+	private BasicPolicyDecision notAuthorized() {
+		return new BasicPolicyDecision(Authorization.UNAUTHORIZED,
+				"Can't edit home menu item.");
+	}
+
+	public static class Setup implements ServletContextListener {
+		@Override
+		public void contextInitialized(ServletContextEvent sce) {
+			ServletPolicyList.addPolicyAtFront(sce.getServletContext(),
+					new RestrictHomeMenuItemEditingPolicy());
+		}
+
+		@Override
+		public void contextDestroyed(ServletContextEvent ctx) {
+			// Nothing to do here.
+		}
+
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java
index 2b43662e2..088a66be4 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/RootUserPolicy.java
@@ -1,197 +1,197 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.policy;
-
-import java.util.TreeSet;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.IsRootUser;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
-import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
-import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
-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 {
-	private static final Log log = LogFactory.getLog(RootUserPolicy.class);
-
-	private static final String PROPERTY_ROOT_USER_EMAIL = "rootUser.emailAddress";
-	private static final String ROOT_USER_INITIAL_PASSWORD = "rootPassword";
-
-	/**
-	 * This is the entire policy. If you are a root user, you are authorized.
-	 */
-	@Override
-	public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
-			RequestedAction whatToAuth) {
-		if (IsRootUser.isRootUser(whoToAuth)) {
-			return new BasicPolicyDecision(Authorization.AUTHORIZED,
-					"RootUserPolicy: approved");
-		} else {
-			return new BasicPolicyDecision(Authorization.INCONCLUSIVE,
-					"not root user");
-		}
-	}
-
-	@Override
-	public String toString() {
-		return "RootUserPolicy - " + hashCode();
-	}
-
-	// ----------------------------------------------------------------------
-	// Setup class
-	// ----------------------------------------------------------------------
-
-	public static class Setup implements ServletContextListener {
-		private ServletContext ctx;
-		private StartupStatus ss;
-		private UserAccountsDao uaDao;
-		private String configuredRootUser;
-		private boolean configuredRootUserExists;
-		private TreeSet<String> otherRootUsers;
-
-		@Override
-		public void contextInitialized(ServletContextEvent sce) {
-			ctx = sce.getServletContext();
-			ss = StartupStatus.getBean(ctx);
-
-			try {
-				uaDao = ModelAccess.on(ctx).getWebappDaoFactory()
-						.getUserAccountsDao();
-				configuredRootUser = getRootEmailFromConfig();
-
-				otherRootUsers = getEmailsOfAllRootUsers();
-				configuredRootUserExists = otherRootUsers
-						.remove(configuredRootUser);
-
-				if (configuredRootUserExists) {
-					if (otherRootUsers.isEmpty()) {
-						informThatRootUserExists();
-					} else {
-						complainAboutMultipleRootUsers();
-					}
-				} else {
-					createRootUser();
-					if (!otherRootUsers.isEmpty()) {
-						complainAboutWrongRootUsers();
-					}
-				}
-
-				ServletPolicyList.addPolicy(ctx, new RootUserPolicy());
-			} catch (Exception e) {
-				ss.fatal(this, "Failed to set up the RootUserPolicy", e);
-			}
-		}
-
-		private String getRootEmailFromConfig() {
-			String email = ConfigurationProperties.getBean(ctx).getProperty(
-					PROPERTY_ROOT_USER_EMAIL);
-			if (email == null) {
-				throw new IllegalStateException(
-						"runtime.properties must contain a value for '"
-								+ PROPERTY_ROOT_USER_EMAIL + "'");
-			} else {
-				return email;
-			}
-		}
-
-		private TreeSet<String> getEmailsOfAllRootUsers() {
-			TreeSet<String> rootUsers = new TreeSet<String>();
-			for (UserAccount ua : uaDao.getAllUserAccounts()) {
-				if (ua.isRootUser()) {
-					rootUsers.add(ua.getEmailAddress());
-				}
-			}
-			return rootUsers;
-		}
-
-		/**
-		 * TODO The first and last name should be left blank, so the user will
-		 * be forced to edit them. However, that's not in place yet.
-		 */
-		private void createRootUser() {
-			if (!Authenticator.isValidEmailAddress(configuredRootUser)) {
-				throw new IllegalStateException("Value for '"
-						+ PROPERTY_ROOT_USER_EMAIL
-						+ "' is not a valid email address: '"
-						+ configuredRootUser + "'");
-			}
-
-			if (null != uaDao.getUserAccountByEmail(configuredRootUser)) {
-				throw new IllegalStateException("Can't create root user - "
-						+ "an account already exists with email address '"
-						+ configuredRootUser + "'");
-			}
-
-			UserAccount ua = new UserAccount();
-			ua.setEmailAddress(configuredRootUser);
-			ua.setFirstName("root");
-			ua.setLastName("user");
-			ua.setMd5Password(Authenticator
-					.applyMd5Encoding(ROOT_USER_INITIAL_PASSWORD));
-			ua.setPasswordChangeRequired(true);
-			ua.setStatus(Status.ACTIVE);
-			ua.setRootUser(true);
-
-			uaDao.insertUserAccount(ua);
-
-			StartupStatus.getBean(ctx).info(this,
-					"Created root user '" + configuredRootUser + "'");
-		}
-
-		private void informThatRootUserExists() {
-			ss.info(this, "Root user is " + configuredRootUser);
-		}
-
-		private void complainAboutMultipleRootUsers() {
-			for (String other : otherRootUsers) {
-				ss.warning(this, "runtime.properties specifies '"
-						+ configuredRootUser + "' as the value for '"
-						+ PROPERTY_ROOT_USER_EMAIL
-						+ "', but the system also contains this root user: "
-						+ other);
-			}
-			ss.warning(this, "For security, "
-					+ "it is best to delete unneeded root user accounts.");
-		}
-
-		private void complainAboutWrongRootUsers() {
-			for (String other : otherRootUsers) {
-				ss.warning(this, "runtime.properties specifies '"
-						+ configuredRootUser + "' as the value for '"
-						+ PROPERTY_ROOT_USER_EMAIL
-						+ "', but the system contains this root user instead: "
-						+ other);
-			}
-			ss.warning(this, "Creating root user '" + configuredRootUser + "'");
-			ss.warning(this, "For security, "
-					+ "it is best to delete unneeded root user accounts.");
-		}
-
-		@Override
-		public void contextDestroyed(ServletContextEvent sce) {
-			// Nothing to destroy
-		}
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy;
+
+import java.util.TreeSet;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.IsRootUser;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
+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 {
+	private static final Log log = LogFactory.getLog(RootUserPolicy.class);
+
+	private static final String PROPERTY_ROOT_USER_EMAIL = "rootUser.emailAddress";
+	private static final String ROOT_USER_INITIAL_PASSWORD = "rootPassword";
+
+	/**
+	 * This is the entire policy. If you are a root user, you are authorized.
+	 */
+	@Override
+	public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
+			RequestedAction whatToAuth) {
+		if (IsRootUser.isRootUser(whoToAuth)) {
+			return new BasicPolicyDecision(Authorization.AUTHORIZED,
+					"RootUserPolicy: approved");
+		} else {
+			return new BasicPolicyDecision(Authorization.INCONCLUSIVE,
+					"not root user");
+		}
+	}
+
+	@Override
+	public String toString() {
+		return "RootUserPolicy - " + hashCode();
+	}
+
+	// ----------------------------------------------------------------------
+	// Setup class
+	// ----------------------------------------------------------------------
+
+	public static class Setup implements ServletContextListener {
+		private ServletContext ctx;
+		private StartupStatus ss;
+		private UserAccountsDao uaDao;
+		private String configuredRootUser;
+		private boolean configuredRootUserExists;
+		private TreeSet<String> otherRootUsers;
+
+		@Override
+		public void contextInitialized(ServletContextEvent sce) {
+			ctx = sce.getServletContext();
+			ss = StartupStatus.getBean(ctx);
+
+			try {
+				uaDao = ModelAccess.on(ctx).getWebappDaoFactory()
+						.getUserAccountsDao();
+				configuredRootUser = getRootEmailFromConfig();
+
+				otherRootUsers = getEmailsOfAllRootUsers();
+				configuredRootUserExists = otherRootUsers
+						.remove(configuredRootUser);
+
+				if (configuredRootUserExists) {
+					if (otherRootUsers.isEmpty()) {
+						informThatRootUserExists();
+					} else {
+						complainAboutMultipleRootUsers();
+					}
+				} else {
+					createRootUser();
+					if (!otherRootUsers.isEmpty()) {
+						complainAboutWrongRootUsers();
+					}
+				}
+
+				ServletPolicyList.addPolicy(ctx, new RootUserPolicy());
+			} catch (Exception e) {
+				ss.fatal(this, "Failed to set up the RootUserPolicy", e);
+			}
+		}
+
+		private String getRootEmailFromConfig() {
+			String email = ConfigurationProperties.getBean(ctx).getProperty(
+					PROPERTY_ROOT_USER_EMAIL);
+			if (email == null) {
+				throw new IllegalStateException(
+						"runtime.properties must contain a value for '"
+								+ PROPERTY_ROOT_USER_EMAIL + "'");
+			} else {
+				return email;
+			}
+		}
+
+		private TreeSet<String> getEmailsOfAllRootUsers() {
+			TreeSet<String> rootUsers = new TreeSet<String>();
+			for (UserAccount ua : uaDao.getAllUserAccounts()) {
+				if (ua.isRootUser()) {
+					rootUsers.add(ua.getEmailAddress());
+				}
+			}
+			return rootUsers;
+		}
+
+		/**
+		 * TODO The first and last name should be left blank, so the user will
+		 * be forced to edit them. However, that's not in place yet.
+		 */
+		private void createRootUser() {
+			if (!Authenticator.isValidEmailAddress(configuredRootUser)) {
+				throw new IllegalStateException("Value for '"
+						+ PROPERTY_ROOT_USER_EMAIL
+						+ "' is not a valid email address: '"
+						+ configuredRootUser + "'");
+			}
+
+			if (null != uaDao.getUserAccountByEmail(configuredRootUser)) {
+				throw new IllegalStateException("Can't create root user - "
+						+ "an account already exists with email address '"
+						+ configuredRootUser + "'");
+			}
+
+			UserAccount ua = new UserAccount();
+			ua.setEmailAddress(configuredRootUser);
+			ua.setFirstName("root");
+			ua.setLastName("user");
+			ua.setMd5Password(Authenticator
+					.applyMd5Encoding(ROOT_USER_INITIAL_PASSWORD));
+			ua.setPasswordChangeRequired(true);
+			ua.setStatus(Status.ACTIVE);
+			ua.setRootUser(true);
+
+			uaDao.insertUserAccount(ua);
+
+			StartupStatus.getBean(ctx).info(this,
+					"Created root user '" + configuredRootUser + "'");
+		}
+
+		private void informThatRootUserExists() {
+			ss.info(this, "Root user is " + configuredRootUser);
+		}
+
+		private void complainAboutMultipleRootUsers() {
+			for (String other : otherRootUsers) {
+				ss.warning(this, "runtime.properties specifies '"
+						+ configuredRootUser + "' as the value for '"
+						+ PROPERTY_ROOT_USER_EMAIL
+						+ "', but the system also contains this root user: "
+						+ other);
+			}
+			ss.warning(this, "For security, "
+					+ "it is best to delete unneeded root user accounts.");
+		}
+
+		private void complainAboutWrongRootUsers() {
+			for (String other : otherRootUsers) {
+				ss.warning(this, "runtime.properties specifies '"
+						+ configuredRootUser + "' as the value for '"
+						+ PROPERTY_ROOT_USER_EMAIL
+						+ "', but the system contains this root user instead: "
+						+ other);
+			}
+			ss.warning(this, "Creating root user '" + configuredRootUser + "'");
+			ss.warning(this, "For security, "
+					+ "it is best to delete unneeded root user accounts.");
+		}
+
+		@Override
+		public void contextDestroyed(ServletContextEvent sce) {
+			// Nothing to destroy
+		}
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionListener.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionListener.java
index c79e593ad..90f9b630a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionListener.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionListener.java
@@ -1,101 +1,101 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.policy.bean;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.rdf.model.Model;
-
-import edu.cornell.mannlib.vedit.beans.EditProcessObject;
-import edu.cornell.mannlib.vedit.listener.ChangeListener;
-import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
-import edu.cornell.mannlib.vitro.webapp.beans.Property;
-import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
-
-/**
- * Add this ChangeListener to your EditProcessObject when modifying the
- * ontology, and we will refresh the PropertyRestrictionPolicyHelper bean as
- * appropriate.
- */
-public class PropertyRestrictionListener implements ChangeListener {
-	private static final Log log = LogFactory
-			.getLog(PropertyRestrictionListener.class);
-
-	private final ServletContext ctx;
-
-	public PropertyRestrictionListener(ServletContext ctx) {
-		this.ctx = ctx;
-	}
-
-	/**
-	 * If the deleted property had a non-null restriction, rebuild the bean.
-	 */
-	@Override
-	public void doDeleted(Object oldObj, EditProcessObject epo) {
-		Property p = (Property) oldObj;
-		if (eitherRoleChanged(p.getHiddenFromDisplayBelowRoleLevel(),
-				p.getProhibitedFromUpdateBelowRoleLevel(), null, null)) {
-			log.debug("rebuilding the PropertyRestrictionPolicyHelper after deletion");
-			createAndSetBean();
-		}
-	}
-
-	/**
-	 * If the inserted property has a non-null restriction, rebuild the bean.
-	 */
-	@Override
-	public void doInserted(Object newObj, EditProcessObject epo) {
-		Property p = (Property) newObj;
-		if (eitherRoleChanged(null, null,
-				p.getHiddenFromDisplayBelowRoleLevel(),
-				p.getProhibitedFromUpdateBelowRoleLevel())) {
-			log.debug("rebuilding the PropertyRestrictionPolicyHelper after insertion");
-			createAndSetBean();
-		}
-	}
-
-	/**
-	 * If the updated property has changed its restrictions, rebuild the bean.
-	 */
-	@Override
-	public void doUpdated(Object oldObj, Object newObj, EditProcessObject epo) {
-		Property oldP = (Property) oldObj;
-		Property newP = (Property) newObj;
-		if (eitherRoleChanged(oldP.getHiddenFromDisplayBelowRoleLevel(),
-				oldP.getProhibitedFromUpdateBelowRoleLevel(),
-				newP.getHiddenFromDisplayBelowRoleLevel(),
-				newP.getProhibitedFromUpdateBelowRoleLevel())) {
-			log.debug("rebuilding the PropertyRestrictionPolicyHelper after update");
-			createAndSetBean();
-		}
-	}
-
-	private boolean eitherRoleChanged(RoleLevel oldDisplayRole,
-			RoleLevel oldUpdateRole, RoleLevel newDisplayRole,
-			RoleLevel newUpdateRole) {
-		return (!isTheSame(oldDisplayRole, newDisplayRole))
-				|| (!isTheSame(oldUpdateRole, newUpdateRole));
-	}
-
-	private boolean isTheSame(RoleLevel oldRole, RoleLevel newRole) {
-		if ((oldRole == null) && (newRole == null)) {
-			return true;
-		} else if ((oldRole == null) || (newRole == null)) {
-			return false;
-		} else {
-			return oldRole.compareTo(newRole) == 0;
-		}
-	}
-
-	private void createAndSetBean() {
-		OntModel model = ModelAccess.on(ctx).getJenaOntModel();
-		Model displayModel = ModelAccess.on(ctx).getDisplayModel();
-		PropertyRestrictionPolicyHelper bean = PropertyRestrictionPolicyHelper
-				.createBean(model, displayModel);
-		PropertyRestrictionPolicyHelper.setBean(ctx, bean);
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy.bean;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.rdf.model.Model;
+
+import edu.cornell.mannlib.vedit.beans.EditProcessObject;
+import edu.cornell.mannlib.vedit.listener.ChangeListener;
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
+import edu.cornell.mannlib.vitro.webapp.beans.Property;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+
+/**
+ * Add this ChangeListener to your EditProcessObject when modifying the
+ * ontology, and we will refresh the PropertyRestrictionPolicyHelper bean as
+ * appropriate.
+ */
+public class PropertyRestrictionListener implements ChangeListener {
+	private static final Log log = LogFactory
+			.getLog(PropertyRestrictionListener.class);
+
+	private final ServletContext ctx;
+
+	public PropertyRestrictionListener(ServletContext ctx) {
+		this.ctx = ctx;
+	}
+
+	/**
+	 * If the deleted property had a non-null restriction, rebuild the bean.
+	 */
+	@Override
+	public void doDeleted(Object oldObj, EditProcessObject epo) {
+		Property p = (Property) oldObj;
+		if (eitherRoleChanged(p.getHiddenFromDisplayBelowRoleLevel(),
+				p.getProhibitedFromUpdateBelowRoleLevel(), null, null)) {
+			log.debug("rebuilding the PropertyRestrictionPolicyHelper after deletion");
+			createAndSetBean();
+		}
+	}
+
+	/**
+	 * If the inserted property has a non-null restriction, rebuild the bean.
+	 */
+	@Override
+	public void doInserted(Object newObj, EditProcessObject epo) {
+		Property p = (Property) newObj;
+		if (eitherRoleChanged(null, null,
+				p.getHiddenFromDisplayBelowRoleLevel(),
+				p.getProhibitedFromUpdateBelowRoleLevel())) {
+			log.debug("rebuilding the PropertyRestrictionPolicyHelper after insertion");
+			createAndSetBean();
+		}
+	}
+
+	/**
+	 * If the updated property has changed its restrictions, rebuild the bean.
+	 */
+	@Override
+	public void doUpdated(Object oldObj, Object newObj, EditProcessObject epo) {
+		Property oldP = (Property) oldObj;
+		Property newP = (Property) newObj;
+		if (eitherRoleChanged(oldP.getHiddenFromDisplayBelowRoleLevel(),
+				oldP.getProhibitedFromUpdateBelowRoleLevel(),
+				newP.getHiddenFromDisplayBelowRoleLevel(),
+				newP.getProhibitedFromUpdateBelowRoleLevel())) {
+			log.debug("rebuilding the PropertyRestrictionPolicyHelper after update");
+			createAndSetBean();
+		}
+	}
+
+	private boolean eitherRoleChanged(RoleLevel oldDisplayRole,
+			RoleLevel oldUpdateRole, RoleLevel newDisplayRole,
+			RoleLevel newUpdateRole) {
+		return (!isTheSame(oldDisplayRole, newDisplayRole))
+				|| (!isTheSame(oldUpdateRole, newUpdateRole));
+	}
+
+	private boolean isTheSame(RoleLevel oldRole, RoleLevel newRole) {
+		if ((oldRole == null) && (newRole == null)) {
+			return true;
+		} else if ((oldRole == null) || (newRole == null)) {
+			return false;
+		} else {
+			return oldRole.compareTo(newRole) == 0;
+		}
+	}
+
+	private void createAndSetBean() {
+		OntModel model = ModelAccess.on(ctx).getJenaOntModel();
+		Model displayModel = ModelAccess.on(ctx).getDisplayModel();
+		PropertyRestrictionPolicyHelper bean = PropertyRestrictionPolicyHelper
+				.createBean(model, displayModel);
+		PropertyRestrictionPolicyHelper.setBean(ctx, bean);
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelper.java
index dd27d126a..eb462b5df 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelper.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelper.java
@@ -1,440 +1,440 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.policy.bean;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.rdf.model.impl.Util;
-import com.hp.hpl.jena.shared.Lock;
-
-import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
-import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
-
-/**
- * Assists the role-based policies in determining whether a property or resource
- * may be displayed or modified.
- * 
- * There is a bean in the context that holds the current threshold role levels
- * for displaying and modifying restricted properties.
- * 
- * Create this bean after the Jena model is in place in the context.
- * 
- * Add PropertyRestrictionListener to your EditProcessObject if you are editing
- * a property, to ensure that the bean stays current.
- */
-public class PropertyRestrictionPolicyHelper {
-	private static final Log log = LogFactory
-			.getLog(PropertyRestrictionPolicyHelper.class);
-
-	private static final Collection<String> PROHIBITED_NAMESPACES = Arrays
-			.asList(new String[] { VitroVocabulary.vitroURI, "" });
-
-	private static final Collection<String> PERMITTED_EXCEPTIONS = Arrays
-			.asList(new String[] {
-					VitroVocabulary.MONIKER,
-					VitroVocabulary.MODTIME,
-
-					VitroVocabulary.IND_MAIN_IMAGE,
-
-					VitroVocabulary.LINK,
-					VitroVocabulary.PRIMARY_LINK,
-					VitroVocabulary.ADDITIONAL_LINK,
-					VitroVocabulary.LINK_ANCHOR,
-					VitroVocabulary.LINK_URL });
-
-	/**
-	 * The bean is attached to the ServletContext using this attribute name.
-	 */
-	private static final String ATTRIBUTE_NAME = PropertyRestrictionPolicyHelper.class
-			.getName();
-
-	// ----------------------------------------------------------------------
-	// static methods
-	// ----------------------------------------------------------------------
-
-	public static PropertyRestrictionPolicyHelper getBean(ServletContext ctx) {
-		Object attribute = ctx.getAttribute(ATTRIBUTE_NAME);
-		if (!(attribute instanceof PropertyRestrictionPolicyHelper)) {
-			throw new IllegalStateException(
-					"PropertyRestrictionPolicyHelper has not been initialized.");
-		}
-		return (PropertyRestrictionPolicyHelper) attribute;
-	}
-
-	private static void removeBean(ServletContext ctx) {
-		ctx.removeAttribute(ATTRIBUTE_NAME);
-	}
-
-	public static void setBean(ServletContext ctx,
-			PropertyRestrictionPolicyHelper bean) {
-		if (bean == null) {
-			throw new NullPointerException("bean may not be null.");
-		}
-		ctx.setAttribute(ATTRIBUTE_NAME, bean);
-	}
-
-	/**
-	 * Initialize the bean with the standard prohibitions and exceptions, and
-	 * with the thresholds obtained from the model.
-	 */
-	public static PropertyRestrictionPolicyHelper createBean(OntModel model, 
-	                                                         Model displayModel) {
-	    
-	    
-		Map<String, RoleLevel> displayThresholdMap = new HashMap<String, RoleLevel>();
-		Map<String, RoleLevel> modifyThresholdMap = new HashMap<String, RoleLevel>();
-
-		if (model != null) {
-			populateThresholdMap(model, displayThresholdMap,
-					VitroVocabulary.HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT);
-			populateThresholdMap(
-					model,
-					modifyThresholdMap,
-					VitroVocabulary.PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT);
-		}
-
-		PropertyRestrictionPolicyHelper bean = new PropertyRestrictionPolicyHelper(
-				PROHIBITED_NAMESPACES, PERMITTED_EXCEPTIONS,
-				displayThresholdMap, modifyThresholdMap, displayModel);
-
-		return bean;
-	}
-
-	/**
-	 * Find all the resources that possess this property, and map the resource
-	 * URI to the required RoleLevel.
-	 */
-	private static void populateThresholdMap(OntModel model,
-			Map<String, RoleLevel> map, String propertyUri) {
-		model.enterCriticalSection(Lock.READ);
-		try {
-			Property property = model.getProperty(propertyUri);
-			StmtIterator stmts = model.listStatements((Resource) null,
-					property, (Resource) null);
-			while (stmts.hasNext()) {
-				Statement stmt = stmts.next();
-				Resource subject = stmt.getSubject();
-				RDFNode objectNode = stmt.getObject();
-				if ((subject == null) || (!(objectNode instanceof Resource))) {
-					continue;
-				}
-				Resource object = (Resource) objectNode;
-				RoleLevel role = RoleLevel.getRoleByUri(object.getURI());
-				map.put(subject.getURI(), role);
-			}
-			stmts.close();
-		} finally {
-			model.leaveCriticalSection();
-		}
-	}
-
-	// ----------------------------------------------------------------------
-	// the bean
-	// ----------------------------------------------------------------------
-
-	/**
-	 * URIs in these namespaces can't be modified, unless they are listed in the
-	 * exceptions.
-	 */
-	private final Collection<String> modifyProhibitedNamespaces;
-
-	/**
-	 * These URIs can be modified, even if they are in the prohibited
-	 * namespaces.
-	 */
-	private final Collection<String> modifyExceptionsAllowedUris;
-
-	/**
-	 * These URIs can be displayed only if the user's role is at least as high
-	 * as the threshold role.
-	 */
-	private final Map<String, RoleLevel> displayThresholdMap;
-
-	/**
-	 * These URIs can be modified only if the user's role is at least as high as
-	 * the threshold role.
-	 */
-	private final Map<String, RoleLevel> modifyThresholdMap;
-	
-	private final Model displayModel;
-
-	/**
-	 * Store unmodifiable versions of the inputs.
-	 * 
-	 * Protected access: the bean should only be created by the static methods,
-	 * or by unit tests.
-	 */
-	protected PropertyRestrictionPolicyHelper(
-			Collection<String> modifyProhibitedNamespaces,
-			Collection<String> modifyExceptionsAllowedUris,
-			Map<String, RoleLevel> displayThresholdMap,
-			Map<String, RoleLevel> modifyThresholdMap,
-			Model displayModel) {
-		this.modifyProhibitedNamespaces = unmodifiable(modifyProhibitedNamespaces);
-		this.modifyExceptionsAllowedUris = unmodifiable(modifyExceptionsAllowedUris);
-		this.displayThresholdMap = unmodifiable(displayThresholdMap);
-		this.modifyThresholdMap = unmodifiable(modifyThresholdMap);
-		this.displayModel = displayModel;
-
-		if (log.isDebugEnabled()) {
-			log.debug("prohibited: " + this.modifyProhibitedNamespaces);
-			log.debug("exceptions: " + this.modifyExceptionsAllowedUris);
-			log.debug("display thresholds: " + this.displayThresholdMap);
-			log.debug("modify thresholds: " + this.modifyThresholdMap);
-		}
-	}
-
-	private Collection<String> unmodifiable(Collection<String> raw) {
-		if (raw == null) {
-			return Collections.emptyList();
-		} else {
-			return Collections.unmodifiableCollection(new HashSet<String>(raw));
-		}
-	}
-
-	private Map<String, RoleLevel> unmodifiable(Map<String, RoleLevel> raw) {
-		if (raw == null) {
-			return Collections.emptyMap();
-		} else {
-			return Collections.unmodifiableMap(new HashMap<String, RoleLevel>(
-					raw));
-		}
-	}
-
-	/**
-	 * Any resource can be displayed.
-	 * 
-	 * (Someday we may want to implement display restrictions based on VClass.)
-	 */
-	@SuppressWarnings("unused")
-	public boolean canDisplayResource(String resourceUri, RoleLevel userRole) {
-		if (resourceUri == null) {
-			log.debug("can't display resource: resourceUri was null");
-			return false;
-		}
-
-		log.debug("can display resource '" + resourceUri + "'");
-		return true;
-	}
-
-	/**
-	 * 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.)
-	 */
-	@SuppressWarnings("unused")
-	public boolean canModifyResource(String resourceUri, RoleLevel userRole) {
-		if (resourceUri == null) {
-			log.debug("can't modify resource: resourceUri was null");
-			return false;
-		}
-
-		if (modifyProhibitedNamespaces.contains(namespace(resourceUri))) {
-			if (modifyExceptionsAllowedUris.contains(resourceUri)) {
-				log.debug("'" + resourceUri + "' is a permitted exception");
-			} else {
-				log.debug("can't modify resource '" + resourceUri
-						+ "': prohibited namespace: '" + namespace(resourceUri)
-						+ "'");
-				return false;
-			}
-		}
-
-		log.debug("can modify resource '" + resourceUri + "'");
-		return true;
-	}
-	
-	public boolean canDisplayPredicate(String predicateUri, RoleLevel userRole) {
-	    return canDisplayPredicate(predicateUri, null, userRole);
-	}
-
-	/**
-	 * If display of a predicate is restricted, the user's role must be at least
-	 * as high as the restriction level.
-	 */
-	public boolean canDisplayPredicate(String predicateUri, String rangeUri, RoleLevel userRole) {
-		if (predicateUri == null) {
-			log.debug("can't display predicate: predicateUri was null");
-			return false;
-		}
-		
-		RoleLevel displayThreshold = RoleLevel.NOBODY;
-		if (rangeUri == null) {
-		    displayThreshold = displayThresholdMap.get(predicateUri); 
-		} else {
-		    log.debug("Getting display threshold for " + predicateUri + " " + rangeUri);
-		    displayThreshold = getDisplayThreshold(predicateUri, rangeUri);
-		    if (displayThreshold == null) {
-		        displayThreshold = displayThresholdMap.get(predicateUri);
-		    }
-		    log.debug(displayThreshold);
-		}
-		       	        
-		if (isAuthorized(userRole, displayThreshold)) {
-			log.debug("can display predicate: '" + predicateUri
-					+ "', userRole=" + userRole + ", thresholdRole="
-					+ displayThreshold);
-			return true;
-		}
-
-		log.debug("can't display predicate: '" + predicateUri + "', userRole="
-				+ userRole + ", thresholdRole=" + displayThreshold);
-		return false;
-	}
-	
-	/**
-	 * Gets the role level threshold for displaying a predicate with a particular
-	 * object class
-	 * @param predicateUri
-	 * @param rangeUri
-	 * @return RoleLevel threshold
-	 */
-	private RoleLevel getDisplayThreshold(String predicateUri, String rangeUri) {
-	    String query = "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" +
-                "PREFIX config: <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#> \n" +
-	            "PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> \n" +
-                "SELECT ?level WHERE { \n" +
-//                "    ?p rdfs:subPropertyOf ?property . \n" +
-                "    ?context config:configContextFor ?p . \n" +
-                "    ?context config:qualifiedBy ?range . \n" +
-                "    ?context config:hasConfiguration ?configuration . \n" +
-                "    ?configuration vitro:hiddenFromDisplayBelowRoleLevelAnnot ?level \n" +
-                "}";
-	    Query q = QueryFactory.create(query);
-	    QueryExecution qe = QueryExecutionFactory.create(q, displayModel);
-	    try {
-	        ResultSet rs = qe.execSelect();
-	        if (!rs.hasNext()) {
-	            return null;
-	        } 
-	        while(rs.hasNext()) {
-	          QuerySolution qsoln = rs.nextSolution();
-	          Resource levelRes = qsoln.getResource("level");
-	          if (levelRes != null) {
-	              return RoleLevel.getRoleByUri(levelRes.getURI());
-	          }
-	        }
-	    } finally {
-	        qe.close();
-	    }
-	    return null;
-	}
-	
-	/**
-	 * 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.
-	 */
-	public boolean canModifyPredicate(String predicateUri, RoleLevel userRole) {
-		if (predicateUri == null) {
-			log.debug("can't modify predicate: predicateUri was null");
-			return false;
-		}
-
-		if (modifyProhibitedNamespaces.contains(namespace(predicateUri))) {
-			if (modifyExceptionsAllowedUris.contains(predicateUri)) {
-				log.debug("'" + predicateUri + "' is a permitted exception");
-			} else {
-				log.debug("can't modify resource '" + predicateUri
-						+ "': prohibited namespace: '"
-						+ namespace(predicateUri) + "'");
-				return false;
-			}
-		}
-
-		RoleLevel modifyThreshold = modifyThresholdMap.get(predicateUri);
-		if (isAuthorized(userRole, modifyThreshold)) {
-			log.debug("can modify predicate: '" + predicateUri + "', userRole="
-					+ userRole + ", thresholdRole=" + modifyThreshold);
-			return true;
-		}
-
-		log.debug("can't modify predicate: '" + predicateUri + "', userRole="
-				+ userRole + ", thresholdRole=" + modifyThreshold);
-		return false;
-	}
-
-	private boolean isAuthorized(RoleLevel userRole, RoleLevel thresholdRole) {
-		if (userRole == null) {
-			return false;
-		}
-		if (thresholdRole == null) {
-			return true;
-		}
-		return userRole.compareTo(thresholdRole) >= 0;
-	}
-
-	private String namespace(String uri) {
-		return uri.substring(0, Util.splitNamespace(uri));
-	}
-
-	// ----------------------------------------------------------------------
-	// Setup class
-	// ----------------------------------------------------------------------
-
-	/**
-	 * Create the bean at startup and remove it at shutdown.
-	 */
-	public static class Setup implements ServletContextListener {
-		@Override
-		public void contextInitialized(ServletContextEvent sce) {
-			ServletContext ctx = sce.getServletContext();
-			StartupStatus ss = StartupStatus.getBean(ctx);
-
-			try {
-				OntModel model = ModelAccess.on(ctx).getJenaOntModel();
-				if (model == null) {
-					throw new NullPointerException(
-							"jenaOntModel has not been initialized.");
-				}
-                Model displayModel = ModelAccess.on(ctx).getDisplayModel();
-                if (displayModel == null) {
-                    throw new NullPointerException(
-                            "display model has not been initialized.");
-                }
-				
-				PropertyRestrictionPolicyHelper bean = PropertyRestrictionPolicyHelper
-						.createBean(model, displayModel);
-				PropertyRestrictionPolicyHelper.setBean(ctx, bean);
-			} catch (Exception e) {
-				ss.fatal(this, "could not set up PropertyRestrictionPolicyHelper", e);
-			}
-		}
-
-		@Override
-		public void contextDestroyed(ServletContextEvent sce) {
-			removeBean(sce.getServletContext());
-		}
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy.bean;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.rdf.model.StmtIterator;
+import com.hp.hpl.jena.rdf.model.impl.Util;
+import com.hp.hpl.jena.shared.Lock;
+
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
+
+/**
+ * Assists the role-based policies in determining whether a property or resource
+ * may be displayed or modified.
+ * 
+ * There is a bean in the context that holds the current threshold role levels
+ * for displaying and modifying restricted properties.
+ * 
+ * Create this bean after the Jena model is in place in the context.
+ * 
+ * Add PropertyRestrictionListener to your EditProcessObject if you are editing
+ * a property, to ensure that the bean stays current.
+ */
+public class PropertyRestrictionPolicyHelper {
+	private static final Log log = LogFactory
+			.getLog(PropertyRestrictionPolicyHelper.class);
+
+	private static final Collection<String> PROHIBITED_NAMESPACES = Arrays
+			.asList(new String[] { VitroVocabulary.vitroURI, "" });
+
+	private static final Collection<String> PERMITTED_EXCEPTIONS = Arrays
+			.asList(new String[] {
+					VitroVocabulary.MONIKER,
+					VitroVocabulary.MODTIME,
+
+					VitroVocabulary.IND_MAIN_IMAGE,
+
+					VitroVocabulary.LINK,
+					VitroVocabulary.PRIMARY_LINK,
+					VitroVocabulary.ADDITIONAL_LINK,
+					VitroVocabulary.LINK_ANCHOR,
+					VitroVocabulary.LINK_URL });
+
+	/**
+	 * The bean is attached to the ServletContext using this attribute name.
+	 */
+	private static final String ATTRIBUTE_NAME = PropertyRestrictionPolicyHelper.class
+			.getName();
+
+	// ----------------------------------------------------------------------
+	// static methods
+	// ----------------------------------------------------------------------
+
+	public static PropertyRestrictionPolicyHelper getBean(ServletContext ctx) {
+		Object attribute = ctx.getAttribute(ATTRIBUTE_NAME);
+		if (!(attribute instanceof PropertyRestrictionPolicyHelper)) {
+			throw new IllegalStateException(
+					"PropertyRestrictionPolicyHelper has not been initialized.");
+		}
+		return (PropertyRestrictionPolicyHelper) attribute;
+	}
+
+	private static void removeBean(ServletContext ctx) {
+		ctx.removeAttribute(ATTRIBUTE_NAME);
+	}
+
+	public static void setBean(ServletContext ctx,
+			PropertyRestrictionPolicyHelper bean) {
+		if (bean == null) {
+			throw new NullPointerException("bean may not be null.");
+		}
+		ctx.setAttribute(ATTRIBUTE_NAME, bean);
+	}
+
+	/**
+	 * Initialize the bean with the standard prohibitions and exceptions, and
+	 * with the thresholds obtained from the model.
+	 */
+	public static PropertyRestrictionPolicyHelper createBean(OntModel model, 
+	                                                         Model displayModel) {
+	    
+	    
+		Map<String, RoleLevel> displayThresholdMap = new HashMap<String, RoleLevel>();
+		Map<String, RoleLevel> modifyThresholdMap = new HashMap<String, RoleLevel>();
+
+		if (model != null) {
+			populateThresholdMap(model, displayThresholdMap,
+					VitroVocabulary.HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT);
+			populateThresholdMap(
+					model,
+					modifyThresholdMap,
+					VitroVocabulary.PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT);
+		}
+
+		PropertyRestrictionPolicyHelper bean = new PropertyRestrictionPolicyHelper(
+				PROHIBITED_NAMESPACES, PERMITTED_EXCEPTIONS,
+				displayThresholdMap, modifyThresholdMap, displayModel);
+
+		return bean;
+	}
+
+	/**
+	 * Find all the resources that possess this property, and map the resource
+	 * URI to the required RoleLevel.
+	 */
+	private static void populateThresholdMap(OntModel model,
+			Map<String, RoleLevel> map, String propertyUri) {
+		model.enterCriticalSection(Lock.READ);
+		try {
+			Property property = model.getProperty(propertyUri);
+			StmtIterator stmts = model.listStatements((Resource) null,
+					property, (Resource) null);
+			while (stmts.hasNext()) {
+				Statement stmt = stmts.next();
+				Resource subject = stmt.getSubject();
+				RDFNode objectNode = stmt.getObject();
+				if ((subject == null) || (!(objectNode instanceof Resource))) {
+					continue;
+				}
+				Resource object = (Resource) objectNode;
+				RoleLevel role = RoleLevel.getRoleByUri(object.getURI());
+				map.put(subject.getURI(), role);
+			}
+			stmts.close();
+		} finally {
+			model.leaveCriticalSection();
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// the bean
+	// ----------------------------------------------------------------------
+
+	/**
+	 * URIs in these namespaces can't be modified, unless they are listed in the
+	 * exceptions.
+	 */
+	private final Collection<String> modifyProhibitedNamespaces;
+
+	/**
+	 * These URIs can be modified, even if they are in the prohibited
+	 * namespaces.
+	 */
+	private final Collection<String> modifyExceptionsAllowedUris;
+
+	/**
+	 * These URIs can be displayed only if the user's role is at least as high
+	 * as the threshold role.
+	 */
+	private final Map<String, RoleLevel> displayThresholdMap;
+
+	/**
+	 * These URIs can be modified only if the user's role is at least as high as
+	 * the threshold role.
+	 */
+	private final Map<String, RoleLevel> modifyThresholdMap;
+	
+	private final Model displayModel;
+
+	/**
+	 * Store unmodifiable versions of the inputs.
+	 * 
+	 * Protected access: the bean should only be created by the static methods,
+	 * or by unit tests.
+	 */
+	protected PropertyRestrictionPolicyHelper(
+			Collection<String> modifyProhibitedNamespaces,
+			Collection<String> modifyExceptionsAllowedUris,
+			Map<String, RoleLevel> displayThresholdMap,
+			Map<String, RoleLevel> modifyThresholdMap,
+			Model displayModel) {
+		this.modifyProhibitedNamespaces = unmodifiable(modifyProhibitedNamespaces);
+		this.modifyExceptionsAllowedUris = unmodifiable(modifyExceptionsAllowedUris);
+		this.displayThresholdMap = unmodifiable(displayThresholdMap);
+		this.modifyThresholdMap = unmodifiable(modifyThresholdMap);
+		this.displayModel = displayModel;
+
+		if (log.isDebugEnabled()) {
+			log.debug("prohibited: " + this.modifyProhibitedNamespaces);
+			log.debug("exceptions: " + this.modifyExceptionsAllowedUris);
+			log.debug("display thresholds: " + this.displayThresholdMap);
+			log.debug("modify thresholds: " + this.modifyThresholdMap);
+		}
+	}
+
+	private Collection<String> unmodifiable(Collection<String> raw) {
+		if (raw == null) {
+			return Collections.emptyList();
+		} else {
+			return Collections.unmodifiableCollection(new HashSet<String>(raw));
+		}
+	}
+
+	private Map<String, RoleLevel> unmodifiable(Map<String, RoleLevel> raw) {
+		if (raw == null) {
+			return Collections.emptyMap();
+		} else {
+			return Collections.unmodifiableMap(new HashMap<String, RoleLevel>(
+					raw));
+		}
+	}
+
+	/**
+	 * Any resource can be displayed.
+	 * 
+	 * (Someday we may want to implement display restrictions based on VClass.)
+	 */
+	@SuppressWarnings("unused")
+	public boolean canDisplayResource(String resourceUri, RoleLevel userRole) {
+		if (resourceUri == null) {
+			log.debug("can't display resource: resourceUri was null");
+			return false;
+		}
+
+		log.debug("can display resource '" + resourceUri + "'");
+		return true;
+	}
+
+	/**
+	 * 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.)
+	 */
+	@SuppressWarnings("unused")
+	public boolean canModifyResource(String resourceUri, RoleLevel userRole) {
+		if (resourceUri == null) {
+			log.debug("can't modify resource: resourceUri was null");
+			return false;
+		}
+
+		if (modifyProhibitedNamespaces.contains(namespace(resourceUri))) {
+			if (modifyExceptionsAllowedUris.contains(resourceUri)) {
+				log.debug("'" + resourceUri + "' is a permitted exception");
+			} else {
+				log.debug("can't modify resource '" + resourceUri
+						+ "': prohibited namespace: '" + namespace(resourceUri)
+						+ "'");
+				return false;
+			}
+		}
+
+		log.debug("can modify resource '" + resourceUri + "'");
+		return true;
+	}
+	
+	public boolean canDisplayPredicate(String predicateUri, RoleLevel userRole) {
+	    return canDisplayPredicate(predicateUri, null, userRole);
+	}
+
+	/**
+	 * If display of a predicate is restricted, the user's role must be at least
+	 * as high as the restriction level.
+	 */
+	public boolean canDisplayPredicate(String predicateUri, String rangeUri, RoleLevel userRole) {
+		if (predicateUri == null) {
+			log.debug("can't display predicate: predicateUri was null");
+			return false;
+		}
+		
+		RoleLevel displayThreshold = RoleLevel.NOBODY;
+		if (rangeUri == null) {
+		    displayThreshold = displayThresholdMap.get(predicateUri); 
+		} else {
+		    log.debug("Getting display threshold for " + predicateUri + " " + rangeUri);
+		    displayThreshold = getDisplayThreshold(predicateUri, rangeUri);
+		    if (displayThreshold == null) {
+		        displayThreshold = displayThresholdMap.get(predicateUri);
+		    }
+		    log.debug(displayThreshold);
+		}
+		       	        
+		if (isAuthorized(userRole, displayThreshold)) {
+			log.debug("can display predicate: '" + predicateUri
+					+ "', userRole=" + userRole + ", thresholdRole="
+					+ displayThreshold);
+			return true;
+		}
+
+		log.debug("can't display predicate: '" + predicateUri + "', userRole="
+				+ userRole + ", thresholdRole=" + displayThreshold);
+		return false;
+	}
+	
+	/**
+	 * Gets the role level threshold for displaying a predicate with a particular
+	 * object class
+	 * @param predicateUri
+	 * @param rangeUri
+	 * @return RoleLevel threshold
+	 */
+	private RoleLevel getDisplayThreshold(String predicateUri, String rangeUri) {
+	    String query = "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" +
+                "PREFIX config: <http://vitro.mannlib.cornell.edu/ns/vitro/ApplicationConfiguration#> \n" +
+	            "PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> \n" +
+                "SELECT ?level WHERE { \n" +
+//                "    ?p rdfs:subPropertyOf ?property . \n" +
+                "    ?context config:configContextFor ?p . \n" +
+                "    ?context config:qualifiedBy ?range . \n" +
+                "    ?context config:hasConfiguration ?configuration . \n" +
+                "    ?configuration vitro:hiddenFromDisplayBelowRoleLevelAnnot ?level \n" +
+                "}";
+	    Query q = QueryFactory.create(query);
+	    QueryExecution qe = QueryExecutionFactory.create(q, displayModel);
+	    try {
+	        ResultSet rs = qe.execSelect();
+	        if (!rs.hasNext()) {
+	            return null;
+	        } 
+	        while(rs.hasNext()) {
+	          QuerySolution qsoln = rs.nextSolution();
+	          Resource levelRes = qsoln.getResource("level");
+	          if (levelRes != null) {
+	              return RoleLevel.getRoleByUri(levelRes.getURI());
+	          }
+	        }
+	    } finally {
+	        qe.close();
+	    }
+	    return null;
+	}
+	
+	/**
+	 * 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.
+	 */
+	public boolean canModifyPredicate(String predicateUri, RoleLevel userRole) {
+		if (predicateUri == null) {
+			log.debug("can't modify predicate: predicateUri was null");
+			return false;
+		}
+
+		if (modifyProhibitedNamespaces.contains(namespace(predicateUri))) {
+			if (modifyExceptionsAllowedUris.contains(predicateUri)) {
+				log.debug("'" + predicateUri + "' is a permitted exception");
+			} else {
+				log.debug("can't modify resource '" + predicateUri
+						+ "': prohibited namespace: '"
+						+ namespace(predicateUri) + "'");
+				return false;
+			}
+		}
+
+		RoleLevel modifyThreshold = modifyThresholdMap.get(predicateUri);
+		if (isAuthorized(userRole, modifyThreshold)) {
+			log.debug("can modify predicate: '" + predicateUri + "', userRole="
+					+ userRole + ", thresholdRole=" + modifyThreshold);
+			return true;
+		}
+
+		log.debug("can't modify predicate: '" + predicateUri + "', userRole="
+				+ userRole + ", thresholdRole=" + modifyThreshold);
+		return false;
+	}
+
+	private boolean isAuthorized(RoleLevel userRole, RoleLevel thresholdRole) {
+		if (userRole == null) {
+			return false;
+		}
+		if (thresholdRole == null) {
+			return true;
+		}
+		return userRole.compareTo(thresholdRole) >= 0;
+	}
+
+	private String namespace(String uri) {
+		return uri.substring(0, Util.splitNamespace(uri));
+	}
+
+	// ----------------------------------------------------------------------
+	// Setup class
+	// ----------------------------------------------------------------------
+
+	/**
+	 * Create the bean at startup and remove it at shutdown.
+	 */
+	public static class Setup implements ServletContextListener {
+		@Override
+		public void contextInitialized(ServletContextEvent sce) {
+			ServletContext ctx = sce.getServletContext();
+			StartupStatus ss = StartupStatus.getBean(ctx);
+
+			try {
+				OntModel model = ModelAccess.on(ctx).getJenaOntModel();
+				if (model == null) {
+					throw new NullPointerException(
+							"jenaOntModel has not been initialized.");
+				}
+                Model displayModel = ModelAccess.on(ctx).getDisplayModel();
+                if (displayModel == null) {
+                    throw new NullPointerException(
+                            "display model has not been initialized.");
+                }
+				
+				PropertyRestrictionPolicyHelper bean = PropertyRestrictionPolicyHelper
+						.createBean(model, displayModel);
+				PropertyRestrictionPolicyHelper.setBean(ctx, bean);
+			} catch (Exception e) {
+				ss.fatal(this, "could not set up PropertyRestrictionPolicyHelper", e);
+			}
+		}
+
+		@Override
+		public void contextDestroyed(ServletContextEvent sce) {
+			removeBean(sce.getServletContext());
+		}
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/CommonPolicyFamilySetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/CommonPolicyFamilySetup.java
index 729ee4ad0..93633c8b2 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/CommonPolicyFamilySetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/setup/CommonPolicyFamilySetup.java
@@ -1,62 +1,62 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.policy.setup;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundleFactory;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.factory.HasPermissionFactory;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.factory.HasPermissionSetFactory;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.factory.HasProfileOrIsBlacklistedFactory;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.factory.HasProxyEditingRightsFactory;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.factory.IsRootUserFactory;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.factory.IsUserFactory;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.DisplayRestrictedDataToSelfPolicy;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.PermissionsPolicy;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.SelfEditingPolicy;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
-import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
-
-/**
- * Set up the common policy family, with Identifier factories.
- */
-public class CommonPolicyFamilySetup implements ServletContextListener {
-
-	@Override
-	public void contextInitialized(ServletContextEvent sce) {
-		ServletContext ctx = sce.getServletContext();
-		StartupStatus ss = StartupStatus.getBean(ctx);
-
-		try {
-			policy(ctx, new PermissionsPolicy());
-			policy(ctx, new DisplayRestrictedDataToSelfPolicy(ctx));
-			policy(ctx, new SelfEditingPolicy(ctx));
-
-			factory(ctx, new IsUserFactory(ctx));
-			factory(ctx, new IsRootUserFactory(ctx));
-			factory(ctx, new HasProfileOrIsBlacklistedFactory(ctx));
-			factory(ctx, new HasPermissionSetFactory(ctx));
-			factory(ctx, new HasPermissionFactory(ctx));
-			factory(ctx, new HasProxyEditingRightsFactory(ctx));
-		} catch (Exception e) {
-			ss.fatal(this, "could not run CommonPolicyFamilySetup", e);
-		}
-	}
-
-	private void policy(ServletContext ctx, PolicyIface policy) {
-		ServletPolicyList.addPolicy(ctx, policy);
-	}
-
-	private void factory(ServletContext ctx, IdentifierBundleFactory factory) {
-		ActiveIdentifierBundleFactories.addFactory(ctx, factory);
-	}
-
-	@Override
-	public void contextDestroyed(ServletContextEvent sce) { /* nothing */
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy.setup;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundleFactory;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.factory.HasPermissionFactory;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.factory.HasPermissionSetFactory;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.factory.HasProfileOrIsBlacklistedFactory;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.factory.HasProxyEditingRightsFactory;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.factory.IsRootUserFactory;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.factory.IsUserFactory;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.DisplayRestrictedDataToSelfPolicy;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.PermissionsPolicy;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.SelfEditingPolicy;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
+import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
+
+/**
+ * Set up the common policy family, with Identifier factories.
+ */
+public class CommonPolicyFamilySetup implements ServletContextListener {
+
+	@Override
+	public void contextInitialized(ServletContextEvent sce) {
+		ServletContext ctx = sce.getServletContext();
+		StartupStatus ss = StartupStatus.getBean(ctx);
+
+		try {
+			policy(ctx, new PermissionsPolicy());
+			policy(ctx, new DisplayRestrictedDataToSelfPolicy(ctx));
+			policy(ctx, new SelfEditingPolicy(ctx));
+
+			factory(ctx, new IsUserFactory(ctx));
+			factory(ctx, new IsRootUserFactory(ctx));
+			factory(ctx, new HasProfileOrIsBlacklistedFactory(ctx));
+			factory(ctx, new HasPermissionSetFactory(ctx));
+			factory(ctx, new HasPermissionFactory(ctx));
+			factory(ctx, new HasProxyEditingRightsFactory(ctx));
+		} catch (Exception e) {
+			ss.fatal(this, "could not run CommonPolicyFamilySetup", e);
+		}
+	}
+
+	private void policy(ServletContext ctx, PolicyIface policy) {
+		ServletPolicyList.addPolicy(ctx, policy);
+	}
+
+	private void factory(ServletContext ctx, IdentifierBundleFactory factory) {
+		ActiveIdentifierBundleFactories.addFactory(ctx, factory);
+	}
+
+	@Override
+	public void contextDestroyed(ServletContextEvent sce) { /* nothing */
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/specialrelationships/AbstractRelationshipPolicy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/specialrelationships/AbstractRelationshipPolicy.java
index f04053f71..02dd57f16 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/specialrelationships/AbstractRelationshipPolicy.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/policy/specialrelationships/AbstractRelationshipPolicy.java
@@ -1,62 +1,62 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.policy.specialrelationships;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.auth.policy.BasicPolicyDecision;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
-import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
-
-/**
- * A collection of building-block methods so we can code a policy based on the
- * relationship of the object being edited to the identity of the user doing the
- * editing.
- */
-public abstract class AbstractRelationshipPolicy implements PolicyIface {
-	private static final Log log = LogFactory
-			.getLog(AbstractRelationshipPolicy.class);
-
-	protected final ServletContext ctx;
-
-	public AbstractRelationshipPolicy(ServletContext ctx) {
-		this.ctx = ctx;
-	}
-
-	protected boolean canModifyResource(String uri) {
-		return PropertyRestrictionPolicyHelper.getBean(ctx).canModifyResource(
-				uri, RoleLevel.SELF);
-	}
-
-	protected boolean canModifyPredicate(String uri) {
-		return PropertyRestrictionPolicyHelper.getBean(ctx).canModifyPredicate(
-				uri, RoleLevel.SELF);
-	}
-
-	protected PolicyDecision cantModifyResource(String uri) {
-		return inconclusiveDecision("No access to admin resources; cannot modify "
-				+ uri);
-	}
-
-	protected PolicyDecision cantModifyPredicate(String uri) {
-		return inconclusiveDecision("No access to admin predicates; cannot modify "
-				+ uri);
-	}
-
-	protected PolicyDecision userNotAuthorizedToStatement() {
-		return inconclusiveDecision("User has no access to this statement.");
-	}
-
-	/** An INCONCLUSIVE decision with a message like "PolicyClass: message". */
-	protected PolicyDecision inconclusiveDecision(String message) {
-		return new BasicPolicyDecision(Authorization.INCONCLUSIVE, getClass()
-				.getSimpleName() + ": " + message);
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy.specialrelationships;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.auth.policy.BasicPolicyDecision;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
+
+/**
+ * A collection of building-block methods so we can code a policy based on the
+ * relationship of the object being edited to the identity of the user doing the
+ * editing.
+ */
+public abstract class AbstractRelationshipPolicy implements PolicyIface {
+	private static final Log log = LogFactory
+			.getLog(AbstractRelationshipPolicy.class);
+
+	protected final ServletContext ctx;
+
+	public AbstractRelationshipPolicy(ServletContext ctx) {
+		this.ctx = ctx;
+	}
+
+	protected boolean canModifyResource(String uri) {
+		return PropertyRestrictionPolicyHelper.getBean(ctx).canModifyResource(
+				uri, RoleLevel.SELF);
+	}
+
+	protected boolean canModifyPredicate(String uri) {
+		return PropertyRestrictionPolicyHelper.getBean(ctx).canModifyPredicate(
+				uri, RoleLevel.SELF);
+	}
+
+	protected PolicyDecision cantModifyResource(String uri) {
+		return inconclusiveDecision("No access to admin resources; cannot modify "
+				+ uri);
+	}
+
+	protected PolicyDecision cantModifyPredicate(String uri) {
+		return inconclusiveDecision("No access to admin predicates; cannot modify "
+				+ uri);
+	}
+
+	protected PolicyDecision userNotAuthorizedToStatement() {
+		return inconclusiveDecision("User has no access to this statement.");
+	}
+
+	/** An INCONCLUSIVE decision with a message like "PolicyClass: message". */
+	protected PolicyDecision inconclusiveDecision(String message) {
+		return new BasicPolicyDecision(Authorization.INCONCLUSIVE, getClass()
+				.getSimpleName() + ": " + message);
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/Actions.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/Actions.java
index ecbf1638a..ad668aa6d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/Actions.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/Actions.java
@@ -1,153 +1,153 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.requestedAction;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-
-/**
- * An immutable list of OR and AND relationships for the required
- * authorizations. A group of AND relationships is a "clause", and the list of
- * clauses are in an OR relationship.
- * 
- * Authorization is successful if ALL of the actions in ANY of the clauses are
- * authorized, or if there are NO clauses.
- */
-public class Actions {
-	private static final Log log = LogFactory.getLog(Actions.class);
-
-	public static final Actions AUTHORIZED = new Actions();
-	public static final Actions UNAUTHORIZED = new Actions(
-			new UnauthorizedAction());
-
-	public static Actions notNull(Actions actions) {
-		return (actions == null) ? AUTHORIZED : actions;
-	}
-
-	private final List<Set<RequestedAction>> clauseList;
-
-	public Actions(RequestedAction... actions) {
-		this(Arrays.asList(actions));
-	}
-
-	public Actions(Collection<RequestedAction> actions) {
-		this(Collections.<Set<RequestedAction>> emptyList(), actions);
-	}
-
-	private Actions(List<Set<RequestedAction>> oldList,
-			Collection<RequestedAction> newActions) {
-		List<Set<RequestedAction>> newList = new ArrayList<Set<RequestedAction>>();
-		newList.addAll(oldList);
-
-		Set<RequestedAction> newActionSet = new HashSet<RequestedAction>(
-				newActions);
-		if (!newActionSet.isEmpty()) {
-			newList.add(Collections.unmodifiableSet(newActionSet));
-		}
-		this.clauseList = Collections.unmodifiableList(newList);
-	}
-
-	public Actions or(RequestedAction... newActions) {
-		return or(Arrays.asList(newActions));
-	}
-
-	public Actions or(Collection<RequestedAction> newActions) {
-		return new Actions(this.clauseList, newActions);
-	}
-
-	public boolean isEmpty() {
-		for (Set<RequestedAction> clause : clauseList) {
-			if (!clause.isEmpty()) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/** No clauses means everything is authorized */
-	public boolean isAuthorized(PolicyIface policy, IdentifierBundle ids) {
-		if (clauseList.isEmpty()) {
-			log.debug("Empty Actions is authorized");
-			return true;
-		}
-		return isAuthorizedForClauseList(policy, ids);
-	}
-
-	/** Any entire clause is good enough. */
-	private boolean isAuthorizedForClauseList(PolicyIface policy,
-			IdentifierBundle ids) {
-		for (Set<RequestedAction> clause : clauseList) {
-			if (isAuthorizedForClause(policy, ids, clause)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/** All actions in a clause must be authorized. */
-	private static boolean isAuthorizedForClause(PolicyIface policy,
-			IdentifierBundle ids, Set<RequestedAction> clause) {
-		for (RequestedAction action : clause) {
-			if (!isAuthorizedForAction(policy, ids, action)) {
-				log.debug("not authorized");
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/** Is this action authorized? */
-	private static boolean isAuthorizedForAction(PolicyIface policy,
-			IdentifierBundle ids, RequestedAction action) {
-		PolicyDecision decision = policy.isAuthorized(ids, action);
-		log.debug("decision for '" + action.getClass().getSimpleName() + "' was: "
-				+ decision);
-		return (decision != null)
-				&& (decision.getAuthorized() == Authorization.AUTHORIZED);
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer sb = new StringBuffer("Actions[");
-		for (Iterator<Set<RequestedAction>> cit = clauseList.iterator(); cit.hasNext();) {
-			Set<RequestedAction> clause = cit.next();
-			sb.append("(");
-			for (Iterator<RequestedAction> it = clause.iterator(); it.hasNext();) {
-				RequestedAction action = it.next();
-				sb.append(action.getClass().getSimpleName());
-				if (it.hasNext()) {
-					sb.append(", ");
-				}
-			}
-			sb.append(")");
-			if (cit.hasNext()) {
-				sb.append(" or ");
-			}
-		}
-		sb.append("]");
-		return sb.toString();
-	}
-
-	/**
-	 * Nobody knows about this action class, so only the root user should be
-	 * authorized for it.
-	 */
-	private static class UnauthorizedAction extends RequestedAction {
-		// no members
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.requestedAction;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+
+/**
+ * An immutable list of OR and AND relationships for the required
+ * authorizations. A group of AND relationships is a "clause", and the list of
+ * clauses are in an OR relationship.
+ * 
+ * Authorization is successful if ALL of the actions in ANY of the clauses are
+ * authorized, or if there are NO clauses.
+ */
+public class Actions {
+	private static final Log log = LogFactory.getLog(Actions.class);
+
+	public static final Actions AUTHORIZED = new Actions();
+	public static final Actions UNAUTHORIZED = new Actions(
+			new UnauthorizedAction());
+
+	public static Actions notNull(Actions actions) {
+		return (actions == null) ? AUTHORIZED : actions;
+	}
+
+	private final List<Set<RequestedAction>> clauseList;
+
+	public Actions(RequestedAction... actions) {
+		this(Arrays.asList(actions));
+	}
+
+	public Actions(Collection<RequestedAction> actions) {
+		this(Collections.<Set<RequestedAction>> emptyList(), actions);
+	}
+
+	private Actions(List<Set<RequestedAction>> oldList,
+			Collection<RequestedAction> newActions) {
+		List<Set<RequestedAction>> newList = new ArrayList<Set<RequestedAction>>();
+		newList.addAll(oldList);
+
+		Set<RequestedAction> newActionSet = new HashSet<RequestedAction>(
+				newActions);
+		if (!newActionSet.isEmpty()) {
+			newList.add(Collections.unmodifiableSet(newActionSet));
+		}
+		this.clauseList = Collections.unmodifiableList(newList);
+	}
+
+	public Actions or(RequestedAction... newActions) {
+		return or(Arrays.asList(newActions));
+	}
+
+	public Actions or(Collection<RequestedAction> newActions) {
+		return new Actions(this.clauseList, newActions);
+	}
+
+	public boolean isEmpty() {
+		for (Set<RequestedAction> clause : clauseList) {
+			if (!clause.isEmpty()) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/** No clauses means everything is authorized */
+	public boolean isAuthorized(PolicyIface policy, IdentifierBundle ids) {
+		if (clauseList.isEmpty()) {
+			log.debug("Empty Actions is authorized");
+			return true;
+		}
+		return isAuthorizedForClauseList(policy, ids);
+	}
+
+	/** Any entire clause is good enough. */
+	private boolean isAuthorizedForClauseList(PolicyIface policy,
+			IdentifierBundle ids) {
+		for (Set<RequestedAction> clause : clauseList) {
+			if (isAuthorizedForClause(policy, ids, clause)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/** All actions in a clause must be authorized. */
+	private static boolean isAuthorizedForClause(PolicyIface policy,
+			IdentifierBundle ids, Set<RequestedAction> clause) {
+		for (RequestedAction action : clause) {
+			if (!isAuthorizedForAction(policy, ids, action)) {
+				log.debug("not authorized");
+				return false;
+			}
+		}
+		return true;
+	}
+
+	/** Is this action authorized? */
+	private static boolean isAuthorizedForAction(PolicyIface policy,
+			IdentifierBundle ids, RequestedAction action) {
+		PolicyDecision decision = policy.isAuthorized(ids, action);
+		log.debug("decision for '" + action.getClass().getSimpleName() + "' was: "
+				+ decision);
+		return (decision != null)
+				&& (decision.getAuthorized() == Authorization.AUTHORIZED);
+	}
+
+	@Override
+	public String toString() {
+		StringBuffer sb = new StringBuffer("Actions[");
+		for (Iterator<Set<RequestedAction>> cit = clauseList.iterator(); cit.hasNext();) {
+			Set<RequestedAction> clause = cit.next();
+			sb.append("(");
+			for (Iterator<RequestedAction> it = clause.iterator(); it.hasNext();) {
+				RequestedAction action = it.next();
+				sb.append(action.getClass().getSimpleName());
+				if (it.hasNext()) {
+					sb.append(", ");
+				}
+			}
+			sb.append(")");
+			if (cit.hasNext()) {
+				sb.append(" or ");
+			}
+		}
+		sb.append("]");
+		return sb.toString();
+	}
+
+	/**
+	 * Nobody knows about this action class, so only the root user should be
+	 * authorized for it.
+	 */
+	private static class UnauthorizedAction extends RequestedAction {
+		// no members
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/display/DisplayDataProperty.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/display/DisplayDataProperty.java
index 69d7f68e9..24a353513 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/display/DisplayDataProperty.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/display/DisplayDataProperty.java
@@ -1,24 +1,24 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display;
-
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
-
-/** Should we allow the user to see this DataProperty? */
-public class DisplayDataProperty extends RequestedAction {
-	private final DataProperty dataProperty;
-
-	public DisplayDataProperty(DataProperty dataProperty) {
-		this.dataProperty = dataProperty;
-	}
-
-	public DataProperty getDataProperty() {
-		return dataProperty;
-	}
-
-	@Override
-	public String toString() {
-		return "DisplayDataProperty[" + dataProperty + "]";
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display;
+
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+
+/** Should we allow the user to see this DataProperty? */
+public class DisplayDataProperty extends RequestedAction {
+	private final DataProperty dataProperty;
+
+	public DisplayDataProperty(DataProperty dataProperty) {
+		this.dataProperty = dataProperty;
+	}
+
+	public DataProperty getDataProperty() {
+		return dataProperty;
+	}
+
+	@Override
+	public String toString() {
+		return "DisplayDataProperty[" + dataProperty + "]";
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/display/DisplayDataPropertyStatement.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/display/DisplayDataPropertyStatement.java
index 7e55f68e6..8aa82af9a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/display/DisplayDataPropertyStatement.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/display/DisplayDataPropertyStatement.java
@@ -1,29 +1,29 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display;
-
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
-
-/** Should we let the user see this DataPropertyStatement? */
-public class DisplayDataPropertyStatement extends RequestedAction {
-	private final DataPropertyStatement dataPropertyStatement;
-
-	public DisplayDataPropertyStatement(
-			DataPropertyStatement dataPropertyStatement) {
-		this.dataPropertyStatement = dataPropertyStatement;
-	}
-
-	public DataPropertyStatement getDataPropertyStatement() {
-		return dataPropertyStatement;
-	}
-
-	@Override
-	public String toString() {
-		return "DisplayDataPropertyStatement["
-				+ dataPropertyStatement.getIndividualURI() + "==>"
-				+ dataPropertyStatement.getDatapropURI() + "==>"
-				+ dataPropertyStatement.getData() + "]";
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display;
+
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+
+/** Should we let the user see this DataPropertyStatement? */
+public class DisplayDataPropertyStatement extends RequestedAction {
+	private final DataPropertyStatement dataPropertyStatement;
+
+	public DisplayDataPropertyStatement(
+			DataPropertyStatement dataPropertyStatement) {
+		this.dataPropertyStatement = dataPropertyStatement;
+	}
+
+	public DataPropertyStatement getDataPropertyStatement() {
+		return dataPropertyStatement;
+	}
+
+	@Override
+	public String toString() {
+		return "DisplayDataPropertyStatement["
+				+ dataPropertyStatement.getIndividualURI() + "==>"
+				+ dataPropertyStatement.getDatapropURI() + "==>"
+				+ dataPropertyStatement.getData() + "]";
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/display/DisplayObjectProperty.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/display/DisplayObjectProperty.java
index 3d3e8c4f7..7bfb97021 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/display/DisplayObjectProperty.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/display/DisplayObjectProperty.java
@@ -1,24 +1,24 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display;
-
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-
-/** Should we allow the user to see this ObjectProperty? */
-public class DisplayObjectProperty extends RequestedAction {
-	private final ObjectProperty objectProperty;
-
-	public DisplayObjectProperty(ObjectProperty objectProperty) {
-		this.objectProperty = objectProperty;
-	}
-
-	public ObjectProperty getObjectProperty() {
-		return objectProperty;
-	}
-
-	@Override
-	public String toString() {
-		return "DisplayObjectProperty[" + objectProperty.getLocalName() + "]";
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display;
+
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+
+/** Should we allow the user to see this ObjectProperty? */
+public class DisplayObjectProperty extends RequestedAction {
+	private final ObjectProperty objectProperty;
+
+	public DisplayObjectProperty(ObjectProperty objectProperty) {
+		this.objectProperty = objectProperty;
+	}
+
+	public ObjectProperty getObjectProperty() {
+		return objectProperty;
+	}
+
+	@Override
+	public String toString() {
+		return "DisplayObjectProperty[" + objectProperty.getLocalName() + "]";
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/display/DisplayObjectPropertyStatement.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/display/DisplayObjectPropertyStatement.java
index 602c1ce40..eac3cd349 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/display/DisplayObjectPropertyStatement.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/display/DisplayObjectPropertyStatement.java
@@ -1,29 +1,29 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display;
-
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
-
-/** Should we let the user see this ObjectPropertyStatement? */
-public class DisplayObjectPropertyStatement extends RequestedAction {
-	private final ObjectPropertyStatement objectPropertyStatement;
-
-	public DisplayObjectPropertyStatement(
-			ObjectPropertyStatement objectPropertyStatement) {
-		this.objectPropertyStatement = objectPropertyStatement;
-	}
-
-	public ObjectPropertyStatement getObjectPropertyStatement() {
-		return objectPropertyStatement;
-	}
-
-	@Override
-	public String toString() {
-		return "DisplayObjectPropertyStatement["
-				+ objectPropertyStatement.getSubjectURI() + "==>"
-				+ objectPropertyStatement.getPropertyURI() + "==>"
-				+ objectPropertyStatement.getObjectURI() + "]";
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display;
+
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
+
+/** Should we let the user see this ObjectPropertyStatement? */
+public class DisplayObjectPropertyStatement extends RequestedAction {
+	private final ObjectPropertyStatement objectPropertyStatement;
+
+	public DisplayObjectPropertyStatement(
+			ObjectPropertyStatement objectPropertyStatement) {
+		this.objectPropertyStatement = objectPropertyStatement;
+	}
+
+	public ObjectPropertyStatement getObjectPropertyStatement() {
+		return objectPropertyStatement;
+	}
+
+	@Override
+	public String toString() {
+		return "DisplayObjectPropertyStatement["
+				+ objectPropertyStatement.getSubjectURI() + "==>"
+				+ objectPropertyStatement.getPropertyURI() + "==>"
+				+ objectPropertyStatement.getObjectURI() + "]";
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractDataPropertyStatementAction.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractDataPropertyStatementAction.java
index 5ea769755..024709878 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractDataPropertyStatementAction.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/propstmt/AbstractDataPropertyStatementAction.java
@@ -1,52 +1,52 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt;
-
-import com.hp.hpl.jena.ontology.OntModel;
-
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
-
-/**
- * A base class for requested actions that involve adding, editing, or dropping
- * data property statements from a model.
- */
-public abstract class AbstractDataPropertyStatementAction extends
-		AbstractPropertyStatementAction {
-	private final String subjectUri;
-	private final String predicateUri;
-
-	public AbstractDataPropertyStatementAction(OntModel ontModel,
-			String subjectUri, String predicateUri) {
-		super(ontModel);
-		this.subjectUri = subjectUri;
-		this.predicateUri = predicateUri;
-	}
-
-	public AbstractDataPropertyStatementAction(OntModel ontModel,
-			DataPropertyStatement dps) {
-		super(ontModel);
-		this.subjectUri = (dps.getIndividual() == null) ? dps
-				.getIndividualURI() : dps.getIndividual().getURI();
-		this.predicateUri = dps.getDatapropURI();
-	}
-
-	public String getSubjectUri() {
-		return subjectUri;
-	}
-
-	@Override
-	public String getPredicateUri() {
-		return predicateUri;
-	}
-
-	@Override
-	public String[] getResourceUris() {
-		return new String[] {subjectUri};
-	}
-
-	@Override
-	public String toString() {
-		return getClass().getSimpleName() + ": <" + subjectUri + "> <"
-				+ predicateUri + ">";
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt;
+
+import com.hp.hpl.jena.ontology.OntModel;
+
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+
+/**
+ * A base class for requested actions that involve adding, editing, or dropping
+ * data property statements from a model.
+ */
+public abstract class AbstractDataPropertyStatementAction extends
+		AbstractPropertyStatementAction {
+	private final String subjectUri;
+	private final String predicateUri;
+
+	public AbstractDataPropertyStatementAction(OntModel ontModel,
+			String subjectUri, String predicateUri) {
+		super(ontModel);
+		this.subjectUri = subjectUri;
+		this.predicateUri = predicateUri;
+	}
+
+	public AbstractDataPropertyStatementAction(OntModel ontModel,
+			DataPropertyStatement dps) {
+		super(ontModel);
+		this.subjectUri = (dps.getIndividual() == null) ? dps
+				.getIndividualURI() : dps.getIndividual().getURI();
+		this.predicateUri = dps.getDatapropURI();
+	}
+
+	public String getSubjectUri() {
+		return subjectUri;
+	}
+
+	@Override
+	public String getPredicateUri() {
+		return predicateUri;
+	}
+
+	@Override
+	public String[] getResourceUris() {
+		return new String[] {subjectUri};
+	}
+
+	@Override
+	public String toString() {
+		return getClass().getSimpleName() + ": <" + subjectUri + "> <"
+				+ predicateUri + ">";
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/resource/AbstractResourceAction.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/resource/AbstractResourceAction.java
index 8c61be6ba..aa47a9a18 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/resource/AbstractResourceAction.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/resource/AbstractResourceAction.java
@@ -1,33 +1,33 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.resource;
-
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-
-/**
- * A common base class for resource-related actions.
- */
-public abstract class AbstractResourceAction extends RequestedAction {
-	private final String typeUri;
-	private final String subjectUri;
-
-	public AbstractResourceAction(String typeUri, String subjectUri) {
-		this.typeUri = typeUri;
-		this.subjectUri = subjectUri;
-	}
-
-	// This should return a list of type URIs since an Indiviudal can be
-	// multiple types.
-	public String getTypeUri() {
-		return typeUri;
-	}
-
-	public String getSubjectUri() {
-		return subjectUri;
-	}
-
-	@Override
-	public String toString() {
-		return this.getClass().getSimpleName() + " <" + subjectUri + ">";
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.resource;
+
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+
+/**
+ * A common base class for resource-related actions.
+ */
+public abstract class AbstractResourceAction extends RequestedAction {
+	private final String typeUri;
+	private final String subjectUri;
+
+	public AbstractResourceAction(String typeUri, String subjectUri) {
+		this.typeUri = typeUri;
+		this.subjectUri = subjectUri;
+	}
+
+	// This should return a list of type URIs since an Indiviudal can be
+	// multiple types.
+	public String getTypeUri() {
+		return typeUri;
+	}
+
+	public String getSubjectUri() {
+		return subjectUri;
+	}
+
+	@Override
+	public String toString() {
+		return this.getClass().getSimpleName() + " <" + subjectUri + ">";
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/ManageRootAccount.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/ManageRootAccount.java
index d469d6979..8bd41b103 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/ManageRootAccount.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/ManageRootAccount.java
@@ -1,12 +1,12 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages;
-
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-
-/**
- * Should we allow the user to edit or delete the root account?
- */
-public class ManageRootAccount extends RequestedAction {
-	// no fields
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages;
+
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+
+/**
+ * Should we allow the user to edit or delete the root account?
+ */
+public class ManageRootAccount extends RequestedAction {
+	// no fields
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/UsePagesRequestedAction.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/UsePagesRequestedAction.java
index 313cdbc60..288ae637f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/UsePagesRequestedAction.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/auth/requestedAction/usepages/UsePagesRequestedAction.java
@@ -1,8 +1,8 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages;
-
-/** Denotes a request to use a particular page or group of pages. */
-public interface UsePagesRequestedAction {
-	/** marker interface */
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages;
+
+/** Denotes a request to use a particular page or group of pages. */
+public interface UsePagesRequestedAction {
+	/** marker interface */
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Classes2Classes.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Classes2Classes.java
index 1c26bdf1c..2768f42fe 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Classes2Classes.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Classes2Classes.java
@@ -1,39 +1,39 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.beans;
-
-/**
- *
- * a class representing a direct subsumption relationship
- * between two ontology classes
- *
- */
-public class Classes2Classes {
-
-    private String superclassURI = null;
-    private String superclassNamespace = null;
-    private String superclassLocalName = null;
-
-    private String subclassURI = null;
-    private String subclassNamespace = null;
-    private String subclassLocalName = null;
-
-    public String getSuperclassURI(){ return superclassURI;}
-    public void setSuperclassURI(String in){ superclassURI=in;}
-
-    public String getSuperclassNamespace(){ return superclassNamespace; }
-    public void setSuperclassNamespace(){ this.superclassNamespace=superclassNamespace;}
-
-    public String getSuperclassLocalName(){ return superclassLocalName; }
-    public void setSuperclassLocalName(){ this.superclassLocalName=superclassLocalName;}
-
-    public String getSubclassURI(){ return subclassURI;}
-    public void setSubclassURI(String in){ subclassURI=in;}
-
-    public String getSubclassNamespace(){ return subclassNamespace; }
-    public void setSubclassNamespace(){ this.subclassNamespace=subclassNamespace;}
-
-    public String getSubclassLocalName(){ return subclassLocalName; }
-    public void setSubclassLocalName(){ this.subclassLocalName=subclassLocalName;}
-
+package edu.cornell.mannlib.vitro.webapp.beans;
+
+/**
+ *
+ * a class representing a direct subsumption relationship
+ * between two ontology classes
+ *
+ */
+public class Classes2Classes {
+
+    private String superclassURI = null;
+    private String superclassNamespace = null;
+    private String superclassLocalName = null;
+
+    private String subclassURI = null;
+    private String subclassNamespace = null;
+    private String subclassLocalName = null;
+
+    public String getSuperclassURI(){ return superclassURI;}
+    public void setSuperclassURI(String in){ superclassURI=in;}
+
+    public String getSuperclassNamespace(){ return superclassNamespace; }
+    public void setSuperclassNamespace(){ this.superclassNamespace=superclassNamespace;}
+
+    public String getSuperclassLocalName(){ return superclassLocalName; }
+    public void setSuperclassLocalName(){ this.superclassLocalName=superclassLocalName;}
+
+    public String getSubclassURI(){ return subclassURI;}
+    public void setSubclassURI(String in){ subclassURI=in;}
+
+    public String getSubclassNamespace(){ return subclassNamespace; }
+    public void setSubclassNamespace(){ this.subclassNamespace=subclassNamespace;}
+
+    public String getSubclassLocalName(){ return subclassLocalName; }
+    public void setSubclassLocalName(){ this.subclassLocalName=subclassLocalName;}
+
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java
index 1131effdc..ea518b5d9 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatement.java
@@ -1,40 +1,40 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.beans;
-
-import java.util.Date;
+package edu.cornell.mannlib.vitro.webapp.beans;
+
+import java.util.Date;
 
 import com.hp.hpl.jena.rdf.model.Property;
-
-/**
- * a class representing a particular instance of a data property
- *
- */
-public interface DataPropertyStatement {
+
+/**
+ * a class representing a particular instance of a data property
+ *
+ */
+public interface DataPropertyStatement {
     
     public Individual getIndividual();
     
     public void setIndividual(Individual individual);
-    
-    public String getIndividualURI();
-
-    public void setIndividualURI(String individualURI);
-
-    public String getData();
-
-    public void setData(String data);
-
-    public String getDatapropURI();
-
-    public void setDatapropURI(String propertyURI);
-
-    public String getDatatypeURI();
-
-    public void setDatatypeURI(String datatypeURI);
-
-    public String getLanguage();
-
-    public void setLanguage(String language);
-
-    public String getString();
-}
+    
+    public String getIndividualURI();
+
+    public void setIndividualURI(String individualURI);
+
+    public String getData();
+
+    public void setData(String data);
+
+    public String getDatapropURI();
+
+    public void setDatapropURI(String propertyURI);
+
+    public String getDatatypeURI();
+
+    public void setDatatypeURI(String datatypeURI);
+
+    public String getLanguage();
+
+    public void setLanguage(String language);
+
+    public String getString();
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatementImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatementImpl.java
index 5f2be0e50..b05c56a19 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatementImpl.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DataPropertyStatementImpl.java
@@ -1,36 +1,36 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.beans;
-
-import java.util.Date;
-
-/**
- * a class representing an particular instance of a data property
- *
- */
-public class DataPropertyStatementImpl implements DataPropertyStatement
+package edu.cornell.mannlib.vitro.webapp.beans;
+
+import java.util.Date;
+
+/**
+ * a class representing an particular instance of a data property
+ *
+ */
+public class DataPropertyStatementImpl implements DataPropertyStatement
 {
-    private Individual individual = null;
-    private String individualURI = null;
-    private String data = null;
-    private String datapropURI = null;
-    private String datatypeURI = null;
+    private Individual individual = null;
+    private String individualURI = null;
+    private String data = null;
+    private String datapropURI = null;
+    private String datatypeURI = null;
     private String language = null;
-    
-    public DataPropertyStatementImpl(){
-    }
-
-    public DataPropertyStatementImpl(Individual individual){
-        if( individual != null ){
-            this.individualURI = individual.getURI();
-        }
+    
+    public DataPropertyStatementImpl(){
+    }
+
+    public DataPropertyStatementImpl(Individual individual){
+        if( individual != null ){
+            this.individualURI = individual.getURI();
+        }
     }
     
     public DataPropertyStatementImpl(String individualUri, String propertyUri, String data){
         individualURI = individualUri;
         datapropURI = propertyUri;
         this.data = data;
-    }
+    }
 
     public Individual getIndividual() {
         return this.individual;
@@ -39,56 +39,56 @@ public class DataPropertyStatementImpl implements DataPropertyStatement
     public void setIndividual(Individual individual) {
         this.individual = individual;
     }
-    
-    public String getIndividualURI() {
-        return individualURI;
-    }
-
-    public void setIndividualURI(String individualURI) {
-        this.individualURI = individualURI;
-    }
-
-    public String getData() {
-        return data;
-    }
-
-    public void setData(String data) {
-        this.data = data;
-    }
-
-    public String getDatapropURI() {
-        return datapropURI;
-    }
-
-    public void setDatapropURI(String datapropURI) {
-        this.datapropURI = datapropURI;
-    }
-
-    public String getDatatypeURI() {
-        return datatypeURI;
-    }
-
-    public void setDatatypeURI(String datatypeURI) {
-        this.datatypeURI = datatypeURI;
-    }
-
-    public String getLanguage() {
-        return language;
-    }
-
-    public void setLanguage(String language) {
-        this.language = language;
-    }
-
-    public String getString(){
-        String out = "instance of dataprop: " + datapropURI;
-
-        if( data == null )
-            out = out + " data is null";
-        else if( data.length() > 20 )
-            out = out + " data (truncated): '" + data.substring(0,19) + "'...";
-        else
-            out = out + " data: '" + data ;
-        return out;
-    }
-}
+    
+    public String getIndividualURI() {
+        return individualURI;
+    }
+
+    public void setIndividualURI(String individualURI) {
+        this.individualURI = individualURI;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+
+    public String getDatapropURI() {
+        return datapropURI;
+    }
+
+    public void setDatapropURI(String datapropURI) {
+        this.datapropURI = datapropURI;
+    }
+
+    public String getDatatypeURI() {
+        return datatypeURI;
+    }
+
+    public void setDatatypeURI(String datatypeURI) {
+        this.datatypeURI = datatypeURI;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public String getString(){
+        String out = "instance of dataprop: " + datapropURI;
+
+        if( data == null )
+            out = out + " data is null";
+        else if( data.length() > 20 )
+            out = out + " data (truncated): '" + data.substring(0,19) + "'...";
+        else
+            out = out + " data: '" + data ;
+        return out;
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Datatype.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Datatype.java
index afe27c4b5..a481276e4 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Datatype.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Datatype.java
@@ -1,35 +1,35 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.beans;
-
-public class Datatype {
-
-    private int id = -1;
-    private String name = null;
-    private String uri = null;
-
-    public int getId(){
-        return id;
-    }
-
-    public void setId(int id){
-        this.id = id;
-    }
-
-    public String getName(){
-        return name;
-    }
-
-    public void setName(String name){
-        this.name = name;
-    }
-
-    public String getUri(){
-        return uri;
-    }
-
-    public void setUri(String uri){
-        this.uri = uri;
-    }
-
-}
+package edu.cornell.mannlib.vitro.webapp.beans;
+
+public class Datatype {
+
+    private int id = -1;
+    private String name = null;
+    private String uri = null;
+
+    public int getId(){
+        return id;
+    }
+
+    public void setId(int id){
+        this.id = id;
+    }
+
+    public String getName(){
+        return name;
+    }
+
+    public void setName(String name){
+        this.name = name;
+    }
+
+    public String getUri(){
+        return uri;
+    }
+
+    public void setUri(String uri){
+        this.uri = uri;
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DisplayMessage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DisplayMessage.java
index e6a5d4c7d..b18aa8092 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DisplayMessage.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/DisplayMessage.java
@@ -1,77 +1,77 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.beans;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * Store a message in the session, so it can be displayed on the page. Getting
- * the message also removes it from the session, so the same message is not
- * displayed repeatedly.
- */
-public class DisplayMessage {
-	private static final Log log = LogFactory.getLog(DisplayMessage.class);
-
-	/** If there is no message, return this instead. */
-	private static final String NO_MESSAGE = "";
-
-	private static final String ATTRIBUTE_NAME = DisplayMessage.class.getName();
-
-	/**
-	 * Store this message on the session. This will overwrite any previously
-	 * stored message.
-	 */
-	public static void setMessage(HttpServletRequest request, String message) {
-		setMessage(request.getSession(), message);
-	}
-
-	/**
-	 * Store this message on the session. This will overwrite any previously
-	 * stored message.
-	 */
-	public static void setMessage(HttpSession session, String message) {
-		session.setAttribute(ATTRIBUTE_NAME, message);
-		log.debug("Set message: '" + message + "'");
-	}
-
-	/**
-	 * 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) {
-		if (request == null) {
-			return NO_MESSAGE;
-		} else {
-			return getMessageAndClear(request.getSession(false));
-		}
-	}
-
-	/**
-	 * 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) {
-	    String message = NO_MESSAGE;
-		if (session != null) {
-			Object sessionMessage = session.getAttribute(ATTRIBUTE_NAME);
-			if (sessionMessage != null) {
-    			if (sessionMessage instanceof String) {
-    				log.debug("Get message: '" + sessionMessage + "'");    				
-    				message = (String) sessionMessage;
-    			} 
-    			session.removeAttribute(ATTRIBUTE_NAME);	
-			} else {
-			    log.debug("Get no message.");
-			}
-		}				
-		return message;
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.beans;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * Store a message in the session, so it can be displayed on the page. Getting
+ * the message also removes it from the session, so the same message is not
+ * displayed repeatedly.
+ */
+public class DisplayMessage {
+	private static final Log log = LogFactory.getLog(DisplayMessage.class);
+
+	/** If there is no message, return this instead. */
+	private static final String NO_MESSAGE = "";
+
+	private static final String ATTRIBUTE_NAME = DisplayMessage.class.getName();
+
+	/**
+	 * Store this message on the session. This will overwrite any previously
+	 * stored message.
+	 */
+	public static void setMessage(HttpServletRequest request, String message) {
+		setMessage(request.getSession(), message);
+	}
+
+	/**
+	 * Store this message on the session. This will overwrite any previously
+	 * stored message.
+	 */
+	public static void setMessage(HttpSession session, String message) {
+		session.setAttribute(ATTRIBUTE_NAME, message);
+		log.debug("Set message: '" + message + "'");
+	}
+
+	/**
+	 * 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) {
+		if (request == null) {
+			return NO_MESSAGE;
+		} else {
+			return getMessageAndClear(request.getSession(false));
+		}
+	}
+
+	/**
+	 * 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) {
+	    String message = NO_MESSAGE;
+		if (session != null) {
+			Object sessionMessage = session.getAttribute(ATTRIBUTE_NAME);
+			if (sessionMessage != null) {
+    			if (sessionMessage instanceof String) {
+    				log.debug("Get message: '" + sessionMessage + "'");    				
+    				message = (String) sessionMessage;
+    			} 
+    			session.removeAttribute(ATTRIBUTE_NAME);	
+			} else {
+			    log.debug("Get no message.");
+			}
+		}				
+		return message;
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatementImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatementImpl.java
index e5f638a04..fb015bb43 100755
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatementImpl.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/ObjectPropertyStatementImpl.java
@@ -1,171 +1,171 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.beans;
-
+package edu.cornell.mannlib.vitro.webapp.beans;
+
 import java.util.Comparator;
 import java.util.Date;
-
-/**
- * a class representing a particular instance of an object property
- *
- */
-public class ObjectPropertyStatementImpl implements ObjectPropertyStatement
-{
-    private String subjectURI = null;
-    private Individual subject = null;
-    private String objectURI = null;
-    private Individual object = null;
-
-    private String propertyURI = null;
-    private ObjectProperty property = null;
+
+/**
+ * a class representing a particular instance of an object property
+ *
+ */
+public class ObjectPropertyStatementImpl implements ObjectPropertyStatement
+{
+    private String subjectURI = null;
+    private Individual subject = null;
+    private String objectURI = null;
+    private Individual object = null;
+
+    private String propertyURI = null;
+    private ObjectProperty property = null;
     private boolean subjectOriented = true; //is the range the item of interest?  
     
-   public ObjectPropertyStatementImpl() { }
-
+   public ObjectPropertyStatementImpl() { }
+
    public ObjectPropertyStatementImpl(String subjectUri, String propertyUri, String objectUri) {
         subjectURI = subjectUri;
         propertyURI = propertyUri;
         objectURI = objectUri;        
     }
 
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#toString()
-     */
-    public String toString(){
-           String prop = (getProperty()!=null)?getProperty().getDomainPublic():"by propURI"+getPropertyURI();
-           String ran = (getObject()!= null)?getObject().getName():"objectURI:"+getObjectURI();
-           String dom = (getSubject()!= null)?getSubject().getName():"subjectURI:"+getSubjectURI();
-           return "Object Property Statements: "+dom+" "+prop+" to "+ran+" ";
-    }
-
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#getSubjectURI()
-     */
-    public String getSubjectURI() {
-        return subjectURI;
-    }
-
-
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#setSubjectURI(java.lang.String)
-     */
-    public void setSubjectURI(String subjectURI) {
-        this.subjectURI = subjectURI;
-    }
-
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#getObjectURI()
-     */
-    public String getObjectURI() {
-        return objectURI;
-    }
-
-
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#setObjectURI(java.lang.String)
-     */
-    public void setObjectURI(String objectURI) {
-        this.objectURI = objectURI;
-    }
-
-
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#getSubject()
-     */
-    public Individual getSubject() {
-        return subject;
-    }
-
-
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#setSubject(edu.cornell.mannlib.vitro.webapp.beans.Individual)
-     */
-    public void setSubject(Individual subject) {
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#toString()
+     */
+    public String toString(){
+           String prop = (getProperty()!=null)?getProperty().getDomainPublic():"by propURI"+getPropertyURI();
+           String ran = (getObject()!= null)?getObject().getName():"objectURI:"+getObjectURI();
+           String dom = (getSubject()!= null)?getSubject().getName():"subjectURI:"+getSubjectURI();
+           return "Object Property Statements: "+dom+" "+prop+" to "+ran+" ";
+    }
+
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#getSubjectURI()
+     */
+    public String getSubjectURI() {
+        return subjectURI;
+    }
+
+
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#setSubjectURI(java.lang.String)
+     */
+    public void setSubjectURI(String subjectURI) {
+        this.subjectURI = subjectURI;
+    }
+
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#getObjectURI()
+     */
+    public String getObjectURI() {
+        return objectURI;
+    }
+
+
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#setObjectURI(java.lang.String)
+     */
+    public void setObjectURI(String objectURI) {
+        this.objectURI = objectURI;
+    }
+
+
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#getSubject()
+     */
+    public Individual getSubject() {
+        return subject;
+    }
+
+
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#setSubject(edu.cornell.mannlib.vitro.webapp.beans.Individual)
+     */
+    public void setSubject(Individual subject) {
         this.subject = subject;
         if (subject == null || subject.isAnonymous()) {
             setSubjectURI(null);    
         } else {
             setSubjectURI(subject.getURI());
-        }
-    }
-
-
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#getProperty()
-     */
-    public ObjectProperty getProperty() {
-        return property;
-    }
-
-
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#setProperty(edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty)
-     */
-    public void setProperty(ObjectProperty property) {
-        if(property != null )
-            setPropertyURI(property.getURI());
-        else
-            setPropertyURI(null);
-        this.property = property;
-    }
-
-
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#getObject()
-     */
-    public Individual getObject() {
-        return object;
-    }
-
-
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#setObject(edu.cornell.mannlib.vitro.webapp.beans.Individual)
-     */
-    public void setObject(Individual object) {
+        }
+    }
+
+
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#getProperty()
+     */
+    public ObjectProperty getProperty() {
+        return property;
+    }
+
+
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#setProperty(edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty)
+     */
+    public void setProperty(ObjectProperty property) {
+        if(property != null )
+            setPropertyURI(property.getURI());
+        else
+            setPropertyURI(null);
+        this.property = property;
+    }
+
+
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#getObject()
+     */
+    public Individual getObject() {
+        return object;
+    }
+
+
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#setObject(edu.cornell.mannlib.vitro.webapp.beans.Individual)
+     */
+    public void setObject(Individual object) {
         this.object = object;
         if (object == null || object.isAnonymous()) {
             setObjectURI(null);    
         } else {
             setObjectURI(object.getURI());
-        }
-    }
-
-
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#getPropertyURI()
-     */
-    public String getPropertyURI() {
-        return this.propertyURI;
-    }
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#setPropertyURI(java.lang.String)
-     */
-    public void setPropertyURI(String URI){
-        this.propertyURI = URI;
-    }
-
-    /**
-     * Sorts entity object for display presentation.
-     * @author bdc34
-     */
-    public static class DisplayComparator implements Comparator{    	    	
-        public int compare(Object o1, Object o2) {
-            Individual ent1 = ((ObjectPropertyStatement) o1).getSubject();
-            Individual ent2 = ((ObjectPropertyStatement) o2).getSubject();            
-            return ent1.getName().compareTo(ent2.getName());
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#toPropertyInstance()
-     */
-    public PropertyInstance toPropertyInstance(){
-        PropertyInstance pi = new PropertyInstance();
-
-        pi.setPropertyURI(propertyURI);
-        pi.setSubjectEntURI(subjectURI);
-        pi.setObjectEntURI(objectURI);
-        return pi;
-    }
-
-}
+        }
+    }
+
+
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#getPropertyURI()
+     */
+    public String getPropertyURI() {
+        return this.propertyURI;
+    }
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#setPropertyURI(java.lang.String)
+     */
+    public void setPropertyURI(String URI){
+        this.propertyURI = URI;
+    }
+
+    /**
+     * Sorts entity object for display presentation.
+     * @author bdc34
+     */
+    public static class DisplayComparator implements Comparator{    	    	
+        public int compare(Object o1, Object o2) {
+            Individual ent1 = ((ObjectPropertyStatement) o1).getSubject();
+            Individual ent2 = ((ObjectPropertyStatement) o2).getSubject();            
+            return ent1.getName().compareTo(ent2.getName());
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement#toPropertyInstance()
+     */
+    public PropertyInstance toPropertyInstance(){
+        PropertyInstance pi = new PropertyInstance();
+
+        pi.setPropertyURI(propertyURI);
+        pi.setSubjectEntURI(subjectURI);
+        pi.setObjectEntURI(objectURI);
+        return pi;
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Ontology.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Ontology.java
index b97431b54..e44dff8a9 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Ontology.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/Ontology.java
@@ -1,65 +1,65 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.beans;
-
-import java.text.Collator;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * A representation of an OWL ontology resource
- * [kwg8-08/01/07] unified get*, set* methods with style in VClass.java
- */
-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; }
-
-    private String myName = null;
-    public String getName()             { return myName; }
-    public void setName( String name )  { myName = name; }
-
-    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; }
-
-    private int myNamespaceID;
-    public int getNamespaceId()           { return myNamespaceID; }
-    public void setNamespaceId( int nid ) { myNamespaceID = nid; }
-
-    private String myURI;
-    public String getURI()              { return myURI; }
-    public void setURI( String URI )    { myURI = URI; }
-
-    private List myVClassesList = null;
-    public List getVClassesList()              { return myVClassesList; }
-    public void setVClassesList( List vcl )    { myVClassesList = vcl; }
-
-    private List myPropsList = null;
-    public List getPropsList()           { return myPropsList; }
-    public void setPropsList( List pl )  { myPropsList = pl; }
-
-    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) {
-            log.error("Ontology NULL in DisplayComparator()");
-            return 0;
-        }
-        return collator.compare(this.getName(), o2.getName());
-    }
-    
+package edu.cornell.mannlib.vitro.webapp.beans;
+
+import java.text.Collator;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A representation of an OWL ontology resource
+ * [kwg8-08/01/07] unified get*, set* methods with style in VClass.java
+ */
+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; }
+
+    private String myName = null;
+    public String getName()             { return myName; }
+    public void setName( String name )  { myName = name; }
+
+    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; }
+
+    private int myNamespaceID;
+    public int getNamespaceId()           { return myNamespaceID; }
+    public void setNamespaceId( int nid ) { myNamespaceID = nid; }
+
+    private String myURI;
+    public String getURI()              { return myURI; }
+    public void setURI( String URI )    { myURI = URI; }
+
+    private List myVClassesList = null;
+    public List getVClassesList()              { return myVClassesList; }
+    public void setVClassesList( List vcl )    { myVClassesList = vcl; }
+
+    private List myPropsList = null;
+    public List getPropsList()           { return myPropsList; }
+    public void setPropsList( List pl )  { myPropsList = pl; }
+
+    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) {
+            log.error("Ontology NULL in DisplayComparator()");
+            return 0;
+        }
+        return collator.compare(this.getName(), o2.getName());
+    }
+    
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/PermissionSet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/PermissionSet.java
index 9767f5303..5da62c694 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/PermissionSet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/PermissionSet.java
@@ -1,72 +1,72 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.beans;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * Reflects a collection of Permissions that can be made available to a user.
- * Similar to the concept of a Role.
- */
-public class PermissionSet {
-	/** This may be empty, but it should never be null. */
-	private String uri = "";
-
-	/** This may be empty, but it should never be null. */
-	private String label = "";
-
-	private boolean forNewUsers;
-	private boolean forPublic;
-
-	/** This may be empty, but it should never be null. */
-	private Set<String> permissionUris = Collections.emptySet();
-
-	public String getUri() {
-		return uri;
-	}
-
-	public void setUri(String uri) {
-		this.uri = (uri == null) ? "" : uri;
-	}
-
-	public String getLabel() {
-		return label;
-	}
-
-	public void setLabel(String label) {
-		this.label = (label == null) ? "" : label;
-	}
-
-	public boolean isForNewUsers() {
-		return forNewUsers;
-	}
-
-	public void setForNewUsers(Boolean forNewUsers) {
-		this.forNewUsers = (forNewUsers == null) ? false
-				: forNewUsers.booleanValue();
-	}
-
-	public boolean isForPublic() {
-		return forPublic;
-	}
-
-	public void setForPublic(Boolean forPublic) {
-		this.forPublic = (forPublic == null) ? false
-				: forPublic.booleanValue();
-	}
-
-	public Set<String> getPermissionUris() {
-		return permissionUris;
-	}
-
-	public void setPermissionUris(Collection<String> permissionUris) {
-		if (permissionUris == null) {
-			throw new NullPointerException("permissionUris may not be null.");
-		}
-		this.permissionUris = new HashSet<String>(permissionUris);
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.beans;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Reflects a collection of Permissions that can be made available to a user.
+ * Similar to the concept of a Role.
+ */
+public class PermissionSet {
+	/** This may be empty, but it should never be null. */
+	private String uri = "";
+
+	/** This may be empty, but it should never be null. */
+	private String label = "";
+
+	private boolean forNewUsers;
+	private boolean forPublic;
+
+	/** This may be empty, but it should never be null. */
+	private Set<String> permissionUris = Collections.emptySet();
+
+	public String getUri() {
+		return uri;
+	}
+
+	public void setUri(String uri) {
+		this.uri = (uri == null) ? "" : uri;
+	}
+
+	public String getLabel() {
+		return label;
+	}
+
+	public void setLabel(String label) {
+		this.label = (label == null) ? "" : label;
+	}
+
+	public boolean isForNewUsers() {
+		return forNewUsers;
+	}
+
+	public void setForNewUsers(Boolean forNewUsers) {
+		this.forNewUsers = (forNewUsers == null) ? false
+				: forNewUsers.booleanValue();
+	}
+
+	public boolean isForPublic() {
+		return forPublic;
+	}
+
+	public void setForPublic(Boolean forPublic) {
+		this.forPublic = (forPublic == null) ? false
+				: forPublic.booleanValue();
+	}
+
+	public Set<String> getPermissionUris() {
+		return permissionUris;
+	}
+
+	public void setPermissionUris(Collection<String> permissionUris) {
+		if (permissionUris == null) {
+			throw new NullPointerException("permissionUris may not be null.");
+		}
+		this.permissionUris = new HashSet<String>(permissionUris);
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstance.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstance.java
index a74d3b04f..09ebe625e 100755
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstance.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstance.java
@@ -1,176 +1,176 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.beans;
-
-import java.util.Date;
-
-/**
-   Represents a Vitro object property instance.  It includes values
-   from the entities, object property statements, properties, and ent2relationships tables
-   bundled up in a usable object.
-*/
-public class PropertyInstance implements PropertyInstanceIface, Comparable<PropertyInstance> {
-
-    private String propertyURI = null;
-    private String objectEntURI = null;
-    private String subjectEntURI = null;
-
-    private String subjectName = null;
-    private String objectName = null;
-
-    private String propertyName = null;
-    private String domainPublic = null;
-    private String rangePublic = null;
-
-    private String domainClassName = null;
-    private String rangeClassName = null;
-    private String domainQuickEditJsp = null;
-    private String rangeQuickEditJsp = null;
-
-    private String domainClassURI = null;
-    private String rangeClassURI = null;
-
-    private boolean subjectSide = true;
-
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getPropertyId()
-     */
-    public String getPropertyURI(){return propertyURI;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getDomainName()
-     */
-    public String getSubjectName(){return subjectName;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getRangeName()
-     */
-    public String getObjectName(){return objectName;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getRangeClass()
-     */
-    public String getRangeClassURI(){return rangeClassURI;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getDomainClass()
-     */
-    public String getDomainClassURI(){return domainClassURI;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getDomainClassName()
-     */
-    public String getDomainClassName(){return domainClassName;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getRangeClassName()
-     */
-    public String getRangeClassName(){return rangeClassName;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getRangeEntId()
-     */
-    public String getObjectEntURI(){return objectEntURI;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getDomainEntId()
-     */
-    public String getSubjectEntURI(){return subjectEntURI;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getPropertyName()
-     */
-    public String getPropertyName(){return propertyName;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getDomainPublic()
-     */
-    public String getDomainPublic(){return domainPublic;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getRangePublic()
-     */
-    public String getRangePublic(){return rangePublic;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getQualifier()
-     */
-    public boolean getSubjectSide(){return subjectSide;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getDomainQuickEditJsp()
-     */
-    public String getDomainQuickEditJsp(){return domainQuickEditJsp; }
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getRangeQuickEditJsp()
-     */
-    public String getRangeQuickEditJsp(){return rangeQuickEditJsp; }
-
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setPropertyId(int)
-     */
-    public void setPropertyURI(String in){propertyURI = in;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setDomainName(java.lang.String)
-     */
-    public void setSubjectName(String in){subjectName=in; }
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setRangeName(java.lang.String)
-     */
-    public void setObjectName(String in){objectName=in;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setRangeClass(int)
-     */
-    public void setRangeClassURI(String in){rangeClassURI=in;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setDomainClass(int)
-     */
-    public void setDomainClassURI(String in){domainClassURI=in;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setDomainClassName(java.lang.String)
-     */
-    public void setDomainClassName(String in){domainClassName=in; }
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setRangeClassName(java.lang.String)
-     */
-    public void setRangeClassName(String in){rangeClassName=in;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setRangeEntId(int)
-     */
-    public void setObjectEntURI(String in){objectEntURI=in;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setDomainEntId(int)
-     */
-    public void setSubjectEntURI(String in){subjectEntURI=in;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setPropertyName(java.lang.String)
-     */
-    public void setPropertyName(String in){propertyName=in;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setDomainPublic(java.lang.String)
-     */
-    public void setDomainPublic(String in){domainPublic=in;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setRangePublic(java.lang.String)
-     */
-    public void setRangePublic(String in){rangePublic=in;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setDomainSide(boolean)
-     */
-    public void setSubjectSide(boolean in){subjectSide=in;}
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setDomainQuickEditJsp(java.lang.String)
-     */
-    public void setDomainQuickEditJsp(String in){ domainQuickEditJsp = in; }
-    /* (non-Javadoc)
-     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setRangeQuickEditJsp(java.lang.String)
-     */
-    public void setRangeQuickEditJsp(String in){ rangeQuickEditJsp = in; }
-
-    public static final int DOMAINSIDE = 0; //property has some entity of interest as domainId
-    public static final int RANGESIDE = 1; //property has some entity of interest as rangeId
-
-    @Override
-    public String toString(){
-        //this takes getDomainSide into account and hides much of the datastruct (and bugs)
-        String out = "PropInst(" + getPropertyURI() +")";
-        if( getSubjectSide() ){
-            out = getDomainClassName() + "("+ getDomainClassURI() + ") ";
-            out += getDomainPublic() + " ";
-            out += getRangeClassName() + "(" + getRangeClassURI() + ")";
-        }else{
-            out += getRangeClassName() + "(" + getRangeClassURI() + ") ";
-            out += getRangePublic() + " ";
-            out = getDomainClassName() + "("+ getDomainClassURI() + ")";
-        }
-        return out;
+package edu.cornell.mannlib.vitro.webapp.beans;
+
+import java.util.Date;
+
+/**
+   Represents a Vitro object property instance.  It includes values
+   from the entities, object property statements, properties, and ent2relationships tables
+   bundled up in a usable object.
+*/
+public class PropertyInstance implements PropertyInstanceIface, Comparable<PropertyInstance> {
+
+    private String propertyURI = null;
+    private String objectEntURI = null;
+    private String subjectEntURI = null;
+
+    private String subjectName = null;
+    private String objectName = null;
+
+    private String propertyName = null;
+    private String domainPublic = null;
+    private String rangePublic = null;
+
+    private String domainClassName = null;
+    private String rangeClassName = null;
+    private String domainQuickEditJsp = null;
+    private String rangeQuickEditJsp = null;
+
+    private String domainClassURI = null;
+    private String rangeClassURI = null;
+
+    private boolean subjectSide = true;
+
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getPropertyId()
+     */
+    public String getPropertyURI(){return propertyURI;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getDomainName()
+     */
+    public String getSubjectName(){return subjectName;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getRangeName()
+     */
+    public String getObjectName(){return objectName;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getRangeClass()
+     */
+    public String getRangeClassURI(){return rangeClassURI;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getDomainClass()
+     */
+    public String getDomainClassURI(){return domainClassURI;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getDomainClassName()
+     */
+    public String getDomainClassName(){return domainClassName;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getRangeClassName()
+     */
+    public String getRangeClassName(){return rangeClassName;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getRangeEntId()
+     */
+    public String getObjectEntURI(){return objectEntURI;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getDomainEntId()
+     */
+    public String getSubjectEntURI(){return subjectEntURI;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getPropertyName()
+     */
+    public String getPropertyName(){return propertyName;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getDomainPublic()
+     */
+    public String getDomainPublic(){return domainPublic;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getRangePublic()
+     */
+    public String getRangePublic(){return rangePublic;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getQualifier()
+     */
+    public boolean getSubjectSide(){return subjectSide;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getDomainQuickEditJsp()
+     */
+    public String getDomainQuickEditJsp(){return domainQuickEditJsp; }
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#getRangeQuickEditJsp()
+     */
+    public String getRangeQuickEditJsp(){return rangeQuickEditJsp; }
+
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setPropertyId(int)
+     */
+    public void setPropertyURI(String in){propertyURI = in;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setDomainName(java.lang.String)
+     */
+    public void setSubjectName(String in){subjectName=in; }
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setRangeName(java.lang.String)
+     */
+    public void setObjectName(String in){objectName=in;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setRangeClass(int)
+     */
+    public void setRangeClassURI(String in){rangeClassURI=in;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setDomainClass(int)
+     */
+    public void setDomainClassURI(String in){domainClassURI=in;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setDomainClassName(java.lang.String)
+     */
+    public void setDomainClassName(String in){domainClassName=in; }
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setRangeClassName(java.lang.String)
+     */
+    public void setRangeClassName(String in){rangeClassName=in;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setRangeEntId(int)
+     */
+    public void setObjectEntURI(String in){objectEntURI=in;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setDomainEntId(int)
+     */
+    public void setSubjectEntURI(String in){subjectEntURI=in;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setPropertyName(java.lang.String)
+     */
+    public void setPropertyName(String in){propertyName=in;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setDomainPublic(java.lang.String)
+     */
+    public void setDomainPublic(String in){domainPublic=in;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setRangePublic(java.lang.String)
+     */
+    public void setRangePublic(String in){rangePublic=in;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setDomainSide(boolean)
+     */
+    public void setSubjectSide(boolean in){subjectSide=in;}
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setDomainQuickEditJsp(java.lang.String)
+     */
+    public void setDomainQuickEditJsp(String in){ domainQuickEditJsp = in; }
+    /* (non-Javadoc)
+     * @see edu.cornell.mannlib.vitro.beans.PropertyInstanceIface#setRangeQuickEditJsp(java.lang.String)
+     */
+    public void setRangeQuickEditJsp(String in){ rangeQuickEditJsp = in; }
+
+    public static final int DOMAINSIDE = 0; //property has some entity of interest as domainId
+    public static final int RANGESIDE = 1; //property has some entity of interest as rangeId
+
+    @Override
+    public String toString(){
+        //this takes getDomainSide into account and hides much of the datastruct (and bugs)
+        String out = "PropInst(" + getPropertyURI() +")";
+        if( getSubjectSide() ){
+            out = getDomainClassName() + "("+ getDomainClassURI() + ") ";
+            out += getDomainPublic() + " ";
+            out += getRangeClassName() + "(" + getRangeClassURI() + ")";
+        }else{
+            out += getRangeClassName() + "(" + getRangeClassURI() + ") ";
+            out += getRangePublic() + " ";
+            out = getDomainClassName() + "("+ getDomainClassURI() + ")";
+        }
+        return out;
     }
     
     public int compareTo(PropertyInstance pi) {
@@ -185,5 +185,5 @@ public class PropertyInstance implements PropertyInstanceIface, Comparable<Prope
             return -1;
         }
 
-    }
-}
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstanceIface.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstanceIface.java
index ad152d9af..b53bbba94 100755
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstanceIface.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/PropertyInstanceIface.java
@@ -1,62 +1,62 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.beans;
-
-import java.util.Date;
-
-public interface PropertyInstanceIface {
-//needed for PropertyInstance
-//object property statements
-    public abstract String getPropertyURI();
-    public abstract String getObjectEntURI();
-    public abstract String getSubjectEntURI();
-
-//  entities
-    public abstract String getSubjectName();
-    public abstract String getObjectName();
-
-//needed for Any Property
-//properties
-    public abstract String getPropertyName();
-    public abstract String getDomainPublic();
-    public abstract String getRangePublic();
-
-//classs
-    public abstract String getDomainClassName();
-    public abstract String getRangeClassName();
-    public abstract String getDomainQuickEditJsp();
-    public abstract String getRangeQuickEditJsp();
-
-//classs2relations
-    public abstract String getRangeClassURI();
-    public abstract String getDomainClassURI();
-
-    public abstract boolean getSubjectSide();
-
-/******************* setters ************************/
-
-    public abstract void setPropertyURI(String in);
-
-    public abstract void setSubjectName(String in);
-    public abstract void setObjectName(String in);
-    public abstract void setRangeClassURI(String in);
-    public abstract void setDomainClassURI(String in);
-    public abstract void setDomainClassName(String in);
-    public abstract void setRangeClassName(String in);
-
-    public abstract void setSubjectEntURI(String in);
-    public abstract void setObjectEntURI(String in);
-
-    public abstract void setPropertyName(String in);
-
-    public abstract void setDomainPublic(String in);
-
-    public abstract void setRangePublic(String in);
-
-    public abstract void setSubjectSide(boolean in);
-
-    public abstract void setDomainQuickEditJsp(String in);
-
-    public abstract void setRangeQuickEditJsp(String in);
-
-}
+package edu.cornell.mannlib.vitro.webapp.beans;
+
+import java.util.Date;
+
+public interface PropertyInstanceIface {
+//needed for PropertyInstance
+//object property statements
+    public abstract String getPropertyURI();
+    public abstract String getObjectEntURI();
+    public abstract String getSubjectEntURI();
+
+//  entities
+    public abstract String getSubjectName();
+    public abstract String getObjectName();
+
+//needed for Any Property
+//properties
+    public abstract String getPropertyName();
+    public abstract String getDomainPublic();
+    public abstract String getRangePublic();
+
+//classs
+    public abstract String getDomainClassName();
+    public abstract String getRangeClassName();
+    public abstract String getDomainQuickEditJsp();
+    public abstract String getRangeQuickEditJsp();
+
+//classs2relations
+    public abstract String getRangeClassURI();
+    public abstract String getDomainClassURI();
+
+    public abstract boolean getSubjectSide();
+
+/******************* setters ************************/
+
+    public abstract void setPropertyURI(String in);
+
+    public abstract void setSubjectName(String in);
+    public abstract void setObjectName(String in);
+    public abstract void setRangeClassURI(String in);
+    public abstract void setDomainClassURI(String in);
+    public abstract void setDomainClassName(String in);
+    public abstract void setRangeClassName(String in);
+
+    public abstract void setSubjectEntURI(String in);
+    public abstract void setObjectEntURI(String in);
+
+    public abstract void setPropertyName(String in);
+
+    public abstract void setDomainPublic(String in);
+
+    public abstract void setRangePublic(String in);
+
+    public abstract void setSubjectSide(boolean in);
+
+    public abstract void setDomainQuickEditJsp(String in);
+
+    public abstract void setRangeQuickEditJsp(String in);
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/SelfEditingConfiguration.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/SelfEditingConfiguration.java
index 3e204bdf7..25d33160d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/SelfEditingConfiguration.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/SelfEditingConfiguration.java
@@ -1,230 +1,230 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.beans;
-
-import java.util.Collections;
-import java.util.List;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
-import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
-import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
-
-/**
- * Holds the configuration properties used in Self-Editing, and some commonly
- * used methods on those properties.
- */
-public class SelfEditingConfiguration {
-	private static final Log log = LogFactory
-			.getLog(SelfEditingConfiguration.class);
-
-	private static final String BEAN_ATTRIBUTE = SelfEditingConfiguration.class
-			.getName();
-
-	/**
-	 * This configuration property tells us which data property on the
-	 * Individual is used to associate it with a net ID.
-	 */
-	private static final String PROPERTY_SELF_EDITING_ID_MATCHING_PROPERTY = "selfEditing.idMatchingProperty";
-
-	// ----------------------------------------------------------------------
-	// static methods
-	// ----------------------------------------------------------------------
-
-	/**
-	 * 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) {
-		if (request == null) {
-			log.error("Request is null");
-			return new SelfEditingConfiguration(null);
-		}
-
-		if (!(request instanceof HttpServletRequest)) {
-			log.error("Not an HttpServletRequest: " + request.getClass());
-			return new SelfEditingConfiguration(null);
-		}
-		HttpServletRequest hreq = (HttpServletRequest) request;
-
-		return getBean(hreq.getSession().getServletContext());
-	}
-
-	/**
-	 * 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) {
-		Object attr = ctx.getAttribute(BEAN_ATTRIBUTE);
-		if (attr instanceof SelfEditingConfiguration) {
-			log.debug("Found a bean: " + attr);
-			return (SelfEditingConfiguration) attr;
-		}
-
-		SelfEditingConfiguration bean = buildBean(ctx);
-		log.debug("Created a bean: " + bean);
-		ctx.setAttribute(BEAN_ATTRIBUTE, bean);
-		return bean;
-	}
-
-	private static SelfEditingConfiguration buildBean(ServletContext ctx) {
-		ConfigurationProperties config = ConfigurationProperties.getBean(ctx);
-		String selfEditingIdMatchingProperty = config
-				.getProperty(PROPERTY_SELF_EDITING_ID_MATCHING_PROPERTY);
-		return new SelfEditingConfiguration(selfEditingIdMatchingProperty);
-	}
-
-	// ----------------------------------------------------------------------
-	// the bean
-	// ----------------------------------------------------------------------
-
-	private final String selfEditingIdMatchingProperty;
-
-	public SelfEditingConfiguration(String selfEditingIdMatchingProperty) {
-		this.selfEditingIdMatchingProperty = trimThis(selfEditingIdMatchingProperty);
-	}
-
-	private String trimThis(String string) {
-		if (string == null) {
-			return null;
-		} else {
-			return string.trim();
-		}
-	}
-
-	/**
-	 * Find out whether there is a matching property at all.
-	 */
-	public boolean isConfigured() {
-		return selfEditingIdMatchingProperty != null;
-	}
-
-	/**
-	 * 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?
-	 */
-	public String getMatchingPropertyUri() {
-		return selfEditingIdMatchingProperty;
-	}
-
-	/**
-	 * Get all Individuals associated with this user through the matching
-	 * property. Never returns null.
-	 */
-	public List<Individual> getAssociatedIndividuals(IndividualDao indDao,
-			UserAccount user) {
-		if (user == null) {
-			log.debug("user is null");
-			return Collections.emptyList();
-		}
-		return getAssociatedIndividuals(indDao, user.getExternalAuthId());
-	}
-
-	/**
-	 * Get all Individuals associated with this externalAuthId through the
-	 * matching property. If the externalAuthId is empty or null, it won't match
-	 * anything, even though many individuals might have empty matching
-	 * properties. Never returns null.
-	 */
-	public List<Individual> getAssociatedIndividuals(IndividualDao indDao,
-			String externalAuthId) {
-		if (indDao == null) {
-			log.warn("No IndividualDao");
-			return Collections.emptyList();
-		}
-		if (externalAuthId == null) {
-			log.debug("externalAuthId is null");
-			return Collections.emptyList();
-		}
-		if (externalAuthId.isEmpty()) {
-			log.debug("externalAuthId is empty");
-			return Collections.emptyList();
-		}
-		if (selfEditingIdMatchingProperty == null) {
-			log.debug("selfEditingMatchingProperty is null");
-			return Collections.emptyList();
-		}
-		return indDao.getIndividualsByDataProperty(
-				selfEditingIdMatchingProperty, externalAuthId);
-	}
-
-	/**
-	 * 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,
-			DataPropertyStatementDao dpsDao, UserAccount user,
-			String associatedIndividualUri) {
-		if (indDao == null) {
-			log.warn("No IndividualDao");
-			return;
-		}
-		if (dpsDao == null) {
-			log.warn("No DataPropertyStatementDao");
-			return;
-		}
-		if (user == null) {
-			log.debug("user is null");
-			return;
-		}
-		if (selfEditingIdMatchingProperty == null) {
-			log.error("Can't associate Individual with UserAccount: "
-					+ "selfEditingMatchingProperty is null");
-			return;
-		}
-
-		String externalAuthId = user.getExternalAuthId();
-		if (externalAuthId.isEmpty()) {
-			log.debug("user has no externalAuthId");
-			return;
-		}
-
-		// If the Individual exists, clear any previous matching property value
-		// and set this one.
-		Individual associatedInd = indDao
-				.getIndividualByURI(associatedIndividualUri);
-		if (associatedInd != null) {
-			log.debug("setting the matching property on '"
-					+ associatedIndividualUri + "' to '" + externalAuthId + "'");
-			dpsDao.deleteDataPropertyStatementsForIndividualByDataProperty(
-					associatedIndividualUri, selfEditingIdMatchingProperty);
-			dpsDao.insertNewDataPropertyStatement(new DataPropertyStatementImpl(
-					associatedIndividualUri, selfEditingIdMatchingProperty,
-					externalAuthId));
-		}
-
-		// If any other Individuals have this matching property value, remove
-		// it.
-		for (Individual ind : indDao.getIndividualsByDataProperty(
-				selfEditingIdMatchingProperty, externalAuthId)) {
-			String indUri = ind.getURI();
-			if (!indUri.equals(associatedIndividualUri)) {
-				log.debug("clearing the matching property on '" + indUri + "'");
-				dpsDao.deleteDataPropertyStatementsForIndividualByDataProperty(
-						indUri, selfEditingIdMatchingProperty);
-			}
-		}
-	}
-
-	@Override
-	public String toString() {
-		return "SelfEditingConfiguration[selfEditingIdMatchingProperty="
-				+ selfEditingIdMatchingProperty + "]";
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.beans;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
+import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+
+/**
+ * Holds the configuration properties used in Self-Editing, and some commonly
+ * used methods on those properties.
+ */
+public class SelfEditingConfiguration {
+	private static final Log log = LogFactory
+			.getLog(SelfEditingConfiguration.class);
+
+	private static final String BEAN_ATTRIBUTE = SelfEditingConfiguration.class
+			.getName();
+
+	/**
+	 * This configuration property tells us which data property on the
+	 * Individual is used to associate it with a net ID.
+	 */
+	private static final String PROPERTY_SELF_EDITING_ID_MATCHING_PROPERTY = "selfEditing.idMatchingProperty";
+
+	// ----------------------------------------------------------------------
+	// static methods
+	// ----------------------------------------------------------------------
+
+	/**
+	 * 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) {
+		if (request == null) {
+			log.error("Request is null");
+			return new SelfEditingConfiguration(null);
+		}
+
+		if (!(request instanceof HttpServletRequest)) {
+			log.error("Not an HttpServletRequest: " + request.getClass());
+			return new SelfEditingConfiguration(null);
+		}
+		HttpServletRequest hreq = (HttpServletRequest) request;
+
+		return getBean(hreq.getSession().getServletContext());
+	}
+
+	/**
+	 * 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) {
+		Object attr = ctx.getAttribute(BEAN_ATTRIBUTE);
+		if (attr instanceof SelfEditingConfiguration) {
+			log.debug("Found a bean: " + attr);
+			return (SelfEditingConfiguration) attr;
+		}
+
+		SelfEditingConfiguration bean = buildBean(ctx);
+		log.debug("Created a bean: " + bean);
+		ctx.setAttribute(BEAN_ATTRIBUTE, bean);
+		return bean;
+	}
+
+	private static SelfEditingConfiguration buildBean(ServletContext ctx) {
+		ConfigurationProperties config = ConfigurationProperties.getBean(ctx);
+		String selfEditingIdMatchingProperty = config
+				.getProperty(PROPERTY_SELF_EDITING_ID_MATCHING_PROPERTY);
+		return new SelfEditingConfiguration(selfEditingIdMatchingProperty);
+	}
+
+	// ----------------------------------------------------------------------
+	// the bean
+	// ----------------------------------------------------------------------
+
+	private final String selfEditingIdMatchingProperty;
+
+	public SelfEditingConfiguration(String selfEditingIdMatchingProperty) {
+		this.selfEditingIdMatchingProperty = trimThis(selfEditingIdMatchingProperty);
+	}
+
+	private String trimThis(String string) {
+		if (string == null) {
+			return null;
+		} else {
+			return string.trim();
+		}
+	}
+
+	/**
+	 * Find out whether there is a matching property at all.
+	 */
+	public boolean isConfigured() {
+		return selfEditingIdMatchingProperty != null;
+	}
+
+	/**
+	 * 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?
+	 */
+	public String getMatchingPropertyUri() {
+		return selfEditingIdMatchingProperty;
+	}
+
+	/**
+	 * Get all Individuals associated with this user through the matching
+	 * property. Never returns null.
+	 */
+	public List<Individual> getAssociatedIndividuals(IndividualDao indDao,
+			UserAccount user) {
+		if (user == null) {
+			log.debug("user is null");
+			return Collections.emptyList();
+		}
+		return getAssociatedIndividuals(indDao, user.getExternalAuthId());
+	}
+
+	/**
+	 * Get all Individuals associated with this externalAuthId through the
+	 * matching property. If the externalAuthId is empty or null, it won't match
+	 * anything, even though many individuals might have empty matching
+	 * properties. Never returns null.
+	 */
+	public List<Individual> getAssociatedIndividuals(IndividualDao indDao,
+			String externalAuthId) {
+		if (indDao == null) {
+			log.warn("No IndividualDao");
+			return Collections.emptyList();
+		}
+		if (externalAuthId == null) {
+			log.debug("externalAuthId is null");
+			return Collections.emptyList();
+		}
+		if (externalAuthId.isEmpty()) {
+			log.debug("externalAuthId is empty");
+			return Collections.emptyList();
+		}
+		if (selfEditingIdMatchingProperty == null) {
+			log.debug("selfEditingMatchingProperty is null");
+			return Collections.emptyList();
+		}
+		return indDao.getIndividualsByDataProperty(
+				selfEditingIdMatchingProperty, externalAuthId);
+	}
+
+	/**
+	 * 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,
+			DataPropertyStatementDao dpsDao, UserAccount user,
+			String associatedIndividualUri) {
+		if (indDao == null) {
+			log.warn("No IndividualDao");
+			return;
+		}
+		if (dpsDao == null) {
+			log.warn("No DataPropertyStatementDao");
+			return;
+		}
+		if (user == null) {
+			log.debug("user is null");
+			return;
+		}
+		if (selfEditingIdMatchingProperty == null) {
+			log.error("Can't associate Individual with UserAccount: "
+					+ "selfEditingMatchingProperty is null");
+			return;
+		}
+
+		String externalAuthId = user.getExternalAuthId();
+		if (externalAuthId.isEmpty()) {
+			log.debug("user has no externalAuthId");
+			return;
+		}
+
+		// If the Individual exists, clear any previous matching property value
+		// and set this one.
+		Individual associatedInd = indDao
+				.getIndividualByURI(associatedIndividualUri);
+		if (associatedInd != null) {
+			log.debug("setting the matching property on '"
+					+ associatedIndividualUri + "' to '" + externalAuthId + "'");
+			dpsDao.deleteDataPropertyStatementsForIndividualByDataProperty(
+					associatedIndividualUri, selfEditingIdMatchingProperty);
+			dpsDao.insertNewDataPropertyStatement(new DataPropertyStatementImpl(
+					associatedIndividualUri, selfEditingIdMatchingProperty,
+					externalAuthId));
+		}
+
+		// If any other Individuals have this matching property value, remove
+		// it.
+		for (Individual ind : indDao.getIndividualsByDataProperty(
+				selfEditingIdMatchingProperty, externalAuthId)) {
+			String indUri = ind.getURI();
+			if (!indUri.equals(associatedIndividualUri)) {
+				log.debug("clearing the matching property on '" + indUri + "'");
+				dpsDao.deleteDataPropertyStatementsForIndividualByDataProperty(
+						indUri, selfEditingIdMatchingProperty);
+			}
+		}
+	}
+
+	@Override
+	public String toString() {
+		return "SelfEditingConfiguration[selfEditingIdMatchingProperty="
+				+ selfEditingIdMatchingProperty + "]";
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/UserAccount.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/UserAccount.java
index b893dcd4d..9830c1618 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/UserAccount.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/UserAccount.java
@@ -1,248 +1,248 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.beans;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-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
- * just send the value as a clear string. There is no real need for security
- * here, except that a brute force attack would allow someone to change the
- * password on an account that they know has a password change pending.
- */
-public class UserAccount {
-	public static final int MIN_PASSWORD_LENGTH = 6;
-	public static final int MAX_PASSWORD_LENGTH = 12;
-
-	public enum Status {
-		ACTIVE, INACTIVE;
-
-		public static Status fromString(String s) {
-			if (s == null) {
-				return null;
-			}
-
-			for (Status status : Status.values()) {
-				if (status.toString().equals(s)) {
-					return status;
-				}
-			}
-
-			return null;
-		}
-
-	}
-
-	private String uri = ""; // Never null.
-
-	private String emailAddress = ""; // Never null.
-	private String firstName = ""; // Never null.
-	private String lastName = ""; // Never null.
-
-	private String md5Password = ""; // Never null.
-	private String oldPassword = ""; // Never null.
-	private long passwordLinkExpires = 0L; // Never negative.
-	private boolean passwordChangeRequired = false;
-
-	private int loginCount = 0; // Never negative.
-	private long lastLoginTime = 0L; // Never negative.
-	private Status status = Status.INACTIVE; // Might be null.
-	private String externalAuthId = ""; // Never null.
-
-	/** If this is true, the User Interface will not allow setting a password. */
-	private boolean externalAuthOnly = false;
-
-	/** This may be empty, but should never be null. */
-	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();
-
-	public String getUri() {
-		return uri;
-	}
-
-	public void setUri(String uri) {
-		if (uri == null) {
-			throw new NullPointerException("uri may not be null.");
-		}
-		this.uri = uri;
-	}
-
-	public String getEmailAddress() {
-		return emailAddress;
-	}
-
-	public void setEmailAddress(String emailAddress) {
-		this.emailAddress = nonNull(emailAddress, "");
-	}
-
-	public String getFirstName() {
-		return firstName;
-	}
-
-	public void setFirstName(String firstName) {
-		this.firstName = nonNull(firstName, "");
-	}
-
-	public String getLastName() {
-		return lastName;
-	}
-
-	public void setLastName(String lastName) {
-		this.lastName = nonNull(lastName, "");
-	}
-
-	public String getMd5Password() {
-		return md5Password;
-	}
-
-	public void setMd5Password(String md5Password) {
-		this.md5Password = nonNull(md5Password, "");
-	}
-
-	public String getOldPassword() {
-		return oldPassword;
-	}
-
-	public void setOldPassword(String oldPassword) {
-		this.oldPassword = nonNull(oldPassword, "");
-	}
-
-	public long getPasswordLinkExpires() {
-		return passwordLinkExpires;
-	}
-
-	public String getPasswordLinkExpiresHash() {
-		return limitStringLength(8, Authenticator.applyMd5Encoding(String
-				.valueOf(passwordLinkExpires)));
-	}
-
-	public void setPasswordLinkExpires(long passwordLinkExpires) {
-		this.passwordLinkExpires = Math.max(0, passwordLinkExpires);
-	}
-
-	public boolean isPasswordChangeRequired() {
-		return passwordChangeRequired;
-	}
-
-	public void setPasswordChangeRequired(Boolean passwordChangeRequired) {
-		this.passwordChangeRequired = nonNull(passwordChangeRequired,
-				Boolean.FALSE);
-	}
-
-	public boolean isExternalAuthOnly() {
-		return externalAuthOnly;
-	}
-
-	public void setExternalAuthOnly(Boolean externalAuthOnly) {
-		this.externalAuthOnly = nonNull(externalAuthOnly, Boolean.FALSE);
-	}
-
-	public int getLoginCount() {
-		return loginCount;
-	}
-
-	public void setLoginCount(int loginCount) {
-		this.loginCount = Math.max(0, loginCount);
-	}
-
-	public long getLastLoginTime() {
-		return lastLoginTime;
-	}
-
-	public void setLastLoginTime(long lastLoginTime) {
-		this.lastLoginTime = Math.max(0, lastLoginTime);
-	}
-
-	public Status getStatus() {
-		return status;
-	}
-
-	public void setStatus(Status status) {
-		this.status = status;
-	}
-
-	public void setStatusFromString(String statusString) {
-		this.status = Status.fromString(statusString);
-	}
-
-	public String getExternalAuthId() {
-		return externalAuthId;
-	}
-
-	public void setExternalAuthId(String externalAuthId) {
-		this.externalAuthId = nonNull(externalAuthId, "");
-	}
-
-	public Set<String> getPermissionSetUris() {
-		return new HashSet<String>(permissionSetUris);
-	}
-
-	public void setPermissionSetUris(Collection<String> permissionSetUris) {
-		if (permissionSetUris == null) {
-			throw new NullPointerException("permissionSetUris may not be null.");
-		}
-		this.permissionSetUris = new HashSet<String>(permissionSetUris);
-	}
-
-	public boolean isRootUser() {
-		return rootUser;
-	}
-
-	public void setRootUser(boolean rootUser) {
-		this.rootUser = rootUser;
-	}
-
-	public Set<String> getProxiedIndividualUris() {
-		return new HashSet<String>(proxiedIndividualUris);
-	}
-
-	public void setProxiedIndividualUris(Collection<String> proxiedIndividualUris) {
-		if (proxiedIndividualUris == null) {
-			throw new NullPointerException("proxiedIndividualUris may not be null.");
-		}
-		this.proxiedIndividualUris = new HashSet<String>(proxiedIndividualUris);
-	}
-
-	private <T> T nonNull(T value, T defaultValue) {
-		return (value == null) ? defaultValue : value;
-	}
-
-	private String limitStringLength(int limit, String s) {
-		if (s == null) {
-			return "";
-		} else if (s.length() <= limit) {
-			return s;
-		} else {
-			return s.substring(0, limit);
-		}
-	}
-
-	@Override
-	public String toString() {
-		return "UserAccount[uri=" + uri + (", emailAddress=" + emailAddress)
-				+ (", firstName=" + firstName) + (", lastName=" + lastName)
-				+ (", md5password=" + md5Password)
-				+ (", oldPassword=" + oldPassword)
-				+ (", passwordLinkExpires=" + passwordLinkExpires)
-				+ (", passwordChangeRequired=" + passwordChangeRequired)
-				+ (", externalAuthOnly=" + externalAuthOnly)
-				+ (", loginCount=" + loginCount) + (", status=" + status)
-				+ (", lastLoginTime=" + lastLoginTime)
-				+ (", externalAuthId=" + externalAuthId)
-				+ (", rootUser=" + rootUser)
-				+ (", permissionSetUris=" + permissionSetUris) + "]";
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.beans;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+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
+ * just send the value as a clear string. There is no real need for security
+ * here, except that a brute force attack would allow someone to change the
+ * password on an account that they know has a password change pending.
+ */
+public class UserAccount {
+	public static final int MIN_PASSWORD_LENGTH = 6;
+	public static final int MAX_PASSWORD_LENGTH = 12;
+
+	public enum Status {
+		ACTIVE, INACTIVE;
+
+		public static Status fromString(String s) {
+			if (s == null) {
+				return null;
+			}
+
+			for (Status status : Status.values()) {
+				if (status.toString().equals(s)) {
+					return status;
+				}
+			}
+
+			return null;
+		}
+
+	}
+
+	private String uri = ""; // Never null.
+
+	private String emailAddress = ""; // Never null.
+	private String firstName = ""; // Never null.
+	private String lastName = ""; // Never null.
+
+	private String md5Password = ""; // Never null.
+	private String oldPassword = ""; // Never null.
+	private long passwordLinkExpires = 0L; // Never negative.
+	private boolean passwordChangeRequired = false;
+
+	private int loginCount = 0; // Never negative.
+	private long lastLoginTime = 0L; // Never negative.
+	private Status status = Status.INACTIVE; // Might be null.
+	private String externalAuthId = ""; // Never null.
+
+	/** If this is true, the User Interface will not allow setting a password. */
+	private boolean externalAuthOnly = false;
+
+	/** This may be empty, but should never be null. */
+	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();
+
+	public String getUri() {
+		return uri;
+	}
+
+	public void setUri(String uri) {
+		if (uri == null) {
+			throw new NullPointerException("uri may not be null.");
+		}
+		this.uri = uri;
+	}
+
+	public String getEmailAddress() {
+		return emailAddress;
+	}
+
+	public void setEmailAddress(String emailAddress) {
+		this.emailAddress = nonNull(emailAddress, "");
+	}
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = nonNull(firstName, "");
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = nonNull(lastName, "");
+	}
+
+	public String getMd5Password() {
+		return md5Password;
+	}
+
+	public void setMd5Password(String md5Password) {
+		this.md5Password = nonNull(md5Password, "");
+	}
+
+	public String getOldPassword() {
+		return oldPassword;
+	}
+
+	public void setOldPassword(String oldPassword) {
+		this.oldPassword = nonNull(oldPassword, "");
+	}
+
+	public long getPasswordLinkExpires() {
+		return passwordLinkExpires;
+	}
+
+	public String getPasswordLinkExpiresHash() {
+		return limitStringLength(8, Authenticator.applyMd5Encoding(String
+				.valueOf(passwordLinkExpires)));
+	}
+
+	public void setPasswordLinkExpires(long passwordLinkExpires) {
+		this.passwordLinkExpires = Math.max(0, passwordLinkExpires);
+	}
+
+	public boolean isPasswordChangeRequired() {
+		return passwordChangeRequired;
+	}
+
+	public void setPasswordChangeRequired(Boolean passwordChangeRequired) {
+		this.passwordChangeRequired = nonNull(passwordChangeRequired,
+				Boolean.FALSE);
+	}
+
+	public boolean isExternalAuthOnly() {
+		return externalAuthOnly;
+	}
+
+	public void setExternalAuthOnly(Boolean externalAuthOnly) {
+		this.externalAuthOnly = nonNull(externalAuthOnly, Boolean.FALSE);
+	}
+
+	public int getLoginCount() {
+		return loginCount;
+	}
+
+	public void setLoginCount(int loginCount) {
+		this.loginCount = Math.max(0, loginCount);
+	}
+
+	public long getLastLoginTime() {
+		return lastLoginTime;
+	}
+
+	public void setLastLoginTime(long lastLoginTime) {
+		this.lastLoginTime = Math.max(0, lastLoginTime);
+	}
+
+	public Status getStatus() {
+		return status;
+	}
+
+	public void setStatus(Status status) {
+		this.status = status;
+	}
+
+	public void setStatusFromString(String statusString) {
+		this.status = Status.fromString(statusString);
+	}
+
+	public String getExternalAuthId() {
+		return externalAuthId;
+	}
+
+	public void setExternalAuthId(String externalAuthId) {
+		this.externalAuthId = nonNull(externalAuthId, "");
+	}
+
+	public Set<String> getPermissionSetUris() {
+		return new HashSet<String>(permissionSetUris);
+	}
+
+	public void setPermissionSetUris(Collection<String> permissionSetUris) {
+		if (permissionSetUris == null) {
+			throw new NullPointerException("permissionSetUris may not be null.");
+		}
+		this.permissionSetUris = new HashSet<String>(permissionSetUris);
+	}
+
+	public boolean isRootUser() {
+		return rootUser;
+	}
+
+	public void setRootUser(boolean rootUser) {
+		this.rootUser = rootUser;
+	}
+
+	public Set<String> getProxiedIndividualUris() {
+		return new HashSet<String>(proxiedIndividualUris);
+	}
+
+	public void setProxiedIndividualUris(Collection<String> proxiedIndividualUris) {
+		if (proxiedIndividualUris == null) {
+			throw new NullPointerException("proxiedIndividualUris may not be null.");
+		}
+		this.proxiedIndividualUris = new HashSet<String>(proxiedIndividualUris);
+	}
+
+	private <T> T nonNull(T value, T defaultValue) {
+		return (value == null) ? defaultValue : value;
+	}
+
+	private String limitStringLength(int limit, String s) {
+		if (s == null) {
+			return "";
+		} else if (s.length() <= limit) {
+			return s;
+		} else {
+			return s.substring(0, limit);
+		}
+	}
+
+	@Override
+	public String toString() {
+		return "UserAccount[uri=" + uri + (", emailAddress=" + emailAddress)
+				+ (", firstName=" + firstName) + (", lastName=" + lastName)
+				+ (", md5password=" + md5Password)
+				+ (", oldPassword=" + oldPassword)
+				+ (", passwordLinkExpires=" + passwordLinkExpires)
+				+ (", passwordChangeRequired=" + passwordChangeRequired)
+				+ (", externalAuthOnly=" + externalAuthOnly)
+				+ (", loginCount=" + loginCount) + (", status=" + status)
+				+ (", lastLoginTime=" + lastLoginTime)
+				+ (", externalAuthId=" + externalAuthId)
+				+ (", rootUser=" + rootUser)
+				+ (", permissionSetUris=" + permissionSetUris) + "]";
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/VClassList.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/VClassList.java
index e3055a71b..160bce9d8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/VClassList.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/beans/VClassList.java
@@ -1,67 +1,67 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.beans;
-
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- * simple class that extends vclass to include a list of entites that are
- * members of that class.
- *
- * @author bdc34
- *
- */
-public class VClassList extends VClass {
-
-    List <Individual>entities = null;
-
-    public VClassList( VClass vc, List<Individual> ents){
-        this.entities = ents;
-        this.setURI(vc.getURI());
-        this.setNamespace(vc.getNamespace());
-        this.setLocalName(vc.getLocalName());
-        this.setDisplayLimit(vc.getDisplayLimit() );
-        this.setDisplayRank(vc.getDisplayRank() );
-        this.setName(vc.getName());
-    }
-    public List<Individual> getEntities() {
-        return entities;
-    }
-
-    public void setEntities(List<Individual> entities) {
-        this.entities = entities;
-    }
-
-    public void sort(){
-        Collections.sort(getEntities(), getCompare() );
-    }
-
-    public int getSize(){
-        if( entities != null )
-            return entities.size();
-        else
-            return 0;
-    }
-    /**
-     * override this if you want a different sorting.
-     * @return
-     */
-    public Comparator<Individual> getCompare(){
-        return new Comparator<Individual>(){
-            public int compare(Individual o1, Individual o2) {
-                if( o1 == null && o2 == null) return 0;
-                if( o1 == null ) return 1;
-                if( o2 == null ) return -1;
-
-                if( o1.getName() == null && o2.getName() == null) return 0;
-                if( o1.getName() == null) return 1;
-                if( o2.getName() == null) return -1;
-                return o1.getName().compareToIgnoreCase( o2.getName());
-
-
-            }
-        };
-    }
-}
+package edu.cornell.mannlib.vitro.webapp.beans;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * simple class that extends vclass to include a list of entites that are
+ * members of that class.
+ *
+ * @author bdc34
+ *
+ */
+public class VClassList extends VClass {
+
+    List <Individual>entities = null;
+
+    public VClassList( VClass vc, List<Individual> ents){
+        this.entities = ents;
+        this.setURI(vc.getURI());
+        this.setNamespace(vc.getNamespace());
+        this.setLocalName(vc.getLocalName());
+        this.setDisplayLimit(vc.getDisplayLimit() );
+        this.setDisplayRank(vc.getDisplayRank() );
+        this.setName(vc.getName());
+    }
+    public List<Individual> getEntities() {
+        return entities;
+    }
+
+    public void setEntities(List<Individual> entities) {
+        this.entities = entities;
+    }
+
+    public void sort(){
+        Collections.sort(getEntities(), getCompare() );
+    }
+
+    public int getSize(){
+        if( entities != null )
+            return entities.size();
+        else
+            return 0;
+    }
+    /**
+     * override this if you want a different sorting.
+     * @return
+     */
+    public Comparator<Individual> getCompare(){
+        return new Comparator<Individual>(){
+            public int compare(Individual o1, Individual o2) {
+                if( o1 == null && o2 == null) return 0;
+                if( o1 == null ) return 1;
+                if( o2 == null ) return -1;
+
+                if( o1.getName() == null && o2.getName() == null) return 0;
+                if( o1.getName() == null) return 1;
+                if( o2.getName() == null) return -1;
+                return o1.getName().compareToIgnoreCase( o2.getName());
+
+
+            }
+        };
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/config/ConfigurationProperties.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/config/ConfigurationProperties.java
index 74112fc15..2b861cc1b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/config/ConfigurationProperties.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/config/ConfigurationProperties.java
@@ -1,145 +1,145 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.config;
-
-import java.util.Map;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-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.
- */
-public abstract class ConfigurationProperties {
-	private static final Log log = LogFactory
-			.getLog(ConfigurationProperties.class);
-
-	/** The bean is attached to the session by this name. */
-	private static final String ATTRIBUTE_NAME = ConfigurationProperties.class
-			.getName();
-
-	/** If they ask for a bean before one has been set, they get this. */
-	private static final ConfigurationProperties DUMMY_PROPERTIES = new DummyConfigurationProperties();
-
-	// ----------------------------------------------------------------------
-	// static methods
-	// ----------------------------------------------------------------------
-
-	public static ConfigurationProperties getBean(ServletRequest request) {
-		if (request == null) {
-			throw new NullPointerException("request may not be null.");
-		}
-		if (!(request instanceof HttpServletRequest)) {
-			throw new IllegalArgumentException(
-					"request must be an HttpServletRequest");
-		}
-		HttpServletRequest httpRequest = (HttpServletRequest) request;
-		return getBean(httpRequest.getSession());
-	}
-
-	public static ConfigurationProperties getBean(HttpSession session) {
-		if (session == null) {
-			throw new NullPointerException("session may not be null.");
-		}
-		return getBean(session.getServletContext());
-	}
-
-	public static ConfigurationProperties getBean(HttpServlet servlet) {
-		if (servlet == null) {
-			throw new NullPointerException("servlet may not be null.");
-		}
-		return getBean(servlet.getServletContext());
-	}
-
-	public static ConfigurationProperties getBean(ServletContextEvent sce) {
-		if (sce == null) {
-			throw new NullPointerException("sce may not be null.");
-		}
-		return getBean(sce.getServletContext());
-	}
-
-	public static ConfigurationProperties getBean(ServletConfig servletConfig) {
-		if (servletConfig == null) {
-			throw new NullPointerException("servletConfig may not be null.");
-		}
-		return getBean(servletConfig.getServletContext());
-	}
-
-	public static ConfigurationProperties getBean(ServletContext context) {
-		if (context == null) {
-			throw new NullPointerException("context may not be null.");
-		}
-
-		Object o = context.getAttribute(ATTRIBUTE_NAME);
-		if (o == null) {
-			log.error("ConfigurationProperties bean has not been set.");
-			return DUMMY_PROPERTIES;
-		} else if (!(o instanceof ConfigurationProperties)) {
-			log.error("Error: ConfigurationProperties was set to an "
-					+ "invalid object: " + o);
-			return DUMMY_PROPERTIES;
-		}
-
-		return (ConfigurationProperties) o;
-	}
-
-	/**
-	 * Protected access, so the Stub class can call it for unit tests.
-	 * Otherwise, this should only be called by ConfigurationPropertiesSetup.
-	 */
-	protected static void setBean(ServletContext context,
-			ConfigurationProperties bean) {
-		if (context == null) {
-			throw new NullPointerException("context may not be null.");
-		}
-		if (bean == null) {
-			throw new NullPointerException("bean may not be null.");
-		}
-		context.setAttribute(ATTRIBUTE_NAME, bean);
-		log.info(bean);
-	}
-
-	/** Package access, so unit tests can call it. */
-	static void removeBean(ServletContext context) {
-		if (context == null) {
-			throw new NullPointerException("context may not be null.");
-		}
-		context.removeAttribute(ATTRIBUTE_NAME);
-	}
-
-	// ----------------------------------------------------------------------
-	// The interface
-	// ----------------------------------------------------------------------
-
-	/**
-	 * Get the value of the property, or <code>null</code> if the property has
-	 * not been assigned a value.
-	 */
-	public abstract String getProperty(String key);
-
-	/**
-	 * Get the value of the property, or use the default value if the property
-	 * has not been assigned a value.
-	 */
-	public abstract String getProperty(String key, String defaultValue);
-
-	/**
-	 * Get a copy of the map of the configuration properties and their settings.
-	 * Because this is a copy, it cannot be used to modify the settings.
-	 */
-	public abstract Map<String, String> getPropertyMap();
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.config;
+
+import java.util.Map;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+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.
+ */
+public abstract class ConfigurationProperties {
+	private static final Log log = LogFactory
+			.getLog(ConfigurationProperties.class);
+
+	/** The bean is attached to the session by this name. */
+	private static final String ATTRIBUTE_NAME = ConfigurationProperties.class
+			.getName();
+
+	/** If they ask for a bean before one has been set, they get this. */
+	private static final ConfigurationProperties DUMMY_PROPERTIES = new DummyConfigurationProperties();
+
+	// ----------------------------------------------------------------------
+	// static methods
+	// ----------------------------------------------------------------------
+
+	public static ConfigurationProperties getBean(ServletRequest request) {
+		if (request == null) {
+			throw new NullPointerException("request may not be null.");
+		}
+		if (!(request instanceof HttpServletRequest)) {
+			throw new IllegalArgumentException(
+					"request must be an HttpServletRequest");
+		}
+		HttpServletRequest httpRequest = (HttpServletRequest) request;
+		return getBean(httpRequest.getSession());
+	}
+
+	public static ConfigurationProperties getBean(HttpSession session) {
+		if (session == null) {
+			throw new NullPointerException("session may not be null.");
+		}
+		return getBean(session.getServletContext());
+	}
+
+	public static ConfigurationProperties getBean(HttpServlet servlet) {
+		if (servlet == null) {
+			throw new NullPointerException("servlet may not be null.");
+		}
+		return getBean(servlet.getServletContext());
+	}
+
+	public static ConfigurationProperties getBean(ServletContextEvent sce) {
+		if (sce == null) {
+			throw new NullPointerException("sce may not be null.");
+		}
+		return getBean(sce.getServletContext());
+	}
+
+	public static ConfigurationProperties getBean(ServletConfig servletConfig) {
+		if (servletConfig == null) {
+			throw new NullPointerException("servletConfig may not be null.");
+		}
+		return getBean(servletConfig.getServletContext());
+	}
+
+	public static ConfigurationProperties getBean(ServletContext context) {
+		if (context == null) {
+			throw new NullPointerException("context may not be null.");
+		}
+
+		Object o = context.getAttribute(ATTRIBUTE_NAME);
+		if (o == null) {
+			log.error("ConfigurationProperties bean has not been set.");
+			return DUMMY_PROPERTIES;
+		} else if (!(o instanceof ConfigurationProperties)) {
+			log.error("Error: ConfigurationProperties was set to an "
+					+ "invalid object: " + o);
+			return DUMMY_PROPERTIES;
+		}
+
+		return (ConfigurationProperties) o;
+	}
+
+	/**
+	 * Protected access, so the Stub class can call it for unit tests.
+	 * Otherwise, this should only be called by ConfigurationPropertiesSetup.
+	 */
+	protected static void setBean(ServletContext context,
+			ConfigurationProperties bean) {
+		if (context == null) {
+			throw new NullPointerException("context may not be null.");
+		}
+		if (bean == null) {
+			throw new NullPointerException("bean may not be null.");
+		}
+		context.setAttribute(ATTRIBUTE_NAME, bean);
+		log.info(bean);
+	}
+
+	/** Package access, so unit tests can call it. */
+	static void removeBean(ServletContext context) {
+		if (context == null) {
+			throw new NullPointerException("context may not be null.");
+		}
+		context.removeAttribute(ATTRIBUTE_NAME);
+	}
+
+	// ----------------------------------------------------------------------
+	// The interface
+	// ----------------------------------------------------------------------
+
+	/**
+	 * Get the value of the property, or <code>null</code> if the property has
+	 * not been assigned a value.
+	 */
+	public abstract String getProperty(String key);
+
+	/**
+	 * Get the value of the property, or use the default value if the property
+	 * has not been assigned a value.
+	 */
+	public abstract String getProperty(String key, String defaultValue);
+
+	/**
+	 * Get a copy of the map of the configuration properties and their settings.
+	 * Because this is a copy, it cannot be used to modify the settings.
+	 */
+	public abstract Map<String, String> getPropertyMap();
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesImpl.java
index 1361d350a..f4e4a13ab 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesImpl.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesImpl.java
@@ -1,96 +1,96 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.config;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.TreeMap;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * The basic implementation of ConfigurationProperties. It loads the
- * configuration properties from a properties file and stores them in a map. It
- * also permits the caller to supply a map of "preemptive" properties that will
- * be included and will override any matching properties from 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 {
-	private static final Log log = LogFactory
-			.getLog(ConfigurationPropertiesImpl.class);
-
-	private final Map<String, String> propertyMap;
-
-	public ConfigurationPropertiesImpl(InputStream stream,
-			Map<String, String> preemptiveProperties) throws IOException {
-		Properties props = loadFromPropertiesFile(stream);
-		Map<String, String> map = copyPropertiesToMap(props);
-
-		if (preemptiveProperties != null) {
-			map.putAll(preemptiveProperties);
-		}
-
-		trimWhiteSpaceFromValues(map);
-
-		this.propertyMap = Collections.unmodifiableMap(map);
-		log.debug("Configuration properties are: " + map);
-	}
-
-	private Properties loadFromPropertiesFile(InputStream stream)
-			throws IOException {
-		Properties props = new Properties();
-		props.load(stream);
-		return props;
-	}
-
-	private Map<String, String> copyPropertiesToMap(Properties props) {
-		Map<String, String> map = new HashMap<String, String>();
-		for (Enumeration<?> keys = props.keys(); keys.hasMoreElements();) {
-			String key = (String) keys.nextElement();
-			String value = props.getProperty(key);
-			map.put(key, value);
-		}
-		return map;
-	}
-
-	private void trimWhiteSpaceFromValues(Map<String, String> map) {
-		for (String key : map.keySet()) {
-			map.put(key, map.get(key).trim());
-		}
-	}
-
-	@Override
-	public String getProperty(String key) {
-		return propertyMap.get(key);
-	}
-
-	@Override
-	public String getProperty(String key, String defaultValue) {
-		if (propertyMap.containsKey(key)) {
-			return propertyMap.get(key);
-		} else {
-			return defaultValue;
-		}
-	}
-
-	@Override
-	public Map<String, String> getPropertyMap() {
-		return new HashMap<String, String>(propertyMap);
-	}
-
-	@Override
-	public String toString() {
-		return "ConfigurationPropertiesImpl[propertyMap="
-				+ new TreeMap<String, String>(propertyMap) + "]";
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.config;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.TreeMap;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * The basic implementation of ConfigurationProperties. It loads the
+ * configuration properties from a properties file and stores them in a map. It
+ * also permits the caller to supply a map of "preemptive" properties that will
+ * be included and will override any matching properties from 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 {
+	private static final Log log = LogFactory
+			.getLog(ConfigurationPropertiesImpl.class);
+
+	private final Map<String, String> propertyMap;
+
+	public ConfigurationPropertiesImpl(InputStream stream,
+			Map<String, String> preemptiveProperties) throws IOException {
+		Properties props = loadFromPropertiesFile(stream);
+		Map<String, String> map = copyPropertiesToMap(props);
+
+		if (preemptiveProperties != null) {
+			map.putAll(preemptiveProperties);
+		}
+
+		trimWhiteSpaceFromValues(map);
+
+		this.propertyMap = Collections.unmodifiableMap(map);
+		log.debug("Configuration properties are: " + map);
+	}
+
+	private Properties loadFromPropertiesFile(InputStream stream)
+			throws IOException {
+		Properties props = new Properties();
+		props.load(stream);
+		return props;
+	}
+
+	private Map<String, String> copyPropertiesToMap(Properties props) {
+		Map<String, String> map = new HashMap<String, String>();
+		for (Enumeration<?> keys = props.keys(); keys.hasMoreElements();) {
+			String key = (String) keys.nextElement();
+			String value = props.getProperty(key);
+			map.put(key, value);
+		}
+		return map;
+	}
+
+	private void trimWhiteSpaceFromValues(Map<String, String> map) {
+		for (String key : map.keySet()) {
+			map.put(key, map.get(key).trim());
+		}
+	}
+
+	@Override
+	public String getProperty(String key) {
+		return propertyMap.get(key);
+	}
+
+	@Override
+	public String getProperty(String key, String defaultValue) {
+		if (propertyMap.containsKey(key)) {
+			return propertyMap.get(key);
+		} else {
+			return defaultValue;
+		}
+	}
+
+	@Override
+	public Map<String, String> getPropertyMap() {
+		return new HashMap<String, String>(propertyMap);
+	}
+
+	@Override
+	public String toString() {
+		return "ConfigurationPropertiesImpl[propertyMap="
+				+ new TreeMap<String, String>(propertyMap) + "]";
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesSetup.java
index b5b5da3fa..abc704697 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesSetup.java
@@ -1,269 +1,269 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.config;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
-
-/**
- * Locates the runtime configuration properties and stores them in the servlet
- * context.
- * 
- * This must be invoked before any listener that requires configuration
- * properties.
- * 
- * The properties file must be called 'runtime.properties' in the Vitro home
- * directory. The path to the Vitro home directory can be specifed by an JNDI
- * value, or by a System property, or by a property in
- * WEB-INF/resources/build.properties, in that order. If the Vitro home
- * directory is specified in more than one way, a warning is issued and the
- * first value is used.
- * 
- * If the Vitro home directory cannot be located, or if it does not contain a
- * file called 'runtime.properties', or if the file cannot be loaded, a fatal
- * error is registered to abort the startup.
- * 
- * The ConfigurationProperties bean is created from the key/value pairs found in
- * 'runtime.properties', and is stored in the servlet context. The value that
- * was determined for 'vitro.home' is also included in the bean.
- */
-public class ConfigurationPropertiesSetup implements ServletContextListener {
-	private static final Log log = LogFactory
-			.getLog(ConfigurationPropertiesSetup.class);
-
-	/** JNDI path that defines the Vitro home directory */
-	private static final String VHD_JNDI_PATH = "java:comp/env/vitro/home";
-
-	/** System property that defines the Vitro home directory */
-	private static final String VHD_SYSTEM_PROPERTY = "vitro.home";
-
-	/** build.properties property that defines the Vitro home directory */
-	private static final String VHD_BUILD_PROPERTY = "vitro.home";
-
-	/** Configuration property to store the Vitro home directory */
-	private static final String VHD_CONFIGURATION_PROPERTY = "vitro.home";
-
-	/** Name of the file that contains runtime properties. */
-	private static final String FILE_RUNTIME_PROPERTIES = "runtime.properties";
-
-	@Override
-	public void contextInitialized(ServletContextEvent sce) {
-		ServletContext ctx = sce.getServletContext();
-		StartupStatus ss = StartupStatus.getBean(ctx);
-
-		try {
-			InputStream stream = null;
-			try {
-				File vitroHomeDir = locateVitroHomeDirectory(ctx, ss);
-
-				File runtimePropertiesFile = locateRuntimePropertiesFile(
-						vitroHomeDir, ss);
-				stream = new FileInputStream(runtimePropertiesFile);
-
-				Map<String, String> preempts = createPreemptiveProperties(
-						VHD_CONFIGURATION_PROPERTY, vitroHomeDir);
-				ConfigurationPropertiesImpl bean = new ConfigurationPropertiesImpl(
-						stream, preempts);
-
-				ConfigurationProperties.setBean(ctx, bean);
-				ss.info(this, "Loaded " + bean.getPropertyMap().size()
-						+ " properties.");
-			} finally {
-				if (stream != null) {
-					try {
-						stream.close();
-					} catch (IOException e) {
-						log.error(e, e);
-					}
-				}
-			}
-		} catch (IllegalStateException e) {
-			ss.fatal(this, e.getMessage(), e);
-		} catch (Exception e) {
-			ss.fatal(this, e.getMessage(), e);
-		}
-	}
-
-	/**
-	 * 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, warn and use the
-	 * first one.
-	 * 
-	 * Confirm that it is an existing, readable directory.
-	 */
-	private File locateVitroHomeDirectory(ServletContext ctx, StartupStatus ss) {
-		Map<String, String> whereWasIt = new LinkedHashMap<String, String>();
-		getVhdFromJndi(whereWasIt);
-		getVhdFromSystemProperties(whereWasIt);
-		getVhdFromBuildProperties(ctx, whereWasIt);
-
-		if (whereWasIt.isEmpty()) {
-			String message = String.format("Can't find a value "
-					+ "for the Vitro home directory. "
-					+ "Looked in JNDI environment at '%s'. "
-					+ "Looked for a system property named '%s'. "
-					+ "Looked in 'WEB-INF/resources/build.properties' "
-					+ "for '%s'.", VHD_JNDI_PATH, VHD_SYSTEM_PROPERTY,
-					VHD_BUILD_PROPERTY);
-			throw new IllegalStateException(message);
-		} else if (whereWasIt.size() > 1) {
-			String message = String.format("Found multiple values for the "
-					+ "Vitro home directory: " + whereWasIt.keySet());
-			ss.warning(this, message);
-		}
-		String message = whereWasIt.keySet().iterator().next();
-		String vhdPath = whereWasIt.values().iterator().next();
-
-		ss.info(this, message);
-
-		File vhd = new File(vhdPath);
-		if (!vhd.exists()) {
-			throw new IllegalStateException("Vitro home directory '" + vhdPath
-					+ "' does not exist.");
-		}
-		if (!vhd.isDirectory()) {
-			throw new IllegalStateException("Vitro home directory '" + vhdPath
-					+ "' is not a directory.");
-		}
-		if (!vhd.canRead()) {
-			throw new IllegalStateException("Vitro home directory '" + vhdPath
-					+ "' cannot be read.");
-		}
-		if (!vhd.canWrite()) {
-			throw new IllegalStateException(
-					"Can't write to Vitro home directory: '" + vhdPath + "'.");
-		}
-
-		return vhd;
-	}
-
-	private void getVhdFromJndi(Map<String, String> whereWasIt) {
-		try {
-			String vhdPath = (String) new InitialContext()
-					.lookup(VHD_JNDI_PATH);
-
-			if (vhdPath == null) {
-				log.debug("Didn't find a JNDI value at '" + VHD_JNDI_PATH
-						+ "'.");
-				return;
-			}
-
-			log.debug("'" + VHD_JNDI_PATH + "' as specified by JNDI: "
-					+ vhdPath);
-			String message = String.format(
-					"JNDI environment '%s' was set to '%s'", VHD_JNDI_PATH,
-					vhdPath);
-			whereWasIt.put(message, vhdPath);
-		} catch (NamingException e) {
-			log.debug("JNDI lookup failed. " + e);
-		}
-	}
-
-	private void getVhdFromSystemProperties(Map<String, String> whereWasIt) {
-		String vhdPath = System.getProperty(VHD_SYSTEM_PROPERTY);
-
-		if (vhdPath == null) {
-			log.debug("Didn't find a system property value at '"
-					+ VHD_SYSTEM_PROPERTY + "'.");
-			return;
-		}
-
-		log.debug("'" + VHD_SYSTEM_PROPERTY
-				+ "' as specified by system property: " + vhdPath);
-		String message = String.format("System property '%s' was set to '%s'",
-				VHD_SYSTEM_PROPERTY, vhdPath);
-		whereWasIt.put(message, vhdPath);
-	}
-
-	private void getVhdFromBuildProperties(ServletContext ctx,
-			Map<String, String> whereWasIt) {
-		String resourcePath = "/WEB-INF/resources/build.properties";
-
-		InputStream stream = null;
-		try {
-			stream = ctx.getResourceAsStream(resourcePath);
-			if (stream == null) {
-				log.debug("Didn't find a resource at '" + resourcePath + "'.");
-				return;
-			}
-
-			Properties props = new Properties();
-			props.load(stream);
-			String vhdPath = props.getProperty(VHD_BUILD_PROPERTY);
-			if (vhdPath == null) {
-				log.debug("'" + resourcePath + "' didn't contain a value for '"
-						+ VHD_BUILD_PROPERTY + "'.");
-				return;
-			}
-
-			log.debug("'" + VHD_BUILD_PROPERTY
-					+ "' as specified by build.properties: " + vhdPath);
-			String message = String.format(
-					"In resource '%s', '%s' was set to '%s'.", resourcePath,
-					VHD_BUILD_PROPERTY, vhdPath);
-			whereWasIt.put(message, vhdPath);
-		} catch (IOException e) {
-			log.warn("Failed to load from '" + resourcePath + "'.", e);
-		} finally {
-			if (stream != null) {
-				try {
-					stream.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-
-	private File locateRuntimePropertiesFile(File vitroHomeDir, StartupStatus ss) {
-		File rpf = new File(vitroHomeDir, FILE_RUNTIME_PROPERTIES);
-
-		if (!rpf.exists()) {
-			throw new IllegalStateException("Did not find '"
-					+ FILE_RUNTIME_PROPERTIES + "' in vitro home directory '"
-					+ vitroHomeDir + "'");
-		}
-		if (!rpf.isFile()) {
-			throw new IllegalStateException("'" + rpf.getPath()
-					+ "' is not a file.");
-		}
-		if (!rpf.canRead()) {
-			throw new IllegalStateException("Cannot read '" + rpf.getPath()
-					+ "'.");
-		}
-		ss.info(this, "Loading runtime properties from '" + rpf.getPath() + "'");
-		return rpf;
-	}
-
-	private Map<String, String> createPreemptiveProperties(
-			String propertyVitroHome, File vitroHomeDir) {
-		Map<String, String> map = new HashMap<String, String>();
-		map.put(propertyVitroHome, vitroHomeDir.getAbsolutePath());
-		return map;
-	}
-
-	@Override
-	public void contextDestroyed(ServletContextEvent sce) {
-		ConfigurationProperties.removeBean(sce.getServletContext());
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.config;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
+
+/**
+ * Locates the runtime configuration properties and stores them in the servlet
+ * context.
+ * 
+ * This must be invoked before any listener that requires configuration
+ * properties.
+ * 
+ * The properties file must be called 'runtime.properties' in the Vitro home
+ * directory. The path to the Vitro home directory can be specifed by an JNDI
+ * value, or by a System property, or by a property in
+ * WEB-INF/resources/build.properties, in that order. If the Vitro home
+ * directory is specified in more than one way, a warning is issued and the
+ * first value is used.
+ * 
+ * If the Vitro home directory cannot be located, or if it does not contain a
+ * file called 'runtime.properties', or if the file cannot be loaded, a fatal
+ * error is registered to abort the startup.
+ * 
+ * The ConfigurationProperties bean is created from the key/value pairs found in
+ * 'runtime.properties', and is stored in the servlet context. The value that
+ * was determined for 'vitro.home' is also included in the bean.
+ */
+public class ConfigurationPropertiesSetup implements ServletContextListener {
+	private static final Log log = LogFactory
+			.getLog(ConfigurationPropertiesSetup.class);
+
+	/** JNDI path that defines the Vitro home directory */
+	private static final String VHD_JNDI_PATH = "java:comp/env/vitro/home";
+
+	/** System property that defines the Vitro home directory */
+	private static final String VHD_SYSTEM_PROPERTY = "vitro.home";
+
+	/** build.properties property that defines the Vitro home directory */
+	private static final String VHD_BUILD_PROPERTY = "vitro.home";
+
+	/** Configuration property to store the Vitro home directory */
+	private static final String VHD_CONFIGURATION_PROPERTY = "vitro.home";
+
+	/** Name of the file that contains runtime properties. */
+	private static final String FILE_RUNTIME_PROPERTIES = "runtime.properties";
+
+	@Override
+	public void contextInitialized(ServletContextEvent sce) {
+		ServletContext ctx = sce.getServletContext();
+		StartupStatus ss = StartupStatus.getBean(ctx);
+
+		try {
+			InputStream stream = null;
+			try {
+				File vitroHomeDir = locateVitroHomeDirectory(ctx, ss);
+
+				File runtimePropertiesFile = locateRuntimePropertiesFile(
+						vitroHomeDir, ss);
+				stream = new FileInputStream(runtimePropertiesFile);
+
+				Map<String, String> preempts = createPreemptiveProperties(
+						VHD_CONFIGURATION_PROPERTY, vitroHomeDir);
+				ConfigurationPropertiesImpl bean = new ConfigurationPropertiesImpl(
+						stream, preempts);
+
+				ConfigurationProperties.setBean(ctx, bean);
+				ss.info(this, "Loaded " + bean.getPropertyMap().size()
+						+ " properties.");
+			} finally {
+				if (stream != null) {
+					try {
+						stream.close();
+					} catch (IOException e) {
+						log.error(e, e);
+					}
+				}
+			}
+		} catch (IllegalStateException e) {
+			ss.fatal(this, e.getMessage(), e);
+		} catch (Exception e) {
+			ss.fatal(this, e.getMessage(), e);
+		}
+	}
+
+	/**
+	 * 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, warn and use the
+	 * first one.
+	 * 
+	 * Confirm that it is an existing, readable directory.
+	 */
+	private File locateVitroHomeDirectory(ServletContext ctx, StartupStatus ss) {
+		Map<String, String> whereWasIt = new LinkedHashMap<String, String>();
+		getVhdFromJndi(whereWasIt);
+		getVhdFromSystemProperties(whereWasIt);
+		getVhdFromBuildProperties(ctx, whereWasIt);
+
+		if (whereWasIt.isEmpty()) {
+			String message = String.format("Can't find a value "
+					+ "for the Vitro home directory. "
+					+ "Looked in JNDI environment at '%s'. "
+					+ "Looked for a system property named '%s'. "
+					+ "Looked in 'WEB-INF/resources/build.properties' "
+					+ "for '%s'.", VHD_JNDI_PATH, VHD_SYSTEM_PROPERTY,
+					VHD_BUILD_PROPERTY);
+			throw new IllegalStateException(message);
+		} else if (whereWasIt.size() > 1) {
+			String message = String.format("Found multiple values for the "
+					+ "Vitro home directory: " + whereWasIt.keySet());
+			ss.warning(this, message);
+		}
+		String message = whereWasIt.keySet().iterator().next();
+		String vhdPath = whereWasIt.values().iterator().next();
+
+		ss.info(this, message);
+
+		File vhd = new File(vhdPath);
+		if (!vhd.exists()) {
+			throw new IllegalStateException("Vitro home directory '" + vhdPath
+					+ "' does not exist.");
+		}
+		if (!vhd.isDirectory()) {
+			throw new IllegalStateException("Vitro home directory '" + vhdPath
+					+ "' is not a directory.");
+		}
+		if (!vhd.canRead()) {
+			throw new IllegalStateException("Vitro home directory '" + vhdPath
+					+ "' cannot be read.");
+		}
+		if (!vhd.canWrite()) {
+			throw new IllegalStateException(
+					"Can't write to Vitro home directory: '" + vhdPath + "'.");
+		}
+
+		return vhd;
+	}
+
+	private void getVhdFromJndi(Map<String, String> whereWasIt) {
+		try {
+			String vhdPath = (String) new InitialContext()
+					.lookup(VHD_JNDI_PATH);
+
+			if (vhdPath == null) {
+				log.debug("Didn't find a JNDI value at '" + VHD_JNDI_PATH
+						+ "'.");
+				return;
+			}
+
+			log.debug("'" + VHD_JNDI_PATH + "' as specified by JNDI: "
+					+ vhdPath);
+			String message = String.format(
+					"JNDI environment '%s' was set to '%s'", VHD_JNDI_PATH,
+					vhdPath);
+			whereWasIt.put(message, vhdPath);
+		} catch (NamingException e) {
+			log.debug("JNDI lookup failed. " + e);
+		}
+	}
+
+	private void getVhdFromSystemProperties(Map<String, String> whereWasIt) {
+		String vhdPath = System.getProperty(VHD_SYSTEM_PROPERTY);
+
+		if (vhdPath == null) {
+			log.debug("Didn't find a system property value at '"
+					+ VHD_SYSTEM_PROPERTY + "'.");
+			return;
+		}
+
+		log.debug("'" + VHD_SYSTEM_PROPERTY
+				+ "' as specified by system property: " + vhdPath);
+		String message = String.format("System property '%s' was set to '%s'",
+				VHD_SYSTEM_PROPERTY, vhdPath);
+		whereWasIt.put(message, vhdPath);
+	}
+
+	private void getVhdFromBuildProperties(ServletContext ctx,
+			Map<String, String> whereWasIt) {
+		String resourcePath = "/WEB-INF/resources/build.properties";
+
+		InputStream stream = null;
+		try {
+			stream = ctx.getResourceAsStream(resourcePath);
+			if (stream == null) {
+				log.debug("Didn't find a resource at '" + resourcePath + "'.");
+				return;
+			}
+
+			Properties props = new Properties();
+			props.load(stream);
+			String vhdPath = props.getProperty(VHD_BUILD_PROPERTY);
+			if (vhdPath == null) {
+				log.debug("'" + resourcePath + "' didn't contain a value for '"
+						+ VHD_BUILD_PROPERTY + "'.");
+				return;
+			}
+
+			log.debug("'" + VHD_BUILD_PROPERTY
+					+ "' as specified by build.properties: " + vhdPath);
+			String message = String.format(
+					"In resource '%s', '%s' was set to '%s'.", resourcePath,
+					VHD_BUILD_PROPERTY, vhdPath);
+			whereWasIt.put(message, vhdPath);
+		} catch (IOException e) {
+			log.warn("Failed to load from '" + resourcePath + "'.", e);
+		} finally {
+			if (stream != null) {
+				try {
+					stream.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+	private File locateRuntimePropertiesFile(File vitroHomeDir, StartupStatus ss) {
+		File rpf = new File(vitroHomeDir, FILE_RUNTIME_PROPERTIES);
+
+		if (!rpf.exists()) {
+			throw new IllegalStateException("Did not find '"
+					+ FILE_RUNTIME_PROPERTIES + "' in vitro home directory '"
+					+ vitroHomeDir + "'");
+		}
+		if (!rpf.isFile()) {
+			throw new IllegalStateException("'" + rpf.getPath()
+					+ "' is not a file.");
+		}
+		if (!rpf.canRead()) {
+			throw new IllegalStateException("Cannot read '" + rpf.getPath()
+					+ "'.");
+		}
+		ss.info(this, "Loading runtime properties from '" + rpf.getPath() + "'");
+		return rpf;
+	}
+
+	private Map<String, String> createPreemptiveProperties(
+			String propertyVitroHome, File vitroHomeDir) {
+		Map<String, String> map = new HashMap<String, String>();
+		map.put(propertyVitroHome, vitroHomeDir.getAbsolutePath());
+		return map;
+	}
+
+	@Override
+	public void contextDestroyed(ServletContextEvent sce) {
+		ConfigurationProperties.removeBean(sce.getServletContext());
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/config/DummyConfigurationProperties.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/config/DummyConfigurationProperties.java
index 434c39efe..99d2393ba 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/config/DummyConfigurationProperties.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/config/DummyConfigurationProperties.java
@@ -1,41 +1,41 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.config;
-
-import java.util.Collections;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * If somebody asks for ConfigurationProperties before it has been initialized,
- * they get this. It doesn't stop them from proceeding, it just yields no
- * properties while logging warning messages for each request.
- */
-class DummyConfigurationProperties extends ConfigurationProperties {
-	private static final Log log = LogFactory
-			.getLog(DummyConfigurationProperties.class);
-
-	@Override
-	public String getProperty(String key) {
-		log.warn("ConfigurationProperties has not been initialized: getProperty(\""
-				+ key + "\")");
-		return null;
-	}
-
-	@Override
-	public String getProperty(String key, String defaultValue) {
-		log.warn("ConfigurationProperties has not been initialized: getProperty(\""
-				+ key + "\", \"" + defaultValue + "\")");
-		return defaultValue;
-	}
-
-	@Override
-	public Map<String, String> getPropertyMap() {
-		log.warn("ConfigurationProperties has not been initialized: "
-				+ "getPropertyMap()");
-		return Collections.emptyMap();
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.config;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * If somebody asks for ConfigurationProperties before it has been initialized,
+ * they get this. It doesn't stop them from proceeding, it just yields no
+ * properties while logging warning messages for each request.
+ */
+class DummyConfigurationProperties extends ConfigurationProperties {
+	private static final Log log = LogFactory
+			.getLog(DummyConfigurationProperties.class);
+
+	@Override
+	public String getProperty(String key) {
+		log.warn("ConfigurationProperties has not been initialized: getProperty(\""
+				+ key + "\")");
+		return null;
+	}
+
+	@Override
+	public String getProperty(String key, String defaultValue) {
+		log.warn("ConfigurationProperties has not been initialized: getProperty(\""
+				+ key + "\", \"" + defaultValue + "\")");
+		return defaultValue;
+	}
+
+	@Override
+	public Map<String, String> getPropertyMap() {
+		log.warn("ConfigurationProperties has not been initialized: "
+				+ "getPropertyMap()");
+		return Collections.emptyMap();
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBean.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBean.java
index 472f0505b..40d9bf713 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBean.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBean.java
@@ -1,210 +1,210 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.config;
-
-import java.util.Date;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-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 {
-	private static final Log log = LogFactory.getLog(RevisionInfoBean.class);
-
-	/** A dummy bean to use if there is no real one. */
-	static final RevisionInfoBean DUMMY_BEAN = new RevisionInfoBean(
-			new Date(0), Collections.singleton(LevelRevisionInfo.DUMMY_LEVEL));
-
-	/** The bean is attached to the session by this name. */
-	static final String ATTRIBUTE_NAME = RevisionInfoBean.class.getName();
-
-	// ----------------------------------------------------------------------
-	// static methods
-	// ----------------------------------------------------------------------
-
-	/** Package access: should only be used during setup. */
-	static void setBean(ServletContext context, RevisionInfoBean bean) {
-		if (bean == null) {
-			bean = DUMMY_BEAN;
-		}
-		context.setAttribute(ATTRIBUTE_NAME, bean);
-		log.info(bean);
-	}
-
-	public static RevisionInfoBean getBean(HttpSession session) {
-		if (session == null) {
-			log.warn("Tried to get revision info bean with a null session!");
-			return DUMMY_BEAN;
-		}
-
-		return getBean(session.getServletContext());
-	}
-
-	public static RevisionInfoBean getBean(ServletContext context) {
-		if (context == null) {
-			log.warn("Tried to get revision info bean from a null context");
-			return DUMMY_BEAN;
-		}
-
-		Object o = context.getAttribute(ATTRIBUTE_NAME);
-		if (o == null) {
-			log.warn("Tried to get revision info bean, but didn't find any.");
-			return DUMMY_BEAN;
-		}
-
-		if (!(o instanceof RevisionInfoBean)) {
-			log.error("Tried to get revision info bean, but found an instance of "
-					+ o.getClass().getName() + ": " + o);
-			return DUMMY_BEAN;
-		}
-
-		return (RevisionInfoBean) o;
-	}
-
-	public static void removeBean(ServletContext context) {
-		context.removeAttribute(ATTRIBUTE_NAME);
-	}
-
-	// ----------------------------------------------------------------------
-	// the bean
-	// ----------------------------------------------------------------------
-
-	private final long buildDate;
-	private final List<LevelRevisionInfo> levelInfos;
-
-	RevisionInfoBean(Date buildDate, Collection<LevelRevisionInfo> levelInfos) {
-		this.buildDate = buildDate.getTime();
-		this.levelInfos = Collections
-				.unmodifiableList(new ArrayList<LevelRevisionInfo>(levelInfos));
-	}
-
-	public Date getBuildDate() {
-		return new Date(buildDate);
-	}
-
-	public List<LevelRevisionInfo> getLevelInfos() {
-		return levelInfos;
-	}
-
-	public String getReleaseLabel() {
-		if (levelInfos.isEmpty()) {
-			return LevelRevisionInfo.DUMMY_LEVEL.getRelease();
-		}
-
-		int lastIndex = levelInfos.size() - 1;
-		LevelRevisionInfo outerLevel = levelInfos.get(lastIndex);
-		return outerLevel.getRelease();
-	}
-
-	@Override
-	public String toString() {
-		return "Revision info [build date: "
-				+ new SimpleDateFormat().format(new Date(buildDate))
-				+ ", level info: " + levelInfos + "]";
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (obj == this) {
-			return true;
-		}
-		if (!(obj instanceof RevisionInfoBean)) {
-			return false;
-		}
-		RevisionInfoBean that = (RevisionInfoBean) obj;
-		return (this.buildDate == that.buildDate)
-				&& this.levelInfos.equals(that.levelInfos);
-	}
-
-	@Override
-	public int hashCode() {
-		return new Long(buildDate).hashCode() ^ levelInfos.hashCode();
-	}
-
-	// ----------------------------------------------------------------------
-	// helper class
-	// ----------------------------------------------------------------------
-
-	/**
-	 * Revision info about one level of the application -- e.g. vitro, vivo,
-	 * vivoCornell, etc.
-	 */
-	public static class LevelRevisionInfo {
-		/** A level to use when no actual level can be found. */
-		static final LevelRevisionInfo DUMMY_LEVEL = new LevelRevisionInfo(
-				"no name", "unknown", "unknown");
-
-		private final String name;
-		private final String release;
-		private final String revision;
-
-		LevelRevisionInfo(String name, String release, String revision) {
-			this.name = name;
-			this.release = release;
-			this.revision = revision;
-		}
-
-		public String getName() {
-			return name;
-		}
-
-		public String getRelease() {
-			return release;
-		}
-
-		public String getRevision() {
-			return revision;
-		}
-
-		@Override
-		public String toString() {
-			return "[" + name + ", " + release + ", " + revision + "]";
-		}
-
-		@Override
-		public boolean equals(Object obj) {
-			if (obj == this) {
-				return true;
-			}
-			if (!(obj instanceof LevelRevisionInfo)) {
-				return false;
-			}
-			LevelRevisionInfo that = (LevelRevisionInfo) obj;
-			return this.name.equals(that.name)
-					&& this.release.equals(that.release)
-					&& this.revision.equals(that.revision);
-		}
-
-		@Override
-		public int hashCode() {
-			return name.hashCode() ^ release.hashCode() ^ revision.hashCode();
-		}
-
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.config;
+
+import java.util.Date;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+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 {
+	private static final Log log = LogFactory.getLog(RevisionInfoBean.class);
+
+	/** A dummy bean to use if there is no real one. */
+	static final RevisionInfoBean DUMMY_BEAN = new RevisionInfoBean(
+			new Date(0), Collections.singleton(LevelRevisionInfo.DUMMY_LEVEL));
+
+	/** The bean is attached to the session by this name. */
+	static final String ATTRIBUTE_NAME = RevisionInfoBean.class.getName();
+
+	// ----------------------------------------------------------------------
+	// static methods
+	// ----------------------------------------------------------------------
+
+	/** Package access: should only be used during setup. */
+	static void setBean(ServletContext context, RevisionInfoBean bean) {
+		if (bean == null) {
+			bean = DUMMY_BEAN;
+		}
+		context.setAttribute(ATTRIBUTE_NAME, bean);
+		log.info(bean);
+	}
+
+	public static RevisionInfoBean getBean(HttpSession session) {
+		if (session == null) {
+			log.warn("Tried to get revision info bean with a null session!");
+			return DUMMY_BEAN;
+		}
+
+		return getBean(session.getServletContext());
+	}
+
+	public static RevisionInfoBean getBean(ServletContext context) {
+		if (context == null) {
+			log.warn("Tried to get revision info bean from a null context");
+			return DUMMY_BEAN;
+		}
+
+		Object o = context.getAttribute(ATTRIBUTE_NAME);
+		if (o == null) {
+			log.warn("Tried to get revision info bean, but didn't find any.");
+			return DUMMY_BEAN;
+		}
+
+		if (!(o instanceof RevisionInfoBean)) {
+			log.error("Tried to get revision info bean, but found an instance of "
+					+ o.getClass().getName() + ": " + o);
+			return DUMMY_BEAN;
+		}
+
+		return (RevisionInfoBean) o;
+	}
+
+	public static void removeBean(ServletContext context) {
+		context.removeAttribute(ATTRIBUTE_NAME);
+	}
+
+	// ----------------------------------------------------------------------
+	// the bean
+	// ----------------------------------------------------------------------
+
+	private final long buildDate;
+	private final List<LevelRevisionInfo> levelInfos;
+
+	RevisionInfoBean(Date buildDate, Collection<LevelRevisionInfo> levelInfos) {
+		this.buildDate = buildDate.getTime();
+		this.levelInfos = Collections
+				.unmodifiableList(new ArrayList<LevelRevisionInfo>(levelInfos));
+	}
+
+	public Date getBuildDate() {
+		return new Date(buildDate);
+	}
+
+	public List<LevelRevisionInfo> getLevelInfos() {
+		return levelInfos;
+	}
+
+	public String getReleaseLabel() {
+		if (levelInfos.isEmpty()) {
+			return LevelRevisionInfo.DUMMY_LEVEL.getRelease();
+		}
+
+		int lastIndex = levelInfos.size() - 1;
+		LevelRevisionInfo outerLevel = levelInfos.get(lastIndex);
+		return outerLevel.getRelease();
+	}
+
+	@Override
+	public String toString() {
+		return "Revision info [build date: "
+				+ new SimpleDateFormat().format(new Date(buildDate))
+				+ ", level info: " + levelInfos + "]";
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (obj == this) {
+			return true;
+		}
+		if (!(obj instanceof RevisionInfoBean)) {
+			return false;
+		}
+		RevisionInfoBean that = (RevisionInfoBean) obj;
+		return (this.buildDate == that.buildDate)
+				&& this.levelInfos.equals(that.levelInfos);
+	}
+
+	@Override
+	public int hashCode() {
+		return new Long(buildDate).hashCode() ^ levelInfos.hashCode();
+	}
+
+	// ----------------------------------------------------------------------
+	// helper class
+	// ----------------------------------------------------------------------
+
+	/**
+	 * Revision info about one level of the application -- e.g. vitro, vivo,
+	 * vivoCornell, etc.
+	 */
+	public static class LevelRevisionInfo {
+		/** A level to use when no actual level can be found. */
+		static final LevelRevisionInfo DUMMY_LEVEL = new LevelRevisionInfo(
+				"no name", "unknown", "unknown");
+
+		private final String name;
+		private final String release;
+		private final String revision;
+
+		LevelRevisionInfo(String name, String release, String revision) {
+			this.name = name;
+			this.release = release;
+			this.revision = revision;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public String getRelease() {
+			return release;
+		}
+
+		public String getRevision() {
+			return revision;
+		}
+
+		@Override
+		public String toString() {
+			return "[" + name + ", " + release + ", " + revision + "]";
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (obj == this) {
+				return true;
+			}
+			if (!(obj instanceof LevelRevisionInfo)) {
+				return false;
+			}
+			LevelRevisionInfo that = (LevelRevisionInfo) obj;
+			return this.name.equals(that.name)
+					&& this.release.equals(that.release)
+					&& this.revision.equals(that.revision);
+		}
+
+		@Override
+		public int hashCode() {
+			return name.hashCode() ^ release.hashCode() ^ revision.hashCode();
+		}
+
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoSetup.java
index e84d491c0..16d826dbe 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoSetup.java
@@ -1,179 +1,179 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.config;
-
-import static edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean.DUMMY_BEAN;
-
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean.LevelRevisionInfo;
-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 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 " ~ ". 
- *    - additional white space before and after info values is ignored.
- * 
- * Example file:
- *    2010-11-14 23:58:00
- *    vitroCore ~ Release 1.1 ~ 6604
- *    nihvivo ~ Release 1.1 ~ 1116
- * </pre>
- */
-public class RevisionInfoSetup implements ServletContextListener {
-	private static final Log log = LogFactory.getLog(RevisionInfoSetup.class);
-
-	private static final Pattern LEVEL_INFO_PATTERN = Pattern
-			.compile("(.+) ~ (.+) ~ (.+)");
-
-	static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
-	static final String RESOURCE_PATH = "/WEB-INF/resources/revisionInfo.txt";
-
-	/**
-	 * 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
-	public void contextInitialized(ServletContextEvent sce) {
-		ServletContext context = sce.getServletContext();
-		RevisionInfoBean bean;
-		try {
-			List<String> lines = readRevisionInfo(context);
-			bean = parseRevisionInformation(lines);
-		} catch (Exception e) {
-			StartupStatus.getBean(context).warning(this,
-					"Failed to load the revision info", e);
-			bean = DUMMY_BEAN;
-		}
-
-		RevisionInfoBean.setBean(sce.getServletContext(), bean);
-	}
-
-	private List<String> readRevisionInfo(ServletContext context)
-			throws IOException {
-		BufferedReader reader = null;
-		try {
-			reader = openRevisionInfoReader(context);
-			return readSignificantLines(reader);
-		} finally {
-			closeReader(reader);
-		}
-	}
-
-	private BufferedReader openRevisionInfoReader(ServletContext context)
-			throws FileNotFoundException {
-		InputStream stream = context.getResourceAsStream(RESOURCE_PATH);
-		if (stream == null) {
-			throw new FileNotFoundException(
-					"Can't find a resource in the webapp at '" + RESOURCE_PATH
-							+ "'.");
-		} else {
-			return new BufferedReader(new InputStreamReader(stream));
-		}
-	}
-
-	private List<String> readSignificantLines(BufferedReader reader)
-			throws IOException {
-		List<String> lines = new ArrayList<String>();
-
-		String line = null;
-		while (null != (line = reader.readLine())) {
-			line = line.trim();
-			if ((!line.isEmpty()) && (!line.startsWith("#"))) {
-				lines.add(line);
-			}
-		}
-
-		return lines;
-	}
-
-	private void closeReader(Reader reader) {
-		if (reader != null) {
-			try {
-				reader.close();
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-	}
-
-	private RevisionInfoBean parseRevisionInformation(List<String> lines)
-			throws ParseException {
-		checkValidNumberOfLines(lines);
-		String dateLine = lines.get(0);
-		List<String> levelLines = lines.subList(1, lines.size());
-
-		Date buildDate = parseDateLine(dateLine);
-		List<LevelRevisionInfo> levelInfos = parseLevelLines(levelLines);
-		return new RevisionInfoBean(buildDate, levelInfos);
-	}
-
-	private void checkValidNumberOfLines(List<String> lines)
-			throws ParseException {
-		if (lines.isEmpty()) {
-			throw new ParseException(
-					"The revision info resource file contains no data.", 0);
-		}
-	}
-
-	private Date parseDateLine(String dateLine) throws ParseException {
-		return new SimpleDateFormat(DATE_FORMAT).parse(dateLine);
-	}
-
-	private List<LevelRevisionInfo> parseLevelLines(List<String> levelLines)
-			throws ParseException {
-		List<LevelRevisionInfo> infos = new ArrayList<LevelRevisionInfo>();
-		for (String line : levelLines) {
-			Matcher m = LEVEL_INFO_PATTERN.matcher(line);
-			if (m.matches()) {
-				String name = m.group(1).trim();
-				String release = m.group(2).trim();
-				String revision = m.group(3).trim();
-				infos.add(new LevelRevisionInfo(name, release, revision));
-			} else {
-				throw new ParseException(
-						"Failed to parse the revision info in '" + line + "'",
-						0);
-			}
-		}
-		return infos;
-	}
-
-	/** On shutdown, clean up. */
-	@Override
-	public void contextDestroyed(ServletContextEvent sce) {
-		RevisionInfoBean.removeBean(sce.getServletContext());
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.config;
+
+import static edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean.DUMMY_BEAN;
+
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean.LevelRevisionInfo;
+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 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 " ~ ". 
+ *    - additional white space before and after info values is ignored.
+ * 
+ * Example file:
+ *    2010-11-14 23:58:00
+ *    vitroCore ~ Release 1.1 ~ 6604
+ *    nihvivo ~ Release 1.1 ~ 1116
+ * </pre>
+ */
+public class RevisionInfoSetup implements ServletContextListener {
+	private static final Log log = LogFactory.getLog(RevisionInfoSetup.class);
+
+	private static final Pattern LEVEL_INFO_PATTERN = Pattern
+			.compile("(.+) ~ (.+) ~ (.+)");
+
+	static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
+	static final String RESOURCE_PATH = "/WEB-INF/resources/revisionInfo.txt";
+
+	/**
+	 * 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
+	public void contextInitialized(ServletContextEvent sce) {
+		ServletContext context = sce.getServletContext();
+		RevisionInfoBean bean;
+		try {
+			List<String> lines = readRevisionInfo(context);
+			bean = parseRevisionInformation(lines);
+		} catch (Exception e) {
+			StartupStatus.getBean(context).warning(this,
+					"Failed to load the revision info", e);
+			bean = DUMMY_BEAN;
+		}
+
+		RevisionInfoBean.setBean(sce.getServletContext(), bean);
+	}
+
+	private List<String> readRevisionInfo(ServletContext context)
+			throws IOException {
+		BufferedReader reader = null;
+		try {
+			reader = openRevisionInfoReader(context);
+			return readSignificantLines(reader);
+		} finally {
+			closeReader(reader);
+		}
+	}
+
+	private BufferedReader openRevisionInfoReader(ServletContext context)
+			throws FileNotFoundException {
+		InputStream stream = context.getResourceAsStream(RESOURCE_PATH);
+		if (stream == null) {
+			throw new FileNotFoundException(
+					"Can't find a resource in the webapp at '" + RESOURCE_PATH
+							+ "'.");
+		} else {
+			return new BufferedReader(new InputStreamReader(stream));
+		}
+	}
+
+	private List<String> readSignificantLines(BufferedReader reader)
+			throws IOException {
+		List<String> lines = new ArrayList<String>();
+
+		String line = null;
+		while (null != (line = reader.readLine())) {
+			line = line.trim();
+			if ((!line.isEmpty()) && (!line.startsWith("#"))) {
+				lines.add(line);
+			}
+		}
+
+		return lines;
+	}
+
+	private void closeReader(Reader reader) {
+		if (reader != null) {
+			try {
+				reader.close();
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+	}
+
+	private RevisionInfoBean parseRevisionInformation(List<String> lines)
+			throws ParseException {
+		checkValidNumberOfLines(lines);
+		String dateLine = lines.get(0);
+		List<String> levelLines = lines.subList(1, lines.size());
+
+		Date buildDate = parseDateLine(dateLine);
+		List<LevelRevisionInfo> levelInfos = parseLevelLines(levelLines);
+		return new RevisionInfoBean(buildDate, levelInfos);
+	}
+
+	private void checkValidNumberOfLines(List<String> lines)
+			throws ParseException {
+		if (lines.isEmpty()) {
+			throw new ParseException(
+					"The revision info resource file contains no data.", 0);
+		}
+	}
+
+	private Date parseDateLine(String dateLine) throws ParseException {
+		return new SimpleDateFormat(DATE_FORMAT).parse(dateLine);
+	}
+
+	private List<LevelRevisionInfo> parseLevelLines(List<String> levelLines)
+			throws ParseException {
+		List<LevelRevisionInfo> infos = new ArrayList<LevelRevisionInfo>();
+		for (String line : levelLines) {
+			Matcher m = LEVEL_INFO_PATTERN.matcher(line);
+			if (m.matches()) {
+				String name = m.group(1).trim();
+				String release = m.group(2).trim();
+				String revision = m.group(3).trim();
+				infos.add(new LevelRevisionInfo(name, release, revision));
+			} else {
+				throw new ParseException(
+						"Failed to parse the revision info in '" + line + "'",
+						0);
+			}
+		}
+		return infos;
+	}
+
+	/** On shutdown, clean up. */
+	@Override
+	public void contextDestroyed(ServletContextEvent sce) {
+		RevisionInfoBean.removeBean(sce.getServletContext());
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java
index c2b22abac..77a302329 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/Controllers.java
@@ -1,23 +1,23 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Simple class to store urls for different controllers.
- * This is just a place to stick the constants that are urls
- * to servlets and jsps.
- *
- * Maybe it should be pulled out of a properties file?
- * @author bdc34
- *
- */
-
+package edu.cornell.mannlib.vitro.webapp.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Simple class to store urls for different controllers.
+ * This is just a place to stick the constants that are urls
+ * to servlets and jsps.
+ *
+ * Maybe it should be pulled out of a properties file?
+ * @author bdc34
+ *
+ */
+
 public class Controllers {
-    
-    // Servlet urls
+    
+    // Servlet urls
 
     public static final String ABOUT = "/about";
     public static final String CONTACT_URL = "/comments";
@@ -33,51 +33,51 @@ public class Controllers {
     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 BASIC_JSP = "/templates/page/basicPage.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";
-    public static final String ENTITY_EDITABLE_PROP_LIST_JSP = "templates/entity/entityEditablePropsList.jsp";
-
-    public static final String ENTITY_LIST_FOR_TABS_JSP = "templates/entity/entityListForTabs.jsp";
-    public static final String ENTITY_NOT_FOUND_JSP = "templates/error/entityNotFound.jsp";
-
-    public static final String TAB_BASIC_JSP = "/templates/tabs/tabBasic.jsp";
-    public static final String TAB_PRIMARY_JSP = "/templates/tabs/tabprimary.jsp";
-
-    public static final String ALPHA_INDEX_JSP = "/templates/alpha/alphaIndex.jsp";
-
-    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;
-    public static List<String> getLetters() {
-        //there must be a better place to put this.
-        if (Controllers.letters == null) {
-            char c[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".toCharArray();
-            Controllers.letters = new ArrayList<String>(c.length);
-            for (int i = 0; i < c.length; i++) {
-                letters.add("" + c[i]);
-            }
-        }
-        return Controllers.letters;
-    }
-}
+    public static final String EXPORT_RDF = "/export";
+    
+    // jsps go here:
+    
+    public static final String TAB = "/index.jsp";
+
+    public static final String BASIC_JSP = "/templates/page/basicPage.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";
+    public static final String ENTITY_EDITABLE_PROP_LIST_JSP = "templates/entity/entityEditablePropsList.jsp";
+
+    public static final String ENTITY_LIST_FOR_TABS_JSP = "templates/entity/entityListForTabs.jsp";
+    public static final String ENTITY_NOT_FOUND_JSP = "templates/error/entityNotFound.jsp";
+
+    public static final String TAB_BASIC_JSP = "/templates/tabs/tabBasic.jsp";
+    public static final String TAB_PRIMARY_JSP = "/templates/tabs/tabprimary.jsp";
+
+    public static final String ALPHA_INDEX_JSP = "/templates/alpha/alphaIndex.jsp";
+
+    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;
+    public static List<String> getLetters() {
+        //there must be a better place to put this.
+        if (Controllers.letters == null) {
+            char c[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".toCharArray();
+            Controllers.letters = new ArrayList<String>(c.length);
+            for (int i = 0; i < c.length; i++) {
+                letters.add("" + c[i]);
+            }
+        }
+        return Controllers.letters;
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/DashboardPropertyListController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/DashboardPropertyListController.java
index 095739cdd..fe03f377f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/DashboardPropertyListController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/DashboardPropertyListController.java
@@ -1,7 +1,7 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller;
-
+package edu.cornell.mannlib.vitro.webapp.controller;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -29,343 +29,343 @@ import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
 import edu.cornell.mannlib.vitro.webapp.dao.PropertyInstanceDao;
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-
-/**
- * Handles requests for entity information.
- * The methods for sorting Property/ObjectPropertyStatement Lists are here also.
- * @author bdc34
- *
- */
-public class DashboardPropertyListController extends VitroHttpServlet {
-
-    /**
-     * This gets the Entity object in the requestScope "entity" and
-     * sets up a merged property list for it, including Object and Data properties
-     * to be sortable and displayable along with other properties.
-     * After that a jsp is called to draw the data.
-     *
-     * Expected parameters:
-     *
-     * Expected Attributes:
-     * entity - set to entity to display properties for.
-     *
-     * @author bdc34, then jc55
-     */
-    
-    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 {
-            super.doGet(req, res);
-            Object obj = req.getAttribute("entity");
-            if( obj == null || !(obj instanceof Individual))
-                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) {
-                groupForUngroupedProperties = unassignedStr;
-                // pass this on to dashboardPropsList.jsp
-                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) {
-                log.debug("found props inclusion parameter \""+allPossiblePropsStr+"\"");
-                if (allPossiblePropsStr.equalsIgnoreCase("true")) {
-                    onlyPopulatedProps = false;
-                }
-            }
-
-            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 
-                List<ObjectProperty> objectPropertyList = subject.getObjectPropertyList();
-                for (ObjectProperty op : objectPropertyList) {
-                    op.setLabel(op.getDomainPublic());
-                    mergedPropertyList.add(op);
-                }
-            } else {
-                log.debug("getting all possible object property choices");
-                Collection<PropertyInstance> allPropInstColl = piDao.getAllPossiblePropInstForIndividual(subject.getURI());
-                if (allPropInstColl != null) {
-                    for (PropertyInstance pi : allPropInstColl) {
-                        if (pi!=null) {
-                            ObjectProperty op = opDao.getObjectPropertyByURI(pi.getPropertyURI());
-                            op.setLabel(op.getDomainPublic()); // no longer relevant: pi.getSubjectSide() ? op.getDomainPublic() : op.getRangePublic());
-                            mergedPropertyList.add(op);
-                        } else {
-                            log.error("a property instance in the Collection created by PropertyInstanceDao.getAllPossiblePropInstForIndividual() is unexpectedly null");
-                        }
-                    }
-                } else {
-                    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
-                List<DataProperty> dataPropertyList = subject.getDataPropertyList();
-                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());
-                if (allDatapropColl != null) {
-                    for (DataProperty dp : allDatapropColl ) {
-                        if (dp!=null) {
-                            dp.setLabel(dp.getPublicName());
-                            mergedPropertyList.add(dp);
-                        } else {
-                            log.error("a data property in the Collection created in DataPropertyDao.getAllPossibleDatapropsForIndividual() is unexpectedly null)");
-                        }
-                    }
-                } else {
-                    log.error("a null Collection is returned from DataPropertyDao.getAllPossibleDatapropsForIndividual())");
-                }
-            }
-            
-            if (mergedPropertyList!=null) {
-                try {
-                    Collections.sort(mergedPropertyList,new PropertyRanker(vreq));
-                } catch (Exception ex) {
-                    log.error("Exception sorting merged property list: " + ex.getMessage());
-                }
-                if (groupedMode) {
-                    int groupsCount=0;
-                    try {
-                        groupsCount = populateGroupsListWithProperties(pgDao,groupsList,mergedPropertyList,groupForUngroupedProperties);
-                    } catch (Exception ex) {
-                        log.error("Exception on trying to populate groups list with properties: "+ex.getMessage());
-                        ex.printStackTrace();
-                    }
-                    try {
-                        int removedCount = pgDao.removeUnpopulatedGroups(groupsList);
-                        if (removedCount == 0) {
-                            log.warn("Of "+groupsCount+" groups, none removed by removeUnpopulatedGroups");
-                    /*  } else {
-                            log.warn("Of "+groupsCount+" groups, "+removedCount+" removed by removeUnpopulatedGroups"); */
-                        }
-                        groupsCount -= removedCount;
-                        req.setAttribute("groupsCount", new Integer(groupsCount));
-                        if (groupsCount > 0) { //still
-                            for (PropertyGroup g : groupsList) {
-                                int statementCount=0;
-                                if (g.getPropertyList()!=null && g.getPropertyList().size()>0) {
-                                    for (Property p : g.getPropertyList()) {
-                                        if (p instanceof ObjectProperty) {
-                                            ObjectProperty op = (ObjectProperty)p;
-                                            if (op.getObjectPropertyStatements()!=null && op.getObjectPropertyStatements().size()>0) {
-                                                statementCount += op.getObjectPropertyStatements().size();
-                                            }
-                                        }
-                                    }
-                                }
-                                g.setStatementCount(statementCount);
-                            }
-                        }
-                    } catch (Exception ex) {
-                        log.error("Exception on trying to prune groups list with properties: "+ex.getMessage());
-                    }
-                    mergedPropertyList.clear();
-                }
-                if (groupedMode) {
-                    req.setAttribute("groupsList",groupsList);
-                } else {
-                    req.setAttribute("dashboardPropertyList",mergedPropertyList);
-                }
-            }
-            req.setAttribute("entity",subject);
-
-            RequestDispatcher rd = req.getRequestDispatcher(Controllers.DASHBOARD_PROP_LIST_JSP);
-            rd.include(req,res);
-        } catch (HelpException help){
-            doHelp(res);
-        } catch (Throwable e) {
-            req.setAttribute("javax.servlet.jsp.jspException",e);
-            RequestDispatcher rd = req.getRequestDispatcher("/error.jsp");
-            rd.forward(req, res);
-        }
-    }
-
-    public void doPost(HttpServletRequest request, HttpServletResponse response)
-    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()");
-            return true; // don't add to list
-        }
-        for (Property ptest : propsList) {
-            if (ptest.getURI() != null && ptest.getURI().equals(p.getURI())) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private int populateGroupsListWithProperties(PropertyGroupDao pgDao, List<PropertyGroup> groupsList, List<Property> mergedPropertyList, String unassignedGroupName) {
-        int count = groupsList.size();
-        PropertyGroup tempGroup = null;
-        if (unassignedGroupName!=null) {
-            tempGroup = pgDao.createDummyPropertyGroup(unassignedGroupName,MAX_GROUP_DISPLAY_RANK);
-            log.debug("creating temp property group "+unassignedGroupName+" for any unassigned properties");
-        }
-        switch (count) {
-        case 0: log.warn("groupsList has no groups on entering populateGroupsListWithProperties(); will create a new group \"other\"");
-                break;
-        case 1: break;
-        default: try {
-                     Collections.sort(groupsList);
-                 } catch (Exception ex) {
-                     log.error("Exception on sorting groupsList in populateGroupsListWithProperties()");
-                 }
-        }
-        if (count==0 && unassignedGroupName!=null) {
-            groupsList.add(tempGroup);
-        }
-        for (PropertyGroup pg : groupsList) {
-             if (pg.getPropertyList().size()>0) {
-                 pg.getPropertyList().clear();
-             }
-             for (Property p : mergedPropertyList) {
-                 if (p.getURI() == null) {
-                     log.error("Property p has null URI in populateGroupsListWithProperties()");
-                 } else if (p.getGroupURI()==null) {
-                     if (tempGroup!=null) { // not assigned any group yet and are creating a group for unassigned properties
-                         if (!alreadyOnPropertyList(tempGroup.getPropertyList(),p)) {
-                             tempGroup.getPropertyList().add(p);
-                             log.debug("adding property "+p.getLabel()+" to members of temp group "+unassignedGroupName);
-                         }
-                     } // otherwise don't put that property on the list
-                 } else if (p.getGroupURI().equals(pg.getURI())) {
-                     if (!alreadyOnPropertyList(pg.getPropertyList(),p)) {
-                         pg.getPropertyList().add(p);
-                     }
-                 }
-             }
-             if (pg.getPropertyList().size()>1) {
-                 try {
-                     Collections.sort(pg.getPropertyList(),new Property.DisplayComparatorIgnoringPropertyGroup());
-                 } catch (Exception ex) {
-                     log.error("Exception sorting property group "+pg.getName()+" property list: "+ex.getMessage());
-                 }
-             }
-        }
-        if (count>0 && tempGroup!=null && tempGroup.getPropertyList().size()>0) {
-            groupsList.add(tempGroup);
-        }
-        count = groupsList.size();
-        return count;
-    }
-
-    private void doHelp(HttpServletResponse res)
-    throws IOException, ServletException {
-        ServletOutputStream out = res.getOutputStream();
-        res.setContentType("text/html; charset=UTF-8");
-        out.println("<html><body><h2>Quick Notes on using EntityMergedPropList:</h2>");
-        out.println("<p>request.attributes 'entity' must be set by Entity servlet before calling."
-                +" It should already be 'filled out.' </p>");
-        out.println("</body></html>");
-    }
-
-    private class HelpException extends Throwable{
-
-        public HelpException(String string) {
-            super(string);
-        }
-    }
-    
-    private class PropertyRanker implements Comparator {
-        VitroRequest vreq;
-        WebappDaoFactory wdf;
-        PropertyGroupDao pgDao;
-
-        private PropertyRanker(VitroRequest vreq) {
-            this.vreq = vreq;
-            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());
-                if (pg1!=null) {
-                    p1GroupRank=pg1.getDisplayRank();
-                }
-            }
-            
-            int p2GroupRank=MAX_GROUP_RANK;
-            if (p2.getGroupURI()!=null) {
-                PropertyGroup pg2 = pgDao.getGroupByURI(p2.getGroupURI());
-                if (pg2!=null) {
-                    p2GroupRank=pg2.getDisplayRank();
-                }
-            }
-            
-            // int diff = pgDao.getGroupByURI(p1.getGroupURI()).getDisplayRank() - pgDao.getGroupByURI(p2.getGroupURI()).getDisplayRank();
-            int diff=p1GroupRank - p2GroupRank;
-            if (diff==0) {
-                diff = determineDisplayRank(p1) - determineDisplayRank(p2);
-                if (diff==0) {
-                    return p1.getLabel().compareTo(p2.getLabel());
-                } else {
-                    return diff;
-                }
-            }
-            return diff;
-        }
-        
-        private int determineDisplayRank(Property p) {
-            if (p instanceof DataProperty) {
-                DataProperty dp = (DataProperty)p;
-                return dp.getDisplayTier();
-            } else if (p instanceof ObjectProperty) {
-                ObjectProperty op = (ObjectProperty)p;
-                return op.getDomainDisplayTier();
-            } else {
-                log.error("Property is of unknown class in PropertyRanker()");  
-            }
-            return 0;
-        }
-    }
-}
+
+/**
+ * Handles requests for entity information.
+ * The methods for sorting Property/ObjectPropertyStatement Lists are here also.
+ * @author bdc34
+ *
+ */
+public class DashboardPropertyListController extends VitroHttpServlet {
+
+    /**
+     * This gets the Entity object in the requestScope "entity" and
+     * sets up a merged property list for it, including Object and Data properties
+     * to be sortable and displayable along with other properties.
+     * After that a jsp is called to draw the data.
+     *
+     * Expected parameters:
+     *
+     * Expected Attributes:
+     * entity - set to entity to display properties for.
+     *
+     * @author bdc34, then jc55
+     */
+    
+    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 {
+            super.doGet(req, res);
+            Object obj = req.getAttribute("entity");
+            if( obj == null || !(obj instanceof Individual))
+                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) {
+                groupForUngroupedProperties = unassignedStr;
+                // pass this on to dashboardPropsList.jsp
+                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) {
+                log.debug("found props inclusion parameter \""+allPossiblePropsStr+"\"");
+                if (allPossiblePropsStr.equalsIgnoreCase("true")) {
+                    onlyPopulatedProps = false;
+                }
+            }
+
+            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 
+                List<ObjectProperty> objectPropertyList = subject.getObjectPropertyList();
+                for (ObjectProperty op : objectPropertyList) {
+                    op.setLabel(op.getDomainPublic());
+                    mergedPropertyList.add(op);
+                }
+            } else {
+                log.debug("getting all possible object property choices");
+                Collection<PropertyInstance> allPropInstColl = piDao.getAllPossiblePropInstForIndividual(subject.getURI());
+                if (allPropInstColl != null) {
+                    for (PropertyInstance pi : allPropInstColl) {
+                        if (pi!=null) {
+                            ObjectProperty op = opDao.getObjectPropertyByURI(pi.getPropertyURI());
+                            op.setLabel(op.getDomainPublic()); // no longer relevant: pi.getSubjectSide() ? op.getDomainPublic() : op.getRangePublic());
+                            mergedPropertyList.add(op);
+                        } else {
+                            log.error("a property instance in the Collection created by PropertyInstanceDao.getAllPossiblePropInstForIndividual() is unexpectedly null");
+                        }
+                    }
+                } else {
+                    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
+                List<DataProperty> dataPropertyList = subject.getDataPropertyList();
+                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());
+                if (allDatapropColl != null) {
+                    for (DataProperty dp : allDatapropColl ) {
+                        if (dp!=null) {
+                            dp.setLabel(dp.getPublicName());
+                            mergedPropertyList.add(dp);
+                        } else {
+                            log.error("a data property in the Collection created in DataPropertyDao.getAllPossibleDatapropsForIndividual() is unexpectedly null)");
+                        }
+                    }
+                } else {
+                    log.error("a null Collection is returned from DataPropertyDao.getAllPossibleDatapropsForIndividual())");
+                }
+            }
+            
+            if (mergedPropertyList!=null) {
+                try {
+                    Collections.sort(mergedPropertyList,new PropertyRanker(vreq));
+                } catch (Exception ex) {
+                    log.error("Exception sorting merged property list: " + ex.getMessage());
+                }
+                if (groupedMode) {
+                    int groupsCount=0;
+                    try {
+                        groupsCount = populateGroupsListWithProperties(pgDao,groupsList,mergedPropertyList,groupForUngroupedProperties);
+                    } catch (Exception ex) {
+                        log.error("Exception on trying to populate groups list with properties: "+ex.getMessage());
+                        ex.printStackTrace();
+                    }
+                    try {
+                        int removedCount = pgDao.removeUnpopulatedGroups(groupsList);
+                        if (removedCount == 0) {
+                            log.warn("Of "+groupsCount+" groups, none removed by removeUnpopulatedGroups");
+                    /*  } else {
+                            log.warn("Of "+groupsCount+" groups, "+removedCount+" removed by removeUnpopulatedGroups"); */
+                        }
+                        groupsCount -= removedCount;
+                        req.setAttribute("groupsCount", new Integer(groupsCount));
+                        if (groupsCount > 0) { //still
+                            for (PropertyGroup g : groupsList) {
+                                int statementCount=0;
+                                if (g.getPropertyList()!=null && g.getPropertyList().size()>0) {
+                                    for (Property p : g.getPropertyList()) {
+                                        if (p instanceof ObjectProperty) {
+                                            ObjectProperty op = (ObjectProperty)p;
+                                            if (op.getObjectPropertyStatements()!=null && op.getObjectPropertyStatements().size()>0) {
+                                                statementCount += op.getObjectPropertyStatements().size();
+                                            }
+                                        }
+                                    }
+                                }
+                                g.setStatementCount(statementCount);
+                            }
+                        }
+                    } catch (Exception ex) {
+                        log.error("Exception on trying to prune groups list with properties: "+ex.getMessage());
+                    }
+                    mergedPropertyList.clear();
+                }
+                if (groupedMode) {
+                    req.setAttribute("groupsList",groupsList);
+                } else {
+                    req.setAttribute("dashboardPropertyList",mergedPropertyList);
+                }
+            }
+            req.setAttribute("entity",subject);
+
+            RequestDispatcher rd = req.getRequestDispatcher(Controllers.DASHBOARD_PROP_LIST_JSP);
+            rd.include(req,res);
+        } catch (HelpException help){
+            doHelp(res);
+        } catch (Throwable e) {
+            req.setAttribute("javax.servlet.jsp.jspException",e);
+            RequestDispatcher rd = req.getRequestDispatcher("/error.jsp");
+            rd.forward(req, res);
+        }
+    }
+
+    public void doPost(HttpServletRequest request, HttpServletResponse response)
+    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()");
+            return true; // don't add to list
+        }
+        for (Property ptest : propsList) {
+            if (ptest.getURI() != null && ptest.getURI().equals(p.getURI())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private int populateGroupsListWithProperties(PropertyGroupDao pgDao, List<PropertyGroup> groupsList, List<Property> mergedPropertyList, String unassignedGroupName) {
+        int count = groupsList.size();
+        PropertyGroup tempGroup = null;
+        if (unassignedGroupName!=null) {
+            tempGroup = pgDao.createDummyPropertyGroup(unassignedGroupName,MAX_GROUP_DISPLAY_RANK);
+            log.debug("creating temp property group "+unassignedGroupName+" for any unassigned properties");
+        }
+        switch (count) {
+        case 0: log.warn("groupsList has no groups on entering populateGroupsListWithProperties(); will create a new group \"other\"");
+                break;
+        case 1: break;
+        default: try {
+                     Collections.sort(groupsList);
+                 } catch (Exception ex) {
+                     log.error("Exception on sorting groupsList in populateGroupsListWithProperties()");
+                 }
+        }
+        if (count==0 && unassignedGroupName!=null) {
+            groupsList.add(tempGroup);
+        }
+        for (PropertyGroup pg : groupsList) {
+             if (pg.getPropertyList().size()>0) {
+                 pg.getPropertyList().clear();
+             }
+             for (Property p : mergedPropertyList) {
+                 if (p.getURI() == null) {
+                     log.error("Property p has null URI in populateGroupsListWithProperties()");
+                 } else if (p.getGroupURI()==null) {
+                     if (tempGroup!=null) { // not assigned any group yet and are creating a group for unassigned properties
+                         if (!alreadyOnPropertyList(tempGroup.getPropertyList(),p)) {
+                             tempGroup.getPropertyList().add(p);
+                             log.debug("adding property "+p.getLabel()+" to members of temp group "+unassignedGroupName);
+                         }
+                     } // otherwise don't put that property on the list
+                 } else if (p.getGroupURI().equals(pg.getURI())) {
+                     if (!alreadyOnPropertyList(pg.getPropertyList(),p)) {
+                         pg.getPropertyList().add(p);
+                     }
+                 }
+             }
+             if (pg.getPropertyList().size()>1) {
+                 try {
+                     Collections.sort(pg.getPropertyList(),new Property.DisplayComparatorIgnoringPropertyGroup());
+                 } catch (Exception ex) {
+                     log.error("Exception sorting property group "+pg.getName()+" property list: "+ex.getMessage());
+                 }
+             }
+        }
+        if (count>0 && tempGroup!=null && tempGroup.getPropertyList().size()>0) {
+            groupsList.add(tempGroup);
+        }
+        count = groupsList.size();
+        return count;
+    }
+
+    private void doHelp(HttpServletResponse res)
+    throws IOException, ServletException {
+        ServletOutputStream out = res.getOutputStream();
+        res.setContentType("text/html; charset=UTF-8");
+        out.println("<html><body><h2>Quick Notes on using EntityMergedPropList:</h2>");
+        out.println("<p>request.attributes 'entity' must be set by Entity servlet before calling."
+                +" It should already be 'filled out.' </p>");
+        out.println("</body></html>");
+    }
+
+    private class HelpException extends Throwable{
+
+        public HelpException(String string) {
+            super(string);
+        }
+    }
+    
+    private class PropertyRanker implements Comparator {
+        VitroRequest vreq;
+        WebappDaoFactory wdf;
+        PropertyGroupDao pgDao;
+
+        private PropertyRanker(VitroRequest vreq) {
+            this.vreq = vreq;
+            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());
+                if (pg1!=null) {
+                    p1GroupRank=pg1.getDisplayRank();
+                }
+            }
+            
+            int p2GroupRank=MAX_GROUP_RANK;
+            if (p2.getGroupURI()!=null) {
+                PropertyGroup pg2 = pgDao.getGroupByURI(p2.getGroupURI());
+                if (pg2!=null) {
+                    p2GroupRank=pg2.getDisplayRank();
+                }
+            }
+            
+            // int diff = pgDao.getGroupByURI(p1.getGroupURI()).getDisplayRank() - pgDao.getGroupByURI(p2.getGroupURI()).getDisplayRank();
+            int diff=p1GroupRank - p2GroupRank;
+            if (diff==0) {
+                diff = determineDisplayRank(p1) - determineDisplayRank(p2);
+                if (diff==0) {
+                    return p1.getLabel().compareTo(p2.getLabel());
+                } else {
+                    return diff;
+                }
+            }
+            return diff;
+        }
+        
+        private int determineDisplayRank(Property p) {
+            if (p instanceof DataProperty) {
+                DataProperty dp = (DataProperty)p;
+                return dp.getDisplayTier();
+            } else if (p instanceof ObjectProperty) {
+                ObjectProperty op = (ObjectProperty)p;
+                return op.getDomainDisplayTier();
+            } else {
+                log.error("Property is of unknown class in PropertyRanker()");  
+            }
+            return 0;
+        }
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java
index 08c62868c..161b1c70d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/MailUsersServlet.java
@@ -1,236 +1,236 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
-
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.SendFailedException;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
-import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
-
-public class MailUsersServlet extends VitroHttpServlet {
-	private static final Log log = LogFactory.getLog(MailUsersServlet.class);
-	
-    public static HttpServletRequest request;
-    public static HttpServletRequest response;
-
-    @Override
-	public void doGet( HttpServletRequest request, HttpServletResponse response )
-        throws ServletException, IOException {
-        VitroRequest vreq = new VitroRequest(request);
-
-        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.";
-            response.sendRedirect( "test?bodyJsp=" + errpage + "&ERR=" + status );
-            return;
-        }
-
-        String SPAM_MESSAGE = "Your message was flagged as spam.";
-
-        boolean probablySpam = false;
-        String spamReason = "";
-
-        String originalReferer = (String) request.getSession().getAttribute("commentsFormReferer");
-        request.getSession().removeAttribute("commentsFormReferer");
-        if (originalReferer == null) {
-            originalReferer = "none";
-            // (the following does not support cookie-less browsing:)
-            // probablySpam = true;
-            // status = SPAM_MESSAGE;
-        } else {
-            String referer = request.getHeader("Referer");
-            //Review how spam works?
-            /*if (referer.indexOf("comments")<0 && referer.indexOf("correction")<0) {
-                probablySpam=true;
-                status = SPAM_MESSAGE ;
-                spamReason = "The form was not submitted from the Contact Us or Corrections page.";
-            }*/
-        }
-
-        String formType = vreq.getParameter("DeliveryType");
-        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(
-                    "To establish the Contact Us mail capability the system administrators must  "
-                    + "specify at least one email address in the current portal.");
-        }
-
-        // obtain passed in form data with a simple trim on the values
-        String   webusername    = vreq.getParameter("webusername");// Null.trim(); will give you an exception
-        String   webuseremail   = vreq.getParameter("webuseremail");//.trim();
-        String   comments       = vreq.getParameter("s34gfd88p9x1"); //what does this string signify?
-        //webusername = "hjk54";
-        //webuseremail = "hjk54@cornell.edu";
-        //comments = "following are comments";
-        
-       webusername=webusername.trim();
-       deliveryfrom = webuseremail; 
-       comments=comments.trim();
-        //Removed spam filtering code
-
-        StringBuffer msgBuf = new StringBuffer(); // contains the intro copy for the body of the email message
-        String lineSeparator = System.getProperty("line.separator"); // \r\n on windows, \n on unix
-        // from MyLibrary
-        msgBuf.setLength(0);
-        //msgBuf.append("Content-Type: text/html; charset='us-ascii'" + lineSeparator);
-        msgBuf.append("<html>" + lineSeparator );
-        msgBuf.append("<head>" + lineSeparator );
-        msgBuf.append("<style>a {text-decoration: none}</style>" + lineSeparator );
-        msgBuf.append("<title>" + deliveryfrom + "</title>" + lineSeparator );
-        msgBuf.append("</head>" + lineSeparator );
-        msgBuf.append("<body>" + lineSeparator );
-        msgBuf.append("<h4>" + deliveryfrom + "</h4>" + lineSeparator );
-        msgBuf.append("<h4>From: "+webusername +" (" + webuseremail + ")"+" at IP address "+request.getRemoteAddr()+"</h4>"+lineSeparator);
-
-        //Don't need any 'likely viewing page' portion to be emailed out to the others
-
-        msgBuf.append(lineSeparator + "</i></p><h3>Comments:</h3>" + lineSeparator );
-        if (comments==null || comments.equals("")) {
-            msgBuf.append("<p>BLANK MESSAGE</p>");
-        } else {
-            msgBuf.append("<p>"+comments+"</p>");
-        }
-        msgBuf.append("</body>" + lineSeparator );
-        msgBuf.append("</html>" + lineSeparator );
-
-        String msgText = msgBuf.toString();
-
-        Calendar cal = Calendar.getInstance();
-
-       /* outFile.println("<hr/>");
-        outFile.println();
-        outFile.println("<p>"+cal.getTime()+"</p>");
-        outFile.println();
-        if (probablySpam) {
-            outFile.println("<p>REJECTED - SPAM</p>");
-            outFile.println("<p>"+spamReason+"</p>");
-            outFile.println();
-        }
-        outFile.print( msgText );
-        outFile.println();
-        outFile.println();
-        outFile.flush();
-        // outFile.close();
-		*/
-
-        Session s = FreemarkerEmailFactory.getEmailSession(vreq);
-        //s.setDebug(true);
-        try {
-            // Construct the message
-            MimeMessage msg = new MimeMessage( s );
-            log.debug("trying to send message from servlet");
-
-            // Set the from address
-            msg.setFrom( new InternetAddress( webuseremail ));
-
-            // Set the recipient address
-            
-            if (recipientCount>0){
-                InternetAddress[] address=new InternetAddress[recipientCount];
-                for (int i=0; i<recipientCount; i++){
-                    address[i] = new InternetAddress(deliverToArray.get(i));
-                }
-                msg.setRecipients( Message.RecipientType.TO, address );
-            }
-
-            // Set the subject and text
-            msg.setSubject( deliveryfrom );
-
-            // add the multipart to the message
-            msg.setContent(msgText,"text/html");
-
-            // set the Date: header
-            msg.setSentDate( new Date() );
-
-            log.debug("sending from servlet");
-
-        //if (!probablySpam)
-            Transport.send( msg ); // try to send the message via smtp - catch error exceptions
-
-
-        } catch (AddressException e) {
-            status = "Please supply a valid email address.";
-            log.debug("Error - status is " + status);
-        } catch (SendFailedException e) {
-            status = "The system was unable to deliver your mail.  Please try again later.  [SEND FAILED]";
-            log.error("Error - status is " + status);
-        } catch (MessagingException e) {
-            status = "The system was unable to deliver your mail.  Please try again later.  [MESSAGING]";
-            log.error("Error - status is " + status, e);
-        }
-
-        //outFile.flush();
-        //outFile.close();
-
-        // Redirect to the appropriate confirmation page
-        if (status == null && !probablySpam) {
-            // message was sent successfully
-            response.sendRedirect( "test?bodyJsp=" + confirmpage );
-        } else {
-            // exception occurred
-            response.sendRedirect( "test?bodyJsp=" + errpage + "&ERR=" + status );
-        }
-
-    }
-    
-	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());
-		}
-
-		return emails;
-	}
-
-    @Override
-	public void doPost( HttpServletRequest request, HttpServletResponse response )
-        throws ServletException, IOException
-    {
-        doGet( request, response );
-    }
-
-    /** Intended to mangle url so it can get through spam filtering
-     *    http://host/dir/servlet?param=value ->  host: dir/servlet?param=value */
-    public String stripProtocol( String in ){
-        if( in == null )
-            return "";
-        else
-            return in.replaceAll("http://", "host: " );
-    }
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.SendFailedException;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
+import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
+
+public class MailUsersServlet extends VitroHttpServlet {
+	private static final Log log = LogFactory.getLog(MailUsersServlet.class);
+	
+    public static HttpServletRequest request;
+    public static HttpServletRequest response;
+
+    @Override
+	public void doGet( HttpServletRequest request, HttpServletResponse response )
+        throws ServletException, IOException {
+        VitroRequest vreq = new VitroRequest(request);
+
+        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.";
+            response.sendRedirect( "test?bodyJsp=" + errpage + "&ERR=" + status );
+            return;
+        }
+
+        String SPAM_MESSAGE = "Your message was flagged as spam.";
+
+        boolean probablySpam = false;
+        String spamReason = "";
+
+        String originalReferer = (String) request.getSession().getAttribute("commentsFormReferer");
+        request.getSession().removeAttribute("commentsFormReferer");
+        if (originalReferer == null) {
+            originalReferer = "none";
+            // (the following does not support cookie-less browsing:)
+            // probablySpam = true;
+            // status = SPAM_MESSAGE;
+        } else {
+            String referer = request.getHeader("Referer");
+            //Review how spam works?
+            /*if (referer.indexOf("comments")<0 && referer.indexOf("correction")<0) {
+                probablySpam=true;
+                status = SPAM_MESSAGE ;
+                spamReason = "The form was not submitted from the Contact Us or Corrections page.";
+            }*/
+        }
+
+        String formType = vreq.getParameter("DeliveryType");
+        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(
+                    "To establish the Contact Us mail capability the system administrators must  "
+                    + "specify at least one email address in the current portal.");
+        }
+
+        // obtain passed in form data with a simple trim on the values
+        String   webusername    = vreq.getParameter("webusername");// Null.trim(); will give you an exception
+        String   webuseremail   = vreq.getParameter("webuseremail");//.trim();
+        String   comments       = vreq.getParameter("s34gfd88p9x1"); //what does this string signify?
+        //webusername = "hjk54";
+        //webuseremail = "hjk54@cornell.edu";
+        //comments = "following are comments";
+        
+       webusername=webusername.trim();
+       deliveryfrom = webuseremail; 
+       comments=comments.trim();
+        //Removed spam filtering code
+
+        StringBuffer msgBuf = new StringBuffer(); // contains the intro copy for the body of the email message
+        String lineSeparator = System.getProperty("line.separator"); // \r\n on windows, \n on unix
+        // from MyLibrary
+        msgBuf.setLength(0);
+        //msgBuf.append("Content-Type: text/html; charset='us-ascii'" + lineSeparator);
+        msgBuf.append("<html>" + lineSeparator );
+        msgBuf.append("<head>" + lineSeparator );
+        msgBuf.append("<style>a {text-decoration: none}</style>" + lineSeparator );
+        msgBuf.append("<title>" + deliveryfrom + "</title>" + lineSeparator );
+        msgBuf.append("</head>" + lineSeparator );
+        msgBuf.append("<body>" + lineSeparator );
+        msgBuf.append("<h4>" + deliveryfrom + "</h4>" + lineSeparator );
+        msgBuf.append("<h4>From: "+webusername +" (" + webuseremail + ")"+" at IP address "+request.getRemoteAddr()+"</h4>"+lineSeparator);
+
+        //Don't need any 'likely viewing page' portion to be emailed out to the others
+
+        msgBuf.append(lineSeparator + "</i></p><h3>Comments:</h3>" + lineSeparator );
+        if (comments==null || comments.equals("")) {
+            msgBuf.append("<p>BLANK MESSAGE</p>");
+        } else {
+            msgBuf.append("<p>"+comments+"</p>");
+        }
+        msgBuf.append("</body>" + lineSeparator );
+        msgBuf.append("</html>" + lineSeparator );
+
+        String msgText = msgBuf.toString();
+
+        Calendar cal = Calendar.getInstance();
+
+       /* outFile.println("<hr/>");
+        outFile.println();
+        outFile.println("<p>"+cal.getTime()+"</p>");
+        outFile.println();
+        if (probablySpam) {
+            outFile.println("<p>REJECTED - SPAM</p>");
+            outFile.println("<p>"+spamReason+"</p>");
+            outFile.println();
+        }
+        outFile.print( msgText );
+        outFile.println();
+        outFile.println();
+        outFile.flush();
+        // outFile.close();
+		*/
+
+        Session s = FreemarkerEmailFactory.getEmailSession(vreq);
+        //s.setDebug(true);
+        try {
+            // Construct the message
+            MimeMessage msg = new MimeMessage( s );
+            log.debug("trying to send message from servlet");
+
+            // Set the from address
+            msg.setFrom( new InternetAddress( webuseremail ));
+
+            // Set the recipient address
+            
+            if (recipientCount>0){
+                InternetAddress[] address=new InternetAddress[recipientCount];
+                for (int i=0; i<recipientCount; i++){
+                    address[i] = new InternetAddress(deliverToArray.get(i));
+                }
+                msg.setRecipients( Message.RecipientType.TO, address );
+            }
+
+            // Set the subject and text
+            msg.setSubject( deliveryfrom );
+
+            // add the multipart to the message
+            msg.setContent(msgText,"text/html");
+
+            // set the Date: header
+            msg.setSentDate( new Date() );
+
+            log.debug("sending from servlet");
+
+        //if (!probablySpam)
+            Transport.send( msg ); // try to send the message via smtp - catch error exceptions
+
+
+        } catch (AddressException e) {
+            status = "Please supply a valid email address.";
+            log.debug("Error - status is " + status);
+        } catch (SendFailedException e) {
+            status = "The system was unable to deliver your mail.  Please try again later.  [SEND FAILED]";
+            log.error("Error - status is " + status);
+        } catch (MessagingException e) {
+            status = "The system was unable to deliver your mail.  Please try again later.  [MESSAGING]";
+            log.error("Error - status is " + status, e);
+        }
+
+        //outFile.flush();
+        //outFile.close();
+
+        // Redirect to the appropriate confirmation page
+        if (status == null && !probablySpam) {
+            // message was sent successfully
+            response.sendRedirect( "test?bodyJsp=" + confirmpage );
+        } else {
+            // exception occurred
+            response.sendRedirect( "test?bodyJsp=" + errpage + "&ERR=" + status );
+        }
+
+    }
+    
+	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());
+		}
+
+		return emails;
+	}
+
+    @Override
+	public void doPost( HttpServletRequest request, HttpServletResponse response )
+        throws ServletException, IOException
+    {
+        doGet( request, response );
+    }
+
+    /** Intended to mangle url so it can get through spam filtering
+     *    http://host/dir/servlet?param=value ->  host: dir/servlet?param=value */
+    public String stripProtocol( String in ){
+        if( in == null )
+            return "";
+        else
+            return in.replaceAll("http://", "host: " );
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/UserMailController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/UserMailController.java
index b022c4de6..96b1453de 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/UserMailController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/UserMailController.java
@@ -1,69 +1,69 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller;
-
-import java.io.IOException;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
-import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
-
-/**
- *  Controller for comments ("contact us") page
- *  * @author bjl23
- */
-public class UserMailController extends VitroHttpServlet{
-
-    @Override
-	public void doPost(HttpServletRequest request, HttpServletResponse response)
-            throws ServletException, IOException {
-        doGet(request, response);
-    }
-
-    @Override
-	public void doGet( HttpServletRequest request, HttpServletResponse response )
-    throws IOException, ServletException {
-        super.doGet(request,response);
-        VitroRequest vreq = new VitroRequest(request);
-        try {
-        //this try block passes any errors to error.jsp
-            if (!FreemarkerEmailFactory.isConfigured(request)) {
-                request.setAttribute("title", "Mail All Users Form");
-                request.setAttribute("bodyJsp", "/contact_err.jsp");// <<< this is where the body gets set
-				request.setAttribute("ERR",
-						"This application has not yet been configured to send mail. "
-								+ "Email properties must be specified in the configuration properties file.");
-                RequestDispatcher errd = request.getRequestDispatcher(Controllers.BASIC_JSP);
-                errd.forward(request, response);
-            }
-            ApplicationBean appBean=vreq.getAppBean();
-
-            request.setAttribute("siteName", appBean.getApplicationName());
-            request.setAttribute("scripts","/js/commentsForm.js");
-
-            if (request.getHeader("Referer") == null)
-                request.getSession().setAttribute("commentsFormReferer","none");
-            else
-                request.getSession().setAttribute("commentsFormReferer",request.getHeader("Referer"));
-
-            request.setAttribute("title", appBean.getApplicationName()+" Mail Users Form");
-            request.setAttribute("bodyJsp", "/templates/parts/emailUsers.jsp");// <<< this is where the body gets set
-
-            RequestDispatcher rd =
-                request.getRequestDispatcher(Controllers.BASIC_JSP);
-            rd.forward(request, response);
-
-        } catch (Throwable e) {
-            // This is how we use an error.jsp
-            //it expects javax.servlet.jsp.jspException to be set to the
-            //exception so that it can display the info out of that.
-            request.setAttribute("javax.servlet.jsp.jspException", e);
-            RequestDispatcher rd = request.getRequestDispatcher("/error.jsp");
-            rd.include(request, response);
-        }
-    }
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller;
+
+import java.io.IOException;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
+import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
+
+/**
+ *  Controller for comments ("contact us") page
+ *  * @author bjl23
+ */
+public class UserMailController extends VitroHttpServlet{
+
+    @Override
+	public void doPost(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+        doGet(request, response);
+    }
+
+    @Override
+	public void doGet( HttpServletRequest request, HttpServletResponse response )
+    throws IOException, ServletException {
+        super.doGet(request,response);
+        VitroRequest vreq = new VitroRequest(request);
+        try {
+        //this try block passes any errors to error.jsp
+            if (!FreemarkerEmailFactory.isConfigured(request)) {
+                request.setAttribute("title", "Mail All Users Form");
+                request.setAttribute("bodyJsp", "/contact_err.jsp");// <<< this is where the body gets set
+				request.setAttribute("ERR",
+						"This application has not yet been configured to send mail. "
+								+ "Email properties must be specified in the configuration properties file.");
+                RequestDispatcher errd = request.getRequestDispatcher(Controllers.BASIC_JSP);
+                errd.forward(request, response);
+            }
+            ApplicationBean appBean=vreq.getAppBean();
+
+            request.setAttribute("siteName", appBean.getApplicationName());
+            request.setAttribute("scripts","/js/commentsForm.js");
+
+            if (request.getHeader("Referer") == null)
+                request.getSession().setAttribute("commentsFormReferer","none");
+            else
+                request.getSession().setAttribute("commentsFormReferer",request.getHeader("Referer"));
+
+            request.setAttribute("title", appBean.getApplicationName()+" Mail Users Form");
+            request.setAttribute("bodyJsp", "/templates/parts/emailUsers.jsp");// <<< this is where the body gets set
+
+            RequestDispatcher rd =
+                request.getRequestDispatcher(Controllers.BASIC_JSP);
+            rd.forward(request, response);
+
+        } catch (Throwable e) {
+            // This is how we use an error.jsp
+            //it expects javax.servlet.jsp.jspException to be set to the
+            //exception so that it can display the info out of that.
+            request.setAttribute("javax.servlet.jsp.jspException", e);
+            RequestDispatcher rd = request.getRequestDispatcher("/error.jsp");
+            rd.include(request, response);
+        }
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsOrdering.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsOrdering.java
index a0ab54e4e..cccb6faca 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsOrdering.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsOrdering.java
@@ -1,87 +1,87 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts;
-
-/**
- * How are the accounts to be sorted?
- */
-public class UserAccountsOrdering {
-	public enum Direction {
-		ASCENDING("ASC"), DESCENDING("DESC");
-
-		public static Direction DEFAULT_DIRECTION = ASCENDING;
-
-		public static Direction fromKeyword(String keyword) {
-			if (keyword == null) {
-				return DEFAULT_DIRECTION;
-			}
-
-			for (Direction d : Direction.values()) {
-				if (d.keyword.equals(keyword)) {
-					return d;
-				}
-			}
-
-			return DEFAULT_DIRECTION;
-		}
-
-		public final String keyword;
-
-		Direction(String keyword) {
-			this.keyword = keyword;
-		}
-	}
-
-	public enum Field {
-		EMAIL("email"), FIRST_NAME("firstName"), LAST_NAME("lastName"), STATUS(
-				"status"), ROLE("ps"), LOGIN_COUNT("count"), LAST_LOGIN_TIME(
-				"lastLogin");
-
-		public static Field DEFAULT_FIELD = EMAIL;
-
-		public static Field fromName(String name) {
-			if (name == null) {
-				return DEFAULT_FIELD;
-			}
-
-			for (Field f : Field.values()) {
-				if (f.name.equals(name)) {
-					return f;
-				}
-			}
-
-			return DEFAULT_FIELD;
-		}
-
-		public final String name;
-
-		Field(String name) {
-			this.name = name;
-		}
-	}
-
-	public static final UserAccountsOrdering DEFAULT_ORDERING = new UserAccountsOrdering(
-			Field.DEFAULT_FIELD, Direction.DEFAULT_DIRECTION);
-
-	private final Field field;
-	private final Direction direction;
-
-	public UserAccountsOrdering(Field field, Direction direction) {
-		this.field = field;
-		this.direction = direction;
-	}
-
-	public Field getField() {
-		return field;
-	}
-
-	public Direction getDirection() {
-		return direction;
-	}
-
-	@Override
-	public String toString() {
-		return "UserAccountsOrdering[field=" + field + ", direction="
-				+ direction + "]";
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts;
+
+/**
+ * How are the accounts to be sorted?
+ */
+public class UserAccountsOrdering {
+	public enum Direction {
+		ASCENDING("ASC"), DESCENDING("DESC");
+
+		public static Direction DEFAULT_DIRECTION = ASCENDING;
+
+		public static Direction fromKeyword(String keyword) {
+			if (keyword == null) {
+				return DEFAULT_DIRECTION;
+			}
+
+			for (Direction d : Direction.values()) {
+				if (d.keyword.equals(keyword)) {
+					return d;
+				}
+			}
+
+			return DEFAULT_DIRECTION;
+		}
+
+		public final String keyword;
+
+		Direction(String keyword) {
+			this.keyword = keyword;
+		}
+	}
+
+	public enum Field {
+		EMAIL("email"), FIRST_NAME("firstName"), LAST_NAME("lastName"), STATUS(
+				"status"), ROLE("ps"), LOGIN_COUNT("count"), LAST_LOGIN_TIME(
+				"lastLogin");
+
+		public static Field DEFAULT_FIELD = EMAIL;
+
+		public static Field fromName(String name) {
+			if (name == null) {
+				return DEFAULT_FIELD;
+			}
+
+			for (Field f : Field.values()) {
+				if (f.name.equals(name)) {
+					return f;
+				}
+			}
+
+			return DEFAULT_FIELD;
+		}
+
+		public final String name;
+
+		Field(String name) {
+			this.name = name;
+		}
+	}
+
+	public static final UserAccountsOrdering DEFAULT_ORDERING = new UserAccountsOrdering(
+			Field.DEFAULT_FIELD, Direction.DEFAULT_DIRECTION);
+
+	private final Field field;
+	private final Direction direction;
+
+	public UserAccountsOrdering(Field field, Direction direction) {
+		this.field = field;
+		this.direction = direction;
+	}
+
+	public Field getField() {
+		return field;
+	}
+
+	public Direction getDirection() {
+		return direction;
+	}
+
+	@Override
+	public String toString() {
+		return "UserAccountsOrdering[field=" + field + ", direction="
+				+ direction + "]";
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsPage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsPage.java
index 5854cbe6c..0a977ec5d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsPage.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsPage.java
@@ -1,167 +1,167 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts;
-
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.SortedMap;
-import java.util.TreeMap;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.controller.AbstractPageHandler;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
-import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
-
-/**
- * Common routines for the page controllers.
- */
-public abstract class UserAccountsPage extends AbstractPageHandler {
-	private static final Log log = LogFactory.getLog(UserAccountsPage.class);
-
-	private static final String PERSON_CLASS_URI = "http://xmlns.com/foaf/0.1/Person";
-
-	/**
-	 * After the account is created, or the password is reset, the user has this
-	 * many days to repond to the email.
-	 */
-	protected static final int DAYS_TO_USE_PASSWORD_LINK = 90;
-
-	protected UserAccountsPage(VitroRequest vreq) {
-		super(vreq);
-	}
-
-	protected boolean isEmailEnabled() {
-		return FreemarkerEmailFactory.isConfigured(vreq);
-	}
-
-	/**
-	 * Create a list of all known non-public PermissionSets.
-	 */
-	protected List<PermissionSet> buildListOfSelectableRoles() {
-		List<PermissionSet> list = new ArrayList<PermissionSet>();
-		for (PermissionSet ps: userAccountsDao.getAllPermissionSets()) {
-			if (!ps.isForPublic()) {
-				list.add(ps);
-			}
-		}
-
-		Collections.sort(list, new Comparator<PermissionSet>() {
-			@Override
-			public int compare(PermissionSet ps1, PermissionSet ps2) {
-				return ps1.getUri().compareTo(ps2.getUri());
-			}
-		});
-		return list;
-	}
-
-	/**
-	 * 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?
-	 */
-	protected SortedMap<String, String> buildProfileTypesList() {
-		String seedClassUri = PERSON_CLASS_URI;
-		List<String> classUris = vclassDao.getAllSubClassURIs(seedClassUri);
-		classUris.add(seedClassUri);
-
-		SortedMap<String, String> types = new TreeMap<String, String>();
-		for (String classUri : classUris) {
-			VClass vclass = vclassDao.getVClassByURI(classUri);
-			if (vclass != null) {
-				types.put(classUri, vclass.getName());
-			}
-		}
-		return types;
-	}
-
-	/**
-	 * Make these URLs available to all of the pages.
-	 */
-	protected Map<String, String> buildUrlsMap() {
-		Map<String, String> map = new HashMap<String, String>();
-
-		map.put("list", UrlBuilder.getUrl("/accountsAdmin/list"));
-		map.put("add", UrlBuilder.getUrl("/accountsAdmin/add"));
-		map.put("delete", UrlBuilder.getUrl("/accountsAdmin/delete"));
-		map.put("myAccount", UrlBuilder.getUrl("/accounts/myAccount"));
-		map.put("createPassword", UrlBuilder.getUrl("/accounts/createPassword"));
-		map.put("resetPassword", UrlBuilder.getUrl("/accounts/resetPassword"));
-		map.put("firstTimeExternal",
-				UrlBuilder.getUrl("/accounts/firstTimeExternal"));
-		map.put("accountsAjax", UrlBuilder.getUrl("/accountsAjax"));
-		map.put("proxyAjax", UrlBuilder.getUrl("/proxiesAjax"));
-
-		return map;
-	}
-
-	protected static String editAccountUrl(String uri) {
-		return UrlBuilder.getUrl("/accountsAdmin/edit", new ParamMap(
-				"editAccount", uri));
-	}
-
-	protected Date figureExpirationDate() {
-		Calendar c = Calendar.getInstance();
-		c.add(Calendar.DATE, DAYS_TO_USE_PASSWORD_LINK);
-		return c.getTime();
-	}
-
-	protected boolean checkPasswordLength(String pw) {
-		return pw.length() >= UserAccount.MIN_PASSWORD_LENGTH
-				&& pw.length() <= UserAccount.MAX_PASSWORD_LENGTH;
-	}
-
-	protected String getSiteName() {
-		ApplicationBean appBean = vreq.getAppBean();
-		return appBean.getApplicationName();
-	}
-
-	protected ProfileInfo buildProfileInfo(String uri) {
-		Individual ind = indDao.getIndividualByURI(uri);
-		if (ind == null) {
-			return null;
-		} else {
-			return new ProfileInfo(ind.getRdfsLabel(), uri,
-					UrlBuilder.getIndividualProfileUrl(uri, vreq));
-		}
-	}
-
-	public static class ProfileInfo {
-		private final String label;
-		private final String uri;
-		private final String url;
-
-		public ProfileInfo(String label, String uri, String url) {
-			this.label = label;
-			this.uri = uri;
-			this.url = url;
-		}
-
-		public String getLabel() {
-			return label;
-		}
-
-		public String getUri() {
-			return uri;
-		}
-
-		public String getUrl() {
-			return url;
-		}
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts;
+
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.controller.AbstractPageHandler;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
+import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
+
+/**
+ * Common routines for the page controllers.
+ */
+public abstract class UserAccountsPage extends AbstractPageHandler {
+	private static final Log log = LogFactory.getLog(UserAccountsPage.class);
+
+	private static final String PERSON_CLASS_URI = "http://xmlns.com/foaf/0.1/Person";
+
+	/**
+	 * After the account is created, or the password is reset, the user has this
+	 * many days to repond to the email.
+	 */
+	protected static final int DAYS_TO_USE_PASSWORD_LINK = 90;
+
+	protected UserAccountsPage(VitroRequest vreq) {
+		super(vreq);
+	}
+
+	protected boolean isEmailEnabled() {
+		return FreemarkerEmailFactory.isConfigured(vreq);
+	}
+
+	/**
+	 * Create a list of all known non-public PermissionSets.
+	 */
+	protected List<PermissionSet> buildListOfSelectableRoles() {
+		List<PermissionSet> list = new ArrayList<PermissionSet>();
+		for (PermissionSet ps: userAccountsDao.getAllPermissionSets()) {
+			if (!ps.isForPublic()) {
+				list.add(ps);
+			}
+		}
+
+		Collections.sort(list, new Comparator<PermissionSet>() {
+			@Override
+			public int compare(PermissionSet ps1, PermissionSet ps2) {
+				return ps1.getUri().compareTo(ps2.getUri());
+			}
+		});
+		return list;
+	}
+
+	/**
+	 * 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?
+	 */
+	protected SortedMap<String, String> buildProfileTypesList() {
+		String seedClassUri = PERSON_CLASS_URI;
+		List<String> classUris = vclassDao.getAllSubClassURIs(seedClassUri);
+		classUris.add(seedClassUri);
+
+		SortedMap<String, String> types = new TreeMap<String, String>();
+		for (String classUri : classUris) {
+			VClass vclass = vclassDao.getVClassByURI(classUri);
+			if (vclass != null) {
+				types.put(classUri, vclass.getName());
+			}
+		}
+		return types;
+	}
+
+	/**
+	 * Make these URLs available to all of the pages.
+	 */
+	protected Map<String, String> buildUrlsMap() {
+		Map<String, String> map = new HashMap<String, String>();
+
+		map.put("list", UrlBuilder.getUrl("/accountsAdmin/list"));
+		map.put("add", UrlBuilder.getUrl("/accountsAdmin/add"));
+		map.put("delete", UrlBuilder.getUrl("/accountsAdmin/delete"));
+		map.put("myAccount", UrlBuilder.getUrl("/accounts/myAccount"));
+		map.put("createPassword", UrlBuilder.getUrl("/accounts/createPassword"));
+		map.put("resetPassword", UrlBuilder.getUrl("/accounts/resetPassword"));
+		map.put("firstTimeExternal",
+				UrlBuilder.getUrl("/accounts/firstTimeExternal"));
+		map.put("accountsAjax", UrlBuilder.getUrl("/accountsAjax"));
+		map.put("proxyAjax", UrlBuilder.getUrl("/proxiesAjax"));
+
+		return map;
+	}
+
+	protected static String editAccountUrl(String uri) {
+		return UrlBuilder.getUrl("/accountsAdmin/edit", new ParamMap(
+				"editAccount", uri));
+	}
+
+	protected Date figureExpirationDate() {
+		Calendar c = Calendar.getInstance();
+		c.add(Calendar.DATE, DAYS_TO_USE_PASSWORD_LINK);
+		return c.getTime();
+	}
+
+	protected boolean checkPasswordLength(String pw) {
+		return pw.length() >= UserAccount.MIN_PASSWORD_LENGTH
+				&& pw.length() <= UserAccount.MAX_PASSWORD_LENGTH;
+	}
+
+	protected String getSiteName() {
+		ApplicationBean appBean = vreq.getAppBean();
+		return appBean.getApplicationName();
+	}
+
+	protected ProfileInfo buildProfileInfo(String uri) {
+		Individual ind = indDao.getIndividualByURI(uri);
+		if (ind == null) {
+			return null;
+		} else {
+			return new ProfileInfo(ind.getRdfsLabel(), uri,
+					UrlBuilder.getIndividualProfileUrl(uri, vreq));
+		}
+	}
+
+	public static class ProfileInfo {
+		private final String label;
+		private final String uri;
+		private final String url;
+
+		public ProfileInfo(String label, String uri, String url) {
+			this.label = label;
+			this.uri = uri;
+			this.url = url;
+		}
+
+		public String getLabel() {
+			return label;
+		}
+
+		public String getUri() {
+			return uri;
+		}
+
+		public String getUrl() {
+			return url;
+		}
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelection.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelection.java
index e93a51ddf..65021933a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelection.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelection.java
@@ -1,40 +1,40 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-
-/**
- * A group of accounts (might be empty), with the criteria that were used to
- * select them.
- */
-public class UserAccountsSelection {
-	private final UserAccountsSelectionCriteria criteria;
-	private final List<UserAccount> userAccounts;
-	private final int resultCount;
-
-	public UserAccountsSelection(UserAccountsSelectionCriteria criteria,
-			Collection<UserAccount> userAccounts, int resultCount) {
-		this.criteria = criteria;
-		this.userAccounts = Collections
-				.unmodifiableList(new ArrayList<UserAccount>(userAccounts));
-		this.resultCount = resultCount;
-	}
-
-	public UserAccountsSelectionCriteria getCriteria() {
-		return criteria;
-	}
-
-	public List<UserAccount> getUserAccounts() {
-		return userAccounts;
-	}
-
-	public int getResultCount() {
-		return resultCount;
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+
+/**
+ * A group of accounts (might be empty), with the criteria that were used to
+ * select them.
+ */
+public class UserAccountsSelection {
+	private final UserAccountsSelectionCriteria criteria;
+	private final List<UserAccount> userAccounts;
+	private final int resultCount;
+
+	public UserAccountsSelection(UserAccountsSelectionCriteria criteria,
+			Collection<UserAccount> userAccounts, int resultCount) {
+		this.criteria = criteria;
+		this.userAccounts = Collections
+				.unmodifiableList(new ArrayList<UserAccount>(userAccounts));
+		this.resultCount = resultCount;
+	}
+
+	public UserAccountsSelectionCriteria getCriteria() {
+		return criteria;
+	}
+
+	public List<UserAccount> getUserAccounts() {
+		return userAccounts;
+	}
+
+	public int getResultCount() {
+		return resultCount;
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectionCriteria.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectionCriteria.java
index dc43a35fb..57a3dfce7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectionCriteria.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectionCriteria.java
@@ -1,85 +1,85 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-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.
- */
-public class UserAccountsSelectionCriteria {
-	public static final int DEFAULT_ACCOUNTS_PER_PAGE = 25;
-
-	public static final UserAccountsSelectionCriteria DEFAULT_CRITERIA = new UserAccountsSelectionCriteria(
-			DEFAULT_ACCOUNTS_PER_PAGE, 1,
-			UserAccountsOrdering.DEFAULT_ORDERING, "", "");
-
-	/** How many accounts should we bring back, at most? */
-	private final int accountsPerPage;
-
-	/** What page are we on? (1-origin) */
-	private final int pageIndex;
-
-	/** How are they sorted? */
-	private final UserAccountsOrdering orderBy;
-
-	/** What role are we filtering by, if any? */
-	private final String roleFilterUri;
-
-	/** What term are we searching on, if any? */
-	private final String searchTerm;
-
-	public UserAccountsSelectionCriteria(int accountsPerPage, int pageIndex,
-			UserAccountsOrdering orderBy, String roleFilterUri,
-			String searchTerm) {
-		if (accountsPerPage <= 0) {
-			throw new IllegalArgumentException("accountsPerPage "
-					+ "must be a positive integer, not " + accountsPerPage);
-		}
-		this.accountsPerPage = accountsPerPage;
-
-		if (pageIndex <= 0) {
-			throw new IllegalArgumentException("pageIndex must be a "
-					+ "non-negative integer, not " + pageIndex);
-		}
-		this.pageIndex = pageIndex;
-
-		this.orderBy = nonNull(orderBy, UserAccountsOrdering.DEFAULT_ORDERING);
-
-		this.roleFilterUri = nonNull(roleFilterUri, "");
-		this.searchTerm = nonNull(searchTerm, "");
-	}
-
-	public int getAccountsPerPage() {
-		return accountsPerPage;
-	}
-
-	public int getPageIndex() {
-		return pageIndex;
-	}
-
-	public UserAccountsOrdering getOrderBy() {
-		return orderBy;
-	}
-
-	public String getRoleFilterUri() {
-		return roleFilterUri;
-	}
-
-	public String getSearchTerm() {
-		return searchTerm;
-	}
-
-	private <T> T nonNull(T t, T nullValue) {
-		return (t == null) ? nullValue : t;
-	}
-
-	@Override
-	public String toString() {
-		return "UserAccountsSelectionCriteria[accountsPerPage="
-				+ accountsPerPage + ", pageIndex=" + pageIndex + ", orderBy="
-				+ orderBy + ", roleFilterUri='" + roleFilterUri
-				+ "', searchTerm='" + searchTerm + "']";
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+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.
+ */
+public class UserAccountsSelectionCriteria {
+	public static final int DEFAULT_ACCOUNTS_PER_PAGE = 25;
+
+	public static final UserAccountsSelectionCriteria DEFAULT_CRITERIA = new UserAccountsSelectionCriteria(
+			DEFAULT_ACCOUNTS_PER_PAGE, 1,
+			UserAccountsOrdering.DEFAULT_ORDERING, "", "");
+
+	/** How many accounts should we bring back, at most? */
+	private final int accountsPerPage;
+
+	/** What page are we on? (1-origin) */
+	private final int pageIndex;
+
+	/** How are they sorted? */
+	private final UserAccountsOrdering orderBy;
+
+	/** What role are we filtering by, if any? */
+	private final String roleFilterUri;
+
+	/** What term are we searching on, if any? */
+	private final String searchTerm;
+
+	public UserAccountsSelectionCriteria(int accountsPerPage, int pageIndex,
+			UserAccountsOrdering orderBy, String roleFilterUri,
+			String searchTerm) {
+		if (accountsPerPage <= 0) {
+			throw new IllegalArgumentException("accountsPerPage "
+					+ "must be a positive integer, not " + accountsPerPage);
+		}
+		this.accountsPerPage = accountsPerPage;
+
+		if (pageIndex <= 0) {
+			throw new IllegalArgumentException("pageIndex must be a "
+					+ "non-negative integer, not " + pageIndex);
+		}
+		this.pageIndex = pageIndex;
+
+		this.orderBy = nonNull(orderBy, UserAccountsOrdering.DEFAULT_ORDERING);
+
+		this.roleFilterUri = nonNull(roleFilterUri, "");
+		this.searchTerm = nonNull(searchTerm, "");
+	}
+
+	public int getAccountsPerPage() {
+		return accountsPerPage;
+	}
+
+	public int getPageIndex() {
+		return pageIndex;
+	}
+
+	public UserAccountsOrdering getOrderBy() {
+		return orderBy;
+	}
+
+	public String getRoleFilterUri() {
+		return roleFilterUri;
+	}
+
+	public String getSearchTerm() {
+		return searchTerm;
+	}
+
+	private <T> T nonNull(T t, T nullValue) {
+		return (t == null) ? nullValue : t;
+	}
+
+	@Override
+	public String toString() {
+		return "UserAccountsSelectionCriteria[accountsPerPage="
+				+ accountsPerPage + ", pageIndex=" + pageIndex + ", orderBy="
+				+ orderBy + ", roleFilterUri='" + roleFilterUri
+				+ "', searchTerm='" + searchTerm + "']";
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelector.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelector.java
index 840bc51e0..f1f206c25 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelector.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelector.java
@@ -1,328 +1,328 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Resource;
-
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering.Field;
-import edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner;
-import edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner.QueryParser;
-import edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryUtils;
-
-/**
- * Pull some UserAccounts from the model, based on a set of criteria.
- */
-public class UserAccountsSelector {
-	private static final Log log = LogFactory
-			.getLog(UserAccountsSelector.class);
-
-	private static final String PREFIX_LINES = ""
-			+ "PREFIX rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
-			+ "PREFIX fn: <http://www.w3.org/2005/xpath-functions#> \n"
-			+ "PREFIX auth: <http://vitro.mannlib.cornell.edu/ns/vitro/authorization#> \n";
-
-	private static final String ALL_VARIABLES = "?uri ?email ?firstName "
-			+ "?lastName ?pwd ?expire ?count ?lastLogin ?status ?isRoot";
-
-	private static final String COUNT_VARIABLE = "?uri";
-
-	private static final String MAIN_QUERY_TEMPLATE = "" //
-			+ "%prefixes% \n" //
-			+ "SELECT DISTINCT %variables% \n" //
-			+ "WHERE {\n" //
-			+ "    %requiredClauses% \n" //
-			+ "    %optionalClauses% \n" //
-			+ "    %filterClauses% \n" //
-			+ "} \n" //
-			+ "ORDER BY %ordering% \n" //
-			+ "LIMIT %limit% \n" //
-			+ "OFFSET %offset% \n";
-
-	private static final String COUNT_QUERY_TEMPLATE = "" //
-			+ "%prefixes% \n" //
-			+ "SELECT count(DISTINCT %countVariable%) \n" //
-			+ "WHERE {\n" //
-			+ "    %requiredClauses% \n" //
-			+ "    %optionalClauses% \n" //
-			+ "    %filterClauses% \n" //
-			+ "} \n";
-
-	private static final String PERMISSIONS_QUERY_TEMPLATE = "" //
-			+ "%prefixes% \n" //
-			+ "SELECT ?ps \n" //
-			+ "WHERE {\n" //
-			+ "    <%uri%> auth:hasPermissionSet ?ps \n" //
-			+ "} \n";
-
-	/**
-	 * Convenience method.
-	 */
-	public static UserAccountsSelection select(OntModel userAccountsModel,
-			UserAccountsSelectionCriteria criteria) {
-		return new UserAccountsSelector(userAccountsModel, criteria).select();
-	}
-
-	private final OntModel model;
-	private final UserAccountsSelectionCriteria criteria;
-
-	public UserAccountsSelector(OntModel userAccountsModel,
-			UserAccountsSelectionCriteria criteria) {
-		if (userAccountsModel == null) {
-			throw new NullPointerException("userAccountsModel may not be null.");
-		}
-		this.model = userAccountsModel;
-
-		if (criteria == null) {
-			throw new NullPointerException("criteria may not be null.");
-		}
-		this.criteria = criteria;
-	}
-
-	public UserAccountsSelection select() {
-		List<UserAccount> accounts = queryForAccounts();
-		int resultCount = queryForCount();
-		queryToPopulatePermissionSets(accounts);
-		return new UserAccountsSelection(criteria, accounts, resultCount);
-	}
-
-	private List<UserAccount> queryForAccounts() {
-		String qString = MAIN_QUERY_TEMPLATE
-				.replace("%prefixes%", PREFIX_LINES)
-				.replace("%variables%", ALL_VARIABLES)
-				.replace("%requiredClauses%", requiredClauses())
-				.replace("%optionalClauses%", optionalClauses())
-				.replace("%filterClauses%", filterClauses())
-				.replace("%ordering%", ordering()).replace("%limit%", limit())
-				.replace("%offset%", offset());
-		log.debug("main query: " + qString);
-
-		List<UserAccount> accounts = new SparqlQueryRunner(model)
-				.executeSelect(new MainQueryParser(), qString);
-		log.debug("query returns: " + accounts);
-		return accounts;
-	}
-
-	private int queryForCount() {
-		String qString = COUNT_QUERY_TEMPLATE
-				.replace("%prefixes%", PREFIX_LINES)
-				.replace("%countVariable%", COUNT_VARIABLE)
-				.replace("%requiredClauses%", requiredClauses())
-				.replace("%optionalClauses%", optionalClauses())
-				.replace("%filterClauses%", filterClauses());
-		log.debug("count query: " + qString);
-
-		int count = new SparqlQueryRunner(model).executeSelect(
-				new CountQueryParser(), qString);
-		log.debug("result count: " + count);
-		return count;
-	}
-
-	private void queryToPopulatePermissionSets(List<UserAccount> accounts) {
-		for (UserAccount account : accounts) {
-			String uri = account.getUri();
-			String qString = PERMISSIONS_QUERY_TEMPLATE.replace("%prefixes%",
-					PREFIX_LINES).replace("%uri%", uri);
-			log.debug("permissions query: " + qString);
-
-			Set<String> permissions = new SparqlQueryRunner(model)
-					.executeSelect(new PermissionsQueryParser(), qString);
-			log.debug("permissions for '" + uri + "': " + permissions);
-			account.setPermissionSetUris(permissions);
-		}
-	}
-
-	/** If the result doesn't have URI and Email Address, we don't want it. */
-	private String requiredClauses() {
-		return "?uri a auth:UserAccount ; \n"
-				+ "         auth:emailAddress ?email .";
-	}
-
-	/** If any of these fields are missing, show the result anyway. */
-	private String optionalClauses() {
-		return "OPTIONAL { ?uri auth:firstName ?firstName } \n"
-				+ "    OPTIONAL { ?uri auth:lastName ?lastName } \n"
-				+ "    OPTIONAL { ?uri auth:md5password ?pwd } \n"
-				+ "    OPTIONAL { ?uri auth:passwordChangeExpires ?expire } \n"
-				+ "    OPTIONAL { ?uri auth:loginCount ?count } \n"
-				+ "    OPTIONAL { ?uri auth:lastLoginTime ?lastLogin } \n"
-				+ "    OPTIONAL { ?uri auth:status ?status } \n"
-				+ "    OPTIONAL { ?uri ?isRoot auth:RootUserAccount }";
-	}
-
-	private String filterClauses() {
-		String filters = "";
-
-		String roleFilterUri = criteria.getRoleFilterUri();
-		String searchTerm = criteria.getSearchTerm();
-
-		if (!roleFilterUri.isEmpty()) {
-			String clean = SparqlQueryUtils.escapeForRegex(roleFilterUri);
-			filters += "OPTIONAL { ?uri auth:hasPermissionSet ?role } \n"
-					+ "    FILTER (REGEX(str(?role), '^" + clean + "$'))";
-		}
-
-		if ((!roleFilterUri.isEmpty()) && (!searchTerm.isEmpty())) {
-			filters += " \n    ";
-		}
-
-		if (!searchTerm.isEmpty()) {
-			String clean = SparqlQueryUtils.escapeForRegex(searchTerm);
-			filters += "FILTER ("
-					+ ("REGEX(?email, '" + clean + "', 'i')")
-					+ " || "
-					+ ("REGEX(fn:concat(?firstName, ' ', ?lastName), '" + clean + "', 'i')")
-					+ ")";
-		}
-
-		return filters;
-	}
-
-	/** Sort as desired, and within ties, sort by EMail address. */
-	private String ordering() {
-		UserAccountsOrdering orderBy = criteria.getOrderBy();
-		String keyword = orderBy.getDirection().keyword;
-		String variable = orderBy.getField().name;
-		if (orderBy.getField() == Field.EMAIL) {
-			return keyword + "(?" + variable + ")";
-		} else {
-			return keyword + "(?" + variable + ") ?" + Field.EMAIL.name;
-		}
-	}
-
-	private String limit() {
-		return String.valueOf(criteria.getAccountsPerPage());
-	}
-
-	private String offset() {
-		int offset = criteria.getAccountsPerPage()
-				* (criteria.getPageIndex() - 1);
-		return String.valueOf(offset);
-	}
-
-	private static class MainQueryParser extends QueryParser<List<UserAccount>> {
-		@Override
-		protected List<UserAccount> defaultValue() {
-			return Collections.emptyList();
-		}
-
-		@Override
-		protected List<UserAccount> parseResults(String queryStr,
-				ResultSet results) {
-			List<UserAccount> accounts = new ArrayList<UserAccount>();
-			while (results.hasNext()) {
-				try {
-					QuerySolution solution = results.next();
-					UserAccount user = parseSolution(solution);
-					accounts.add(user);
-				} catch (Exception e) {
-					log.warn("Failed to parse the query result: " + queryStr, e);
-				}
-			}
-			return accounts;
-		}
-
-		private UserAccount parseSolution(QuerySolution solution) {
-			UserAccount user = new UserAccount();
-			user.setUri(getUriFromSolution(solution));
-			user.setEmailAddress(solution.getLiteral("email").getString());
-			user.setFirstName(ifLiteralPresent(solution, "firstName", ""));
-			user.setLastName(ifLiteralPresent(solution, "lastName", ""));
-			user.setMd5Password(ifLiteralPresent(solution, "pwd", ""));
-			user.setPasswordLinkExpires(ifLongPresent(solution, "expire", 0L));
-			user.setLoginCount(ifIntPresent(solution, "count", 0));
-			user.setLastLoginTime(ifLongPresent(solution, "lastLogin", 0));
-			user.setStatus(parseStatus(solution, "status", null));
-			user.setRootUser(solution.contains("isRoot"));
-			return user;
-		}
-
-		private Status parseStatus(QuerySolution solution, String variableName,
-				Status defaultValue) {
-			Literal literal = solution.getLiteral(variableName);
-			if (literal == null) {
-				return defaultValue;
-			} else {
-				String string = literal.getString();
-				try {
-					return Status.valueOf(string);
-				} catch (Exception e) {
-					String uri = getUriFromSolution(solution);
-					log.warn("Failed to parse the status value for '" + uri
-							+ "': '" + string + "'");
-					return defaultValue;
-				}
-			}
-		}
-
-		private String getUriFromSolution(QuerySolution solution) {
-			return solution.getResource("uri").getURI();
-		}
-	}
-
-	private static class CountQueryParser extends QueryParser<Integer> {
-		@Override
-		protected Integer defaultValue() {
-			return 0;
-		}
-
-		@Override
-		protected Integer parseResults(String queryStr, ResultSet results) {
-			int count = 0;
-
-			if (!results.hasNext()) {
-				log.warn("count query returned no results.");
-			}
-			try {
-				QuerySolution solution = results.next();
-				count = ifIntPresent(solution, ".1", 0);
-			} catch (Exception e) {
-				log.warn("Failed to parse the query result" + queryStr, e);
-			}
-
-			return count;
-		}
-	}
-
-	private static class PermissionsQueryParser extends
-			QueryParser<Set<String>> {
-		@Override
-		protected Set<String> defaultValue() {
-			return Collections.emptySet();
-		}
-
-		@Override
-		protected Set<String> parseResults(String queryStr, ResultSet results) {
-			Set<String> permissions = new HashSet<String>();
-
-			while (results.hasNext()) {
-				try {
-					QuerySolution solution = results.next();
-					Resource r = solution.getResource("ps");
-					if (r != null) {
-						permissions.add(r.getURI());
-					}
-				} catch (Exception e) {
-					log.warn("Failed to parse the query result: " + queryStr, e);
-				}
-			}
-
-			return permissions;
-		}
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Resource;
+
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering.Field;
+import edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner;
+import edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryRunner.QueryParser;
+import edu.cornell.mannlib.vitro.webapp.utils.SparqlQueryUtils;
+
+/**
+ * Pull some UserAccounts from the model, based on a set of criteria.
+ */
+public class UserAccountsSelector {
+	private static final Log log = LogFactory
+			.getLog(UserAccountsSelector.class);
+
+	private static final String PREFIX_LINES = ""
+			+ "PREFIX rdf:  <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
+			+ "PREFIX fn: <http://www.w3.org/2005/xpath-functions#> \n"
+			+ "PREFIX auth: <http://vitro.mannlib.cornell.edu/ns/vitro/authorization#> \n";
+
+	private static final String ALL_VARIABLES = "?uri ?email ?firstName "
+			+ "?lastName ?pwd ?expire ?count ?lastLogin ?status ?isRoot";
+
+	private static final String COUNT_VARIABLE = "?uri";
+
+	private static final String MAIN_QUERY_TEMPLATE = "" //
+			+ "%prefixes% \n" //
+			+ "SELECT DISTINCT %variables% \n" //
+			+ "WHERE {\n" //
+			+ "    %requiredClauses% \n" //
+			+ "    %optionalClauses% \n" //
+			+ "    %filterClauses% \n" //
+			+ "} \n" //
+			+ "ORDER BY %ordering% \n" //
+			+ "LIMIT %limit% \n" //
+			+ "OFFSET %offset% \n";
+
+	private static final String COUNT_QUERY_TEMPLATE = "" //
+			+ "%prefixes% \n" //
+			+ "SELECT count(DISTINCT %countVariable%) \n" //
+			+ "WHERE {\n" //
+			+ "    %requiredClauses% \n" //
+			+ "    %optionalClauses% \n" //
+			+ "    %filterClauses% \n" //
+			+ "} \n";
+
+	private static final String PERMISSIONS_QUERY_TEMPLATE = "" //
+			+ "%prefixes% \n" //
+			+ "SELECT ?ps \n" //
+			+ "WHERE {\n" //
+			+ "    <%uri%> auth:hasPermissionSet ?ps \n" //
+			+ "} \n";
+
+	/**
+	 * Convenience method.
+	 */
+	public static UserAccountsSelection select(OntModel userAccountsModel,
+			UserAccountsSelectionCriteria criteria) {
+		return new UserAccountsSelector(userAccountsModel, criteria).select();
+	}
+
+	private final OntModel model;
+	private final UserAccountsSelectionCriteria criteria;
+
+	public UserAccountsSelector(OntModel userAccountsModel,
+			UserAccountsSelectionCriteria criteria) {
+		if (userAccountsModel == null) {
+			throw new NullPointerException("userAccountsModel may not be null.");
+		}
+		this.model = userAccountsModel;
+
+		if (criteria == null) {
+			throw new NullPointerException("criteria may not be null.");
+		}
+		this.criteria = criteria;
+	}
+
+	public UserAccountsSelection select() {
+		List<UserAccount> accounts = queryForAccounts();
+		int resultCount = queryForCount();
+		queryToPopulatePermissionSets(accounts);
+		return new UserAccountsSelection(criteria, accounts, resultCount);
+	}
+
+	private List<UserAccount> queryForAccounts() {
+		String qString = MAIN_QUERY_TEMPLATE
+				.replace("%prefixes%", PREFIX_LINES)
+				.replace("%variables%", ALL_VARIABLES)
+				.replace("%requiredClauses%", requiredClauses())
+				.replace("%optionalClauses%", optionalClauses())
+				.replace("%filterClauses%", filterClauses())
+				.replace("%ordering%", ordering()).replace("%limit%", limit())
+				.replace("%offset%", offset());
+		log.debug("main query: " + qString);
+
+		List<UserAccount> accounts = new SparqlQueryRunner(model)
+				.executeSelect(new MainQueryParser(), qString);
+		log.debug("query returns: " + accounts);
+		return accounts;
+	}
+
+	private int queryForCount() {
+		String qString = COUNT_QUERY_TEMPLATE
+				.replace("%prefixes%", PREFIX_LINES)
+				.replace("%countVariable%", COUNT_VARIABLE)
+				.replace("%requiredClauses%", requiredClauses())
+				.replace("%optionalClauses%", optionalClauses())
+				.replace("%filterClauses%", filterClauses());
+		log.debug("count query: " + qString);
+
+		int count = new SparqlQueryRunner(model).executeSelect(
+				new CountQueryParser(), qString);
+		log.debug("result count: " + count);
+		return count;
+	}
+
+	private void queryToPopulatePermissionSets(List<UserAccount> accounts) {
+		for (UserAccount account : accounts) {
+			String uri = account.getUri();
+			String qString = PERMISSIONS_QUERY_TEMPLATE.replace("%prefixes%",
+					PREFIX_LINES).replace("%uri%", uri);
+			log.debug("permissions query: " + qString);
+
+			Set<String> permissions = new SparqlQueryRunner(model)
+					.executeSelect(new PermissionsQueryParser(), qString);
+			log.debug("permissions for '" + uri + "': " + permissions);
+			account.setPermissionSetUris(permissions);
+		}
+	}
+
+	/** If the result doesn't have URI and Email Address, we don't want it. */
+	private String requiredClauses() {
+		return "?uri a auth:UserAccount ; \n"
+				+ "         auth:emailAddress ?email .";
+	}
+
+	/** If any of these fields are missing, show the result anyway. */
+	private String optionalClauses() {
+		return "OPTIONAL { ?uri auth:firstName ?firstName } \n"
+				+ "    OPTIONAL { ?uri auth:lastName ?lastName } \n"
+				+ "    OPTIONAL { ?uri auth:md5password ?pwd } \n"
+				+ "    OPTIONAL { ?uri auth:passwordChangeExpires ?expire } \n"
+				+ "    OPTIONAL { ?uri auth:loginCount ?count } \n"
+				+ "    OPTIONAL { ?uri auth:lastLoginTime ?lastLogin } \n"
+				+ "    OPTIONAL { ?uri auth:status ?status } \n"
+				+ "    OPTIONAL { ?uri ?isRoot auth:RootUserAccount }";
+	}
+
+	private String filterClauses() {
+		String filters = "";
+
+		String roleFilterUri = criteria.getRoleFilterUri();
+		String searchTerm = criteria.getSearchTerm();
+
+		if (!roleFilterUri.isEmpty()) {
+			String clean = SparqlQueryUtils.escapeForRegex(roleFilterUri);
+			filters += "OPTIONAL { ?uri auth:hasPermissionSet ?role } \n"
+					+ "    FILTER (REGEX(str(?role), '^" + clean + "$'))";
+		}
+
+		if ((!roleFilterUri.isEmpty()) && (!searchTerm.isEmpty())) {
+			filters += " \n    ";
+		}
+
+		if (!searchTerm.isEmpty()) {
+			String clean = SparqlQueryUtils.escapeForRegex(searchTerm);
+			filters += "FILTER ("
+					+ ("REGEX(?email, '" + clean + "', 'i')")
+					+ " || "
+					+ ("REGEX(fn:concat(?firstName, ' ', ?lastName), '" + clean + "', 'i')")
+					+ ")";
+		}
+
+		return filters;
+	}
+
+	/** Sort as desired, and within ties, sort by EMail address. */
+	private String ordering() {
+		UserAccountsOrdering orderBy = criteria.getOrderBy();
+		String keyword = orderBy.getDirection().keyword;
+		String variable = orderBy.getField().name;
+		if (orderBy.getField() == Field.EMAIL) {
+			return keyword + "(?" + variable + ")";
+		} else {
+			return keyword + "(?" + variable + ") ?" + Field.EMAIL.name;
+		}
+	}
+
+	private String limit() {
+		return String.valueOf(criteria.getAccountsPerPage());
+	}
+
+	private String offset() {
+		int offset = criteria.getAccountsPerPage()
+				* (criteria.getPageIndex() - 1);
+		return String.valueOf(offset);
+	}
+
+	private static class MainQueryParser extends QueryParser<List<UserAccount>> {
+		@Override
+		protected List<UserAccount> defaultValue() {
+			return Collections.emptyList();
+		}
+
+		@Override
+		protected List<UserAccount> parseResults(String queryStr,
+				ResultSet results) {
+			List<UserAccount> accounts = new ArrayList<UserAccount>();
+			while (results.hasNext()) {
+				try {
+					QuerySolution solution = results.next();
+					UserAccount user = parseSolution(solution);
+					accounts.add(user);
+				} catch (Exception e) {
+					log.warn("Failed to parse the query result: " + queryStr, e);
+				}
+			}
+			return accounts;
+		}
+
+		private UserAccount parseSolution(QuerySolution solution) {
+			UserAccount user = new UserAccount();
+			user.setUri(getUriFromSolution(solution));
+			user.setEmailAddress(solution.getLiteral("email").getString());
+			user.setFirstName(ifLiteralPresent(solution, "firstName", ""));
+			user.setLastName(ifLiteralPresent(solution, "lastName", ""));
+			user.setMd5Password(ifLiteralPresent(solution, "pwd", ""));
+			user.setPasswordLinkExpires(ifLongPresent(solution, "expire", 0L));
+			user.setLoginCount(ifIntPresent(solution, "count", 0));
+			user.setLastLoginTime(ifLongPresent(solution, "lastLogin", 0));
+			user.setStatus(parseStatus(solution, "status", null));
+			user.setRootUser(solution.contains("isRoot"));
+			return user;
+		}
+
+		private Status parseStatus(QuerySolution solution, String variableName,
+				Status defaultValue) {
+			Literal literal = solution.getLiteral(variableName);
+			if (literal == null) {
+				return defaultValue;
+			} else {
+				String string = literal.getString();
+				try {
+					return Status.valueOf(string);
+				} catch (Exception e) {
+					String uri = getUriFromSolution(solution);
+					log.warn("Failed to parse the status value for '" + uri
+							+ "': '" + string + "'");
+					return defaultValue;
+				}
+			}
+		}
+
+		private String getUriFromSolution(QuerySolution solution) {
+			return solution.getResource("uri").getURI();
+		}
+	}
+
+	private static class CountQueryParser extends QueryParser<Integer> {
+		@Override
+		protected Integer defaultValue() {
+			return 0;
+		}
+
+		@Override
+		protected Integer parseResults(String queryStr, ResultSet results) {
+			int count = 0;
+
+			if (!results.hasNext()) {
+				log.warn("count query returned no results.");
+			}
+			try {
+				QuerySolution solution = results.next();
+				count = ifIntPresent(solution, ".1", 0);
+			} catch (Exception e) {
+				log.warn("Failed to parse the query result" + queryStr, e);
+			}
+
+			return count;
+		}
+	}
+
+	private static class PermissionsQueryParser extends
+			QueryParser<Set<String>> {
+		@Override
+		protected Set<String> defaultValue() {
+			return Collections.emptySet();
+		}
+
+		@Override
+		protected Set<String> parseResults(String queryStr, ResultSet results) {
+			Set<String> permissions = new HashSet<String>();
+
+			while (results.hasNext()) {
+				try {
+					QuerySolution solution = results.next();
+					Resource r = solution.getResource("ps");
+					if (r != null) {
+						permissions.add(r.getURI());
+					}
+				} catch (Exception e) {
+					log.warn("Failed to parse the query result: " + queryStr, e);
+				}
+			}
+
+			return permissions;
+		}
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPage.java
index 2f0dcb3ae..1970a024a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPage.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPage.java
@@ -1,259 +1,259 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
-import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
-
-/**
- * Handle the "Add new account" form display and submission.
- */
-public class UserAccountsAddPage extends UserAccountsPage {
-	private static final Log log = LogFactory.getLog(UserAccountsAddPage.class);
-
-	private static final String PARAMETER_SUBMIT = "submitAdd";
-	private static final String PARAMETER_EMAIL_ADDRESS = "emailAddress";
-	private static final String PARAMETER_EXTERNAL_AUTH_ID = "externalAuthId";
-	private static final String PARAMETER_EXTERNAL_AUTH_ONLY = "externalAuthOnly";
-	private static final String PARAMETER_FIRST_NAME = "firstName";
-	private static final String PARAMETER_LAST_NAME = "lastName";
-	private static final String PARAMETER_ROLE = "role";
-	private static final String PARAMETER_ASSOCIATED_PROFILE_URI = "associatedProfileUri";
-	private static final String PARAMETER_NEW_PROFILE_CLASS_URI = "newProfileClassUri";
-
-	private static final String ERROR_NO_EMAIL = "errorEmailIsEmpty";
-	private static final String ERROR_EMAIL_IN_USE = "errorEmailInUse";
-	private static final String ERROR_EMAIL_INVALID_FORMAT = "errorEmailInvalidFormat";
-	private static final String ERROR_EXTERNAL_AUTH_ID_IN_USE = "errorExternalAuthIdInUse";
-	private static final String ERROR_NO_FIRST_NAME = "errorFirstNameIsEmpty";
-	private static final String ERROR_NO_LAST_NAME = "errorLastNameIsEmpty";
-	private static final String ERROR_NO_ROLE = "errorNoRoleSelected";
-
-	private static final String TEMPLATE_NAME = "userAccounts-add.ftl";
-
-	private final UserAccountsAddPageStrategy strategy;
-	private final boolean matchingIsEnabled;
-
-	/* The request parameters */
-	private boolean submit;
-	private String emailAddress = "";
-	private String externalAuthId = "";
-	private boolean externalAuthOnly;
-	private String firstName = "";
-	private String lastName = "";
-	private Collection<String> selectedRoleUris = Collections.emptyList();
-	private String associatedProfileUri = "";
-	private String newProfileClassUri = "";
-
-	/** The result of validating a "submit" request. */
-	private String errorCode = "";
-
-	/** The new user account, if one was created. */
-	private UserAccount addedAccount;
-
-	public UserAccountsAddPage(VitroRequest vreq) {
-		super(vreq);
-
-		this.strategy = UserAccountsAddPageStrategy.getInstance(vreq, this,
-				isEmailEnabled());
-
-		this.matchingIsEnabled = SelfEditingConfiguration.getBean(vreq)
-				.isConfigured();
-
-		parseRequestParameters();
-
-		if (submit) {
-			validateParameters();
-		}
-	}
-
-	private void parseRequestParameters() {
-		submit = isFlagOnRequest(PARAMETER_SUBMIT);
-		emailAddress = getStringParameter(PARAMETER_EMAIL_ADDRESS, "");
-		externalAuthId = getStringParameter(PARAMETER_EXTERNAL_AUTH_ID, "");
-		externalAuthOnly = isFlagOnRequest(PARAMETER_EXTERNAL_AUTH_ONLY);
-		firstName = getStringParameter(PARAMETER_FIRST_NAME, "");
-		lastName = getStringParameter(PARAMETER_LAST_NAME, "");
-		selectedRoleUris = getStringParameters(PARAMETER_ROLE);
-		associatedProfileUri = getStringParameter(
-				PARAMETER_ASSOCIATED_PROFILE_URI, "");
-		newProfileClassUri = getStringParameter(
-				PARAMETER_NEW_PROFILE_CLASS_URI, "");
-
-		strategy.parseAdditionalParameters();
-	}
-
-	public boolean isSubmit() {
-		return submit;
-	}
-
-	private void validateParameters() {
-		if (emailAddress.isEmpty()) {
-			errorCode = ERROR_NO_EMAIL;
-		} else if (isEmailInUse()) {
-			errorCode = ERROR_EMAIL_IN_USE;
-		} else if (!isEmailValidFormat()) {
-			errorCode = ERROR_EMAIL_INVALID_FORMAT;
-		} else if (isExternalAuthIdInUse()) {
-			errorCode = ERROR_EXTERNAL_AUTH_ID_IN_USE;
-		} else if (firstName.isEmpty()) {
-			errorCode = ERROR_NO_FIRST_NAME;
-		} else if (lastName.isEmpty()) {
-			errorCode = ERROR_NO_LAST_NAME;
-		} else if (selectedRoleUris.isEmpty()) {
-			errorCode = ERROR_NO_ROLE;
-		} else {
-			errorCode = strategy.additionalValidations();
-		}
-	}
-
-	private boolean isEmailInUse() {
-		return userAccountsDao.getUserAccountByEmail(emailAddress) != null;
-	}
-
-	private boolean isExternalAuthIdInUse() {
-		if (externalAuthId.isEmpty()) {
-			return false;
-		}
-		return userAccountsDao.getUserAccountByExternalAuthId(externalAuthId) != null;
-	}
-
-	private boolean isEmailValidFormat() {
-		return Authenticator.isValidEmailAddress(emailAddress);
-	}
-
-	public boolean isValid() {
-		return errorCode.isEmpty();
-	}
-
-	public void createNewAccount() {
-		// Assemble the fields into a new UserAccount
-		UserAccount u = new UserAccount();
-		u.setEmailAddress(emailAddress);
-		u.setFirstName(firstName);
-		u.setLastName(lastName);
-		u.setExternalAuthId(externalAuthId);
-		u.setExternalAuthOnly(externalAuthOnly);
-		u.setMd5Password("");
-		u.setOldPassword("");
-		u.setPasswordChangeRequired(false);
-		u.setPasswordLinkExpires(0);
-		u.setLoginCount(0);
-		u.setLastLoginTime(0L);
-		u.setStatus(Status.INACTIVE);
-		u.setPermissionSetUris(selectedRoleUris);
-
-		strategy.setAdditionalProperties(u);
-
-		// Create the account.
-		String uri = userAccountsDao.insertUserAccount(u);
-		this.addedAccount = userAccountsDao.getUserAccountByUri(uri);
-
-		// Associate the profile, as appropriate.
-		if (matchingIsEnabled) {
-			if (!newProfileClassUri.isEmpty()) {
-				try {
-					String newProfileUri = UserAccountsProfileCreator
-							.createProfile(indDao, dpsDao, newProfileClassUri,
-									this.addedAccount);
-					associatedProfileUri = newProfileUri;
-				} catch (InsertException e) {
-					log.error("Failed to create new profile of class '"
-							+ newProfileClassUri + "' for user '"
-							+ this.addedAccount.getEmailAddress() + "'");
-				}
-			}
-
-			SelfEditingConfiguration.getBean(vreq)
-					.associateIndividualWithUserAccount(indDao, dpsDao,
-							this.addedAccount, associatedProfileUri);
-		}
-
-		strategy.notifyUser();
-	}
-
-	public final ResponseValues showPage() {
-		Map<String, Object> body = new HashMap<String, Object>();
-
-		if (isSubmit()) {
-			body.put(PARAMETER_EMAIL_ADDRESS, emailAddress);
-			body.put(PARAMETER_EXTERNAL_AUTH_ID, externalAuthId);
-			body.put(PARAMETER_FIRST_NAME, firstName);
-			body.put(PARAMETER_LAST_NAME, lastName);
-			body.put("selectedRoles", selectedRoleUris);
-		} else {
-			body.put(PARAMETER_EMAIL_ADDRESS, "");
-			body.put(PARAMETER_EXTERNAL_AUTH_ID, "");
-			body.put(PARAMETER_FIRST_NAME, "");
-			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));
-		}
-
-		if (!errorCode.isEmpty()) {
-			body.put(errorCode, Boolean.TRUE);
-		}
-
-		if (matchingIsEnabled) {
-			body.put("showAssociation", Boolean.TRUE);
-		}
-
-		strategy.addMoreBodyValues(body);
-
-		return new TemplateResponseValues(TEMPLATE_NAME, body);
-	}
-
-	private Collection<String> getDefaultRolesForNewUsers() {
-		List<String> list = new ArrayList<String>();
-		for (PermissionSet ps : userAccountsDao.getAllPermissionSets()) {
-			if (ps.isForNewUsers()) {
-				list.add(ps.getUri());
-			}
-		}
-		return list;
-	}
-
-	public UserAccount getAddedAccount() {
-		return addedAccount;
-	}
-
-	public boolean wasPasswordEmailSent() {
-		return this.strategy.wasPasswordEmailSent();
-	}
-
-	boolean isExternalAuthOnly() {
-		return externalAuthOnly;
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
+import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
+
+/**
+ * Handle the "Add new account" form display and submission.
+ */
+public class UserAccountsAddPage extends UserAccountsPage {
+	private static final Log log = LogFactory.getLog(UserAccountsAddPage.class);
+
+	private static final String PARAMETER_SUBMIT = "submitAdd";
+	private static final String PARAMETER_EMAIL_ADDRESS = "emailAddress";
+	private static final String PARAMETER_EXTERNAL_AUTH_ID = "externalAuthId";
+	private static final String PARAMETER_EXTERNAL_AUTH_ONLY = "externalAuthOnly";
+	private static final String PARAMETER_FIRST_NAME = "firstName";
+	private static final String PARAMETER_LAST_NAME = "lastName";
+	private static final String PARAMETER_ROLE = "role";
+	private static final String PARAMETER_ASSOCIATED_PROFILE_URI = "associatedProfileUri";
+	private static final String PARAMETER_NEW_PROFILE_CLASS_URI = "newProfileClassUri";
+
+	private static final String ERROR_NO_EMAIL = "errorEmailIsEmpty";
+	private static final String ERROR_EMAIL_IN_USE = "errorEmailInUse";
+	private static final String ERROR_EMAIL_INVALID_FORMAT = "errorEmailInvalidFormat";
+	private static final String ERROR_EXTERNAL_AUTH_ID_IN_USE = "errorExternalAuthIdInUse";
+	private static final String ERROR_NO_FIRST_NAME = "errorFirstNameIsEmpty";
+	private static final String ERROR_NO_LAST_NAME = "errorLastNameIsEmpty";
+	private static final String ERROR_NO_ROLE = "errorNoRoleSelected";
+
+	private static final String TEMPLATE_NAME = "userAccounts-add.ftl";
+
+	private final UserAccountsAddPageStrategy strategy;
+	private final boolean matchingIsEnabled;
+
+	/* The request parameters */
+	private boolean submit;
+	private String emailAddress = "";
+	private String externalAuthId = "";
+	private boolean externalAuthOnly;
+	private String firstName = "";
+	private String lastName = "";
+	private Collection<String> selectedRoleUris = Collections.emptyList();
+	private String associatedProfileUri = "";
+	private String newProfileClassUri = "";
+
+	/** The result of validating a "submit" request. */
+	private String errorCode = "";
+
+	/** The new user account, if one was created. */
+	private UserAccount addedAccount;
+
+	public UserAccountsAddPage(VitroRequest vreq) {
+		super(vreq);
+
+		this.strategy = UserAccountsAddPageStrategy.getInstance(vreq, this,
+				isEmailEnabled());
+
+		this.matchingIsEnabled = SelfEditingConfiguration.getBean(vreq)
+				.isConfigured();
+
+		parseRequestParameters();
+
+		if (submit) {
+			validateParameters();
+		}
+	}
+
+	private void parseRequestParameters() {
+		submit = isFlagOnRequest(PARAMETER_SUBMIT);
+		emailAddress = getStringParameter(PARAMETER_EMAIL_ADDRESS, "");
+		externalAuthId = getStringParameter(PARAMETER_EXTERNAL_AUTH_ID, "");
+		externalAuthOnly = isFlagOnRequest(PARAMETER_EXTERNAL_AUTH_ONLY);
+		firstName = getStringParameter(PARAMETER_FIRST_NAME, "");
+		lastName = getStringParameter(PARAMETER_LAST_NAME, "");
+		selectedRoleUris = getStringParameters(PARAMETER_ROLE);
+		associatedProfileUri = getStringParameter(
+				PARAMETER_ASSOCIATED_PROFILE_URI, "");
+		newProfileClassUri = getStringParameter(
+				PARAMETER_NEW_PROFILE_CLASS_URI, "");
+
+		strategy.parseAdditionalParameters();
+	}
+
+	public boolean isSubmit() {
+		return submit;
+	}
+
+	private void validateParameters() {
+		if (emailAddress.isEmpty()) {
+			errorCode = ERROR_NO_EMAIL;
+		} else if (isEmailInUse()) {
+			errorCode = ERROR_EMAIL_IN_USE;
+		} else if (!isEmailValidFormat()) {
+			errorCode = ERROR_EMAIL_INVALID_FORMAT;
+		} else if (isExternalAuthIdInUse()) {
+			errorCode = ERROR_EXTERNAL_AUTH_ID_IN_USE;
+		} else if (firstName.isEmpty()) {
+			errorCode = ERROR_NO_FIRST_NAME;
+		} else if (lastName.isEmpty()) {
+			errorCode = ERROR_NO_LAST_NAME;
+		} else if (selectedRoleUris.isEmpty()) {
+			errorCode = ERROR_NO_ROLE;
+		} else {
+			errorCode = strategy.additionalValidations();
+		}
+	}
+
+	private boolean isEmailInUse() {
+		return userAccountsDao.getUserAccountByEmail(emailAddress) != null;
+	}
+
+	private boolean isExternalAuthIdInUse() {
+		if (externalAuthId.isEmpty()) {
+			return false;
+		}
+		return userAccountsDao.getUserAccountByExternalAuthId(externalAuthId) != null;
+	}
+
+	private boolean isEmailValidFormat() {
+		return Authenticator.isValidEmailAddress(emailAddress);
+	}
+
+	public boolean isValid() {
+		return errorCode.isEmpty();
+	}
+
+	public void createNewAccount() {
+		// Assemble the fields into a new UserAccount
+		UserAccount u = new UserAccount();
+		u.setEmailAddress(emailAddress);
+		u.setFirstName(firstName);
+		u.setLastName(lastName);
+		u.setExternalAuthId(externalAuthId);
+		u.setExternalAuthOnly(externalAuthOnly);
+		u.setMd5Password("");
+		u.setOldPassword("");
+		u.setPasswordChangeRequired(false);
+		u.setPasswordLinkExpires(0);
+		u.setLoginCount(0);
+		u.setLastLoginTime(0L);
+		u.setStatus(Status.INACTIVE);
+		u.setPermissionSetUris(selectedRoleUris);
+
+		strategy.setAdditionalProperties(u);
+
+		// Create the account.
+		String uri = userAccountsDao.insertUserAccount(u);
+		this.addedAccount = userAccountsDao.getUserAccountByUri(uri);
+
+		// Associate the profile, as appropriate.
+		if (matchingIsEnabled) {
+			if (!newProfileClassUri.isEmpty()) {
+				try {
+					String newProfileUri = UserAccountsProfileCreator
+							.createProfile(indDao, dpsDao, newProfileClassUri,
+									this.addedAccount);
+					associatedProfileUri = newProfileUri;
+				} catch (InsertException e) {
+					log.error("Failed to create new profile of class '"
+							+ newProfileClassUri + "' for user '"
+							+ this.addedAccount.getEmailAddress() + "'");
+				}
+			}
+
+			SelfEditingConfiguration.getBean(vreq)
+					.associateIndividualWithUserAccount(indDao, dpsDao,
+							this.addedAccount, associatedProfileUri);
+		}
+
+		strategy.notifyUser();
+	}
+
+	public final ResponseValues showPage() {
+		Map<String, Object> body = new HashMap<String, Object>();
+
+		if (isSubmit()) {
+			body.put(PARAMETER_EMAIL_ADDRESS, emailAddress);
+			body.put(PARAMETER_EXTERNAL_AUTH_ID, externalAuthId);
+			body.put(PARAMETER_FIRST_NAME, firstName);
+			body.put(PARAMETER_LAST_NAME, lastName);
+			body.put("selectedRoles", selectedRoleUris);
+		} else {
+			body.put(PARAMETER_EMAIL_ADDRESS, "");
+			body.put(PARAMETER_EXTERNAL_AUTH_ID, "");
+			body.put(PARAMETER_FIRST_NAME, "");
+			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));
+		}
+
+		if (!errorCode.isEmpty()) {
+			body.put(errorCode, Boolean.TRUE);
+		}
+
+		if (matchingIsEnabled) {
+			body.put("showAssociation", Boolean.TRUE);
+		}
+
+		strategy.addMoreBodyValues(body);
+
+		return new TemplateResponseValues(TEMPLATE_NAME, body);
+	}
+
+	private Collection<String> getDefaultRolesForNewUsers() {
+		List<String> list = new ArrayList<String>();
+		for (PermissionSet ps : userAccountsDao.getAllPermissionSets()) {
+			if (ps.isForNewUsers()) {
+				list.add(ps.getUri());
+			}
+		}
+		return list;
+	}
+
+	public UserAccount getAddedAccount() {
+		return addedAccount;
+	}
+
+	public boolean wasPasswordEmailSent() {
+		return this.strategy.wasPasswordEmailSent();
+	}
+
+	boolean isExternalAuthOnly() {
+		return externalAuthOnly;
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPageStrategy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPageStrategy.java
index caa52e38a..740b31a97 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPageStrategy.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAddPageStrategy.java
@@ -1,220 +1,220 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin;
-
-import static javax.mail.Message.RecipientType.TO;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
-import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailMessage;
-
-/**
- * Handle the variant details of the UserAccountsAddPage.
- */
-public abstract class UserAccountsAddPageStrategy extends UserAccountsPage {
-	protected final UserAccountsAddPage page;
-
-	public static UserAccountsAddPageStrategy getInstance(VitroRequest vreq,
-			UserAccountsAddPage page, boolean emailEnabled) {
-		if (emailEnabled) {
-			return new EmailStrategy(vreq, page);
-		} else {
-			return new NoEmailStrategy(vreq, page);
-		}
-	}
-
-	public UserAccountsAddPageStrategy(VitroRequest vreq,
-			UserAccountsAddPage page) {
-		super(vreq);
-		this.page = page;
-	}
-
-	protected abstract void parseAdditionalParameters();
-
-	protected abstract String additionalValidations();
-
-	protected abstract void addMoreBodyValues(Map<String, Object> body);
-
-	protected abstract void setAdditionalProperties(UserAccount u);
-
-	protected abstract void notifyUser();
-
-	protected abstract boolean wasPasswordEmailSent();
-
-	// ----------------------------------------------------------------------
-	// Strategy to use if email is enabled.
-	// ----------------------------------------------------------------------
-
-	private static class EmailStrategy extends UserAccountsAddPageStrategy {
-		public static final String CREATE_PASSWORD_URL = "/accounts/createPassword";
-		private static final String EMAIL_TEMPLATE_WITH_PASSWORD = "userAccounts-acctCreatedEmail.ftl";
-		private static final String EMAIL_TEMPLATE_NO_PASSWORD = "userAccounts-acctCreatedExternalOnlyEmail.ftl";
-
-		private boolean sentEmail;
-
-		public EmailStrategy(VitroRequest vreq, UserAccountsAddPage page) {
-			super(vreq, page);
-		}
-
-		@Override
-		protected void parseAdditionalParameters() {
-			// No additional parameters
-		}
-
-		@Override
-		protected String additionalValidations() {
-			// No additional validations
-			return "";
-		}
-
-		@Override
-		protected void setAdditionalProperties(UserAccount u) {
-			if (page.isExternalAuthOnly()) {
-				u.setPasswordLinkExpires(0L);
-				u.setStatus(Status.ACTIVE);
-			} else {
-				u.setPasswordLinkExpires(figureExpirationDate().getTime());
-				u.setStatus(Status.INACTIVE);
-			}
-		}
-
-		@Override
-		protected void addMoreBodyValues(Map<String, Object> body) {
-			body.put("emailIsEnabled", Boolean.TRUE);
-		}
-
-		@Override
-		protected void notifyUser() {
-			Map<String, Object> body = new HashMap<String, Object>();
-			body.put("userAccount", page.getAddedAccount());
-			body.put("passwordLink", buildCreatePasswordLink());
-			body.put("siteName", getSiteName());
-
-			FreemarkerEmailMessage email = FreemarkerEmailFactory
-					.createNewMessage(vreq);
-			email.addRecipient(TO, page.getAddedAccount().getEmailAddress());
-			email.setSubject(i18n.text("account_created_subject", getSiteName()));
-			if (page.isExternalAuthOnly()) {
-				email.setTemplate(EMAIL_TEMPLATE_NO_PASSWORD);
-			} else {
-				email.setTemplate(EMAIL_TEMPLATE_WITH_PASSWORD);
-			}
-			email.setBodyMap(body);
-			email.processTemplate();
-			email.send();
-
-			sentEmail = true;
-		}
-
-		private String buildCreatePasswordLink() {
-			try {
-				String email = page.getAddedAccount().getEmailAddress();
-				String hash = page.getAddedAccount()
-						.getPasswordLinkExpiresHash();
-				String relativeUrl = UrlBuilder.getUrl(CREATE_PASSWORD_URL,
-						"user", email, "key", hash);
-
-				URL context = new URL(vreq.getRequestURL().toString());
-				URL url = new URL(context, relativeUrl);
-				return url.toExternalForm();
-			} catch (MalformedURLException e) {
-				return "error_creating_password_link";
-			}
-		}
-
-		@Override
-		protected boolean wasPasswordEmailSent() {
-			return sentEmail;
-		}
-
-	}
-
-	// ----------------------------------------------------------------------
-	// Strategy to use if email is not enabled.
-	// ----------------------------------------------------------------------
-
-	private static class NoEmailStrategy extends UserAccountsAddPageStrategy {
-		private static final String PARAMETER_INITIAL_PASSWORD = "initialPassword";
-		private static final String PARAMETER_CONFIRM_PASSWORD = "confirmPassword";
-
-		private static final String ERROR_NO_PASSWORD = "errorPasswordIsEmpty";
-		private static final String ERROR_WRONG_PASSWORD_LENGTH = "errorPasswordIsWrongLength";
-		private static final String ERROR_PASSWORDS_DONT_MATCH = "errorPasswordsDontMatch";
-
-		private String initialPassword;
-		private String confirmPassword;
-
-		public NoEmailStrategy(VitroRequest vreq, UserAccountsAddPage page) {
-			super(vreq, page);
-		}
-
-		@Override
-		protected void parseAdditionalParameters() {
-			initialPassword = getStringParameter(PARAMETER_INITIAL_PASSWORD, "");
-			confirmPassword = getStringParameter(PARAMETER_CONFIRM_PASSWORD, "");
-		}
-
-		@Override
-		protected String additionalValidations() {
-			if (page.isExternalAuthOnly()) {
-				// No need to check the password info on external-only accounts
-				return "";
-			}
-
-			if (initialPassword.isEmpty()) {
-				return ERROR_NO_PASSWORD;
-			} else if (!checkPasswordLength()) {
-				return ERROR_WRONG_PASSWORD_LENGTH;
-			} else if (!initialPassword.equals(confirmPassword)) {
-				return ERROR_PASSWORDS_DONT_MATCH;
-			} else {
-				return "";
-			}
-		}
-
-		private boolean checkPasswordLength() {
-			return initialPassword.length() >= UserAccount.MIN_PASSWORD_LENGTH
-					&& initialPassword.length() <= UserAccount.MAX_PASSWORD_LENGTH;
-		}
-
-		@Override
-		protected void addMoreBodyValues(Map<String, Object> body) {
-			body.put("initialPassword", initialPassword);
-			body.put("confirmPassword", confirmPassword);
-			body.put("minimumLength", UserAccount.MIN_PASSWORD_LENGTH);
-			body.put("maximumLength", UserAccount.MAX_PASSWORD_LENGTH);
-		}
-
-		@Override
-		protected void setAdditionalProperties(UserAccount u) {
-			if (!page.isExternalAuthOnly()) {
-				u.setMd5Password(Authenticator
-						.applyMd5Encoding(initialPassword));
-				u.setPasswordChangeRequired(true);
-			}
-			u.setStatus(Status.ACTIVE);
-		}
-
-		@Override
-		protected void notifyUser() {
-			// Do nothing.
-		}
-
-		@Override
-		protected boolean wasPasswordEmailSent() {
-			return false;
-		}
-
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin;
+
+import static javax.mail.Message.RecipientType.TO;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
+import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailMessage;
+
+/**
+ * Handle the variant details of the UserAccountsAddPage.
+ */
+public abstract class UserAccountsAddPageStrategy extends UserAccountsPage {
+	protected final UserAccountsAddPage page;
+
+	public static UserAccountsAddPageStrategy getInstance(VitroRequest vreq,
+			UserAccountsAddPage page, boolean emailEnabled) {
+		if (emailEnabled) {
+			return new EmailStrategy(vreq, page);
+		} else {
+			return new NoEmailStrategy(vreq, page);
+		}
+	}
+
+	public UserAccountsAddPageStrategy(VitroRequest vreq,
+			UserAccountsAddPage page) {
+		super(vreq);
+		this.page = page;
+	}
+
+	protected abstract void parseAdditionalParameters();
+
+	protected abstract String additionalValidations();
+
+	protected abstract void addMoreBodyValues(Map<String, Object> body);
+
+	protected abstract void setAdditionalProperties(UserAccount u);
+
+	protected abstract void notifyUser();
+
+	protected abstract boolean wasPasswordEmailSent();
+
+	// ----------------------------------------------------------------------
+	// Strategy to use if email is enabled.
+	// ----------------------------------------------------------------------
+
+	private static class EmailStrategy extends UserAccountsAddPageStrategy {
+		public static final String CREATE_PASSWORD_URL = "/accounts/createPassword";
+		private static final String EMAIL_TEMPLATE_WITH_PASSWORD = "userAccounts-acctCreatedEmail.ftl";
+		private static final String EMAIL_TEMPLATE_NO_PASSWORD = "userAccounts-acctCreatedExternalOnlyEmail.ftl";
+
+		private boolean sentEmail;
+
+		public EmailStrategy(VitroRequest vreq, UserAccountsAddPage page) {
+			super(vreq, page);
+		}
+
+		@Override
+		protected void parseAdditionalParameters() {
+			// No additional parameters
+		}
+
+		@Override
+		protected String additionalValidations() {
+			// No additional validations
+			return "";
+		}
+
+		@Override
+		protected void setAdditionalProperties(UserAccount u) {
+			if (page.isExternalAuthOnly()) {
+				u.setPasswordLinkExpires(0L);
+				u.setStatus(Status.ACTIVE);
+			} else {
+				u.setPasswordLinkExpires(figureExpirationDate().getTime());
+				u.setStatus(Status.INACTIVE);
+			}
+		}
+
+		@Override
+		protected void addMoreBodyValues(Map<String, Object> body) {
+			body.put("emailIsEnabled", Boolean.TRUE);
+		}
+
+		@Override
+		protected void notifyUser() {
+			Map<String, Object> body = new HashMap<String, Object>();
+			body.put("userAccount", page.getAddedAccount());
+			body.put("passwordLink", buildCreatePasswordLink());
+			body.put("siteName", getSiteName());
+
+			FreemarkerEmailMessage email = FreemarkerEmailFactory
+					.createNewMessage(vreq);
+			email.addRecipient(TO, page.getAddedAccount().getEmailAddress());
+			email.setSubject(i18n.text("account_created_subject", getSiteName()));
+			if (page.isExternalAuthOnly()) {
+				email.setTemplate(EMAIL_TEMPLATE_NO_PASSWORD);
+			} else {
+				email.setTemplate(EMAIL_TEMPLATE_WITH_PASSWORD);
+			}
+			email.setBodyMap(body);
+			email.processTemplate();
+			email.send();
+
+			sentEmail = true;
+		}
+
+		private String buildCreatePasswordLink() {
+			try {
+				String email = page.getAddedAccount().getEmailAddress();
+				String hash = page.getAddedAccount()
+						.getPasswordLinkExpiresHash();
+				String relativeUrl = UrlBuilder.getUrl(CREATE_PASSWORD_URL,
+						"user", email, "key", hash);
+
+				URL context = new URL(vreq.getRequestURL().toString());
+				URL url = new URL(context, relativeUrl);
+				return url.toExternalForm();
+			} catch (MalformedURLException e) {
+				return "error_creating_password_link";
+			}
+		}
+
+		@Override
+		protected boolean wasPasswordEmailSent() {
+			return sentEmail;
+		}
+
+	}
+
+	// ----------------------------------------------------------------------
+	// Strategy to use if email is not enabled.
+	// ----------------------------------------------------------------------
+
+	private static class NoEmailStrategy extends UserAccountsAddPageStrategy {
+		private static final String PARAMETER_INITIAL_PASSWORD = "initialPassword";
+		private static final String PARAMETER_CONFIRM_PASSWORD = "confirmPassword";
+
+		private static final String ERROR_NO_PASSWORD = "errorPasswordIsEmpty";
+		private static final String ERROR_WRONG_PASSWORD_LENGTH = "errorPasswordIsWrongLength";
+		private static final String ERROR_PASSWORDS_DONT_MATCH = "errorPasswordsDontMatch";
+
+		private String initialPassword;
+		private String confirmPassword;
+
+		public NoEmailStrategy(VitroRequest vreq, UserAccountsAddPage page) {
+			super(vreq, page);
+		}
+
+		@Override
+		protected void parseAdditionalParameters() {
+			initialPassword = getStringParameter(PARAMETER_INITIAL_PASSWORD, "");
+			confirmPassword = getStringParameter(PARAMETER_CONFIRM_PASSWORD, "");
+		}
+
+		@Override
+		protected String additionalValidations() {
+			if (page.isExternalAuthOnly()) {
+				// No need to check the password info on external-only accounts
+				return "";
+			}
+
+			if (initialPassword.isEmpty()) {
+				return ERROR_NO_PASSWORD;
+			} else if (!checkPasswordLength()) {
+				return ERROR_WRONG_PASSWORD_LENGTH;
+			} else if (!initialPassword.equals(confirmPassword)) {
+				return ERROR_PASSWORDS_DONT_MATCH;
+			} else {
+				return "";
+			}
+		}
+
+		private boolean checkPasswordLength() {
+			return initialPassword.length() >= UserAccount.MIN_PASSWORD_LENGTH
+					&& initialPassword.length() <= UserAccount.MAX_PASSWORD_LENGTH;
+		}
+
+		@Override
+		protected void addMoreBodyValues(Map<String, Object> body) {
+			body.put("initialPassword", initialPassword);
+			body.put("confirmPassword", confirmPassword);
+			body.put("minimumLength", UserAccount.MIN_PASSWORD_LENGTH);
+			body.put("maximumLength", UserAccount.MAX_PASSWORD_LENGTH);
+		}
+
+		@Override
+		protected void setAdditionalProperties(UserAccount u) {
+			if (!page.isExternalAuthOnly()) {
+				u.setMd5Password(Authenticator
+						.applyMd5Encoding(initialPassword));
+				u.setPasswordChangeRequired(true);
+			}
+			u.setStatus(Status.ACTIVE);
+		}
+
+		@Override
+		protected void notifyUser() {
+			// Do nothing.
+		}
+
+		@Override
+		protected boolean wasPasswordEmailSent() {
+			return false;
+		}
+
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAdminController.java
index c8457d8ad..31be2ecce 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAdminController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsAdminController.java
@@ -1,113 +1,113 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin;
-
-import java.util.Collection;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
-import edu.cornell.mannlib.vitro.webapp.beans.DisplayMessage;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-
-/**
- * Parcel out the different actions required of the Administrators portion of
- * the UserAccounts GUI.
- */
-public class UserAccountsAdminController extends FreemarkerHttpServlet {
-	private static final Log log = LogFactory
-			.getLog(UserAccountsAdminController.class);
-
-	private static final String ACTION_ADD = "/add";
-	private static final String ACTION_DELETE = "/delete";
-	private static final String ACTION_EDIT = "/edit";
-
-	@Override
-	protected Actions requiredActions(VitroRequest vreq) {
-		return SimplePermission.MANAGE_USER_ACCOUNTS.ACTIONS;
-	}
-
-	@Override
-	protected ResponseValues processRequest(VitroRequest vreq) {
-		if (log.isDebugEnabled()) {
-			dumpRequestParameters(vreq);
-		}
-
-		String action = vreq.getPathInfo();
-		log.debug("action = '" + action + "'");
-
-		if (ACTION_ADD.equals(action)) {
-			return handleAddRequest(vreq);
-		} else if (ACTION_EDIT.equals(action)) {
-			return handleEditRequest(vreq);
-		} else if (ACTION_DELETE.equals(action)) {
-			return handleDeleteRequest(vreq);
-		} else {
-			return handleListRequest(vreq);
-		}
-	}
-
-	private ResponseValues handleAddRequest(VitroRequest vreq) {
-		UserAccountsAddPage page = new UserAccountsAddPage(vreq);
-		if (page.isSubmit() && page.isValid()) {
-			page.createNewAccount();
-
-			UserAccountsListPage.Message.showNewAccount(vreq,
-					page.getAddedAccount(), page.wasPasswordEmailSent());
-			return redirectToList();
-		} else {
-			return page.showPage();
-		}
-	}
-
-	private ResponseValues handleEditRequest(VitroRequest vreq) {
-		UserAccountsEditPage page = new UserAccountsEditPage(vreq);
-		if (page.isBogus()) {
-			return showHomePage(vreq, page.getBogusMessage());
-		} else if (page.isSubmit() && page.isValid()) {
-			page.updateAccount();
-
-			UserAccountsListPage.Message.showUpdatedAccount(vreq,
-					page.getUpdatedAccount(), page.wasPasswordEmailSent());
-			return redirectToList();
-		} else {
-			return page.showPage();
-		}
-	}
-
-	private ResponseValues handleDeleteRequest(VitroRequest vreq) {
-		UserAccountsDeleter deleter = new UserAccountsDeleter(vreq);
-		if (deleter.isBogus()) {
-			return showHomePage(vreq, deleter.getBogusMessage());
-		} else {
-			Collection<String> deletedUris = deleter.delete();
-
-			UserAccountsListPage.Message.showDeletions(vreq, deletedUris);
-			return redirectToList();
-		}
-	}
-
-	private ResponseValues handleListRequest(VitroRequest vreq) {
-		UserAccountsListPage page = new UserAccountsListPage(vreq);
-		return page.showPage();
-	}
-
-	/**
-	 * After an successful change, redirect to the list instead of forwarding.
-	 * That way, a browser "refresh" won't try to repeat the operation.
-	 */
-	private ResponseValues redirectToList() {
-		return new RedirectResponseValues("/accountsAdmin/list");
-	}
-
-	private ResponseValues showHomePage(VitroRequest vreq, String message) {
-		DisplayMessage.setMessage(vreq, message);
-		return new RedirectResponseValues("/");
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin;
+
+import java.util.Collection;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.beans.DisplayMessage;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+
+/**
+ * Parcel out the different actions required of the Administrators portion of
+ * the UserAccounts GUI.
+ */
+public class UserAccountsAdminController extends FreemarkerHttpServlet {
+	private static final Log log = LogFactory
+			.getLog(UserAccountsAdminController.class);
+
+	private static final String ACTION_ADD = "/add";
+	private static final String ACTION_DELETE = "/delete";
+	private static final String ACTION_EDIT = "/edit";
+
+	@Override
+	protected Actions requiredActions(VitroRequest vreq) {
+		return SimplePermission.MANAGE_USER_ACCOUNTS.ACTIONS;
+	}
+
+	@Override
+	protected ResponseValues processRequest(VitroRequest vreq) {
+		if (log.isDebugEnabled()) {
+			dumpRequestParameters(vreq);
+		}
+
+		String action = vreq.getPathInfo();
+		log.debug("action = '" + action + "'");
+
+		if (ACTION_ADD.equals(action)) {
+			return handleAddRequest(vreq);
+		} else if (ACTION_EDIT.equals(action)) {
+			return handleEditRequest(vreq);
+		} else if (ACTION_DELETE.equals(action)) {
+			return handleDeleteRequest(vreq);
+		} else {
+			return handleListRequest(vreq);
+		}
+	}
+
+	private ResponseValues handleAddRequest(VitroRequest vreq) {
+		UserAccountsAddPage page = new UserAccountsAddPage(vreq);
+		if (page.isSubmit() && page.isValid()) {
+			page.createNewAccount();
+
+			UserAccountsListPage.Message.showNewAccount(vreq,
+					page.getAddedAccount(), page.wasPasswordEmailSent());
+			return redirectToList();
+		} else {
+			return page.showPage();
+		}
+	}
+
+	private ResponseValues handleEditRequest(VitroRequest vreq) {
+		UserAccountsEditPage page = new UserAccountsEditPage(vreq);
+		if (page.isBogus()) {
+			return showHomePage(vreq, page.getBogusMessage());
+		} else if (page.isSubmit() && page.isValid()) {
+			page.updateAccount();
+
+			UserAccountsListPage.Message.showUpdatedAccount(vreq,
+					page.getUpdatedAccount(), page.wasPasswordEmailSent());
+			return redirectToList();
+		} else {
+			return page.showPage();
+		}
+	}
+
+	private ResponseValues handleDeleteRequest(VitroRequest vreq) {
+		UserAccountsDeleter deleter = new UserAccountsDeleter(vreq);
+		if (deleter.isBogus()) {
+			return showHomePage(vreq, deleter.getBogusMessage());
+		} else {
+			Collection<String> deletedUris = deleter.delete();
+
+			UserAccountsListPage.Message.showDeletions(vreq, deletedUris);
+			return redirectToList();
+		}
+	}
+
+	private ResponseValues handleListRequest(VitroRequest vreq) {
+		UserAccountsListPage page = new UserAccountsListPage(vreq);
+		return page.showPage();
+	}
+
+	/**
+	 * After an successful change, redirect to the list instead of forwarding.
+	 * That way, a browser "refresh" won't try to repeat the operation.
+	 */
+	private ResponseValues redirectToList() {
+		return new RedirectResponseValues("/accountsAdmin/list");
+	}
+
+	private ResponseValues showHomePage(VitroRequest vreq, String message) {
+		DisplayMessage.setMessage(vreq, message);
+		return new RedirectResponseValues("/");
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsDeleter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsDeleter.java
index 012b9abc6..0c452862b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsDeleter.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsDeleter.java
@@ -1,110 +1,110 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin;
-
-import static edu.cornell.mannlib.vitro.webapp.controller.accounts.user.UserAccountsUserController.getBogusStandardMessage;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageRootAccount;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-
-/**
- * Process a request to delete User Accounts.
- */
-public class UserAccountsDeleter extends UserAccountsPage {
-	private static final Log log = LogFactory.getLog(UserAccountsDeleter.class);
-
-	private static final String PARAMETER_DELETE_ACCOUNT = "deleteAccount";
-
-	/** Might be empty, but never null. */
-	private final String[] uris;
-
-	/** The result of checking whether this request is even appropriate. */
-	private String bogusMessage = "";
-
-	public UserAccountsDeleter(VitroRequest vreq) {
-		super(vreq);
-
-		String[] values = vreq.getParameterValues(PARAMETER_DELETE_ACCOUNT);
-		if (values == null) {
-			this.uris = new String[0];
-		} else {
-			this.uris = values;
-		}
-
-		WebappDaoFactory wadf = vreq.getWebappDaoFactory();
-
-		validateInputUris();
-	}
-
-	private void validateInputUris() {
-		UserAccount loggedInAccount = LoginStatusBean.getCurrentUser(vreq);
-		if (loggedInAccount == null) {
-			log.warn("Trying to delete accounts while not logged in!");
-			bogusMessage = getBogusStandardMessage(vreq);
-			return;
-		}
-
-		for (String uri : this.uris) {
-			UserAccount u = userAccountsDao.getUserAccountByUri(uri);
-
-			if (u == null) {
-				log.warn("Delete account for '" + uri
-						+ "' is bogus: no such user");
-				bogusMessage = getBogusStandardMessage(vreq);
-				return;
-			}
-
-			if (u.getUri().equals(loggedInAccount.getUri())) {
-				log.warn("'" + u.getUri()
-						+ "' is trying to delete his own account.");
-				bogusMessage = getBogusStandardMessage(vreq);
-				return;
-			}
-
-			if (u.isRootUser()
-					&& (!PolicyHelper.isAuthorizedForActions(vreq,
-							new ManageRootAccount()))) {
-				log.warn("Attempting to delete the root account, "
-						+ "but not authorized. Logged in as "
-						+ LoginStatusBean.getCurrentUser(vreq));
-				bogusMessage = getBogusStandardMessage(vreq);
-				return;
-			}
-		}
-	}
-
-	public Collection<String> delete() {
-		List<String> deletedUris = new ArrayList<String>();
-
-		for (String uri : uris) {
-			UserAccount u = userAccountsDao.getUserAccountByUri(uri);
-			if (u != null) {
-				userAccountsDao.deleteUserAccount(uri);
-				deletedUris.add(uri);
-			}
-		}
-
-		return deletedUris;
-	}
-
-	public boolean isBogus() {
-		return !bogusMessage.isEmpty();
-	}
-
-	public String getBogusMessage() {
-		return bogusMessage;
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin;
+
+import static edu.cornell.mannlib.vitro.webapp.controller.accounts.user.UserAccountsUserController.getBogusStandardMessage;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageRootAccount;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+
+/**
+ * Process a request to delete User Accounts.
+ */
+public class UserAccountsDeleter extends UserAccountsPage {
+	private static final Log log = LogFactory.getLog(UserAccountsDeleter.class);
+
+	private static final String PARAMETER_DELETE_ACCOUNT = "deleteAccount";
+
+	/** Might be empty, but never null. */
+	private final String[] uris;
+
+	/** The result of checking whether this request is even appropriate. */
+	private String bogusMessage = "";
+
+	public UserAccountsDeleter(VitroRequest vreq) {
+		super(vreq);
+
+		String[] values = vreq.getParameterValues(PARAMETER_DELETE_ACCOUNT);
+		if (values == null) {
+			this.uris = new String[0];
+		} else {
+			this.uris = values;
+		}
+
+		WebappDaoFactory wadf = vreq.getWebappDaoFactory();
+
+		validateInputUris();
+	}
+
+	private void validateInputUris() {
+		UserAccount loggedInAccount = LoginStatusBean.getCurrentUser(vreq);
+		if (loggedInAccount == null) {
+			log.warn("Trying to delete accounts while not logged in!");
+			bogusMessage = getBogusStandardMessage(vreq);
+			return;
+		}
+
+		for (String uri : this.uris) {
+			UserAccount u = userAccountsDao.getUserAccountByUri(uri);
+
+			if (u == null) {
+				log.warn("Delete account for '" + uri
+						+ "' is bogus: no such user");
+				bogusMessage = getBogusStandardMessage(vreq);
+				return;
+			}
+
+			if (u.getUri().equals(loggedInAccount.getUri())) {
+				log.warn("'" + u.getUri()
+						+ "' is trying to delete his own account.");
+				bogusMessage = getBogusStandardMessage(vreq);
+				return;
+			}
+
+			if (u.isRootUser()
+					&& (!PolicyHelper.isAuthorizedForActions(vreq,
+							new ManageRootAccount()))) {
+				log.warn("Attempting to delete the root account, "
+						+ "but not authorized. Logged in as "
+						+ LoginStatusBean.getCurrentUser(vreq));
+				bogusMessage = getBogusStandardMessage(vreq);
+				return;
+			}
+		}
+	}
+
+	public Collection<String> delete() {
+		List<String> deletedUris = new ArrayList<String>();
+
+		for (String uri : uris) {
+			UserAccount u = userAccountsDao.getUserAccountByUri(uri);
+			if (u != null) {
+				userAccountsDao.deleteUserAccount(uri);
+				deletedUris.add(uri);
+			}
+		}
+
+		return deletedUris;
+	}
+
+	public boolean isBogus() {
+		return !bogusMessage.isEmpty();
+	}
+
+	public String getBogusMessage() {
+		return bogusMessage;
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPage.java
index f13c2eab3..4769ad813 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPage.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPage.java
@@ -1,327 +1,327 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin;
-
-import static edu.cornell.mannlib.vitro.webapp.controller.accounts.user.UserAccountsUserController.getBogusStandardMessage;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageRootAccount;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
-
-/**
- * Handle the "Edit Account" form display and submission.
- */
-public class UserAccountsEditPage extends UserAccountsPage {
-	private static final Log log = LogFactory
-			.getLog(UserAccountsEditPage.class);
-
-	private static final String PARAMETER_SUBMIT = "submitEdit";
-	private static final String PARAMETER_USER_URI = "editAccount";
-	private static final String PARAMETER_EMAIL_ADDRESS = "emailAddress";
-	private static final String PARAMETER_EXTERNAL_AUTH_ID = "externalAuthId";
-	private static final String PARAMETER_EXTERNAL_AUTH_ONLY = "externalAuthOnly";
-	private static final String PARAMETER_FIRST_NAME = "firstName";
-	private static final String PARAMETER_LAST_NAME = "lastName";
-	private static final String PARAMETER_ROLE = "role";
-	private static final String PARAMETER_ASSOCIATED_PROFILE_URI = "associatedProfileUri";
-	private static final String PARAMETER_NEW_PROFILE_CLASS_URI = "newProfileClassUri";
-
-	private static final String ERROR_NO_EMAIL = "errorEmailIsEmpty";
-	private static final String ERROR_EMAIL_IN_USE = "errorEmailInUse";
-	private static final String ERROR_EMAIL_INVALID_FORMAT = "errorEmailInvalidFormat";
-	private static final String ERROR_EXTERNAL_AUTH_ID_IN_USE = "errorExternalAuthIdInUse";
-	private static final String ERROR_NO_FIRST_NAME = "errorFirstNameIsEmpty";
-	private static final String ERROR_NO_LAST_NAME = "errorLastNameIsEmpty";
-	private static final String ERROR_NO_ROLE = "errorNoRoleSelected";
-
-	private static final String TEMPLATE_NAME = "userAccounts-edit.ftl";
-
-	private final UserAccountsEditPageStrategy strategy;
-	private final boolean matchingIsEnabled;
-
-	/* The request parameters */
-	private boolean submit;
-	private String userUri = "";
-	private String emailAddress = "";
-	private String externalAuthId = "";
-	private boolean externalAuthOnly;
-	private String firstName = "";
-	private String lastName = "";
-	private Collection<String> selectedRoleUris = new ArrayList<String>();
-	private String associatedProfileUri = "";
-	private String newProfileClassUri = "";
-
-	private UserAccount userAccount;
-
-	/** The result of checking whether this request is even appropriate. */
-	private String bogusMessage = "";
-
-	/** The result of validating a "submit" request. */
-	private String errorCode = "";
-
-	public UserAccountsEditPage(VitroRequest vreq) {
-		super(vreq);
-
-		this.strategy = UserAccountsEditPageStrategy.getInstance(vreq, this,
-				isEmailEnabled());
-
-		this.matchingIsEnabled = SelfEditingConfiguration.getBean(vreq)
-				.isConfigured();
-
-		parseRequestParameters();
-		validateUserAccountInfo();
-
-		if (isSubmit() && !isBogus()) {
-			validateParameters();
-		}
-	}
-
-	private void parseRequestParameters() {
-		submit = isFlagOnRequest(PARAMETER_SUBMIT);
-		userUri = getStringParameter(PARAMETER_USER_URI, "");
-		emailAddress = getStringParameter(PARAMETER_EMAIL_ADDRESS, "");
-		externalAuthId = getStringParameter(PARAMETER_EXTERNAL_AUTH_ID, "");
-		externalAuthOnly = isFlagOnRequest(PARAMETER_EXTERNAL_AUTH_ONLY);
-		firstName = getStringParameter(PARAMETER_FIRST_NAME, "");
-		lastName = getStringParameter(PARAMETER_LAST_NAME, "");
-		selectedRoleUris = getStringParameters(PARAMETER_ROLE);
-		associatedProfileUri = getStringParameter(
-				PARAMETER_ASSOCIATED_PROFILE_URI, "");
-		newProfileClassUri = getStringParameter(
-				PARAMETER_NEW_PROFILE_CLASS_URI, "");
-
-		strategy.parseAdditionalParameters();
-	}
-
-	private void validateUserAccountInfo() {
-		userAccount = userAccountsDao.getUserAccountByUri(userUri);
-		if (userAccount == null) {
-			log.warn("Edit account for '" + userUri
-					+ "' is bogus: no such user");
-			bogusMessage = getBogusStandardMessage(vreq);
-			return;
-		}
-		if (userAccount.isRootUser()) {
-			if (!PolicyHelper.isAuthorizedForActions(vreq,
-					new ManageRootAccount())) {
-				log.warn("User is attempting to edit the root account, "
-						+ "but is not authorized to do so. Logged in as: "
-						+ LoginStatusBean.getCurrentUser(vreq));
-				bogusMessage = getBogusStandardMessage(vreq);
-				return;
-			}
-		}
-	}
-
-	public boolean isBogus() {
-		return !bogusMessage.isEmpty();
-	}
-
-	public String getBogusMessage() {
-		return bogusMessage;
-	}
-
-	public boolean isSubmit() {
-		return submit;
-	}
-
-	private void validateParameters() {
-		if (emailAddress.isEmpty()) {
-			errorCode = ERROR_NO_EMAIL;
-		} else if (emailIsChanged() && isEmailInUse()) {
-			errorCode = ERROR_EMAIL_IN_USE;
-		} else if (!isEmailValidFormat()) {
-			errorCode = ERROR_EMAIL_INVALID_FORMAT;
-		} else if (externalAuthIdIsChanged() && isExternalAuthIdInUse()) {
-			errorCode = ERROR_EXTERNAL_AUTH_ID_IN_USE;
-		} else if (firstName.isEmpty()) {
-			errorCode = ERROR_NO_FIRST_NAME;
-		} else if (lastName.isEmpty()) {
-			errorCode = ERROR_NO_LAST_NAME;
-		} else if (!isRootUser() && selectedRoleUris.isEmpty()) {
-			errorCode = ERROR_NO_ROLE;
-		} else {
-			errorCode = strategy.additionalValidations();
-		}
-	}
-
-	private boolean emailIsChanged() {
-		return !emailAddress.equals(userAccount.getEmailAddress());
-	}
-
-	private boolean isEmailInUse() {
-		return userAccountsDao.getUserAccountByEmail(emailAddress) != null;
-	}
-
-	private boolean isEmailValidFormat() {
-		return Authenticator.isValidEmailAddress(emailAddress);
-	}
-
-	private boolean externalAuthIdIsChanged() {
-		return !externalAuthId.equals(userAccount.getExternalAuthId());
-	}
-
-	private boolean isExternalAuthIdInUse() {
-		if (externalAuthId.isEmpty()) {
-			return false;
-		}
-		return userAccountsDao.getUserAccountByExternalAuthId(externalAuthId) != null;
-	}
-
-	private boolean isRootUser() {
-		return ((userAccount != null) && userAccount.isRootUser());
-	}
-
-	public boolean isValid() {
-		return errorCode.isEmpty();
-	}
-
-	public final ResponseValues showPage() {
-		Map<String, Object> body = new HashMap<String, Object>();
-
-		body.put("userUri", userUri);
-
-		if (isSubmit()) {
-			body.put("emailAddress", emailAddress);
-			body.put("externalAuthId", externalAuthId);
-			body.put("firstName", firstName);
-			body.put("lastName", lastName);
-			body.put("selectedRoles", selectedRoleUris);
-			body.put(PARAMETER_NEW_PROFILE_CLASS_URI, newProfileClassUri);
-
-			if (externalAuthOnly) {
-				body.put(PARAMETER_EXTERNAL_AUTH_ONLY, Boolean.TRUE);
-			}
-
-			if (!associatedProfileUri.isEmpty()) {
-				body.put("associatedProfileInfo",
-						buildProfileInfo(associatedProfileUri));
-			}
-		} else {
-			body.put("emailAddress", userAccount.getEmailAddress());
-			body.put("externalAuthId", userAccount.getExternalAuthId());
-			body.put("firstName", userAccount.getFirstName());
-			body.put("lastName", userAccount.getLastName());
-			body.put("selectedRoles", userAccount.getPermissionSetUris());
-			body.put(PARAMETER_NEW_PROFILE_CLASS_URI, "");
-
-			if (userAccount.isExternalAuthOnly()) {
-				body.put(PARAMETER_EXTERNAL_AUTH_ONLY, Boolean.TRUE);
-			}
-
-			List<Individual> associatedInds = SelfEditingConfiguration.getBean(
-					vreq).getAssociatedIndividuals(indDao, userAccount);
-			if (!associatedInds.isEmpty()) {
-				body.put("associatedProfileInfo",
-						buildProfileInfo(associatedInds.get(0).getURI()));
-			}
-		}
-
-		if (!isRootUser()) {
-			body.put("roles", buildListOfSelectableRoles());
-			body.put("externalAuthPermitted", Boolean.TRUE);
-		}
-
-		body.put("profileTypes", buildProfileTypesList());
-		body.put("formUrls", buildUrlsMapWithEditUrl());
-
-		if (!errorCode.isEmpty()) {
-			body.put(errorCode, Boolean.TRUE);
-		}
-
-		if (matchingIsEnabled) {
-			body.put("showAssociation", Boolean.TRUE);
-		}
-
-		strategy.addMoreBodyValues(body);
-
-		return new TemplateResponseValues(TEMPLATE_NAME, body);
-	}
-
-	private Map<String, String> buildUrlsMapWithEditUrl() {
-		Map<String, String> map = buildUrlsMap();
-		map.put("edit", editAccountUrl(userAccount.getUri()));
-		return map;
-	}
-
-	public void updateAccount() {
-		// Assemble the fields of the account.
-		userAccount.setEmailAddress(emailAddress);
-		userAccount.setFirstName(firstName);
-		userAccount.setLastName(lastName);
-		userAccount.setExternalAuthId(externalAuthId);
-
-		if (externalAuthOnly) {
-			userAccount.setMd5Password("");
-			userAccount.setOldPassword("");
-			userAccount.setPasswordChangeRequired(false);
-			userAccount.setPasswordLinkExpires(0L);
-		}
-
-		if (isRootUser()) {
-			userAccount.setPermissionSetUris(Collections.<String> emptySet());
-			userAccount.setExternalAuthOnly(false);
-		} else {
-			userAccount.setPermissionSetUris(selectedRoleUris);
-			userAccount.setExternalAuthOnly(externalAuthOnly);
-		}
-		strategy.setAdditionalProperties(userAccount);
-
-		// Update the account.
-		userAccountsDao.updateUserAccount(userAccount);
-
-		// Associate the profile, as appropriate.
-		if (matchingIsEnabled) {
-			if (!newProfileClassUri.isEmpty()) {
-				try {
-					String newProfileUri = UserAccountsProfileCreator
-							.createProfile(indDao, dpsDao, newProfileClassUri,
-									userAccount);
-					associatedProfileUri = newProfileUri;
-				} catch (InsertException e) {
-					log.error("Failed to create new profile of class '"
-							+ newProfileClassUri + "' for user '"
-							+ userAccount.getEmailAddress() + "'");
-				}
-			}
-
-			SelfEditingConfiguration.getBean(vreq)
-					.associateIndividualWithUserAccount(indDao, dpsDao,
-							userAccount, associatedProfileUri);
-		}
-
-		// Tell the user.
-		strategy.notifyUser();
-	}
-
-	public boolean wasPasswordEmailSent() {
-		return strategy.wasPasswordEmailSent();
-	}
-
-	public UserAccount getUpdatedAccount() {
-		return userAccount;
-	}
-
-	boolean isExternalAuthOnly() {
-		return externalAuthOnly;
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin;
+
+import static edu.cornell.mannlib.vitro.webapp.controller.accounts.user.UserAccountsUserController.getBogusStandardMessage;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageRootAccount;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
+
+/**
+ * Handle the "Edit Account" form display and submission.
+ */
+public class UserAccountsEditPage extends UserAccountsPage {
+	private static final Log log = LogFactory
+			.getLog(UserAccountsEditPage.class);
+
+	private static final String PARAMETER_SUBMIT = "submitEdit";
+	private static final String PARAMETER_USER_URI = "editAccount";
+	private static final String PARAMETER_EMAIL_ADDRESS = "emailAddress";
+	private static final String PARAMETER_EXTERNAL_AUTH_ID = "externalAuthId";
+	private static final String PARAMETER_EXTERNAL_AUTH_ONLY = "externalAuthOnly";
+	private static final String PARAMETER_FIRST_NAME = "firstName";
+	private static final String PARAMETER_LAST_NAME = "lastName";
+	private static final String PARAMETER_ROLE = "role";
+	private static final String PARAMETER_ASSOCIATED_PROFILE_URI = "associatedProfileUri";
+	private static final String PARAMETER_NEW_PROFILE_CLASS_URI = "newProfileClassUri";
+
+	private static final String ERROR_NO_EMAIL = "errorEmailIsEmpty";
+	private static final String ERROR_EMAIL_IN_USE = "errorEmailInUse";
+	private static final String ERROR_EMAIL_INVALID_FORMAT = "errorEmailInvalidFormat";
+	private static final String ERROR_EXTERNAL_AUTH_ID_IN_USE = "errorExternalAuthIdInUse";
+	private static final String ERROR_NO_FIRST_NAME = "errorFirstNameIsEmpty";
+	private static final String ERROR_NO_LAST_NAME = "errorLastNameIsEmpty";
+	private static final String ERROR_NO_ROLE = "errorNoRoleSelected";
+
+	private static final String TEMPLATE_NAME = "userAccounts-edit.ftl";
+
+	private final UserAccountsEditPageStrategy strategy;
+	private final boolean matchingIsEnabled;
+
+	/* The request parameters */
+	private boolean submit;
+	private String userUri = "";
+	private String emailAddress = "";
+	private String externalAuthId = "";
+	private boolean externalAuthOnly;
+	private String firstName = "";
+	private String lastName = "";
+	private Collection<String> selectedRoleUris = new ArrayList<String>();
+	private String associatedProfileUri = "";
+	private String newProfileClassUri = "";
+
+	private UserAccount userAccount;
+
+	/** The result of checking whether this request is even appropriate. */
+	private String bogusMessage = "";
+
+	/** The result of validating a "submit" request. */
+	private String errorCode = "";
+
+	public UserAccountsEditPage(VitroRequest vreq) {
+		super(vreq);
+
+		this.strategy = UserAccountsEditPageStrategy.getInstance(vreq, this,
+				isEmailEnabled());
+
+		this.matchingIsEnabled = SelfEditingConfiguration.getBean(vreq)
+				.isConfigured();
+
+		parseRequestParameters();
+		validateUserAccountInfo();
+
+		if (isSubmit() && !isBogus()) {
+			validateParameters();
+		}
+	}
+
+	private void parseRequestParameters() {
+		submit = isFlagOnRequest(PARAMETER_SUBMIT);
+		userUri = getStringParameter(PARAMETER_USER_URI, "");
+		emailAddress = getStringParameter(PARAMETER_EMAIL_ADDRESS, "");
+		externalAuthId = getStringParameter(PARAMETER_EXTERNAL_AUTH_ID, "");
+		externalAuthOnly = isFlagOnRequest(PARAMETER_EXTERNAL_AUTH_ONLY);
+		firstName = getStringParameter(PARAMETER_FIRST_NAME, "");
+		lastName = getStringParameter(PARAMETER_LAST_NAME, "");
+		selectedRoleUris = getStringParameters(PARAMETER_ROLE);
+		associatedProfileUri = getStringParameter(
+				PARAMETER_ASSOCIATED_PROFILE_URI, "");
+		newProfileClassUri = getStringParameter(
+				PARAMETER_NEW_PROFILE_CLASS_URI, "");
+
+		strategy.parseAdditionalParameters();
+	}
+
+	private void validateUserAccountInfo() {
+		userAccount = userAccountsDao.getUserAccountByUri(userUri);
+		if (userAccount == null) {
+			log.warn("Edit account for '" + userUri
+					+ "' is bogus: no such user");
+			bogusMessage = getBogusStandardMessage(vreq);
+			return;
+		}
+		if (userAccount.isRootUser()) {
+			if (!PolicyHelper.isAuthorizedForActions(vreq,
+					new ManageRootAccount())) {
+				log.warn("User is attempting to edit the root account, "
+						+ "but is not authorized to do so. Logged in as: "
+						+ LoginStatusBean.getCurrentUser(vreq));
+				bogusMessage = getBogusStandardMessage(vreq);
+				return;
+			}
+		}
+	}
+
+	public boolean isBogus() {
+		return !bogusMessage.isEmpty();
+	}
+
+	public String getBogusMessage() {
+		return bogusMessage;
+	}
+
+	public boolean isSubmit() {
+		return submit;
+	}
+
+	private void validateParameters() {
+		if (emailAddress.isEmpty()) {
+			errorCode = ERROR_NO_EMAIL;
+		} else if (emailIsChanged() && isEmailInUse()) {
+			errorCode = ERROR_EMAIL_IN_USE;
+		} else if (!isEmailValidFormat()) {
+			errorCode = ERROR_EMAIL_INVALID_FORMAT;
+		} else if (externalAuthIdIsChanged() && isExternalAuthIdInUse()) {
+			errorCode = ERROR_EXTERNAL_AUTH_ID_IN_USE;
+		} else if (firstName.isEmpty()) {
+			errorCode = ERROR_NO_FIRST_NAME;
+		} else if (lastName.isEmpty()) {
+			errorCode = ERROR_NO_LAST_NAME;
+		} else if (!isRootUser() && selectedRoleUris.isEmpty()) {
+			errorCode = ERROR_NO_ROLE;
+		} else {
+			errorCode = strategy.additionalValidations();
+		}
+	}
+
+	private boolean emailIsChanged() {
+		return !emailAddress.equals(userAccount.getEmailAddress());
+	}
+
+	private boolean isEmailInUse() {
+		return userAccountsDao.getUserAccountByEmail(emailAddress) != null;
+	}
+
+	private boolean isEmailValidFormat() {
+		return Authenticator.isValidEmailAddress(emailAddress);
+	}
+
+	private boolean externalAuthIdIsChanged() {
+		return !externalAuthId.equals(userAccount.getExternalAuthId());
+	}
+
+	private boolean isExternalAuthIdInUse() {
+		if (externalAuthId.isEmpty()) {
+			return false;
+		}
+		return userAccountsDao.getUserAccountByExternalAuthId(externalAuthId) != null;
+	}
+
+	private boolean isRootUser() {
+		return ((userAccount != null) && userAccount.isRootUser());
+	}
+
+	public boolean isValid() {
+		return errorCode.isEmpty();
+	}
+
+	public final ResponseValues showPage() {
+		Map<String, Object> body = new HashMap<String, Object>();
+
+		body.put("userUri", userUri);
+
+		if (isSubmit()) {
+			body.put("emailAddress", emailAddress);
+			body.put("externalAuthId", externalAuthId);
+			body.put("firstName", firstName);
+			body.put("lastName", lastName);
+			body.put("selectedRoles", selectedRoleUris);
+			body.put(PARAMETER_NEW_PROFILE_CLASS_URI, newProfileClassUri);
+
+			if (externalAuthOnly) {
+				body.put(PARAMETER_EXTERNAL_AUTH_ONLY, Boolean.TRUE);
+			}
+
+			if (!associatedProfileUri.isEmpty()) {
+				body.put("associatedProfileInfo",
+						buildProfileInfo(associatedProfileUri));
+			}
+		} else {
+			body.put("emailAddress", userAccount.getEmailAddress());
+			body.put("externalAuthId", userAccount.getExternalAuthId());
+			body.put("firstName", userAccount.getFirstName());
+			body.put("lastName", userAccount.getLastName());
+			body.put("selectedRoles", userAccount.getPermissionSetUris());
+			body.put(PARAMETER_NEW_PROFILE_CLASS_URI, "");
+
+			if (userAccount.isExternalAuthOnly()) {
+				body.put(PARAMETER_EXTERNAL_AUTH_ONLY, Boolean.TRUE);
+			}
+
+			List<Individual> associatedInds = SelfEditingConfiguration.getBean(
+					vreq).getAssociatedIndividuals(indDao, userAccount);
+			if (!associatedInds.isEmpty()) {
+				body.put("associatedProfileInfo",
+						buildProfileInfo(associatedInds.get(0).getURI()));
+			}
+		}
+
+		if (!isRootUser()) {
+			body.put("roles", buildListOfSelectableRoles());
+			body.put("externalAuthPermitted", Boolean.TRUE);
+		}
+
+		body.put("profileTypes", buildProfileTypesList());
+		body.put("formUrls", buildUrlsMapWithEditUrl());
+
+		if (!errorCode.isEmpty()) {
+			body.put(errorCode, Boolean.TRUE);
+		}
+
+		if (matchingIsEnabled) {
+			body.put("showAssociation", Boolean.TRUE);
+		}
+
+		strategy.addMoreBodyValues(body);
+
+		return new TemplateResponseValues(TEMPLATE_NAME, body);
+	}
+
+	private Map<String, String> buildUrlsMapWithEditUrl() {
+		Map<String, String> map = buildUrlsMap();
+		map.put("edit", editAccountUrl(userAccount.getUri()));
+		return map;
+	}
+
+	public void updateAccount() {
+		// Assemble the fields of the account.
+		userAccount.setEmailAddress(emailAddress);
+		userAccount.setFirstName(firstName);
+		userAccount.setLastName(lastName);
+		userAccount.setExternalAuthId(externalAuthId);
+
+		if (externalAuthOnly) {
+			userAccount.setMd5Password("");
+			userAccount.setOldPassword("");
+			userAccount.setPasswordChangeRequired(false);
+			userAccount.setPasswordLinkExpires(0L);
+		}
+
+		if (isRootUser()) {
+			userAccount.setPermissionSetUris(Collections.<String> emptySet());
+			userAccount.setExternalAuthOnly(false);
+		} else {
+			userAccount.setPermissionSetUris(selectedRoleUris);
+			userAccount.setExternalAuthOnly(externalAuthOnly);
+		}
+		strategy.setAdditionalProperties(userAccount);
+
+		// Update the account.
+		userAccountsDao.updateUserAccount(userAccount);
+
+		// Associate the profile, as appropriate.
+		if (matchingIsEnabled) {
+			if (!newProfileClassUri.isEmpty()) {
+				try {
+					String newProfileUri = UserAccountsProfileCreator
+							.createProfile(indDao, dpsDao, newProfileClassUri,
+									userAccount);
+					associatedProfileUri = newProfileUri;
+				} catch (InsertException e) {
+					log.error("Failed to create new profile of class '"
+							+ newProfileClassUri + "' for user '"
+							+ userAccount.getEmailAddress() + "'");
+				}
+			}
+
+			SelfEditingConfiguration.getBean(vreq)
+					.associateIndividualWithUserAccount(indDao, dpsDao,
+							userAccount, associatedProfileUri);
+		}
+
+		// Tell the user.
+		strategy.notifyUser();
+	}
+
+	public boolean wasPasswordEmailSent() {
+		return strategy.wasPasswordEmailSent();
+	}
+
+	public UserAccount getUpdatedAccount() {
+		return userAccount;
+	}
+
+	boolean isExternalAuthOnly() {
+		return externalAuthOnly;
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPageStrategy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPageStrategy.java
index a95105402..0c67d5e5a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPageStrategy.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsEditPageStrategy.java
@@ -1,214 +1,214 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin;
-
-import static javax.mail.Message.RecipientType.TO;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
-import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailMessage;
-
-/**
- * Handle the variant details of the UserAccountsAddPage.
- */
-public abstract class UserAccountsEditPageStrategy extends UserAccountsPage {
-	protected final UserAccountsEditPage page;
-
-	public static UserAccountsEditPageStrategy getInstance(VitroRequest vreq,
-			UserAccountsEditPage page, boolean emailEnabled) {
-		if (emailEnabled) {
-			return new EmailStrategy(vreq, page);
-		} else {
-			return new NoEmailStrategy(vreq, page);
-		}
-	}
-
-	public UserAccountsEditPageStrategy(VitroRequest vreq,
-			UserAccountsEditPage page) {
-		super(vreq);
-		this.page = page;
-	}
-
-	protected abstract void parseAdditionalParameters();
-
-	protected abstract String additionalValidations();
-
-	protected abstract void addMoreBodyValues(Map<String, Object> body);
-
-	protected abstract void setAdditionalProperties(UserAccount u);
-
-	protected abstract void notifyUser();
-
-	protected abstract boolean wasPasswordEmailSent();
-
-	// ----------------------------------------------------------------------
-	// Strategy to use if email is enabled.
-	// ----------------------------------------------------------------------
-
-	private static class EmailStrategy extends UserAccountsEditPageStrategy {
-		private static final String PARAMETER_RESET_PASSWORD = "resetPassword";
-		private static final String EMAIL_TEMPLATE = "userAccounts-passwordResetPendingEmail.ftl";
-
-		public static final String RESET_PASSWORD_URL = "/accounts/resetPassword";
-
-		private boolean resetPassword;
-		private boolean sentEmail;
-
-		public EmailStrategy(VitroRequest vreq, UserAccountsEditPage page) {
-			super(vreq, page);
-		}
-
-		@Override
-		protected void parseAdditionalParameters() {
-			resetPassword = isFlagOnRequest(PARAMETER_RESET_PASSWORD);
-		}
-
-		@Override
-		protected String additionalValidations() {
-			// No additional validations
-			return "";
-		}
-
-		@Override
-		protected void setAdditionalProperties(UserAccount u) {
-			if (resetPassword && !page.isExternalAuthOnly()) {
-				u.setPasswordLinkExpires(figureExpirationDate().getTime());
-			}
-		}
-
-		@Override
-		protected void addMoreBodyValues(Map<String, Object> body) {
-			body.put("emailIsEnabled", Boolean.TRUE);
-			if (resetPassword) {
-				body.put("resetPassword", Boolean.TRUE);
-			}
-		}
-
-		@Override
-		protected void notifyUser() {
-			if (!resetPassword) {
-				return;
-			}
-			if (page.isExternalAuthOnly()) {
-				return;
-			}
-
-			Map<String, Object> body = new HashMap<String, Object>();
-			body.put("userAccount", page.getUpdatedAccount());
-			body.put("passwordLink", buildResetPasswordLink());
-			body.put("siteName", getSiteName());
-
-			FreemarkerEmailMessage email = FreemarkerEmailFactory
-					.createNewMessage(vreq);
-			email.addRecipient(TO, page.getUpdatedAccount().getEmailAddress());
-			email.setTemplate(EMAIL_TEMPLATE);
-			email.setBodyMap(body);
-			email.processTemplate();
-			email.send();
-
-			sentEmail = true;
-		}
-
-		private String buildResetPasswordLink() {
-			try {
-				String email = page.getUpdatedAccount().getEmailAddress();
-				String hash = page.getUpdatedAccount()
-						.getPasswordLinkExpiresHash();
-				String relativeUrl = UrlBuilder.getUrl(RESET_PASSWORD_URL,
-						"user", email, "key", hash);
-
-				URL context = new URL(vreq.getRequestURL().toString());
-				URL url = new URL(context, relativeUrl);
-				return url.toExternalForm();
-			} catch (MalformedURLException e) {
-				return "error_creating_password_link";
-			}
-		}
-
-		@Override
-		protected boolean wasPasswordEmailSent() {
-			return sentEmail;
-		}
-
-	}
-
-	// ----------------------------------------------------------------------
-	// Strategy to use if email is not enabled.
-	// ----------------------------------------------------------------------
-
-	private static class NoEmailStrategy extends UserAccountsEditPageStrategy {
-		private static final String PARAMETER_NEW_PASSWORD = "newPassword";
-		private static final String PARAMETER_CONFIRM_PASSWORD = "confirmPassword";
-
-		private static final String ERROR_WRONG_PASSWORD_LENGTH = "errorPasswordIsWrongLength";
-		private static final String ERROR_PASSWORDS_DONT_MATCH = "errorPasswordsDontMatch";
-
-		private String newPassword;
-		private String confirmPassword;
-
-		public NoEmailStrategy(VitroRequest vreq, UserAccountsEditPage page) {
-			super(vreq, page);
-		}
-
-		@Override
-		protected void parseAdditionalParameters() {
-			newPassword = getStringParameter(PARAMETER_NEW_PASSWORD, "");
-			confirmPassword = getStringParameter(PARAMETER_CONFIRM_PASSWORD, "");
-		}
-
-		@Override
-		protected String additionalValidations() {
-			if (page.isExternalAuthOnly()) {
-				// No need to check the password info on external-only accounts
-				return "";
-			}
-
-			if (newPassword.isEmpty() && confirmPassword.isEmpty()) {
-				return "";
-			} else if (!checkPasswordLength(newPassword)) {
-				return ERROR_WRONG_PASSWORD_LENGTH;
-			} else if (!newPassword.equals(confirmPassword)) {
-				return ERROR_PASSWORDS_DONT_MATCH;
-			} else {
-				return "";
-			}
-		}
-
-		@Override
-		protected void addMoreBodyValues(Map<String, Object> body) {
-			body.put("newPassword", newPassword);
-			body.put("confirmPassword", confirmPassword);
-			body.put("minimumLength", UserAccount.MIN_PASSWORD_LENGTH);
-			body.put("maximumLength", UserAccount.MAX_PASSWORD_LENGTH);
-		}
-
-		@Override
-		protected void setAdditionalProperties(UserAccount u) {
-			if (!page.isExternalAuthOnly() && !newPassword.isEmpty()) {
-				u.setMd5Password(Authenticator.applyMd5Encoding(newPassword));
-				u.setPasswordChangeRequired(true);
-			}
-		}
-
-		@Override
-		protected void notifyUser() {
-			// Do nothing.
-		}
-
-		@Override
-		protected boolean wasPasswordEmailSent() {
-			return false;
-		}
-
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin;
+
+import static javax.mail.Message.RecipientType.TO;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.Map;
+
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
+import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailMessage;
+
+/**
+ * Handle the variant details of the UserAccountsAddPage.
+ */
+public abstract class UserAccountsEditPageStrategy extends UserAccountsPage {
+	protected final UserAccountsEditPage page;
+
+	public static UserAccountsEditPageStrategy getInstance(VitroRequest vreq,
+			UserAccountsEditPage page, boolean emailEnabled) {
+		if (emailEnabled) {
+			return new EmailStrategy(vreq, page);
+		} else {
+			return new NoEmailStrategy(vreq, page);
+		}
+	}
+
+	public UserAccountsEditPageStrategy(VitroRequest vreq,
+			UserAccountsEditPage page) {
+		super(vreq);
+		this.page = page;
+	}
+
+	protected abstract void parseAdditionalParameters();
+
+	protected abstract String additionalValidations();
+
+	protected abstract void addMoreBodyValues(Map<String, Object> body);
+
+	protected abstract void setAdditionalProperties(UserAccount u);
+
+	protected abstract void notifyUser();
+
+	protected abstract boolean wasPasswordEmailSent();
+
+	// ----------------------------------------------------------------------
+	// Strategy to use if email is enabled.
+	// ----------------------------------------------------------------------
+
+	private static class EmailStrategy extends UserAccountsEditPageStrategy {
+		private static final String PARAMETER_RESET_PASSWORD = "resetPassword";
+		private static final String EMAIL_TEMPLATE = "userAccounts-passwordResetPendingEmail.ftl";
+
+		public static final String RESET_PASSWORD_URL = "/accounts/resetPassword";
+
+		private boolean resetPassword;
+		private boolean sentEmail;
+
+		public EmailStrategy(VitroRequest vreq, UserAccountsEditPage page) {
+			super(vreq, page);
+		}
+
+		@Override
+		protected void parseAdditionalParameters() {
+			resetPassword = isFlagOnRequest(PARAMETER_RESET_PASSWORD);
+		}
+
+		@Override
+		protected String additionalValidations() {
+			// No additional validations
+			return "";
+		}
+
+		@Override
+		protected void setAdditionalProperties(UserAccount u) {
+			if (resetPassword && !page.isExternalAuthOnly()) {
+				u.setPasswordLinkExpires(figureExpirationDate().getTime());
+			}
+		}
+
+		@Override
+		protected void addMoreBodyValues(Map<String, Object> body) {
+			body.put("emailIsEnabled", Boolean.TRUE);
+			if (resetPassword) {
+				body.put("resetPassword", Boolean.TRUE);
+			}
+		}
+
+		@Override
+		protected void notifyUser() {
+			if (!resetPassword) {
+				return;
+			}
+			if (page.isExternalAuthOnly()) {
+				return;
+			}
+
+			Map<String, Object> body = new HashMap<String, Object>();
+			body.put("userAccount", page.getUpdatedAccount());
+			body.put("passwordLink", buildResetPasswordLink());
+			body.put("siteName", getSiteName());
+
+			FreemarkerEmailMessage email = FreemarkerEmailFactory
+					.createNewMessage(vreq);
+			email.addRecipient(TO, page.getUpdatedAccount().getEmailAddress());
+			email.setTemplate(EMAIL_TEMPLATE);
+			email.setBodyMap(body);
+			email.processTemplate();
+			email.send();
+
+			sentEmail = true;
+		}
+
+		private String buildResetPasswordLink() {
+			try {
+				String email = page.getUpdatedAccount().getEmailAddress();
+				String hash = page.getUpdatedAccount()
+						.getPasswordLinkExpiresHash();
+				String relativeUrl = UrlBuilder.getUrl(RESET_PASSWORD_URL,
+						"user", email, "key", hash);
+
+				URL context = new URL(vreq.getRequestURL().toString());
+				URL url = new URL(context, relativeUrl);
+				return url.toExternalForm();
+			} catch (MalformedURLException e) {
+				return "error_creating_password_link";
+			}
+		}
+
+		@Override
+		protected boolean wasPasswordEmailSent() {
+			return sentEmail;
+		}
+
+	}
+
+	// ----------------------------------------------------------------------
+	// Strategy to use if email is not enabled.
+	// ----------------------------------------------------------------------
+
+	private static class NoEmailStrategy extends UserAccountsEditPageStrategy {
+		private static final String PARAMETER_NEW_PASSWORD = "newPassword";
+		private static final String PARAMETER_CONFIRM_PASSWORD = "confirmPassword";
+
+		private static final String ERROR_WRONG_PASSWORD_LENGTH = "errorPasswordIsWrongLength";
+		private static final String ERROR_PASSWORDS_DONT_MATCH = "errorPasswordsDontMatch";
+
+		private String newPassword;
+		private String confirmPassword;
+
+		public NoEmailStrategy(VitroRequest vreq, UserAccountsEditPage page) {
+			super(vreq, page);
+		}
+
+		@Override
+		protected void parseAdditionalParameters() {
+			newPassword = getStringParameter(PARAMETER_NEW_PASSWORD, "");
+			confirmPassword = getStringParameter(PARAMETER_CONFIRM_PASSWORD, "");
+		}
+
+		@Override
+		protected String additionalValidations() {
+			if (page.isExternalAuthOnly()) {
+				// No need to check the password info on external-only accounts
+				return "";
+			}
+
+			if (newPassword.isEmpty() && confirmPassword.isEmpty()) {
+				return "";
+			} else if (!checkPasswordLength(newPassword)) {
+				return ERROR_WRONG_PASSWORD_LENGTH;
+			} else if (!newPassword.equals(confirmPassword)) {
+				return ERROR_PASSWORDS_DONT_MATCH;
+			} else {
+				return "";
+			}
+		}
+
+		@Override
+		protected void addMoreBodyValues(Map<String, Object> body) {
+			body.put("newPassword", newPassword);
+			body.put("confirmPassword", confirmPassword);
+			body.put("minimumLength", UserAccount.MIN_PASSWORD_LENGTH);
+			body.put("maximumLength", UserAccount.MAX_PASSWORD_LENGTH);
+		}
+
+		@Override
+		protected void setAdditionalProperties(UserAccount u) {
+			if (!page.isExternalAuthOnly() && !newPassword.isEmpty()) {
+				u.setMd5Password(Authenticator.applyMd5Encoding(newPassword));
+				u.setPasswordChangeRequired(true);
+			}
+		}
+
+		@Override
+		protected void notifyUser() {
+			// Do nothing.
+		}
+
+		@Override
+		protected boolean wasPasswordEmailSent() {
+			return false;
+		}
+
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsListPage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsListPage.java
index 97f2365ab..07a74c560 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsListPage.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsListPage.java
@@ -1,394 +1,394 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin;
-
-import static edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsSelectionCriteria.DEFAULT_ACCOUNTS_PER_PAGE;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageRootAccount;
-import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering.Direction;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering.Field;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsSelection;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsSelectionCriteria;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsSelector;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-
-/**
- * Handle the List page.
- * 
- * TODO: auto-complete
- */
-public class UserAccountsListPage extends UserAccountsPage {
-	private static final Log log = LogFactory
-			.getLog(UserAccountsListPage.class);
-
-	public static final String PARAMETER_ACCOUNTS_PER_PAGE = "accountsPerPage";
-	public static final String PARAMETER_PAGE_INDEX = "pageIndex";
-	public static final String PARAMETER_ORDERING_DIRECTION = "orderDirection";
-	public static final String PARAMETER_ORDERING_FIELD = "orderField";
-	public static final String PARAMETER_ROLE_FILTER_URI = "roleFilterUri";
-	public static final String PARAMETER_SEARCH_TERM = "searchTerm";
-	public static final String PARAMETER_NEW_USER_URI = "newUserUri";
-	public static final String PARAMETER_UPDATED_USER_URI = "updatedUserUri";
-	public static final String FLAG_UPDATED_USER_PW = "updatedUserPw";
-	public static final String FLAG_USERS_DELETED = "usersDeleted";
-
-	private static final String TEMPLATE_NAME = "userAccounts-list.ftl";
-
-	private UserAccountsSelectionCriteria criteria = UserAccountsSelectionCriteria.DEFAULT_CRITERIA;
-
-	public UserAccountsListPage(VitroRequest vreq) {
-		super(vreq);
-		parseParameters();
-	}
-
-	/**
-	 * Build the criteria from the request parameters.
-	 */
-	private void parseParameters() {
-		int accountsPerPage = getIntegerParameter(PARAMETER_ACCOUNTS_PER_PAGE,
-				DEFAULT_ACCOUNTS_PER_PAGE);
-		int pageIndex = getIntegerParameter(PARAMETER_PAGE_INDEX, 1);
-
-		Direction orderingDirection = Direction.fromKeyword(vreq
-				.getParameter(PARAMETER_ORDERING_DIRECTION));
-		Field orderingField = Field.fromName(vreq
-				.getParameter(PARAMETER_ORDERING_FIELD));
-		UserAccountsOrdering ordering = new UserAccountsOrdering(orderingField,
-				orderingDirection);
-
-		String roleFilterUri = getStringParameter(PARAMETER_ROLE_FILTER_URI, "");
-		String searchTerm = getStringParameter(PARAMETER_SEARCH_TERM, "");
-
-		criteria = new UserAccountsSelectionCriteria(accountsPerPage,
-				pageIndex, ordering, roleFilterUri, searchTerm);
-		log.debug("selection criteria is: " + criteria);
-	}
-
-	/**
-	 * Build the selection criteria from the request, select the accounts, and
-	 * create the ResponseValues to display the page.
-	 */
-	public ResponseValues showPage() {
-		UserAccountsSelection selection = UserAccountsSelector.select(
-				userAccountsModel, criteria);
-		Map<String, Object> body = buildTemplateBodyMap(selection);
-		Message.applyToBodyMap(vreq, body);
-		return new TemplateResponseValues(TEMPLATE_NAME, body);
-	}
-
-	private Map<String, Object> buildTemplateBodyMap(
-			UserAccountsSelection selection) {
-		Map<String, Object> body = new HashMap<String, Object>();
-
-		body.put("accountsPerPage", criteria.getAccountsPerPage());
-		body.put("pageIndex", criteria.getPageIndex());
-		body.put("orderDirection", criteria.getOrderBy().getDirection().keyword);
-		body.put("orderField", criteria.getOrderBy().getField().name);
-		body.put("roleFilterUri", criteria.getRoleFilterUri());
-		body.put("searchTerm", criteria.getSearchTerm());
-
-		body.put("accounts", wrapUserAccounts(selection));
-		body.put("total", selection.getResultCount());
-		body.put("page", buildPageMap(selection));
-
-		body.put("formUrls", buildUrlsMap());
-		body.put("roles", buildListOfSelectableRoles());
-
-		body.put("messages", buildMessagesMap());
-
-		return body;
-	}
-
-	private Map<String, Integer> buildPageMap(UserAccountsSelection selection) {
-		int currentPage = selection.getCriteria().getPageIndex();
-
-		float pageCount = ((float) selection.getResultCount())
-				/ selection.getCriteria().getAccountsPerPage();
-		int lastPage = (int) Math.ceil(pageCount);
-
-		Map<String, Integer> map = new HashMap<String, Integer>();
-
-		map.put("current", currentPage);
-		map.put("first", 1);
-		map.put("last", lastPage);
-
-		if (currentPage < lastPage) {
-			map.put("next", currentPage + 1);
-		}
-		if (currentPage > 1) {
-			map.put("previous", currentPage - 1);
-		}
-
-		return map;
-	}
-
-	private Map<String, Object> buildMessagesMap() {
-		Map<String, Object> map = new HashMap<String, Object>();
-
-		UserAccount newUser = getUserFromUriParameter(PARAMETER_NEW_USER_URI);
-		if (newUser != null) {
-			map.put("newUser", newUser);
-		}
-
-		UserAccount updatedUser = getUserFromUriParameter(PARAMETER_UPDATED_USER_URI);
-		if (updatedUser != null) {
-			map.put("updatedUser", updatedUser);
-		}
-
-		if (isFlagOnRequest(FLAG_UPDATED_USER_PW)) {
-			map.put("updatedUserPw", true);
-		}
-
-		if (isFlagOnRequest(FLAG_USERS_DELETED)) {
-			map.put("usersDeleted", true);
-		}
-
-		return map;
-	}
-
-	private UserAccount getUserFromUriParameter(String key) {
-		String uri = vreq.getParameter(key);
-		if ((uri == null) || uri.isEmpty()) {
-			return null;
-		}
-
-		return userAccountsDao.getUserAccountByUri(uri);
-	}
-
-	/**
-	 * The UserAccount has a list of PermissionSetUris, but the Freemarker
-	 * template needs a list of PermissionSet labels instead.
-	 */
-	private List<UserAccountWrapper> wrapUserAccounts(
-			UserAccountsSelection selection) {
-		List<UserAccountWrapper> list = new ArrayList<UserAccountWrapper>();
-		for (UserAccount account : selection.getUserAccounts()) {
-			UserAccountWrapper wrapper = new UserAccountWrapper(account,
-					findPermissionSetLabels(account), permittedToEdit(account),
-					permittedToDelete(account));
-			list.add(wrapper);
-		}
-		return list;
-	}
-
-	private boolean permittedToEdit(UserAccount account) {
-		if (!account.isRootUser()) {
-			return true;
-		}
-		if (PolicyHelper.isAuthorizedForActions(vreq, new ManageRootAccount())) {
-			return true;
-		}
-		return false;
-	}
-
-	private boolean permittedToDelete(UserAccount account) {
-		if (!permittedToEdit(account)) {
-			return false;
-		}
-		UserAccount loggedInUser = LoginStatusBean.getCurrentUser(vreq);
-		if (loggedInUser == null) {
-			return false;
-		}
-		if (account.getUri().equals(loggedInUser.getUri())) {
-			return false;
-		}
-		return true;
-	}
-
-	private List<String> findPermissionSetLabels(UserAccount account) {
-		List<String> labels = new ArrayList<String>();
-
-		if (account.isRootUser()) {
-			labels.add("ROOT");
-		} else {
-			for (String uri : account.getPermissionSetUris()) {
-				PermissionSet pSet = userAccountsDao.getPermissionSetByUri(uri);
-				if (pSet != null) {
-					labels.add(pSet.getLabel());
-				}
-			}
-		}
-		return labels;
-	}
-
-	/**
-	 * Shows PermissionSet labels instead of PermissionSet URIs.
-	 */
-	public static class UserAccountWrapper {
-		private final UserAccount account;
-		private final List<String> permissionSets;
-		private final String editUrl;
-		private final boolean deletable;
-
-		public UserAccountWrapper(UserAccount account,
-				List<String> permissionSets, boolean showEditUrl,
-				boolean permitDelete) {
-			this.account = account;
-			this.permissionSets = permissionSets;
-			this.deletable = permitDelete;
-
-			if (showEditUrl) {
-				this.editUrl = UserAccountsPage
-						.editAccountUrl(account.getUri());
-			} else {
-				this.editUrl = "";
-			}
-		}
-
-		public String getUri() {
-			return account.getUri();
-		}
-
-		public String getEmailAddress() {
-			return account.getEmailAddress();
-		}
-
-		public String getFirstName() {
-			return account.getFirstName();
-		}
-
-		public String getLastName() {
-			return account.getLastName();
-		}
-
-		public int getLoginCount() {
-			return account.getLoginCount();
-		}
-
-		public Date getLastLoginTime() {
-			long time = account.getLastLoginTime();
-			if (time > 0L) {
-				return new Date(time);
-			} else {
-				return null;
-			}
-		}
-
-		public String getStatus() {
-			Status status = account.getStatus();
-			if (status == null) {
-				return "";
-			} else {
-				return status.toString();
-			}
-		}
-
-		public List<String> getPermissionSets() {
-			return permissionSets;
-		}
-
-		public String getEditUrl() {
-			return editUrl;
-		}
-
-		public boolean isDeletable() {
-			return deletable;
-		}
-
-	}
-
-	/**
-	 * Message info that lives in the session. Another request can store this,
-	 * and it will be displayed (once) by the list page.
-	 */
-	public static class Message {
-		private static final String ATTRIBUTE = Message.class.getName();
-		private static final Collection<String> EMPTY = Collections.emptySet();
-
-		public static void showNewAccount(HttpServletRequest req,
-				UserAccount userAccount, boolean emailWasSent) {
-			Message message = new Message(Type.NEW_ACCOUNT, userAccount,
-					emailWasSent, EMPTY);
-			setMessage(req, message);
-		}
-
-		public static void showUpdatedAccount(HttpServletRequest req,
-				UserAccount userAccount, boolean emailWasSent) {
-			Message message = new Message(Type.UPDATED_ACCOUNT, userAccount,
-					emailWasSent, EMPTY);
-			setMessage(req, message);
-		}
-
-		public static void showDeletions(HttpServletRequest req,
-				Collection<String> deletedUris) {
-			Message message = new Message(Type.DELETIONS, null, false,
-					deletedUris);
-			setMessage(req, message);
-		}
-
-		private static void setMessage(HttpServletRequest req, Message message) {
-			req.getSession().setAttribute(ATTRIBUTE, message);
-		}
-
-		public static void applyToBodyMap(HttpServletRequest req,
-				Map<String, Object> body) {
-			HttpSession session = req.getSession();
-			Object o = session.getAttribute(ATTRIBUTE);
-			session.removeAttribute(ATTRIBUTE);
-
-			if (o instanceof Message) {
-				((Message) o).applyToBodyMap(body);
-			}
-		}
-
-		enum Type {
-			NEW_ACCOUNT, UPDATED_ACCOUNT, DELETIONS
-		}
-
-		private final Type type;
-		private final UserAccount userAccount;
-		private final boolean emailWasSent;
-		private final Collection<String> deletedUris;
-
-		public Message(Type type, UserAccount userAccount,
-				boolean emailWasSent, Collection<String> deletedUris) {
-			this.type = type;
-			this.userAccount = userAccount;
-			this.emailWasSent = emailWasSent;
-			this.deletedUris = deletedUris;
-		}
-
-		private void applyToBodyMap(Map<String, Object> body) {
-			if (type == Type.NEW_ACCOUNT) {
-				body.put("newUserAccount", new UserAccountWrapper(userAccount,
-						Collections.<String> emptyList(), true, false));
-				if (emailWasSent) {
-					body.put("emailWasSent", Boolean.TRUE);
-				}
-			} else if (type == Type.UPDATED_ACCOUNT) {
-				body.put("updatedUserAccount", new UserAccountWrapper(
-						userAccount, Collections.<String> emptyList(), true,
-						false));
-				if (emailWasSent) {
-					body.put("emailWasSent", Boolean.TRUE);
-				}
-			} else {
-				body.put("deletedAccountCount", deletedUris.size());
-			}
-		}
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin;
+
+import static edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsSelectionCriteria.DEFAULT_ACCOUNTS_PER_PAGE;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.usepages.ManageRootAccount;
+import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering.Direction;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering.Field;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsSelection;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsSelectionCriteria;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsSelector;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+
+/**
+ * Handle the List page.
+ * 
+ * TODO: auto-complete
+ */
+public class UserAccountsListPage extends UserAccountsPage {
+	private static final Log log = LogFactory
+			.getLog(UserAccountsListPage.class);
+
+	public static final String PARAMETER_ACCOUNTS_PER_PAGE = "accountsPerPage";
+	public static final String PARAMETER_PAGE_INDEX = "pageIndex";
+	public static final String PARAMETER_ORDERING_DIRECTION = "orderDirection";
+	public static final String PARAMETER_ORDERING_FIELD = "orderField";
+	public static final String PARAMETER_ROLE_FILTER_URI = "roleFilterUri";
+	public static final String PARAMETER_SEARCH_TERM = "searchTerm";
+	public static final String PARAMETER_NEW_USER_URI = "newUserUri";
+	public static final String PARAMETER_UPDATED_USER_URI = "updatedUserUri";
+	public static final String FLAG_UPDATED_USER_PW = "updatedUserPw";
+	public static final String FLAG_USERS_DELETED = "usersDeleted";
+
+	private static final String TEMPLATE_NAME = "userAccounts-list.ftl";
+
+	private UserAccountsSelectionCriteria criteria = UserAccountsSelectionCriteria.DEFAULT_CRITERIA;
+
+	public UserAccountsListPage(VitroRequest vreq) {
+		super(vreq);
+		parseParameters();
+	}
+
+	/**
+	 * Build the criteria from the request parameters.
+	 */
+	private void parseParameters() {
+		int accountsPerPage = getIntegerParameter(PARAMETER_ACCOUNTS_PER_PAGE,
+				DEFAULT_ACCOUNTS_PER_PAGE);
+		int pageIndex = getIntegerParameter(PARAMETER_PAGE_INDEX, 1);
+
+		Direction orderingDirection = Direction.fromKeyword(vreq
+				.getParameter(PARAMETER_ORDERING_DIRECTION));
+		Field orderingField = Field.fromName(vreq
+				.getParameter(PARAMETER_ORDERING_FIELD));
+		UserAccountsOrdering ordering = new UserAccountsOrdering(orderingField,
+				orderingDirection);
+
+		String roleFilterUri = getStringParameter(PARAMETER_ROLE_FILTER_URI, "");
+		String searchTerm = getStringParameter(PARAMETER_SEARCH_TERM, "");
+
+		criteria = new UserAccountsSelectionCriteria(accountsPerPage,
+				pageIndex, ordering, roleFilterUri, searchTerm);
+		log.debug("selection criteria is: " + criteria);
+	}
+
+	/**
+	 * Build the selection criteria from the request, select the accounts, and
+	 * create the ResponseValues to display the page.
+	 */
+	public ResponseValues showPage() {
+		UserAccountsSelection selection = UserAccountsSelector.select(
+				userAccountsModel, criteria);
+		Map<String, Object> body = buildTemplateBodyMap(selection);
+		Message.applyToBodyMap(vreq, body);
+		return new TemplateResponseValues(TEMPLATE_NAME, body);
+	}
+
+	private Map<String, Object> buildTemplateBodyMap(
+			UserAccountsSelection selection) {
+		Map<String, Object> body = new HashMap<String, Object>();
+
+		body.put("accountsPerPage", criteria.getAccountsPerPage());
+		body.put("pageIndex", criteria.getPageIndex());
+		body.put("orderDirection", criteria.getOrderBy().getDirection().keyword);
+		body.put("orderField", criteria.getOrderBy().getField().name);
+		body.put("roleFilterUri", criteria.getRoleFilterUri());
+		body.put("searchTerm", criteria.getSearchTerm());
+
+		body.put("accounts", wrapUserAccounts(selection));
+		body.put("total", selection.getResultCount());
+		body.put("page", buildPageMap(selection));
+
+		body.put("formUrls", buildUrlsMap());
+		body.put("roles", buildListOfSelectableRoles());
+
+		body.put("messages", buildMessagesMap());
+
+		return body;
+	}
+
+	private Map<String, Integer> buildPageMap(UserAccountsSelection selection) {
+		int currentPage = selection.getCriteria().getPageIndex();
+
+		float pageCount = ((float) selection.getResultCount())
+				/ selection.getCriteria().getAccountsPerPage();
+		int lastPage = (int) Math.ceil(pageCount);
+
+		Map<String, Integer> map = new HashMap<String, Integer>();
+
+		map.put("current", currentPage);
+		map.put("first", 1);
+		map.put("last", lastPage);
+
+		if (currentPage < lastPage) {
+			map.put("next", currentPage + 1);
+		}
+		if (currentPage > 1) {
+			map.put("previous", currentPage - 1);
+		}
+
+		return map;
+	}
+
+	private Map<String, Object> buildMessagesMap() {
+		Map<String, Object> map = new HashMap<String, Object>();
+
+		UserAccount newUser = getUserFromUriParameter(PARAMETER_NEW_USER_URI);
+		if (newUser != null) {
+			map.put("newUser", newUser);
+		}
+
+		UserAccount updatedUser = getUserFromUriParameter(PARAMETER_UPDATED_USER_URI);
+		if (updatedUser != null) {
+			map.put("updatedUser", updatedUser);
+		}
+
+		if (isFlagOnRequest(FLAG_UPDATED_USER_PW)) {
+			map.put("updatedUserPw", true);
+		}
+
+		if (isFlagOnRequest(FLAG_USERS_DELETED)) {
+			map.put("usersDeleted", true);
+		}
+
+		return map;
+	}
+
+	private UserAccount getUserFromUriParameter(String key) {
+		String uri = vreq.getParameter(key);
+		if ((uri == null) || uri.isEmpty()) {
+			return null;
+		}
+
+		return userAccountsDao.getUserAccountByUri(uri);
+	}
+
+	/**
+	 * The UserAccount has a list of PermissionSetUris, but the Freemarker
+	 * template needs a list of PermissionSet labels instead.
+	 */
+	private List<UserAccountWrapper> wrapUserAccounts(
+			UserAccountsSelection selection) {
+		List<UserAccountWrapper> list = new ArrayList<UserAccountWrapper>();
+		for (UserAccount account : selection.getUserAccounts()) {
+			UserAccountWrapper wrapper = new UserAccountWrapper(account,
+					findPermissionSetLabels(account), permittedToEdit(account),
+					permittedToDelete(account));
+			list.add(wrapper);
+		}
+		return list;
+	}
+
+	private boolean permittedToEdit(UserAccount account) {
+		if (!account.isRootUser()) {
+			return true;
+		}
+		if (PolicyHelper.isAuthorizedForActions(vreq, new ManageRootAccount())) {
+			return true;
+		}
+		return false;
+	}
+
+	private boolean permittedToDelete(UserAccount account) {
+		if (!permittedToEdit(account)) {
+			return false;
+		}
+		UserAccount loggedInUser = LoginStatusBean.getCurrentUser(vreq);
+		if (loggedInUser == null) {
+			return false;
+		}
+		if (account.getUri().equals(loggedInUser.getUri())) {
+			return false;
+		}
+		return true;
+	}
+
+	private List<String> findPermissionSetLabels(UserAccount account) {
+		List<String> labels = new ArrayList<String>();
+
+		if (account.isRootUser()) {
+			labels.add("ROOT");
+		} else {
+			for (String uri : account.getPermissionSetUris()) {
+				PermissionSet pSet = userAccountsDao.getPermissionSetByUri(uri);
+				if (pSet != null) {
+					labels.add(pSet.getLabel());
+				}
+			}
+		}
+		return labels;
+	}
+
+	/**
+	 * Shows PermissionSet labels instead of PermissionSet URIs.
+	 */
+	public static class UserAccountWrapper {
+		private final UserAccount account;
+		private final List<String> permissionSets;
+		private final String editUrl;
+		private final boolean deletable;
+
+		public UserAccountWrapper(UserAccount account,
+				List<String> permissionSets, boolean showEditUrl,
+				boolean permitDelete) {
+			this.account = account;
+			this.permissionSets = permissionSets;
+			this.deletable = permitDelete;
+
+			if (showEditUrl) {
+				this.editUrl = UserAccountsPage
+						.editAccountUrl(account.getUri());
+			} else {
+				this.editUrl = "";
+			}
+		}
+
+		public String getUri() {
+			return account.getUri();
+		}
+
+		public String getEmailAddress() {
+			return account.getEmailAddress();
+		}
+
+		public String getFirstName() {
+			return account.getFirstName();
+		}
+
+		public String getLastName() {
+			return account.getLastName();
+		}
+
+		public int getLoginCount() {
+			return account.getLoginCount();
+		}
+
+		public Date getLastLoginTime() {
+			long time = account.getLastLoginTime();
+			if (time > 0L) {
+				return new Date(time);
+			} else {
+				return null;
+			}
+		}
+
+		public String getStatus() {
+			Status status = account.getStatus();
+			if (status == null) {
+				return "";
+			} else {
+				return status.toString();
+			}
+		}
+
+		public List<String> getPermissionSets() {
+			return permissionSets;
+		}
+
+		public String getEditUrl() {
+			return editUrl;
+		}
+
+		public boolean isDeletable() {
+			return deletable;
+		}
+
+	}
+
+	/**
+	 * Message info that lives in the session. Another request can store this,
+	 * and it will be displayed (once) by the list page.
+	 */
+	public static class Message {
+		private static final String ATTRIBUTE = Message.class.getName();
+		private static final Collection<String> EMPTY = Collections.emptySet();
+
+		public static void showNewAccount(HttpServletRequest req,
+				UserAccount userAccount, boolean emailWasSent) {
+			Message message = new Message(Type.NEW_ACCOUNT, userAccount,
+					emailWasSent, EMPTY);
+			setMessage(req, message);
+		}
+
+		public static void showUpdatedAccount(HttpServletRequest req,
+				UserAccount userAccount, boolean emailWasSent) {
+			Message message = new Message(Type.UPDATED_ACCOUNT, userAccount,
+					emailWasSent, EMPTY);
+			setMessage(req, message);
+		}
+
+		public static void showDeletions(HttpServletRequest req,
+				Collection<String> deletedUris) {
+			Message message = new Message(Type.DELETIONS, null, false,
+					deletedUris);
+			setMessage(req, message);
+		}
+
+		private static void setMessage(HttpServletRequest req, Message message) {
+			req.getSession().setAttribute(ATTRIBUTE, message);
+		}
+
+		public static void applyToBodyMap(HttpServletRequest req,
+				Map<String, Object> body) {
+			HttpSession session = req.getSession();
+			Object o = session.getAttribute(ATTRIBUTE);
+			session.removeAttribute(ATTRIBUTE);
+
+			if (o instanceof Message) {
+				((Message) o).applyToBodyMap(body);
+			}
+		}
+
+		enum Type {
+			NEW_ACCOUNT, UPDATED_ACCOUNT, DELETIONS
+		}
+
+		private final Type type;
+		private final UserAccount userAccount;
+		private final boolean emailWasSent;
+		private final Collection<String> deletedUris;
+
+		public Message(Type type, UserAccount userAccount,
+				boolean emailWasSent, Collection<String> deletedUris) {
+			this.type = type;
+			this.userAccount = userAccount;
+			this.emailWasSent = emailWasSent;
+			this.deletedUris = deletedUris;
+		}
+
+		private void applyToBodyMap(Map<String, Object> body) {
+			if (type == Type.NEW_ACCOUNT) {
+				body.put("newUserAccount", new UserAccountWrapper(userAccount,
+						Collections.<String> emptyList(), true, false));
+				if (emailWasSent) {
+					body.put("emailWasSent", Boolean.TRUE);
+				}
+			} else if (type == Type.UPDATED_ACCOUNT) {
+				body.put("updatedUserAccount", new UserAccountWrapper(
+						userAccount, Collections.<String> emptyList(), true,
+						false));
+				if (emailWasSent) {
+					body.put("emailWasSent", Boolean.TRUE);
+				}
+			} else {
+				body.put("deletedAccountCount", deletedUris.size());
+			}
+		}
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsProfileCreator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsProfileCreator.java
index d4d718cd4..cb4b11e1a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsProfileCreator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/UserAccountsProfileCreator.java
@@ -1,42 +1,42 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin;
-
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl;
-import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
-import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
-import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-
-/**
- * Create a new profile with the given VClass URI, and info from the user account.
- */
-public class UserAccountsProfileCreator {
-	private static final String URI_FOAF_FIRST_NAME = "http://xmlns.com/foaf/0.1/firstName";
-	private static final String URI_FOAF_LAST_NAME = "http://xmlns.com/foaf/0.1/lastName";
-
-	public static String createProfile(IndividualDao indDao,
-			DataPropertyStatementDao dpsDao, String profileClassUri,
-			UserAccount account) throws InsertException {
-		IndividualImpl i = new IndividualImpl();
-		i.setVClassURI(profileClassUri);
-		String indUri = indDao.insertNewIndividual(i);
-
-		addProp(dpsDao, indUri, URI_FOAF_FIRST_NAME, account.getFirstName());
-		addProp(dpsDao, indUri, URI_FOAF_LAST_NAME, account.getLastName());
-
-		String label = account.getLastName() + ", " + account.getFirstName();
-		addProp(dpsDao, indUri, VitroVocabulary.LABEL, label);
-		
-		return indUri;
-	}
-
-	private static void addProp(DataPropertyStatementDao dpsDao, String indUri,
-			String propertyUri, String value) {
-		DataPropertyStatementImpl dps = new DataPropertyStatementImpl(indUri,
-				propertyUri, value);
-		dpsDao.insertNewDataPropertyStatement(dps);
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin;
+
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl;
+import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
+import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+
+/**
+ * Create a new profile with the given VClass URI, and info from the user account.
+ */
+public class UserAccountsProfileCreator {
+	private static final String URI_FOAF_FIRST_NAME = "http://xmlns.com/foaf/0.1/firstName";
+	private static final String URI_FOAF_LAST_NAME = "http://xmlns.com/foaf/0.1/lastName";
+
+	public static String createProfile(IndividualDao indDao,
+			DataPropertyStatementDao dpsDao, String profileClassUri,
+			UserAccount account) throws InsertException {
+		IndividualImpl i = new IndividualImpl();
+		i.setVClassURI(profileClassUri);
+		String indUri = indDao.insertNewIndividual(i);
+
+		addProp(dpsDao, indUri, URI_FOAF_FIRST_NAME, account.getFirstName());
+		addProp(dpsDao, indUri, URI_FOAF_LAST_NAME, account.getLastName());
+
+		String label = account.getLastName() + ", " + account.getFirstName();
+		addProp(dpsDao, indUri, VitroVocabulary.LABEL, label);
+		
+		return indUri;
+	}
+
+	private static void addProp(DataPropertyStatementDao dpsDao, String indUri,
+			String propertyUri, String value) {
+		DataPropertyStatementImpl dps = new DataPropertyStatementImpl(indUri,
+				propertyUri, value);
+		dpsDao.insertNewDataPropertyStatement(dps);
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ExternalAuthChecker.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ExternalAuthChecker.java
index 7f539204d..874bd9479 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ExternalAuthChecker.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ExternalAuthChecker.java
@@ -1,126 +1,126 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin.ajax;
-
-import java.io.IOException;
-import java.util.List;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.ajax.AbstractAjaxResponder;
-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 {
-	private static final Log log = LogFactory.getLog(ExternalAuthChecker.class);
-
-	private static final String PARAMETER_USER_ACCOUNT_URI = "userAccountUri";
-	private static final String PARAMETER_ETERNAL_AUTH_ID = "externalAuthId";
-	private static final String RESPONSE_ID_IN_USE = "idInUse";
-	private static final String RESPONSE_MATCHES_PROFILE = "matchesProfile";
-	private static final String RESPONSE_PROFILE_URI = "profileUri";
-	private static final String RESPONSE_PROFILE_URL = "profileUrl";
-	private static final String RESPONSE_PROFILE_LABEL = "profileLabel";
-
-	private final String userAccountUri;
-	private final String externalAuthId;
-
-	private Individual matchingProfile;
-
-	public ExternalAuthChecker(HttpServlet parent, VitroRequest vreq,
-			HttpServletResponse resp) {
-		super(parent, vreq, resp);
-		userAccountUri = getStringParameter(PARAMETER_USER_ACCOUNT_URI, "");
-		externalAuthId = getStringParameter(PARAMETER_ETERNAL_AUTH_ID, "");
-	}
-
-	@Override
-	public String prepareResponse() throws IOException, JSONException {
-		if (someoneElseIsUsingThisExternalAuthId()) {
-			return respondExternalAuthIdAlreadyUsed();
-		}
-
-		checkForMatchingProfile();
-		if (matchingProfile != null) {
-			return respondWithMatchingProfile();
-		}
-
-		return EMPTY_RESPONSE;
-	}
-
-	private boolean someoneElseIsUsingThisExternalAuthId() {
-		if (externalAuthId.isEmpty()) {
-			log.debug("externalAuthId is empty.");
-			return false;
-		}
-
-		UserAccount user = uaDao.getUserAccountByExternalAuthId(externalAuthId);
-		if (user == null) {
-			log.debug("no user account has externalAuthId='" + externalAuthId
-					+ "'");
-			return false;
-		}
-
-		if (user.getUri().equals(userAccountUri)) {
-			log.debug("externalAuthId '" + externalAuthId
-					+ "' belongs to current user '" + userAccountUri + "'");
-			return false;
-		}
-
-		log.debug(user.getEmailAddress() + " is already using externalAuthId '"
-				+ externalAuthId + "'");
-		return true;
-	}
-
-	private String respondExternalAuthIdAlreadyUsed() throws JSONException {
-		JSONObject jsonObject = new JSONObject();
-		jsonObject.put(RESPONSE_ID_IN_USE, true);
-		return jsonObject.toString();
-	}
-
-	private void checkForMatchingProfile() {
-		List<Individual> inds = SelfEditingConfiguration.getBean(vreq)
-				.getAssociatedIndividuals(indDao, externalAuthId);
-		if (inds.isEmpty()) {
-			log.debug("No profiles match '" + externalAuthId + "'");
-			return;
-		}
-
-		this.matchingProfile = inds.get(0);
-	}
-
-	private String respondWithMatchingProfile() throws JSONException {
-		String uri = matchingProfile.getURI();
-		String url = UrlBuilder.getIndividualProfileUrl(uri, vreq);
-		String label = matchingProfile.getRdfsLabel();
-
-		JSONObject jsonObject = new JSONObject();
-		jsonObject.put(RESPONSE_MATCHES_PROFILE, true);
-		jsonObject.put(RESPONSE_PROFILE_URI, uri);
-		jsonObject.put(RESPONSE_PROFILE_URL, url);
-		jsonObject.put(RESPONSE_PROFILE_LABEL, label);
-		return jsonObject.toString();
-	}
-
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin.ajax;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.ajax.AbstractAjaxResponder;
+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 {
+	private static final Log log = LogFactory.getLog(ExternalAuthChecker.class);
+
+	private static final String PARAMETER_USER_ACCOUNT_URI = "userAccountUri";
+	private static final String PARAMETER_ETERNAL_AUTH_ID = "externalAuthId";
+	private static final String RESPONSE_ID_IN_USE = "idInUse";
+	private static final String RESPONSE_MATCHES_PROFILE = "matchesProfile";
+	private static final String RESPONSE_PROFILE_URI = "profileUri";
+	private static final String RESPONSE_PROFILE_URL = "profileUrl";
+	private static final String RESPONSE_PROFILE_LABEL = "profileLabel";
+
+	private final String userAccountUri;
+	private final String externalAuthId;
+
+	private Individual matchingProfile;
+
+	public ExternalAuthChecker(HttpServlet parent, VitroRequest vreq,
+			HttpServletResponse resp) {
+		super(parent, vreq, resp);
+		userAccountUri = getStringParameter(PARAMETER_USER_ACCOUNT_URI, "");
+		externalAuthId = getStringParameter(PARAMETER_ETERNAL_AUTH_ID, "");
+	}
+
+	@Override
+	public String prepareResponse() throws IOException, JSONException {
+		if (someoneElseIsUsingThisExternalAuthId()) {
+			return respondExternalAuthIdAlreadyUsed();
+		}
+
+		checkForMatchingProfile();
+		if (matchingProfile != null) {
+			return respondWithMatchingProfile();
+		}
+
+		return EMPTY_RESPONSE;
+	}
+
+	private boolean someoneElseIsUsingThisExternalAuthId() {
+		if (externalAuthId.isEmpty()) {
+			log.debug("externalAuthId is empty.");
+			return false;
+		}
+
+		UserAccount user = uaDao.getUserAccountByExternalAuthId(externalAuthId);
+		if (user == null) {
+			log.debug("no user account has externalAuthId='" + externalAuthId
+					+ "'");
+			return false;
+		}
+
+		if (user.getUri().equals(userAccountUri)) {
+			log.debug("externalAuthId '" + externalAuthId
+					+ "' belongs to current user '" + userAccountUri + "'");
+			return false;
+		}
+
+		log.debug(user.getEmailAddress() + " is already using externalAuthId '"
+				+ externalAuthId + "'");
+		return true;
+	}
+
+	private String respondExternalAuthIdAlreadyUsed() throws JSONException {
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put(RESPONSE_ID_IN_USE, true);
+		return jsonObject.toString();
+	}
+
+	private void checkForMatchingProfile() {
+		List<Individual> inds = SelfEditingConfiguration.getBean(vreq)
+				.getAssociatedIndividuals(indDao, externalAuthId);
+		if (inds.isEmpty()) {
+			log.debug("No profiles match '" + externalAuthId + "'");
+			return;
+		}
+
+		this.matchingProfile = inds.get(0);
+	}
+
+	private String respondWithMatchingProfile() throws JSONException {
+		String uri = matchingProfile.getURI();
+		String url = UrlBuilder.getIndividualProfileUrl(uri, vreq);
+		String label = matchingProfile.getRdfsLabel();
+
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put(RESPONSE_MATCHES_PROFILE, true);
+		jsonObject.put(RESPONSE_PROFILE_URI, uri);
+		jsonObject.put(RESPONSE_PROFILE_URL, url);
+		jsonObject.put(RESPONSE_PROFILE_LABEL, label);
+		return jsonObject.toString();
+	}
+
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ProfileAutoCompleter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ProfileAutoCompleter.java
index 2fa957d50..3ad16b77e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ProfileAutoCompleter.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/ProfileAutoCompleter.java
@@ -1,230 +1,230 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin.ajax;
-
-import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.AC_NAME_STEMMED;
-import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.NAME_LOWERCASE_SINGLE_VALUED;
-import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.NAME_RAW;
-import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.NAME_UNSTEMMED;
-import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.RDFTYPE;
-import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.URI;
-import static edu.cornell.mannlib.vitro.webapp.utils.solr.SolrQueryUtils.Conjunction.OR;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.solr.client.solrj.SolrQuery;
-import org.apache.solr.client.solrj.SolrQuery.ORDER;
-import org.apache.solr.client.solrj.SolrServer;
-import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.response.QueryResponse;
-import org.json.JSONException;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.query.Syntax;
-import com.hp.hpl.jena.rdf.model.Literal;
-
-import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.ajax.AbstractAjaxResponder;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup;
-import edu.cornell.mannlib.vitro.webapp.utils.solr.AutoCompleteWords;
-import edu.cornell.mannlib.vitro.webapp.utils.solr.FieldMap;
-import edu.cornell.mannlib.vitro.webapp.utils.solr.SolrQueryUtils;
-import edu.cornell.mannlib.vitro.webapp.utils.solr.SolrResponseFilter;
-
-/**
- * Get a list of Profiles with last names that begin with this search term, and
- * 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.
- */
-class ProfileAutoCompleter extends AbstractAjaxResponder implements
-		SolrResponseFilter {
-	private static final Log log = LogFactory
-			.getLog(ProfileAutoCompleter.class);
-
-	private static final String PARAMETER_SEARCH_TERM = "term";
-	private static final String PARAMETER_ETERNAL_AUTH_ID = "externalAuthId";
-
-	private static final Collection<String> profileTypes = Collections
-			.singleton("http://xmlns.com/foaf/0.1/Person");
-
-	private static final String WORD_DELIMITER = "[, ]+";
-	private static final FieldMap RESPONSE_FIELDS = SolrQueryUtils.fieldMap()
-			.put(URI, "uri").put(NAME_RAW, "label");
-
-	private static final Syntax SYNTAX = Syntax.syntaxARQ;
-
-	/** Use this to check whether search results should be filtered out. */
-	private static final String QUERY_TEMPLATE = "" //
-			+ "SELECT DISTINCT ?id \n" //
-			+ "WHERE {\n" //
-			+ "    <%uri%> <%matchingPropertyUri%> ?id . \n" //
-			+ "} \n" //
-			+ "LIMIT 1 \n";
-
-	private final String externalAuthId;
-	private final String selfEditingIdMatchingProperty;
-	private final String term;
-	private final AutoCompleteWords searchWords;
-	private final OntModel fullModel;
-
-	public ProfileAutoCompleter(HttpServlet parent, VitroRequest vreq,
-			HttpServletResponse resp) {
-		super(parent, vreq, resp);
-		this.externalAuthId = getStringParameter(PARAMETER_ETERNAL_AUTH_ID, "");
-
-		this.term = getStringParameter(PARAMETER_SEARCH_TERM, "");
-		this.searchWords = SolrQueryUtils.parseForAutoComplete(term,
-				WORD_DELIMITER);
-
-		// TODO This seems to expose the matching property and mechanism too
-		// much. Can this be done within SelfEditingConfiguration somehow?
-		this.selfEditingIdMatchingProperty = SelfEditingConfiguration.getBean(
-				vreq).getMatchingPropertyUri();
-
-		this.fullModel = vreq.getJenaOntModel();
-	}
-
-	@Override
-	public String prepareResponse() throws IOException, JSONException {
-		if (term.isEmpty()) {
-			return EMPTY_RESPONSE;
-		}
-		if (selfEditingIdMatchingProperty == null) {
-			return EMPTY_RESPONSE;
-		}
-		if (selfEditingIdMatchingProperty.isEmpty()) {
-			return EMPTY_RESPONSE;
-		}
-
-		try {
-			SolrQuery query = buildSolrQuery();
-			QueryResponse queryResponse = executeSolrQuery(query);
-
-			List<Map<String, String>> maps = SolrQueryUtils
-					.parseAndFilterResponse(queryResponse, RESPONSE_FIELDS,
-							this, 30);
-
-			addProfileUrls(maps);
-
-			String response = assembleJsonResponse(maps);
-			log.debug(response);
-			return response;
-		} catch (SolrServerException e) {
-			log.error("Failed to get basic profile info", e);
-			return EMPTY_RESPONSE;
-		}
-	}
-
-	private SolrQuery buildSolrQuery() {
-		SolrQuery q = new SolrQuery();
-		q.setFields(NAME_RAW, URI);
-		q.setSortField(NAME_LOWERCASE_SINGLE_VALUED, ORDER.asc);
-		q.setFilterQueries(SolrQueryUtils.assembleConjunctiveQuery(RDFTYPE,
-				profileTypes, OR));
-		q.setStart(0);
-		q.setRows(10000);
-		q.setQuery(searchWords.assembleQuery(NAME_UNSTEMMED, AC_NAME_STEMMED));
-		return q;
-	}
-
-	private QueryResponse executeSolrQuery(SolrQuery query)
-			throws SolrServerException {
-		ServletContext ctx = servlet.getServletContext();
-		SolrServer solr = SolrSetup.getSolrServer(ctx);
-		return solr.query(query);
-	}
-
-	/**
-	 * For each URI in the maps, insert the corresponding URL.
-	 */
-	private void addProfileUrls(List<Map<String, String>> maps) {
-		for (Map<String, String> map : maps) {
-			String uri = map.get("uri");
-			String url = UrlBuilder.getIndividualProfileUrl(uri, vreq);
-			map.put("url", url);
-		}
-	}
-
-	/**
-	 * 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.
-	 */
-	@Override
-	public boolean accept(Map<String, String> map) {
-		String uri = map.get("uri");
-		if (uri == null) {
-			log.debug("reject result with no uri");
-			return false;
-		}
-
-		String id = runQueryAndGetId(uri);
-		if (id.isEmpty() || id.equals(externalAuthId)) {
-			log.debug("accept '" + uri + "' with id='" + id + "'");
-			return true;
-		}
-
-		log.debug("reject '" + uri + "' with id='" + id + "'");
-		return false;
-	}
-
-	/**
-	 * Run the query for the filter. Return the ID, if one was found.
-	 */
-	private String runQueryAndGetId(String uri) {
-		String queryString = QUERY_TEMPLATE.replace("%matchingPropertyUri%",
-				selfEditingIdMatchingProperty).replace("%uri%", uri);
-
-		QueryExecution qe = null;
-		try {
-			Query query = QueryFactory.create(queryString, SYNTAX);
-			qe = QueryExecutionFactory.create(query, fullModel);
-
-			ResultSet resultSet = qe.execSelect();
-			if (!resultSet.hasNext()) {
-				return "";
-			}
-
-			QuerySolution solution = resultSet.next();
-			Literal literal = solution.getLiteral("id");
-			if (literal == null) {
-				return "";
-			}
-
-			return literal.getString();
-		} catch (Exception e) {
-			log.error("Failed to execute the query: " + queryString, e);
-			return "";
-		} finally {
-			if (qe != null) {
-				qe.close();
-			}
-		}
-	}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin.ajax;
+
+import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.AC_NAME_STEMMED;
+import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.NAME_LOWERCASE_SINGLE_VALUED;
+import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.NAME_RAW;
+import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.NAME_UNSTEMMED;
+import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.RDFTYPE;
+import static edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames.URI;
+import static edu.cornell.mannlib.vitro.webapp.utils.solr.SolrQueryUtils.Conjunction.OR;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrQuery.ORDER;
+import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.json.JSONException;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.query.Syntax;
+import com.hp.hpl.jena.rdf.model.Literal;
+
+import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.ajax.AbstractAjaxResponder;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup;
+import edu.cornell.mannlib.vitro.webapp.utils.solr.AutoCompleteWords;
+import edu.cornell.mannlib.vitro.webapp.utils.solr.FieldMap;
+import edu.cornell.mannlib.vitro.webapp.utils.solr.SolrQueryUtils;
+import edu.cornell.mannlib.vitro.webapp.utils.solr.SolrResponseFilter;
+
+/**
+ * Get a list of Profiles with last names that begin with this search term, and
+ * 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.
+ */
+class ProfileAutoCompleter extends AbstractAjaxResponder implements
+		SolrResponseFilter {
+	private static final Log log = LogFactory
+			.getLog(ProfileAutoCompleter.class);
+
+	private static final String PARAMETER_SEARCH_TERM = "term";
+	private static final String PARAMETER_ETERNAL_AUTH_ID = "externalAuthId";
+
+	private static final Collection<String> profileTypes = Collections
+			.singleton("http://xmlns.com/foaf/0.1/Person");
+
+	private static final String WORD_DELIMITER = "[, ]+";
+	private static final FieldMap RESPONSE_FIELDS = SolrQueryUtils.fieldMap()
+			.put(URI, "uri").put(NAME_RAW, "label");
+
+	private static final Syntax SYNTAX = Syntax.syntaxARQ;
+
+	/** Use this to check whether search results should be filtered out. */
+	private static final String QUERY_TEMPLATE = "" //
+			+ "SELECT DISTINCT ?id \n" //
+			+ "WHERE {\n" //
+			+ "    <%uri%> <%matchingPropertyUri%> ?id . \n" //
+			+ "} \n" //
+			+ "LIMIT 1 \n";
+
+	private final String externalAuthId;
+	private final String selfEditingIdMatchingProperty;
+	private final String term;
+	private final AutoCompleteWords searchWords;
+	private final OntModel fullModel;
+
+	public ProfileAutoCompleter(HttpServlet parent, VitroRequest vreq,
+			HttpServletResponse resp) {
+		super(parent, vreq, resp);
+		this.externalAuthId = getStringParameter(PARAMETER_ETERNAL_AUTH_ID, "");
+
+		this.term = getStringParameter(PARAMETER_SEARCH_TERM, "");
+		this.searchWords = SolrQueryUtils.parseForAutoComplete(term,
+				WORD_DELIMITER);
+
+		// TODO This seems to expose the matching property and mechanism too
+		// much. Can this be done within SelfEditingConfiguration somehow?
+		this.selfEditingIdMatchingProperty = SelfEditingConfiguration.getBean(
+				vreq).getMatchingPropertyUri();
+
+		this.fullModel = vreq.getJenaOntModel();
+	}
+
+	@Override
+	public String prepareResponse() throws IOException, JSONException {
+		if (term.isEmpty()) {
+			return EMPTY_RESPONSE;
+		}
+		if (selfEditingIdMatchingProperty == null) {
+			return EMPTY_RESPONSE;
+		}
+		if (selfEditingIdMatchingProperty.isEmpty()) {
+			return EMPTY_RESPONSE;
+		}
+
+		try {
+			SolrQuery query = buildSolrQuery();
+			QueryResponse queryResponse = executeSolrQuery(query);
+
+			List<Map<String, String>> maps = SolrQueryUtils
+					.parseAndFilterResponse(queryResponse, RESPONSE_FIELDS,
+							this, 30);
+
+			addProfileUrls(maps);
+
+			String response = assembleJsonResponse(maps);
+			log.debug(response);
+			return response;
+		} catch (SolrServerException e) {
+			log.error("Failed to get basic profile info", e);
+			return EMPTY_RESPONSE;
+		}
+	}
+
+	private SolrQuery buildSolrQuery() {
+		SolrQuery q = new SolrQuery();
+		q.setFields(NAME_RAW, URI);
+		q.setSortField(NAME_LOWERCASE_SINGLE_VALUED, ORDER.asc);
+		q.setFilterQueries(SolrQueryUtils.assembleConjunctiveQuery(RDFTYPE,
+				profileTypes, OR));
+		q.setStart(0);
+		q.setRows(10000);
+		q.setQuery(searchWords.assembleQuery(NAME_UNSTEMMED, AC_NAME_STEMMED));
+		return q;
+	}
+
+	private QueryResponse executeSolrQuery(SolrQuery query)
+			throws SolrServerException {
+		ServletContext ctx = servlet.getServletContext();
+		SolrServer solr = SolrSetup.getSolrServer(ctx);
+		return solr.query(query);
+	}
+
+	/**
+	 * For each URI in the maps, insert the corresponding URL.
+	 */
+	private void addProfileUrls(List<Map<String, String>> maps) {
+		for (Map<String, String> map : maps) {
+			String uri = map.get("uri");
+			String url = UrlBuilder.getIndividualProfileUrl(uri, vreq);
+			map.put("url", url);
+		}
+	}
+
+	/**
+	 * 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.
+	 */
+	@Override
+	public boolean accept(Map<String, String> map) {
+		String uri = map.get("uri");
+		if (uri == null) {
+			log.debug("reject result with no uri");
+			return false;
+		}
+
+		String id = runQueryAndGetId(uri);
+		if (id.isEmpty() || id.equals(externalAuthId)) {
+			log.debug("accept '" + uri + "' with id='" + id + "'");
+			return true;
+		}
+
+		log.debug("reject '" + uri + "' with id='" + id + "'");
+		return false;
+	}
+
+	/**
+	 * Run the query for the filter. Return the ID, if one was found.
+	 */
+	private String runQueryAndGetId(String uri) {
+		String queryString = QUERY_TEMPLATE.replace("%matchingPropertyUri%",
+				selfEditingIdMatchingProperty).replace("%uri%", uri);
+
+		QueryExecution qe = null;
+		try {
+			Query query = QueryFactory.create(queryString, SYNTAX);
+			qe = QueryExecutionFactory.create(query, fullModel);
+
+			ResultSet resultSet = qe.execSelect();
+			if (!resultSet.hasNext()) {
+				return "";
+			}
+
+			QuerySolution solution = resultSet.next();
+			Literal literal = solution.getLiteral("id");
+			if (literal == null) {
+				return "";
+			}
+
+			return literal.getString();
+		} catch (Exception e) {
+			log.error("Failed to execute the query: " + queryString, e);
+			return "";
+		} finally {
+			if (qe != null) {
+				qe.close();
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/UserAccountsAjaxController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/UserAccountsAjaxController.java
index 6c6f23076..9643adc33 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/UserAccountsAjaxController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/admin/ajax/UserAccountsAjaxController.java
@@ -1,50 +1,50 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin.ajax;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController;
-
-/**
- * Handle the AJAX functions that are specific to the UserAccounts pages.
- */
-public class UserAccountsAjaxController extends VitroAjaxController {
-	private static final Log log = LogFactory
-			.getLog(UserAccountsAjaxController.class);
-
-	private static final String PARAMETER_ACTION = "action";
-
-	@Override
-	protected Actions requiredActions(VitroRequest vreq) {
-		return SimplePermission.MANAGE_USER_ACCOUNTS.ACTIONS;
-	}
-
-	@Override
-	protected void doRequest(VitroRequest vreq, HttpServletResponse resp)
-			throws ServletException, IOException {
-		try {
-			String function = vreq.getParameter(PARAMETER_ACTION);
-			if ("checkExternalAuth".equals(function)) {
-				new ExternalAuthChecker(this, vreq, resp).processRequest();
-			} else if ("autoCompleteProfile".equals(function)) {
-				new ProfileAutoCompleter(this, vreq, resp).processRequest();
-			} else {
-				resp.getWriter().write("[]");
-			}
-		} catch (Exception e) {
-			log.error(e, e);
-			resp.getWriter().write("[]");
-		}
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.admin.ajax;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController;
+
+/**
+ * Handle the AJAX functions that are specific to the UserAccounts pages.
+ */
+public class UserAccountsAjaxController extends VitroAjaxController {
+	private static final Log log = LogFactory
+			.getLog(UserAccountsAjaxController.class);
+
+	private static final String PARAMETER_ACTION = "action";
+
+	@Override
+	protected Actions requiredActions(VitroRequest vreq) {
+		return SimplePermission.MANAGE_USER_ACCOUNTS.ACTIONS;
+	}
+
+	@Override
+	protected void doRequest(VitroRequest vreq, HttpServletResponse resp)
+			throws ServletException, IOException {
+		try {
+			String function = vreq.getParameter(PARAMETER_ACTION);
+			if ("checkExternalAuth".equals(function)) {
+				new ExternalAuthChecker(this, vreq, resp).processRequest();
+			} else if ("autoCompleteProfile".equals(function)) {
+				new ProfileAutoCompleter(this, vreq, resp).processRequest();
+			} else {
+				resp.getWriter().write("[]");
+			}
+		} catch (Exception e) {
+			log.error(e, e);
+			resp.getWriter().write("[]");
+		}
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsCreatePasswordPage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsCreatePasswordPage.java
index 3b6585e72..77390fc6d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsCreatePasswordPage.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsCreatePasswordPage.java
@@ -1,76 +1,76 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.user;
-
-import static javax.mail.Message.RecipientType.TO;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
-import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
-import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailMessage;
-
-/**
- * When the user clicks on the link in their notification email, handle their
- * request to create a password.
- */
-public class UserAccountsCreatePasswordPage extends
-		UserAccountsPasswordBasePage {
-	private static final Log log = LogFactory
-			.getLog(UserAccountsCreatePasswordPage.class);
-
-	private static final String TEMPLATE_NAME = "userAccounts-createPassword.ftl";
-	private static final String EMAIL_TEMPLATE = "userAccounts-passwordCreatedEmail.ftl";
-
-	public UserAccountsCreatePasswordPage(VitroRequest vreq) {
-		super(vreq);
-	}
-
-	public void createPassword() {
-		userAccount.setMd5Password(Authenticator.applyMd5Encoding(newPassword));
-		userAccount.setPasswordLinkExpires(0L);
-		userAccount.setPasswordChangeRequired(false);
-		userAccount.setStatus(Status.ACTIVE);
-		userAccountsDao.updateUserAccount(userAccount);
-		log.debug("Set password on '" + userAccount.getEmailAddress()
-				+ "' to '" + newPassword + "'");
-
-		notifyUser();
-	}
-
-	@Override
-	protected String alreadyLoggedInMessage(String currentUserEmail) {
-		return i18n.text("cant_activate_while_logged_in", userEmail, currentUserEmail);
-	}
-
-	@Override
-	protected String passwordChangeNotPendingMessage() {
-		return i18n.text("account_already_activated", userEmail);
-	}
-
-	@Override
-	protected String templateName() {
-		return TEMPLATE_NAME;
-	}
-
-	private void notifyUser() {
-		Map<String, Object> body = new HashMap<String, Object>();
-		body.put("userAccount", userAccount);
-		body.put("siteName", getSiteName());
-
-		FreemarkerEmailMessage email = FreemarkerEmailFactory
-				.createNewMessage(vreq);
-		email.addRecipient(TO, userAccount.getEmailAddress());
-		email.setSubject(i18n.text("password_created_subject", getSiteName()));
-		email.setTemplate(EMAIL_TEMPLATE);
-		email.setBodyMap(body);
-		email.processTemplate();
-		email.send();
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.user;
+
+import static javax.mail.Message.RecipientType.TO;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
+import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
+import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailMessage;
+
+/**
+ * When the user clicks on the link in their notification email, handle their
+ * request to create a password.
+ */
+public class UserAccountsCreatePasswordPage extends
+		UserAccountsPasswordBasePage {
+	private static final Log log = LogFactory
+			.getLog(UserAccountsCreatePasswordPage.class);
+
+	private static final String TEMPLATE_NAME = "userAccounts-createPassword.ftl";
+	private static final String EMAIL_TEMPLATE = "userAccounts-passwordCreatedEmail.ftl";
+
+	public UserAccountsCreatePasswordPage(VitroRequest vreq) {
+		super(vreq);
+	}
+
+	public void createPassword() {
+		userAccount.setMd5Password(Authenticator.applyMd5Encoding(newPassword));
+		userAccount.setPasswordLinkExpires(0L);
+		userAccount.setPasswordChangeRequired(false);
+		userAccount.setStatus(Status.ACTIVE);
+		userAccountsDao.updateUserAccount(userAccount);
+		log.debug("Set password on '" + userAccount.getEmailAddress()
+				+ "' to '" + newPassword + "'");
+
+		notifyUser();
+	}
+
+	@Override
+	protected String alreadyLoggedInMessage(String currentUserEmail) {
+		return i18n.text("cant_activate_while_logged_in", userEmail, currentUserEmail);
+	}
+
+	@Override
+	protected String passwordChangeNotPendingMessage() {
+		return i18n.text("account_already_activated", userEmail);
+	}
+
+	@Override
+	protected String templateName() {
+		return TEMPLATE_NAME;
+	}
+
+	private void notifyUser() {
+		Map<String, Object> body = new HashMap<String, Object>();
+		body.put("userAccount", userAccount);
+		body.put("siteName", getSiteName());
+
+		FreemarkerEmailMessage email = FreemarkerEmailFactory
+				.createNewMessage(vreq);
+		email.addRecipient(TO, userAccount.getEmailAddress());
+		email.setSubject(i18n.text("password_created_subject", getSiteName()));
+		email.setTemplate(EMAIL_TEMPLATE);
+		email.setBodyMap(body);
+		email.processTemplate();
+		email.send();
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPage.java
index 9ac36f700..7ae86c744 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPage.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPage.java
@@ -1,233 +1,233 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.user;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.lang.StringUtils;
-
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsLoader;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-
-/**
- * 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.
- */
-public class UserAccountsFirstTimeExternalPage extends UserAccountsPage {
-	private static final String PARAMETER_SUBMIT = "submit";
-	private static final String PARAMETER_EXTERNAL_AUTH_ID = "externalAuthId";
-	private static final String PARAMETER_AFTER_LOGIN_URL = "afterLoginUrl";
-	private static final String PARAMETER_EMAIL_ADDRESS = "emailAddress";
-	private static final String PARAMETER_FIRST_NAME = "firstName";
-	private static final String PARAMETER_LAST_NAME = "lastName";
-
-	private static final String ERROR_NO_EMAIL = "errorEmailIsEmpty";
-	private static final String ERROR_EMAIL_IN_USE = "errorEmailInUse";
-	private static final String ERROR_EMAIL_INVALID_FORMAT = "errorEmailInvalidFormat";
-	private static final String ERROR_NO_FIRST_NAME = "errorFirstNameIsEmpty";
-	private static final String ERROR_NO_LAST_NAME = "errorLastNameIsEmpty";
-
-	private static final String TEMPLATE_NAME = "userAccounts-firstTimeExternal.ftl";
-
-	private static final String ATTRIBUTE_EXTERNAL_LOGIN_INFO = UserAccountsFirstTimeExternalPage.class
-			.getName();
-
-	/**
-	 * Let some other request set the External Auth ID and the afterLogin URL
-	 * before redirecting to here.
-	 */
-	public static void setExternalLoginInfo(HttpServletRequest req,
-			String externalAuthId, String afterLoginUrl) {
-		req.getSession().setAttribute(ATTRIBUTE_EXTERNAL_LOGIN_INFO,
-				new ExternalLoginInfo(externalAuthId, afterLoginUrl));
-	}
-
-	private final UserAccountsFirstTimeExternalPageStrategy strategy;
-
-	private String externalAuthId = "";
-	private String afterLoginUrl = "";
-
-	private boolean submit = false;
-	private String emailAddress = "";
-	private String firstName = "";
-	private String lastName = "";
-
-	private String errorCode = "";
-	private String bogusMessage = "";
-
-	protected UserAccountsFirstTimeExternalPage(VitroRequest vreq) {
-		super(vreq);
-
-		this.strategy = UserAccountsFirstTimeExternalPageStrategy.getInstance(
-				vreq, this, isEmailEnabled());
-
-		checkSessionForExternalLoginInfo();
-		if (externalAuthId.isEmpty()) {
-			parseRequestParameters();
-		}
-
-		validateExternalAuthId();
-
-		if (isSubmit() && !isBogus()) {
-			validateParameters();
-		}
-	}
-
-	private void checkSessionForExternalLoginInfo() {
-		HttpSession session = vreq.getSession();
-
-		Object o = session.getAttribute(ATTRIBUTE_EXTERNAL_LOGIN_INFO);
-		session.removeAttribute(ATTRIBUTE_EXTERNAL_LOGIN_INFO);
-
-		if (o instanceof ExternalLoginInfo) {
-			externalAuthId = ((ExternalLoginInfo) o).externalAuthId;
-			afterLoginUrl = ((ExternalLoginInfo) o).afterLoginUrl;
-			if (afterLoginUrl == null) {
-				afterLoginUrl = "";
-			}
-		}
-	}
-
-	private void parseRequestParameters() {
-		externalAuthId = getStringParameter(PARAMETER_EXTERNAL_AUTH_ID, "");
-		afterLoginUrl = getStringParameter(PARAMETER_AFTER_LOGIN_URL, "");
-
-		submit = isFlagOnRequest(PARAMETER_SUBMIT);
-		emailAddress = getStringParameter(PARAMETER_EMAIL_ADDRESS, "");
-		firstName = getStringParameter(PARAMETER_FIRST_NAME, "");
-		lastName = getStringParameter(PARAMETER_LAST_NAME, "");
-	}
-
-	private void validateExternalAuthId() {
-		if (externalAuthId.isEmpty()) {
-			bogusMessage = i18n.text("external_id_not_provided");
-			return;
-		}
-		if (null != userAccountsDao
-				.getUserAccountByExternalAuthId(externalAuthId)) {
-			bogusMessage = i18n.text("external_id_already_in_use",
-					externalAuthId);
-			return;
-		}
-		if (!Authenticator.getInstance(vreq).isUserPermittedToLogin(null)) {
-			bogusMessage = i18n.text("logins_disabled_for_maintenance");
-			return;
-		}
-	}
-
-	public boolean isBogus() {
-		return !bogusMessage.isEmpty();
-	}
-
-	public String getBogusMessage() {
-		return bogusMessage;
-	}
-
-	public boolean isSubmit() {
-		return submit;
-	}
-
-	private void validateParameters() {
-		if (firstName.isEmpty()) {
-			errorCode = ERROR_NO_FIRST_NAME;
-		} else if (lastName.isEmpty()) {
-			errorCode = ERROR_NO_LAST_NAME;
-		} else if (emailAddress.isEmpty()) {
-			errorCode = ERROR_NO_EMAIL;
-		} else if (isEmailInUse()) {
-			errorCode = ERROR_EMAIL_IN_USE;
-		} else if (!isEmailValidFormat()) {
-			errorCode = ERROR_EMAIL_INVALID_FORMAT;
-		}
-	}
-
-	private boolean isEmailInUse() {
-		return userAccountsDao.getUserAccountByEmail(emailAddress) != null;
-	}
-
-	private boolean isEmailValidFormat() {
-		return Authenticator.isValidEmailAddress(emailAddress);
-	}
-
-	public boolean isValid() {
-		return errorCode.isEmpty();
-	}
-
-	public final ResponseValues showPage() {
-		Map<String, Object> body = new HashMap<String, Object>();
-
-		body.put("externalAuthId", externalAuthId);
-		body.put("afterLoginUrl", afterLoginUrl);
-
-		body.put("emailAddress", emailAddress);
-		body.put("firstName", firstName);
-		body.put("lastName", lastName);
-		body.put("formUrls", buildUrlsMap());
-
-		if (!errorCode.isEmpty()) {
-			body.put(errorCode, Boolean.TRUE);
-		}
-
-		strategy.addMoreBodyValues(body);
-
-		return new TemplateResponseValues(TEMPLATE_NAME, body);
-	}
-
-	public UserAccount createAccount() {
-		UserAccount u = new UserAccount();
-		u.setEmailAddress(emailAddress);
-		u.setFirstName(firstName);
-		u.setLastName(lastName);
-		u.setExternalAuthId(externalAuthId);
-		u.setPasswordChangeRequired(false);
-		u.setPasswordLinkExpires(0);
-		u.setExternalAuthOnly(true);
-		u.setLoginCount(0);
-		u.setStatus(Status.ACTIVE);
-		u.setPermissionSetUris(Collections
-				.singleton(PermissionSetsLoader.URI_SELF_EDITOR));
-
-		userAccountsDao.insertUserAccount(u);
-
-		strategy.notifyUser(u);
-
-		return u;
-	}
-
-	/**
-	 * If the afterLoginUrl is missing, go to the home page. If it is relative,
-	 * make sure it doesn't start with the cotext path.
-	 */
-	public String getAfterLoginUrl() {
-		if (StringUtils.isEmpty(afterLoginUrl)) {
-			return null;
-		}
-		return afterLoginUrl;
-	}
-
-	private static class ExternalLoginInfo {
-		final String externalAuthId;
-		final String afterLoginUrl;
-
-		public ExternalLoginInfo(String externalAuthId, String afterLoginUrl) {
-			this.externalAuthId = externalAuthId;
-			this.afterLoginUrl = afterLoginUrl;
-		}
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.user;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.lang.StringUtils;
+
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsLoader;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+
+/**
+ * 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.
+ */
+public class UserAccountsFirstTimeExternalPage extends UserAccountsPage {
+	private static final String PARAMETER_SUBMIT = "submit";
+	private static final String PARAMETER_EXTERNAL_AUTH_ID = "externalAuthId";
+	private static final String PARAMETER_AFTER_LOGIN_URL = "afterLoginUrl";
+	private static final String PARAMETER_EMAIL_ADDRESS = "emailAddress";
+	private static final String PARAMETER_FIRST_NAME = "firstName";
+	private static final String PARAMETER_LAST_NAME = "lastName";
+
+	private static final String ERROR_NO_EMAIL = "errorEmailIsEmpty";
+	private static final String ERROR_EMAIL_IN_USE = "errorEmailInUse";
+	private static final String ERROR_EMAIL_INVALID_FORMAT = "errorEmailInvalidFormat";
+	private static final String ERROR_NO_FIRST_NAME = "errorFirstNameIsEmpty";
+	private static final String ERROR_NO_LAST_NAME = "errorLastNameIsEmpty";
+
+	private static final String TEMPLATE_NAME = "userAccounts-firstTimeExternal.ftl";
+
+	private static final String ATTRIBUTE_EXTERNAL_LOGIN_INFO = UserAccountsFirstTimeExternalPage.class
+			.getName();
+
+	/**
+	 * Let some other request set the External Auth ID and the afterLogin URL
+	 * before redirecting to here.
+	 */
+	public static void setExternalLoginInfo(HttpServletRequest req,
+			String externalAuthId, String afterLoginUrl) {
+		req.getSession().setAttribute(ATTRIBUTE_EXTERNAL_LOGIN_INFO,
+				new ExternalLoginInfo(externalAuthId, afterLoginUrl));
+	}
+
+	private final UserAccountsFirstTimeExternalPageStrategy strategy;
+
+	private String externalAuthId = "";
+	private String afterLoginUrl = "";
+
+	private boolean submit = false;
+	private String emailAddress = "";
+	private String firstName = "";
+	private String lastName = "";
+
+	private String errorCode = "";
+	private String bogusMessage = "";
+
+	protected UserAccountsFirstTimeExternalPage(VitroRequest vreq) {
+		super(vreq);
+
+		this.strategy = UserAccountsFirstTimeExternalPageStrategy.getInstance(
+				vreq, this, isEmailEnabled());
+
+		checkSessionForExternalLoginInfo();
+		if (externalAuthId.isEmpty()) {
+			parseRequestParameters();
+		}
+
+		validateExternalAuthId();
+
+		if (isSubmit() && !isBogus()) {
+			validateParameters();
+		}
+	}
+
+	private void checkSessionForExternalLoginInfo() {
+		HttpSession session = vreq.getSession();
+
+		Object o = session.getAttribute(ATTRIBUTE_EXTERNAL_LOGIN_INFO);
+		session.removeAttribute(ATTRIBUTE_EXTERNAL_LOGIN_INFO);
+
+		if (o instanceof ExternalLoginInfo) {
+			externalAuthId = ((ExternalLoginInfo) o).externalAuthId;
+			afterLoginUrl = ((ExternalLoginInfo) o).afterLoginUrl;
+			if (afterLoginUrl == null) {
+				afterLoginUrl = "";
+			}
+		}
+	}
+
+	private void parseRequestParameters() {
+		externalAuthId = getStringParameter(PARAMETER_EXTERNAL_AUTH_ID, "");
+		afterLoginUrl = getStringParameter(PARAMETER_AFTER_LOGIN_URL, "");
+
+		submit = isFlagOnRequest(PARAMETER_SUBMIT);
+		emailAddress = getStringParameter(PARAMETER_EMAIL_ADDRESS, "");
+		firstName = getStringParameter(PARAMETER_FIRST_NAME, "");
+		lastName = getStringParameter(PARAMETER_LAST_NAME, "");
+	}
+
+	private void validateExternalAuthId() {
+		if (externalAuthId.isEmpty()) {
+			bogusMessage = i18n.text("external_id_not_provided");
+			return;
+		}
+		if (null != userAccountsDao
+				.getUserAccountByExternalAuthId(externalAuthId)) {
+			bogusMessage = i18n.text("external_id_already_in_use",
+					externalAuthId);
+			return;
+		}
+		if (!Authenticator.getInstance(vreq).isUserPermittedToLogin(null)) {
+			bogusMessage = i18n.text("logins_disabled_for_maintenance");
+			return;
+		}
+	}
+
+	public boolean isBogus() {
+		return !bogusMessage.isEmpty();
+	}
+
+	public String getBogusMessage() {
+		return bogusMessage;
+	}
+
+	public boolean isSubmit() {
+		return submit;
+	}
+
+	private void validateParameters() {
+		if (firstName.isEmpty()) {
+			errorCode = ERROR_NO_FIRST_NAME;
+		} else if (lastName.isEmpty()) {
+			errorCode = ERROR_NO_LAST_NAME;
+		} else if (emailAddress.isEmpty()) {
+			errorCode = ERROR_NO_EMAIL;
+		} else if (isEmailInUse()) {
+			errorCode = ERROR_EMAIL_IN_USE;
+		} else if (!isEmailValidFormat()) {
+			errorCode = ERROR_EMAIL_INVALID_FORMAT;
+		}
+	}
+
+	private boolean isEmailInUse() {
+		return userAccountsDao.getUserAccountByEmail(emailAddress) != null;
+	}
+
+	private boolean isEmailValidFormat() {
+		return Authenticator.isValidEmailAddress(emailAddress);
+	}
+
+	public boolean isValid() {
+		return errorCode.isEmpty();
+	}
+
+	public final ResponseValues showPage() {
+		Map<String, Object> body = new HashMap<String, Object>();
+
+		body.put("externalAuthId", externalAuthId);
+		body.put("afterLoginUrl", afterLoginUrl);
+
+		body.put("emailAddress", emailAddress);
+		body.put("firstName", firstName);
+		body.put("lastName", lastName);
+		body.put("formUrls", buildUrlsMap());
+
+		if (!errorCode.isEmpty()) {
+			body.put(errorCode, Boolean.TRUE);
+		}
+
+		strategy.addMoreBodyValues(body);
+
+		return new TemplateResponseValues(TEMPLATE_NAME, body);
+	}
+
+	public UserAccount createAccount() {
+		UserAccount u = new UserAccount();
+		u.setEmailAddress(emailAddress);
+		u.setFirstName(firstName);
+		u.setLastName(lastName);
+		u.setExternalAuthId(externalAuthId);
+		u.setPasswordChangeRequired(false);
+		u.setPasswordLinkExpires(0);
+		u.setExternalAuthOnly(true);
+		u.setLoginCount(0);
+		u.setStatus(Status.ACTIVE);
+		u.setPermissionSetUris(Collections
+				.singleton(PermissionSetsLoader.URI_SELF_EDITOR));
+
+		userAccountsDao.insertUserAccount(u);
+
+		strategy.notifyUser(u);
+
+		return u;
+	}
+
+	/**
+	 * If the afterLoginUrl is missing, go to the home page. If it is relative,
+	 * make sure it doesn't start with the cotext path.
+	 */
+	public String getAfterLoginUrl() {
+		if (StringUtils.isEmpty(afterLoginUrl)) {
+			return null;
+		}
+		return afterLoginUrl;
+	}
+
+	private static class ExternalLoginInfo {
+		final String externalAuthId;
+		final String afterLoginUrl;
+
+		public ExternalLoginInfo(String externalAuthId, String afterLoginUrl) {
+			this.externalAuthId = externalAuthId;
+			this.afterLoginUrl = afterLoginUrl;
+		}
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPageStrategy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPageStrategy.java
index ca1423ad3..ff6e7367e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPageStrategy.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsFirstTimeExternalPageStrategy.java
@@ -1,109 +1,109 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.user;
-
-import static javax.mail.Message.RecipientType.TO;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
-import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
-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
-		UserAccountsPage {
-
-	public static UserAccountsFirstTimeExternalPageStrategy getInstance(
-			VitroRequest vreq, UserAccountsFirstTimeExternalPage page,
-			boolean emailEnabled) {
-		if (emailEnabled) {
-			return new EmailStrategy(vreq, page);
-		} else {
-			return new NoEmailStrategy(vreq, page);
-		}
-	}
-
-	@SuppressWarnings("unused")
-	private UserAccountsFirstTimeExternalPage page;
-
-	public UserAccountsFirstTimeExternalPageStrategy(VitroRequest vreq,
-			UserAccountsFirstTimeExternalPage page) {
-		super(vreq);
-		this.page = page;
-	}
-
-	public abstract void addMoreBodyValues(Map<String, Object> body);
-
-	public abstract void notifyUser(UserAccount ua);
-
-	// ----------------------------------------------------------------------
-	// Strategy to use if email is enabled.
-	// ----------------------------------------------------------------------
-
-	public static class EmailStrategy extends
-			UserAccountsFirstTimeExternalPageStrategy {
-
-		private static final String EMAIL_TEMPLATE = "userAccounts-firstTimeExternalEmail.ftl";
-
-		public EmailStrategy(VitroRequest vreq,
-				UserAccountsFirstTimeExternalPage page) {
-			super(vreq, page);
-		}
-
-		@Override
-		public void addMoreBodyValues(Map<String, Object> body) {
-			body.put("emailIsEnabled", Boolean.TRUE);
-		}
-
-		@Override
-		public void notifyUser(UserAccount ua) {
-			Map<String, Object> body = new HashMap<String, Object>();
-			body.put("userAccount", ua);
-			body.put("siteName", getSiteName());
-
-			FreemarkerEmailMessage email = FreemarkerEmailFactory
-					.createNewMessage(vreq);
-			email.addRecipient(TO, ua.getEmailAddress());
-			email.setSubject(i18n.text("account_created_subject", getSiteName()));
-			email.setTemplate(EMAIL_TEMPLATE);
-			email.setBodyMap(body);
-			email.processTemplate();
-			email.send();
-		}
-
-	}
-
-	// ----------------------------------------------------------------------
-	// Strategy to use if email is disabled.
-	// ----------------------------------------------------------------------
-
-	public static class NoEmailStrategy extends
-			UserAccountsFirstTimeExternalPageStrategy {
-
-		public NoEmailStrategy(VitroRequest vreq,
-				UserAccountsFirstTimeExternalPage page) {
-			super(vreq, page);
-		}
-
-		@Override
-		public void addMoreBodyValues(Map<String, Object> body) {
-			// Nothing to add.
-		}
-
-		@Override
-		public void notifyUser(UserAccount ua) {
-			// No way to notify.
-		}
-
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.user;
+
+import static javax.mail.Message.RecipientType.TO;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
+import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
+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
+		UserAccountsPage {
+
+	public static UserAccountsFirstTimeExternalPageStrategy getInstance(
+			VitroRequest vreq, UserAccountsFirstTimeExternalPage page,
+			boolean emailEnabled) {
+		if (emailEnabled) {
+			return new EmailStrategy(vreq, page);
+		} else {
+			return new NoEmailStrategy(vreq, page);
+		}
+	}
+
+	@SuppressWarnings("unused")
+	private UserAccountsFirstTimeExternalPage page;
+
+	public UserAccountsFirstTimeExternalPageStrategy(VitroRequest vreq,
+			UserAccountsFirstTimeExternalPage page) {
+		super(vreq);
+		this.page = page;
+	}
+
+	public abstract void addMoreBodyValues(Map<String, Object> body);
+
+	public abstract void notifyUser(UserAccount ua);
+
+	// ----------------------------------------------------------------------
+	// Strategy to use if email is enabled.
+	// ----------------------------------------------------------------------
+
+	public static class EmailStrategy extends
+			UserAccountsFirstTimeExternalPageStrategy {
+
+		private static final String EMAIL_TEMPLATE = "userAccounts-firstTimeExternalEmail.ftl";
+
+		public EmailStrategy(VitroRequest vreq,
+				UserAccountsFirstTimeExternalPage page) {
+			super(vreq, page);
+		}
+
+		@Override
+		public void addMoreBodyValues(Map<String, Object> body) {
+			body.put("emailIsEnabled", Boolean.TRUE);
+		}
+
+		@Override
+		public void notifyUser(UserAccount ua) {
+			Map<String, Object> body = new HashMap<String, Object>();
+			body.put("userAccount", ua);
+			body.put("siteName", getSiteName());
+
+			FreemarkerEmailMessage email = FreemarkerEmailFactory
+					.createNewMessage(vreq);
+			email.addRecipient(TO, ua.getEmailAddress());
+			email.setSubject(i18n.text("account_created_subject", getSiteName()));
+			email.setTemplate(EMAIL_TEMPLATE);
+			email.setBodyMap(body);
+			email.processTemplate();
+			email.send();
+		}
+
+	}
+
+	// ----------------------------------------------------------------------
+	// Strategy to use if email is disabled.
+	// ----------------------------------------------------------------------
+
+	public static class NoEmailStrategy extends
+			UserAccountsFirstTimeExternalPageStrategy {
+
+		public NoEmailStrategy(VitroRequest vreq,
+				UserAccountsFirstTimeExternalPage page) {
+			super(vreq, page);
+		}
+
+		@Override
+		public void addMoreBodyValues(Map<String, Object> body) {
+			// Nothing to add.
+		}
+
+		@Override
+		public void notifyUser(UserAccount ua) {
+			// No way to notify.
+		}
+
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPage.java
index 791b3d277..fc55a9b17 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPage.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPage.java
@@ -1,350 +1,350 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.user;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.admin.UserAccountsEditPage;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.web.images.PlaceholderUtil;
-
-/**
- * Handle the "My Account" form display and submission.
- */
-public class UserAccountsMyAccountPage extends UserAccountsPage {
-	private static final Log log = LogFactory
-			.getLog(UserAccountsEditPage.class);
-
-	private static final String PARAMETER_SUBMIT = "submitMyAccount";
-	private static final String PARAMETER_EMAIL_ADDRESS = "emailAddress";
-	private static final String PARAMETER_FIRST_NAME = "firstName";
-	private static final String PARAMETER_LAST_NAME = "lastName";
-	private static final String PARAMETER_PROXY_URI = "proxyUri";
-
-	private static final String ERROR_NO_EMAIL = "errorEmailIsEmpty";
-	private static final String ERROR_EMAIL_IN_USE = "errorEmailInUse";
-	private static final String ERROR_EMAIL_INVALID_FORMAT = "errorEmailInvalidFormat";
-	private static final String ERROR_NO_FIRST_NAME = "errorFirstNameIsEmpty";
-	private static final String ERROR_NO_LAST_NAME = "errorLastNameIsEmpty";
-
-	private static final String TEMPLATE_NAME = "userAccounts-myAccount.ftl";
-
-	private static final String PROPERTY_PROFILE_TYPES = "proxy.eligibleTypeList";
-
-	private final UserAccountsMyAccountPageStrategy strategy;
-
-	private final UserAccount userAccount;
-
-	/* The request parameters */
-	private boolean submit;
-	private String emailAddress = "";
-	private String firstName = "";
-	private String lastName = "";
-	private List<String> proxyUris = new ArrayList<String>();
-
-	/** The result of validating a "submit" request. */
-	private String errorCode = "";
-
-	/** The result of updating the account. */
-	private String confirmationCode = "";
-
-	public UserAccountsMyAccountPage(VitroRequest vreq) {
-		super(vreq);
-
-		this.userAccount = LoginStatusBean.getCurrentUser(vreq);
-		this.strategy = UserAccountsMyAccountPageStrategy.getInstance(vreq,
-				this, isExternalAccount());
-
-		parseRequestParameters();
-
-		if (isSubmit()) {
-			validateParameters();
-		}
-	}
-
-	public UserAccount getUserAccount() {
-		return userAccount;
-	}
-
-	private void parseRequestParameters() {
-		submit = isFlagOnRequest(PARAMETER_SUBMIT);
-		emailAddress = getStringParameter(PARAMETER_EMAIL_ADDRESS, "");
-		firstName = getStringParameter(PARAMETER_FIRST_NAME, "");
-		lastName = getStringParameter(PARAMETER_LAST_NAME, "");
-		proxyUris = getStringParameters(PARAMETER_PROXY_URI);
-
-		strategy.parseAdditionalParameters();
-	}
-
-	public boolean isSubmit() {
-		return submit;
-	}
-
-	private void validateParameters() {
-		if (emailAddress.isEmpty()) {
-			errorCode = ERROR_NO_EMAIL;
-		} else if (emailIsChanged() && isEmailInUse()) {
-			errorCode = ERROR_EMAIL_IN_USE;
-		} else if (!isEmailValidFormat()) {
-			errorCode = ERROR_EMAIL_INVALID_FORMAT;
-		} else if (firstName.isEmpty()) {
-			errorCode = ERROR_NO_FIRST_NAME;
-		} else if (lastName.isEmpty()) {
-			errorCode = ERROR_NO_LAST_NAME;
-		} else {
-			errorCode = strategy.additionalValidations();
-		}
-	}
-
-	private boolean emailIsChanged() {
-		return !emailAddress.equals(userAccount.getEmailAddress());
-	}
-
-	private boolean isEmailInUse() {
-		return userAccountsDao.getUserAccountByEmail(emailAddress) != null;
-	}
-
-	private boolean isEmailValidFormat() {
-		return Authenticator.isValidEmailAddress(emailAddress);
-	}
-
-	public boolean isValid() {
-		return errorCode.isEmpty();
-	}
-
-	private boolean isExternalAccount() {
-		return LoginStatusBean.getBean(vreq).hasExternalAuthentication();
-	}
-
-	public final ResponseValues showPage() {
-		Map<String, Object> body = new HashMap<String, Object>();
-
-		if (isSubmit()) {
-			body.put("emailAddress", emailAddress);
-			body.put("firstName", firstName);
-			body.put("lastName", lastName);
-			body.put("proxies", buildOngoingProxyList());
-		} else {
-			body.put("emailAddress", userAccount.getEmailAddress());
-			body.put("firstName", userAccount.getFirstName());
-			body.put("lastName", userAccount.getLastName());
-			body.put("proxies", buildOriginalProxyList());
-		}
-		body.put("formUrls", buildUrlsMap());
-		body.put("myAccountUri", userAccount.getUri());
-		body.put("profileTypes", buildProfileTypesString());
-
-		// Could I do this without exposing this mechanism? But how to search
-		// for an associated profile in AJAX?
-		body.put("matchingProperty", SelfEditingConfiguration.getBean(vreq)
-				.getMatchingPropertyUri());
-
-		if (userAccount.isExternalAuthOnly()) {
-			body.put("externalAuthOnly", Boolean.TRUE);
-		}
-		if (!errorCode.isEmpty()) {
-			body.put(errorCode, Boolean.TRUE);
-		}
-		if (!confirmationCode.isEmpty()) {
-			body.put(confirmationCode, Boolean.TRUE);
-		}
-		if (isProxyPanelAuthorized()) {
-			body.put("showProxyPanel", Boolean.TRUE);
-		}
-
-		strategy.addMoreBodyValues(body);
-
-		return new TemplateResponseValues(TEMPLATE_NAME, body);
-	}
-
-	private String buildProfileTypesString() {
-		return ConfigurationProperties.getBean(vreq).getProperty(
-				PROPERTY_PROFILE_TYPES, "http://www.w3.org/2002/07/owl#Thing");
-	}
-
-	public void updateAccount() {
-		userAccount.setEmailAddress(emailAddress);
-		userAccount.setFirstName(firstName);
-		userAccount.setLastName(lastName);
-
-		Individual profilePage = getProfilePage(userAccount);
-		if (profilePage != null) {
-			userAccountsDao.setProxyAccountsOnProfile(profilePage.getURI(),
-					proxyUris);
-		}
-
-		strategy.setAdditionalProperties(userAccount);
-
-		userAccountsDao.updateUserAccount(userAccount);
-
-		strategy.notifyUser();
-		confirmationCode = strategy.getConfirmationCode();
-	}
-
-	boolean isProxyPanelAuthorized() {
-		return PolicyHelper.isAuthorizedForActions(vreq,
-				SimplePermission.MANAGE_OWN_PROXIES.ACTIONS)
-				&& (getProfilePage(userAccount) != null);
-	}
-
-	boolean isExternalAuthOnly() {
-		return (userAccount != null) && userAccount.isExternalAuthOnly();
-	}
-
-	private List<ProxyInfo> buildOngoingProxyList() {
-		List<UserAccount> proxyUsers = new ArrayList<UserAccount>();
-		for (String proxyUri : proxyUris) {
-			UserAccount proxyUser = userAccountsDao
-					.getUserAccountByUri(proxyUri);
-			if (proxyUser == null) {
-				log.warn("No UserAccount found for proxyUri: " + proxyUri);
-			} else {
-				proxyUsers.add(proxyUser);
-			}
-		}
-
-		return buildProxyListFromUserAccounts(proxyUsers);
-	}
-
-	private List<ProxyInfo> buildOriginalProxyList() {
-		Collection<UserAccount> proxyUsers;
-
-		Individual profilePage = getProfilePage(userAccount);
-		if (profilePage == null) {
-			log.debug("no profile page");
-			proxyUsers = Collections.emptyList();
-		} else {
-			String uri = profilePage.getURI();
-			log.debug("profile page at " + uri);
-			proxyUsers = userAccountsDao.getUserAccountsWhoProxyForPage(uri);
-			if (log.isDebugEnabled()) {
-				log.debug(getUrisFromUserAccounts(proxyUsers));
-			}
-		}
-
-		return buildProxyListFromUserAccounts(proxyUsers);
-	}
-
-	private Individual getProfilePage(UserAccount ua) {
-		SelfEditingConfiguration sec = SelfEditingConfiguration.getBean(vreq);
-		List<Individual> profilePages = sec
-				.getAssociatedIndividuals(indDao, ua);
-		if (profilePages.isEmpty()) {
-			return null;
-		} else {
-			return profilePages.get(0);
-		}
-	}
-
-	private List<ProxyInfo> buildProxyListFromUserAccounts(
-			Collection<UserAccount> proxyUsers) {
-		List<ProxyInfo> proxyInfos = new ArrayList<ProxyInfo>();
-		for (UserAccount proxyUser : proxyUsers) {
-			proxyInfos.add(assembleProxyInfoForUser(proxyUser));
-		}
-		return proxyInfos;
-	}
-
-	private ProxyInfo assembleProxyInfoForUser(UserAccount proxyUser) {
-		String userUri = proxyUser.getUri();
-		String label = assembleUserAccountLabel(proxyUser);
-		String classLabel = "";
-		String imageUrl = UrlBuilder.getUrl(PlaceholderUtil
-				.getPlaceholderImagePathForType(vreq,
-						VitroVocabulary.USERACCOUNT));
-
-		// Does this user have a profile? Can we get better info?
-		Individual proxyProfilePage = getProfilePage(proxyUser);
-		if (proxyProfilePage != null) {
-			String thumbUrl = proxyProfilePage.getThumbUrl();
-			if ((thumbUrl != null) && (!thumbUrl.isEmpty())) {
-				imageUrl = UrlBuilder.getUrl(thumbUrl);
-			}
-			classLabel = getMostSpecificTypeLabel(proxyProfilePage.getURI());
-		}
-		return new ProxyInfo(userUri, label, classLabel, imageUrl);
-	}
-
-	private String assembleUserAccountLabel(UserAccount ua) {
-		String last = ua.getLastName();
-		String first = ua.getFirstName();
-		if (last.isEmpty()) {
-			return first;
-		} else if (first.isEmpty()) {
-			return last;
-		} else {
-			return last + ", " + first;
-		}
-	}
-
-	private String getMostSpecificTypeLabel(String uri) {
-		Map<String, String> types = opsDao
-				.getMostSpecificTypesInClassgroupsForIndividual(uri);
-		if (types.isEmpty()) {
-			return "";
-		} else {
-			return types.values().iterator().next();
-		}
-	}
-
-	private List<String> getUrisFromUserAccounts(
-			Collection<UserAccount> proxyUsers) {
-		List<String> list = new ArrayList<String>();
-		for (UserAccount u : proxyUsers) {
-			list.add(u.getUri());
-		}
-		return list;
-	}
-
-	public static class ProxyInfo {
-		private final String uri;
-		private final String label;
-		private final String classLabel;
-		private final String imageUrl;
-
-		public ProxyInfo(String uri, String label, String classLabel,
-				String imageUrl) {
-			this.uri = uri;
-			this.label = label;
-			this.classLabel = classLabel;
-			this.imageUrl = imageUrl;
-		}
-
-		public String getUri() {
-			return uri;
-		}
-
-		public String getLabel() {
-			return label;
-		}
-
-		public String getClassLabel() {
-			return classLabel;
-		}
-
-		public String getImageUrl() {
-			return imageUrl;
-		}
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.user;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.admin.UserAccountsEditPage;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.web.images.PlaceholderUtil;
+
+/**
+ * Handle the "My Account" form display and submission.
+ */
+public class UserAccountsMyAccountPage extends UserAccountsPage {
+	private static final Log log = LogFactory
+			.getLog(UserAccountsEditPage.class);
+
+	private static final String PARAMETER_SUBMIT = "submitMyAccount";
+	private static final String PARAMETER_EMAIL_ADDRESS = "emailAddress";
+	private static final String PARAMETER_FIRST_NAME = "firstName";
+	private static final String PARAMETER_LAST_NAME = "lastName";
+	private static final String PARAMETER_PROXY_URI = "proxyUri";
+
+	private static final String ERROR_NO_EMAIL = "errorEmailIsEmpty";
+	private static final String ERROR_EMAIL_IN_USE = "errorEmailInUse";
+	private static final String ERROR_EMAIL_INVALID_FORMAT = "errorEmailInvalidFormat";
+	private static final String ERROR_NO_FIRST_NAME = "errorFirstNameIsEmpty";
+	private static final String ERROR_NO_LAST_NAME = "errorLastNameIsEmpty";
+
+	private static final String TEMPLATE_NAME = "userAccounts-myAccount.ftl";
+
+	private static final String PROPERTY_PROFILE_TYPES = "proxy.eligibleTypeList";
+
+	private final UserAccountsMyAccountPageStrategy strategy;
+
+	private final UserAccount userAccount;
+
+	/* The request parameters */
+	private boolean submit;
+	private String emailAddress = "";
+	private String firstName = "";
+	private String lastName = "";
+	private List<String> proxyUris = new ArrayList<String>();
+
+	/** The result of validating a "submit" request. */
+	private String errorCode = "";
+
+	/** The result of updating the account. */
+	private String confirmationCode = "";
+
+	public UserAccountsMyAccountPage(VitroRequest vreq) {
+		super(vreq);
+
+		this.userAccount = LoginStatusBean.getCurrentUser(vreq);
+		this.strategy = UserAccountsMyAccountPageStrategy.getInstance(vreq,
+				this, isExternalAccount());
+
+		parseRequestParameters();
+
+		if (isSubmit()) {
+			validateParameters();
+		}
+	}
+
+	public UserAccount getUserAccount() {
+		return userAccount;
+	}
+
+	private void parseRequestParameters() {
+		submit = isFlagOnRequest(PARAMETER_SUBMIT);
+		emailAddress = getStringParameter(PARAMETER_EMAIL_ADDRESS, "");
+		firstName = getStringParameter(PARAMETER_FIRST_NAME, "");
+		lastName = getStringParameter(PARAMETER_LAST_NAME, "");
+		proxyUris = getStringParameters(PARAMETER_PROXY_URI);
+
+		strategy.parseAdditionalParameters();
+	}
+
+	public boolean isSubmit() {
+		return submit;
+	}
+
+	private void validateParameters() {
+		if (emailAddress.isEmpty()) {
+			errorCode = ERROR_NO_EMAIL;
+		} else if (emailIsChanged() && isEmailInUse()) {
+			errorCode = ERROR_EMAIL_IN_USE;
+		} else if (!isEmailValidFormat()) {
+			errorCode = ERROR_EMAIL_INVALID_FORMAT;
+		} else if (firstName.isEmpty()) {
+			errorCode = ERROR_NO_FIRST_NAME;
+		} else if (lastName.isEmpty()) {
+			errorCode = ERROR_NO_LAST_NAME;
+		} else {
+			errorCode = strategy.additionalValidations();
+		}
+	}
+
+	private boolean emailIsChanged() {
+		return !emailAddress.equals(userAccount.getEmailAddress());
+	}
+
+	private boolean isEmailInUse() {
+		return userAccountsDao.getUserAccountByEmail(emailAddress) != null;
+	}
+
+	private boolean isEmailValidFormat() {
+		return Authenticator.isValidEmailAddress(emailAddress);
+	}
+
+	public boolean isValid() {
+		return errorCode.isEmpty();
+	}
+
+	private boolean isExternalAccount() {
+		return LoginStatusBean.getBean(vreq).hasExternalAuthentication();
+	}
+
+	public final ResponseValues showPage() {
+		Map<String, Object> body = new HashMap<String, Object>();
+
+		if (isSubmit()) {
+			body.put("emailAddress", emailAddress);
+			body.put("firstName", firstName);
+			body.put("lastName", lastName);
+			body.put("proxies", buildOngoingProxyList());
+		} else {
+			body.put("emailAddress", userAccount.getEmailAddress());
+			body.put("firstName", userAccount.getFirstName());
+			body.put("lastName", userAccount.getLastName());
+			body.put("proxies", buildOriginalProxyList());
+		}
+		body.put("formUrls", buildUrlsMap());
+		body.put("myAccountUri", userAccount.getUri());
+		body.put("profileTypes", buildProfileTypesString());
+
+		// Could I do this without exposing this mechanism? But how to search
+		// for an associated profile in AJAX?
+		body.put("matchingProperty", SelfEditingConfiguration.getBean(vreq)
+				.getMatchingPropertyUri());
+
+		if (userAccount.isExternalAuthOnly()) {
+			body.put("externalAuthOnly", Boolean.TRUE);
+		}
+		if (!errorCode.isEmpty()) {
+			body.put(errorCode, Boolean.TRUE);
+		}
+		if (!confirmationCode.isEmpty()) {
+			body.put(confirmationCode, Boolean.TRUE);
+		}
+		if (isProxyPanelAuthorized()) {
+			body.put("showProxyPanel", Boolean.TRUE);
+		}
+
+		strategy.addMoreBodyValues(body);
+
+		return new TemplateResponseValues(TEMPLATE_NAME, body);
+	}
+
+	private String buildProfileTypesString() {
+		return ConfigurationProperties.getBean(vreq).getProperty(
+				PROPERTY_PROFILE_TYPES, "http://www.w3.org/2002/07/owl#Thing");
+	}
+
+	public void updateAccount() {
+		userAccount.setEmailAddress(emailAddress);
+		userAccount.setFirstName(firstName);
+		userAccount.setLastName(lastName);
+
+		Individual profilePage = getProfilePage(userAccount);
+		if (profilePage != null) {
+			userAccountsDao.setProxyAccountsOnProfile(profilePage.getURI(),
+					proxyUris);
+		}
+
+		strategy.setAdditionalProperties(userAccount);
+
+		userAccountsDao.updateUserAccount(userAccount);
+
+		strategy.notifyUser();
+		confirmationCode = strategy.getConfirmationCode();
+	}
+
+	boolean isProxyPanelAuthorized() {
+		return PolicyHelper.isAuthorizedForActions(vreq,
+				SimplePermission.MANAGE_OWN_PROXIES.ACTIONS)
+				&& (getProfilePage(userAccount) != null);
+	}
+
+	boolean isExternalAuthOnly() {
+		return (userAccount != null) && userAccount.isExternalAuthOnly();
+	}
+
+	private List<ProxyInfo> buildOngoingProxyList() {
+		List<UserAccount> proxyUsers = new ArrayList<UserAccount>();
+		for (String proxyUri : proxyUris) {
+			UserAccount proxyUser = userAccountsDao
+					.getUserAccountByUri(proxyUri);
+			if (proxyUser == null) {
+				log.warn("No UserAccount found for proxyUri: " + proxyUri);
+			} else {
+				proxyUsers.add(proxyUser);
+			}
+		}
+
+		return buildProxyListFromUserAccounts(proxyUsers);
+	}
+
+	private List<ProxyInfo> buildOriginalProxyList() {
+		Collection<UserAccount> proxyUsers;
+
+		Individual profilePage = getProfilePage(userAccount);
+		if (profilePage == null) {
+			log.debug("no profile page");
+			proxyUsers = Collections.emptyList();
+		} else {
+			String uri = profilePage.getURI();
+			log.debug("profile page at " + uri);
+			proxyUsers = userAccountsDao.getUserAccountsWhoProxyForPage(uri);
+			if (log.isDebugEnabled()) {
+				log.debug(getUrisFromUserAccounts(proxyUsers));
+			}
+		}
+
+		return buildProxyListFromUserAccounts(proxyUsers);
+	}
+
+	private Individual getProfilePage(UserAccount ua) {
+		SelfEditingConfiguration sec = SelfEditingConfiguration.getBean(vreq);
+		List<Individual> profilePages = sec
+				.getAssociatedIndividuals(indDao, ua);
+		if (profilePages.isEmpty()) {
+			return null;
+		} else {
+			return profilePages.get(0);
+		}
+	}
+
+	private List<ProxyInfo> buildProxyListFromUserAccounts(
+			Collection<UserAccount> proxyUsers) {
+		List<ProxyInfo> proxyInfos = new ArrayList<ProxyInfo>();
+		for (UserAccount proxyUser : proxyUsers) {
+			proxyInfos.add(assembleProxyInfoForUser(proxyUser));
+		}
+		return proxyInfos;
+	}
+
+	private ProxyInfo assembleProxyInfoForUser(UserAccount proxyUser) {
+		String userUri = proxyUser.getUri();
+		String label = assembleUserAccountLabel(proxyUser);
+		String classLabel = "";
+		String imageUrl = UrlBuilder.getUrl(PlaceholderUtil
+				.getPlaceholderImagePathForType(vreq,
+						VitroVocabulary.USERACCOUNT));
+
+		// Does this user have a profile? Can we get better info?
+		Individual proxyProfilePage = getProfilePage(proxyUser);
+		if (proxyProfilePage != null) {
+			String thumbUrl = proxyProfilePage.getThumbUrl();
+			if ((thumbUrl != null) && (!thumbUrl.isEmpty())) {
+				imageUrl = UrlBuilder.getUrl(thumbUrl);
+			}
+			classLabel = getMostSpecificTypeLabel(proxyProfilePage.getURI());
+		}
+		return new ProxyInfo(userUri, label, classLabel, imageUrl);
+	}
+
+	private String assembleUserAccountLabel(UserAccount ua) {
+		String last = ua.getLastName();
+		String first = ua.getFirstName();
+		if (last.isEmpty()) {
+			return first;
+		} else if (first.isEmpty()) {
+			return last;
+		} else {
+			return last + ", " + first;
+		}
+	}
+
+	private String getMostSpecificTypeLabel(String uri) {
+		Map<String, String> types = opsDao
+				.getMostSpecificTypesInClassgroupsForIndividual(uri);
+		if (types.isEmpty()) {
+			return "";
+		} else {
+			return types.values().iterator().next();
+		}
+	}
+
+	private List<String> getUrisFromUserAccounts(
+			Collection<UserAccount> proxyUsers) {
+		List<String> list = new ArrayList<String>();
+		for (UserAccount u : proxyUsers) {
+			list.add(u.getUri());
+		}
+		return list;
+	}
+
+	public static class ProxyInfo {
+		private final String uri;
+		private final String label;
+		private final String classLabel;
+		private final String imageUrl;
+
+		public ProxyInfo(String uri, String label, String classLabel,
+				String imageUrl) {
+			this.uri = uri;
+			this.label = label;
+			this.classLabel = classLabel;
+			this.imageUrl = imageUrl;
+		}
+
+		public String getUri() {
+			return uri;
+		}
+
+		public String getLabel() {
+			return label;
+		}
+
+		public String getClassLabel() {
+			return classLabel;
+		}
+
+		public String getImageUrl() {
+			return imageUrl;
+		}
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java
index 13436c701..2fa87ea3f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsMyAccountPageStrategy.java
@@ -1,202 +1,202 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.user;
-
-import static javax.mail.Message.RecipientType.TO;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
-import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
-import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailMessage;
-
-/**
- * Handle the variant details of the MyAccounts page
- */
-public abstract class UserAccountsMyAccountPageStrategy extends
-		UserAccountsPage {
-
-	private static final String CONFIRM_CHANGE = "confirmChange";
-	private static final String CONFIRM_EMAIL_SENT = "confirmEmailSent";
-
-	protected final UserAccountsMyAccountPage page;
-
-	public static UserAccountsMyAccountPageStrategy getInstance(
-			VitroRequest vreq, UserAccountsMyAccountPage page,
-			boolean externalAuth) {
-		if (externalAuth) {
-			return new ExternalAuthStrategy(vreq, page);
-		} else {
-			return new InternalAuthStrategy(vreq, page);
-		}
-	}
-
-	protected UserAccountsMyAccountPageStrategy(VitroRequest vreq,
-			UserAccountsMyAccountPage page) {
-		super(vreq);
-		this.page = page;
-	}
-
-	public abstract void parseAdditionalParameters();
-
-	public abstract String additionalValidations();
-
-	public abstract void addMoreBodyValues(Map<String, Object> body);
-
-	public abstract void setAdditionalProperties(UserAccount userAccount);
-
-	public abstract void notifyUser();
-
-	public abstract String getConfirmationCode();
-
-	// ----------------------------------------------------------------------
-	// Strategy to use if the account used External Authentication
-	// ----------------------------------------------------------------------
-
-	private static class ExternalAuthStrategy extends
-			UserAccountsMyAccountPageStrategy {
-
-		ExternalAuthStrategy(VitroRequest vreq, UserAccountsMyAccountPage page) {
-			super(vreq, page);
-		}
-
-		@Override
-		public void parseAdditionalParameters() {
-			// No additional parameters
-		}
-
-		@Override
-		public String additionalValidations() {
-			// No additional validations
-			return "";
-		}
-
-		@Override
-		public void addMoreBodyValues(Map<String, Object> body) {
-			body.put("externalAuth", Boolean.TRUE);
-		}
-
-		@Override
-		public void setAdditionalProperties(UserAccount userAccount) {
-			// No additional properties.
-		}
-
-		@Override
-		public void notifyUser() {
-			// No notification beyond the screen message.
-		}
-
-		@Override
-		public String getConfirmationCode() {
-			return CONFIRM_CHANGE;
-		}
-	}
-
-	// ----------------------------------------------------------------------
-	// Strategy to use if the account used Internal Authentication
-	// ----------------------------------------------------------------------
-
-	private static class InternalAuthStrategy extends
-			UserAccountsMyAccountPageStrategy {
-		private static final String PARAMETER_NEW_PASSWORD = "newPassword";
-		private static final String PARAMETER_CONFIRM_PASSWORD = "confirmPassword";
-
-		private static final String ERROR_WRONG_PASSWORD_LENGTH = "errorPasswordIsWrongLength";
-		private static final String ERROR_PASSWORDS_DONT_MATCH = "errorPasswordsDontMatch";
-
-		private static final String EMAIL_TEMPLATE = "userAccounts-confirmEmailChangedEmail.ftl";
-
-		private final String originalEmail;
-
-		private String newPassword;
-		private String confirmPassword;
-		private boolean emailSent;
-
-		InternalAuthStrategy(VitroRequest vreq, UserAccountsMyAccountPage page) {
-			super(vreq, page);
-			originalEmail = page.getUserAccount().getEmailAddress();
-		}
-
-		@Override
-		public void parseAdditionalParameters() {
-			newPassword = getStringParameter(PARAMETER_NEW_PASSWORD, "");
-			confirmPassword = getStringParameter(PARAMETER_CONFIRM_PASSWORD, "");
-		}
-
-		@Override
-		public String additionalValidations() {
-			if (!page.isExternalAuthOnly()) {
-				if (newPassword.isEmpty() && confirmPassword.isEmpty()) {
-					return "";
-				} else if (!newPassword.equals(confirmPassword)) {
-					return ERROR_PASSWORDS_DONT_MATCH;
-				} else if (!checkPasswordLength(newPassword)) {
-					return ERROR_WRONG_PASSWORD_LENGTH;
-				} else {
-					return "";
-				}
-			} else {
-				return "";
-			}
-		}
-
-		@Override
-		public void addMoreBodyValues(Map<String, Object> body) {
-			body.put("newPassword", newPassword);
-			body.put("confirmPassword", confirmPassword);
-			body.put("minimumLength", UserAccount.MIN_PASSWORD_LENGTH);
-			body.put("maximumLength", UserAccount.MAX_PASSWORD_LENGTH);
-		}
-
-		@Override
-		public void setAdditionalProperties(UserAccount userAccount) {
-			if (!newPassword.isEmpty() && !page.isExternalAuthOnly()) {
-				userAccount.setMd5Password(Authenticator
-						.applyMd5Encoding(newPassword));
-				userAccount.setPasswordChangeRequired(false);
-				userAccount.setPasswordLinkExpires(0L);
-			}
-		}
-
-		@Override
-		public void notifyUser() {
-			if (!isEmailEnabled()) {
-				return;
-			}
-			if (!emailHasChanged()) {
-				return;
-			}
-
-			Map<String, Object> body = new HashMap<String, Object>();
-			body.put("userAccount", page.getUserAccount());
-			body.put("siteName", getSiteName());
-
-			FreemarkerEmailMessage email = FreemarkerEmailFactory
-					.createNewMessage(vreq);
-			email.addRecipient(TO, page.getUserAccount().getEmailAddress());
-			email.setSubject(i18n.text("email_changed_subject", getSiteName()));
-			email.setTemplate(EMAIL_TEMPLATE);
-			email.setBodyMap(body);
-			email.processTemplate();
-			email.send();
-
-			emailSent = true;
-		}
-
-		private boolean emailHasChanged() {
-			return !page.getUserAccount().getEmailAddress()
-					.equals(originalEmail);
-		}
-
-		@Override
-		public String getConfirmationCode() {
-			return emailSent ? CONFIRM_EMAIL_SENT : CONFIRM_CHANGE;
-		}
-
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.user;
+
+import static javax.mail.Message.RecipientType.TO;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
+import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
+import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailMessage;
+
+/**
+ * Handle the variant details of the MyAccounts page
+ */
+public abstract class UserAccountsMyAccountPageStrategy extends
+		UserAccountsPage {
+
+	private static final String CONFIRM_CHANGE = "confirmChange";
+	private static final String CONFIRM_EMAIL_SENT = "confirmEmailSent";
+
+	protected final UserAccountsMyAccountPage page;
+
+	public static UserAccountsMyAccountPageStrategy getInstance(
+			VitroRequest vreq, UserAccountsMyAccountPage page,
+			boolean externalAuth) {
+		if (externalAuth) {
+			return new ExternalAuthStrategy(vreq, page);
+		} else {
+			return new InternalAuthStrategy(vreq, page);
+		}
+	}
+
+	protected UserAccountsMyAccountPageStrategy(VitroRequest vreq,
+			UserAccountsMyAccountPage page) {
+		super(vreq);
+		this.page = page;
+	}
+
+	public abstract void parseAdditionalParameters();
+
+	public abstract String additionalValidations();
+
+	public abstract void addMoreBodyValues(Map<String, Object> body);
+
+	public abstract void setAdditionalProperties(UserAccount userAccount);
+
+	public abstract void notifyUser();
+
+	public abstract String getConfirmationCode();
+
+	// ----------------------------------------------------------------------
+	// Strategy to use if the account used External Authentication
+	// ----------------------------------------------------------------------
+
+	private static class ExternalAuthStrategy extends
+			UserAccountsMyAccountPageStrategy {
+
+		ExternalAuthStrategy(VitroRequest vreq, UserAccountsMyAccountPage page) {
+			super(vreq, page);
+		}
+
+		@Override
+		public void parseAdditionalParameters() {
+			// No additional parameters
+		}
+
+		@Override
+		public String additionalValidations() {
+			// No additional validations
+			return "";
+		}
+
+		@Override
+		public void addMoreBodyValues(Map<String, Object> body) {
+			body.put("externalAuth", Boolean.TRUE);
+		}
+
+		@Override
+		public void setAdditionalProperties(UserAccount userAccount) {
+			// No additional properties.
+		}
+
+		@Override
+		public void notifyUser() {
+			// No notification beyond the screen message.
+		}
+
+		@Override
+		public String getConfirmationCode() {
+			return CONFIRM_CHANGE;
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// Strategy to use if the account used Internal Authentication
+	// ----------------------------------------------------------------------
+
+	private static class InternalAuthStrategy extends
+			UserAccountsMyAccountPageStrategy {
+		private static final String PARAMETER_NEW_PASSWORD = "newPassword";
+		private static final String PARAMETER_CONFIRM_PASSWORD = "confirmPassword";
+
+		private static final String ERROR_WRONG_PASSWORD_LENGTH = "errorPasswordIsWrongLength";
+		private static final String ERROR_PASSWORDS_DONT_MATCH = "errorPasswordsDontMatch";
+
+		private static final String EMAIL_TEMPLATE = "userAccounts-confirmEmailChangedEmail.ftl";
+
+		private final String originalEmail;
+
+		private String newPassword;
+		private String confirmPassword;
+		private boolean emailSent;
+
+		InternalAuthStrategy(VitroRequest vreq, UserAccountsMyAccountPage page) {
+			super(vreq, page);
+			originalEmail = page.getUserAccount().getEmailAddress();
+		}
+
+		@Override
+		public void parseAdditionalParameters() {
+			newPassword = getStringParameter(PARAMETER_NEW_PASSWORD, "");
+			confirmPassword = getStringParameter(PARAMETER_CONFIRM_PASSWORD, "");
+		}
+
+		@Override
+		public String additionalValidations() {
+			if (!page.isExternalAuthOnly()) {
+				if (newPassword.isEmpty() && confirmPassword.isEmpty()) {
+					return "";
+				} else if (!newPassword.equals(confirmPassword)) {
+					return ERROR_PASSWORDS_DONT_MATCH;
+				} else if (!checkPasswordLength(newPassword)) {
+					return ERROR_WRONG_PASSWORD_LENGTH;
+				} else {
+					return "";
+				}
+			} else {
+				return "";
+			}
+		}
+
+		@Override
+		public void addMoreBodyValues(Map<String, Object> body) {
+			body.put("newPassword", newPassword);
+			body.put("confirmPassword", confirmPassword);
+			body.put("minimumLength", UserAccount.MIN_PASSWORD_LENGTH);
+			body.put("maximumLength", UserAccount.MAX_PASSWORD_LENGTH);
+		}
+
+		@Override
+		public void setAdditionalProperties(UserAccount userAccount) {
+			if (!newPassword.isEmpty() && !page.isExternalAuthOnly()) {
+				userAccount.setMd5Password(Authenticator
+						.applyMd5Encoding(newPassword));
+				userAccount.setPasswordChangeRequired(false);
+				userAccount.setPasswordLinkExpires(0L);
+			}
+		}
+
+		@Override
+		public void notifyUser() {
+			if (!isEmailEnabled()) {
+				return;
+			}
+			if (!emailHasChanged()) {
+				return;
+			}
+
+			Map<String, Object> body = new HashMap<String, Object>();
+			body.put("userAccount", page.getUserAccount());
+			body.put("siteName", getSiteName());
+
+			FreemarkerEmailMessage email = FreemarkerEmailFactory
+					.createNewMessage(vreq);
+			email.addRecipient(TO, page.getUserAccount().getEmailAddress());
+			email.setSubject(i18n.text("email_changed_subject", getSiteName()));
+			email.setTemplate(EMAIL_TEMPLATE);
+			email.setBodyMap(body);
+			email.processTemplate();
+			email.send();
+
+			emailSent = true;
+		}
+
+		private boolean emailHasChanged() {
+			return !page.getUserAccount().getEmailAddress()
+					.equals(originalEmail);
+		}
+
+		@Override
+		public String getConfirmationCode() {
+			return emailSent ? CONFIRM_EMAIL_SENT : CONFIRM_CHANGE;
+		}
+
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsPasswordBasePage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsPasswordBasePage.java
index 78e78ce3f..d8e903f60 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsPasswordBasePage.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsPasswordBasePage.java
@@ -1,182 +1,182 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.user;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-
-/**
- * Routines in common to the "Create Password" and "Reset Password" pages.
- */
-public abstract class UserAccountsPasswordBasePage extends UserAccountsPage {
-	private static final Log log = LogFactory
-			.getLog(UserAccountsPasswordBasePage.class);
-
-	private static final String PARAMETER_SUBMIT = "submit";
-	private static final String PARAMETER_USER = "user";
-	private static final String PARAMETER_KEY = "key";
-	private static final String PARAMETER_NEW_PASSWORD = "newPassword";
-	private static final String PARAMETER_CONFIRM_PASSWORD = "confirmPassword";
-
-	private static final String ERROR_NO_PASSWORD = "errorPasswordIsEmpty";
-	private static final String ERROR_WRONG_PASSWORD_LENGTH = "errorPasswordIsWrongLength";
-	private static final String ERROR_PASSWORDS_DONT_MATCH = "errorPasswordsDontMatch";
-
-	protected boolean submit;
-	protected String userEmail = "";
-	protected String key = "";
-	protected String newPassword = "";
-	protected String confirmPassword = "";
-
-	protected UserAccount userAccount;
-
-	/** The result of checking whether this request is even appropriate. */
-	private String bogusMessage = "";
-
-	/** The result of validating a "submit" request. */
-	private String errorCode = "";
-
-	private boolean loggedIn;
-
-	protected UserAccountsPasswordBasePage(VitroRequest vreq) {
-		super(vreq);
-
-		parseRequestParameters();
-		validateUserAccountInfo();
-
-		if (isSubmit() && !isBogus()) {
-			validateParameters();
-		}
-	}
-
-	private void parseRequestParameters() {
-		submit = isFlagOnRequest(PARAMETER_SUBMIT);
-		userEmail = getStringParameter(PARAMETER_USER, "");
-		key = getStringParameter(PARAMETER_KEY, "");
-		newPassword = getStringParameter(PARAMETER_NEW_PASSWORD, "");
-		confirmPassword = getStringParameter(PARAMETER_CONFIRM_PASSWORD, "");
-	}
-
-	public boolean isSubmit() {
-		return submit;
-	}
-
-	private void validateUserAccountInfo() {
-		userAccount = userAccountsDao.getUserAccountByEmail(userEmail);
-		if (userAccount == null) {
-			log.warn("Password request for '" + userEmail
-					+ "' is bogus: no such user");
-			bogusMessage = i18n.text("account_no_longer_exists");
-			return;
-		}
-
-		if (userAccount.getPasswordLinkExpires() == 0L) {
-			log.info("Password request for '" + userEmail
-					+ "' is bogus: password change is not pending.");
-			bogusMessage = passwordChangeNotPendingMessage();
-			return;
-		}
-
-		if (userAccount.isExternalAuthOnly()) {
-			log.info("Password request for '" + userEmail
-					+ "' is bogus: account is external auth only.");
-			bogusMessage = passwordChangeNotPendingMessage();
-			return;
-		}
-
-		Date expirationDate = new Date(userAccount.getPasswordLinkExpires());
-		if (expirationDate.before(new Date())) {
-			log.info("Password request for '" + userEmail
-					+ "' is bogus: expiration date has passed.");
-			bogusMessage = passwordChangeNotPendingMessage();
-			return;
-		}
-
-		String expectedKey = userAccount.getPasswordLinkExpiresHash();
-		if (!key.equals(expectedKey)) {
-			log.warn("Password request for '" + userEmail + "' is bogus: key ("
-					+ key + ") doesn't match expected key (" + expectedKey
-					+ ")");
-			bogusMessage = passwordChangeNotPendingMessage();
-			return;
-		}
-
-		UserAccount currentUser = LoginStatusBean.getCurrentUser(vreq);
-		if (currentUser != null) {
-			loggedIn = true;
-			String currentUserEmail = currentUser.getEmailAddress();
-			if (!userEmail.equals(currentUserEmail)) {
-				log.info("Password request for '" + userEmail
-						+ "' when already logged in as '" + currentUserEmail
-						+ "'");
-				bogusMessage = alreadyLoggedInMessage(currentUserEmail);
-				return;
-			}
-		}
-	}
-
-	public boolean isBogus() {
-		return !bogusMessage.isEmpty();
-	}
-
-	public String getBogusMessage() {
-		return bogusMessage;
-	}
-
-	private void validateParameters() {
-		if (newPassword.isEmpty()) {
-			errorCode = ERROR_NO_PASSWORD;
-		} else if (!checkPasswordLength(newPassword)) {
-			errorCode = ERROR_WRONG_PASSWORD_LENGTH;
-		} else if (!newPassword.equals(confirmPassword)) {
-			errorCode = ERROR_PASSWORDS_DONT_MATCH;
-		}
-	}
-
-	public boolean isValid() {
-		return errorCode.isEmpty();
-	}
-
-	public final ResponseValues showPage() {
-		Map<String, Object> body = new HashMap<String, Object>();
-
-		body.put("minimumLength", UserAccount.MIN_PASSWORD_LENGTH);
-		body.put("maximumLength", UserAccount.MAX_PASSWORD_LENGTH);
-		body.put("userAccount", userAccount);
-		body.put("key", userAccount.getPasswordLinkExpiresHash());
-		body.put("newPassword", newPassword);
-		body.put("confirmPassword", confirmPassword);
-		body.put("formUrls", buildUrlsMap());
-
-		if (!errorCode.isEmpty()) {
-			body.put(errorCode, Boolean.TRUE);
-		}
-
-		return new TemplateResponseValues(templateName(), body);
-	}
-
-	public String getSuccessMessage() {
-		if (loggedIn) {
-			return i18n.text("password_saved");
-		} else {
-			return i18n.text("password_saved_please_login");
-		}
-	}
-
-	protected abstract String alreadyLoggedInMessage(String currentUserEmail);
-
-	protected abstract String passwordChangeNotPendingMessage();
-
-	protected abstract String templateName();
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.user;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsPage;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+
+/**
+ * Routines in common to the "Create Password" and "Reset Password" pages.
+ */
+public abstract class UserAccountsPasswordBasePage extends UserAccountsPage {
+	private static final Log log = LogFactory
+			.getLog(UserAccountsPasswordBasePage.class);
+
+	private static final String PARAMETER_SUBMIT = "submit";
+	private static final String PARAMETER_USER = "user";
+	private static final String PARAMETER_KEY = "key";
+	private static final String PARAMETER_NEW_PASSWORD = "newPassword";
+	private static final String PARAMETER_CONFIRM_PASSWORD = "confirmPassword";
+
+	private static final String ERROR_NO_PASSWORD = "errorPasswordIsEmpty";
+	private static final String ERROR_WRONG_PASSWORD_LENGTH = "errorPasswordIsWrongLength";
+	private static final String ERROR_PASSWORDS_DONT_MATCH = "errorPasswordsDontMatch";
+
+	protected boolean submit;
+	protected String userEmail = "";
+	protected String key = "";
+	protected String newPassword = "";
+	protected String confirmPassword = "";
+
+	protected UserAccount userAccount;
+
+	/** The result of checking whether this request is even appropriate. */
+	private String bogusMessage = "";
+
+	/** The result of validating a "submit" request. */
+	private String errorCode = "";
+
+	private boolean loggedIn;
+
+	protected UserAccountsPasswordBasePage(VitroRequest vreq) {
+		super(vreq);
+
+		parseRequestParameters();
+		validateUserAccountInfo();
+
+		if (isSubmit() && !isBogus()) {
+			validateParameters();
+		}
+	}
+
+	private void parseRequestParameters() {
+		submit = isFlagOnRequest(PARAMETER_SUBMIT);
+		userEmail = getStringParameter(PARAMETER_USER, "");
+		key = getStringParameter(PARAMETER_KEY, "");
+		newPassword = getStringParameter(PARAMETER_NEW_PASSWORD, "");
+		confirmPassword = getStringParameter(PARAMETER_CONFIRM_PASSWORD, "");
+	}
+
+	public boolean isSubmit() {
+		return submit;
+	}
+
+	private void validateUserAccountInfo() {
+		userAccount = userAccountsDao.getUserAccountByEmail(userEmail);
+		if (userAccount == null) {
+			log.warn("Password request for '" + userEmail
+					+ "' is bogus: no such user");
+			bogusMessage = i18n.text("account_no_longer_exists");
+			return;
+		}
+
+		if (userAccount.getPasswordLinkExpires() == 0L) {
+			log.info("Password request for '" + userEmail
+					+ "' is bogus: password change is not pending.");
+			bogusMessage = passwordChangeNotPendingMessage();
+			return;
+		}
+
+		if (userAccount.isExternalAuthOnly()) {
+			log.info("Password request for '" + userEmail
+					+ "' is bogus: account is external auth only.");
+			bogusMessage = passwordChangeNotPendingMessage();
+			return;
+		}
+
+		Date expirationDate = new Date(userAccount.getPasswordLinkExpires());
+		if (expirationDate.before(new Date())) {
+			log.info("Password request for '" + userEmail
+					+ "' is bogus: expiration date has passed.");
+			bogusMessage = passwordChangeNotPendingMessage();
+			return;
+		}
+
+		String expectedKey = userAccount.getPasswordLinkExpiresHash();
+		if (!key.equals(expectedKey)) {
+			log.warn("Password request for '" + userEmail + "' is bogus: key ("
+					+ key + ") doesn't match expected key (" + expectedKey
+					+ ")");
+			bogusMessage = passwordChangeNotPendingMessage();
+			return;
+		}
+
+		UserAccount currentUser = LoginStatusBean.getCurrentUser(vreq);
+		if (currentUser != null) {
+			loggedIn = true;
+			String currentUserEmail = currentUser.getEmailAddress();
+			if (!userEmail.equals(currentUserEmail)) {
+				log.info("Password request for '" + userEmail
+						+ "' when already logged in as '" + currentUserEmail
+						+ "'");
+				bogusMessage = alreadyLoggedInMessage(currentUserEmail);
+				return;
+			}
+		}
+	}
+
+	public boolean isBogus() {
+		return !bogusMessage.isEmpty();
+	}
+
+	public String getBogusMessage() {
+		return bogusMessage;
+	}
+
+	private void validateParameters() {
+		if (newPassword.isEmpty()) {
+			errorCode = ERROR_NO_PASSWORD;
+		} else if (!checkPasswordLength(newPassword)) {
+			errorCode = ERROR_WRONG_PASSWORD_LENGTH;
+		} else if (!newPassword.equals(confirmPassword)) {
+			errorCode = ERROR_PASSWORDS_DONT_MATCH;
+		}
+	}
+
+	public boolean isValid() {
+		return errorCode.isEmpty();
+	}
+
+	public final ResponseValues showPage() {
+		Map<String, Object> body = new HashMap<String, Object>();
+
+		body.put("minimumLength", UserAccount.MIN_PASSWORD_LENGTH);
+		body.put("maximumLength", UserAccount.MAX_PASSWORD_LENGTH);
+		body.put("userAccount", userAccount);
+		body.put("key", userAccount.getPasswordLinkExpiresHash());
+		body.put("newPassword", newPassword);
+		body.put("confirmPassword", confirmPassword);
+		body.put("formUrls", buildUrlsMap());
+
+		if (!errorCode.isEmpty()) {
+			body.put(errorCode, Boolean.TRUE);
+		}
+
+		return new TemplateResponseValues(templateName(), body);
+	}
+
+	public String getSuccessMessage() {
+		if (loggedIn) {
+			return i18n.text("password_saved");
+		} else {
+			return i18n.text("password_saved_please_login");
+		}
+	}
+
+	protected abstract String alreadyLoggedInMessage(String currentUserEmail);
+
+	protected abstract String passwordChangeNotPendingMessage();
+
+	protected abstract String templateName();
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsResetPasswordPage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsResetPasswordPage.java
index 9a42ab8c7..41ef7ee55 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsResetPasswordPage.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsResetPasswordPage.java
@@ -1,78 +1,78 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.user;
-
-import static javax.mail.Message.RecipientType.TO;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
-import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
-import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailMessage;
-
-/**
- * When the user clicks on the link in their notification email, handle their
- * request to reset their password.
- */
-public class UserAccountsResetPasswordPage extends UserAccountsPasswordBasePage {
-	private static final Log log = LogFactory
-			.getLog(UserAccountsResetPasswordPage.class);
-
-	private static final String TEMPLATE_NAME = "userAccounts-resetPassword.ftl";
-
-	private static final String EMAIL_TEMPLATE = "userAccounts-passwordResetCompleteEmail.ftl";
-
-	protected UserAccountsResetPasswordPage(VitroRequest vreq) {
-		super(vreq);
-	}
-
-	public void resetPassword() {
-		userAccount.setMd5Password(Authenticator.applyMd5Encoding(newPassword));
-		userAccount.setPasswordLinkExpires(0L);
-		userAccount.setPasswordChangeRequired(false);
-		userAccount.setStatus(Status.ACTIVE);
-		userAccountsDao.updateUserAccount(userAccount);
-		log.debug("Set password on '" + userAccount.getEmailAddress()
-				+ "' to '" + newPassword + "'");
-
-		notifyUser();
-	}
-
-	@Override
-	protected String alreadyLoggedInMessage(String currentUserEmail) {
-		return i18n.text("cant_change_password_while_logged_in", userEmail,
-				currentUserEmail);
-	}
-
-	@Override
-	protected String passwordChangeNotPendingMessage() {
-		return i18n.text("password_change_not_pending", userEmail);
-	}
-
-	@Override
-	protected String templateName() {
-		return TEMPLATE_NAME;
-	}
-
-	private void notifyUser() {
-		Map<String, Object> body = new HashMap<String, Object>();
-		body.put("userAccount", userAccount);
-		body.put("siteName", getSiteName());
-
-		FreemarkerEmailMessage email = FreemarkerEmailFactory
-				.createNewMessage(vreq);
-		email.addRecipient(TO, userAccount.getEmailAddress());
-		email.setSubject(i18n.text("password_changed_subject"));
-		email.setTemplate(EMAIL_TEMPLATE);
-		email.setBodyMap(body);
-		email.processTemplate();
-		email.send();
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.user;
+
+import static javax.mail.Message.RecipientType.TO;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
+import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
+import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailMessage;
+
+/**
+ * When the user clicks on the link in their notification email, handle their
+ * request to reset their password.
+ */
+public class UserAccountsResetPasswordPage extends UserAccountsPasswordBasePage {
+	private static final Log log = LogFactory
+			.getLog(UserAccountsResetPasswordPage.class);
+
+	private static final String TEMPLATE_NAME = "userAccounts-resetPassword.ftl";
+
+	private static final String EMAIL_TEMPLATE = "userAccounts-passwordResetCompleteEmail.ftl";
+
+	protected UserAccountsResetPasswordPage(VitroRequest vreq) {
+		super(vreq);
+	}
+
+	public void resetPassword() {
+		userAccount.setMd5Password(Authenticator.applyMd5Encoding(newPassword));
+		userAccount.setPasswordLinkExpires(0L);
+		userAccount.setPasswordChangeRequired(false);
+		userAccount.setStatus(Status.ACTIVE);
+		userAccountsDao.updateUserAccount(userAccount);
+		log.debug("Set password on '" + userAccount.getEmailAddress()
+				+ "' to '" + newPassword + "'");
+
+		notifyUser();
+	}
+
+	@Override
+	protected String alreadyLoggedInMessage(String currentUserEmail) {
+		return i18n.text("cant_change_password_while_logged_in", userEmail,
+				currentUserEmail);
+	}
+
+	@Override
+	protected String passwordChangeNotPendingMessage() {
+		return i18n.text("password_change_not_pending", userEmail);
+	}
+
+	@Override
+	protected String templateName() {
+		return TEMPLATE_NAME;
+	}
+
+	private void notifyUser() {
+		Map<String, Object> body = new HashMap<String, Object>();
+		body.put("userAccount", userAccount);
+		body.put("siteName", getSiteName());
+
+		FreemarkerEmailMessage email = FreemarkerEmailFactory
+				.createNewMessage(vreq);
+		email.addRecipient(TO, userAccount.getEmailAddress());
+		email.setSubject(i18n.text("password_changed_subject"));
+		email.setTemplate(EMAIL_TEMPLATE);
+		email.setBodyMap(body);
+		email.processTemplate();
+		email.send();
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java
index eb2d175fe..b42489155 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/accounts/user/UserAccountsUserController.java
@@ -1,167 +1,167 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts.user;
-
-import static edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource.EXTERNAL;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
-import edu.cornell.mannlib.vitro.webapp.beans.DisplayMessage;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator.LoginNotPermitted;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.LoginRedirector;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
-
-/**
- * Parcel out the different actions required of the UserAccounts GUI.
- */
-public class UserAccountsUserController extends FreemarkerHttpServlet {
-	private static final Log log = LogFactory
-			.getLog(UserAccountsUserController.class);
-
-	private static final String ACTION_CREATE_PASSWORD = "/createPassword";
-	private static final String ACTION_RESET_PASSWORD = "/resetPassword";
-	private static final String ACTION_MY_ACCOUNT = "/myAccount";
-	private static final String ACTION_FIRST_TIME_EXTERNAL = "/firstTimeExternal";
-
-	@Override
-	protected Actions requiredActions(VitroRequest vreq) {
-		String action = vreq.getPathInfo();
-
-		if (ACTION_MY_ACCOUNT.equals(action)) {
-			return SimplePermission.EDIT_OWN_ACCOUNT.ACTIONS;
-		} else {
-			return Actions.AUTHORIZED;
-		}
-	}
-
-	@Override
-	protected ResponseValues processRequest(VitroRequest vreq) {
-		if (log.isDebugEnabled()) {
-			dumpRequestParameters(vreq);
-		}
-
-		String action = vreq.getPathInfo();
-		log.debug("action = '" + action + "'");
-
-		if (ACTION_MY_ACCOUNT.equals(action)) {
-			return handleMyAccountRequest(vreq);
-		} else if (ACTION_CREATE_PASSWORD.equals(action)) {
-			return handleCreatePasswordRequest(vreq);
-		} else if (ACTION_RESET_PASSWORD.equals(action)) {
-			return handleResetPasswordRequest(vreq);
-		} else if (ACTION_FIRST_TIME_EXTERNAL.equals(action)) {
-			return handleFirstTimeLoginFromExternalAccount(vreq);
-		} else {
-			return handleInvalidRequest(vreq);
-		}
-	}
-
-	private ResponseValues handleMyAccountRequest(VitroRequest vreq) {
-		UserAccountsMyAccountPage page = new UserAccountsMyAccountPage(vreq);
-		if (page.isSubmit() && page.isValid()) {
-			page.updateAccount();
-		}
-		return page.showPage();
-	}
-
-	private ResponseValues handleCreatePasswordRequest(VitroRequest vreq) {
-		UserAccountsCreatePasswordPage page = new UserAccountsCreatePasswordPage(
-				vreq);
-		if (page.isBogus()) {
-			return showHomePage(vreq, page.getBogusMessage());
-		} else if (page.isSubmit() && page.isValid()) {
-			page.createPassword();
-			return showHomePage(vreq, page.getSuccessMessage());
-		} else {
-			return page.showPage();
-		}
-
-	}
-
-	private ResponseValues handleResetPasswordRequest(VitroRequest vreq) {
-		UserAccountsResetPasswordPage page = new UserAccountsResetPasswordPage(
-				vreq);
-		if (page.isBogus()) {
-			return showHomePage(vreq, page.getBogusMessage());
-		} else if (page.isSubmit() && page.isValid()) {
-			page.resetPassword();
-			return showHomePage(vreq, page.getSuccessMessage());
-		} else {
-			return page.showPage();
-		}
-
-	}
-
-	private ResponseValues handleFirstTimeLoginFromExternalAccount(
-			VitroRequest vreq) {
-		UserAccountsFirstTimeExternalPage page = new UserAccountsFirstTimeExternalPage(
-				vreq);
-		if (page.isBogus()) {
-			return showHomePage(vreq, page.getBogusMessage());
-		} else if (page.isSubmit() && page.isValid()) {
-			try {
-				UserAccount userAccount = page.createAccount();
-				Authenticator auth = Authenticator.getInstance(vreq);
-				auth.recordLoginAgainstUserAccount(userAccount, EXTERNAL);
-				return showLoginRedirection(vreq, page.getAfterLoginUrl());
-			} catch (LoginNotPermitted e) {
-				// This should have been anticipated by the page.
-				return showHomePage(vreq, getBogusStandardMessage(vreq));
-			}
-		} else {
-			return page.showPage();
-		}
-	}
-
-	private ResponseValues handleInvalidRequest(VitroRequest vreq) {
-		return showHomePage(vreq, getBogusStandardMessage(vreq));
-	}
-
-	private ResponseValues showHomePage(VitroRequest vreq, String message) {
-		DisplayMessage.setMessage(vreq, message);
-		return new RedirectResponseValues("/");
-	}
-
-	private ResponseValues showLoginRedirection(VitroRequest vreq,
-			String afterLoginUrl) {
-		LoginRedirector lr = new LoginRedirector(vreq, afterLoginUrl);
-		DisplayMessage.setMessage(vreq, lr.assembleWelcomeMessage());
-		String uri = lr.getRedirectionUriForLoggedInUser();
-		return new RedirectResponseValues(stripContextPath(vreq, uri));
-	}
-
-	/**
-	 * 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) {
-		if ((uri == null) || uri.isEmpty() || uri.equals(vreq.getContextPath())) {
-			return "/";
-		}
-		if (uri.contains("://")) {
-			return uri;
-		}
-		if (uri.startsWith(vreq.getContextPath() + '/')) {
-			return uri.substring(vreq.getContextPath().length());
-		}
-		return uri;
-	}
-
-	public static String getBogusStandardMessage(HttpServletRequest req) {
-		return I18n.bundle(req).text("request_failed");
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts.user;
+
+import static edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource.EXTERNAL;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.beans.DisplayMessage;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator.LoginNotPermitted;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.LoginRedirector;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
+
+/**
+ * Parcel out the different actions required of the UserAccounts GUI.
+ */
+public class UserAccountsUserController extends FreemarkerHttpServlet {
+	private static final Log log = LogFactory
+			.getLog(UserAccountsUserController.class);
+
+	private static final String ACTION_CREATE_PASSWORD = "/createPassword";
+	private static final String ACTION_RESET_PASSWORD = "/resetPassword";
+	private static final String ACTION_MY_ACCOUNT = "/myAccount";
+	private static final String ACTION_FIRST_TIME_EXTERNAL = "/firstTimeExternal";
+
+	@Override
+	protected Actions requiredActions(VitroRequest vreq) {
+		String action = vreq.getPathInfo();
+
+		if (ACTION_MY_ACCOUNT.equals(action)) {
+			return SimplePermission.EDIT_OWN_ACCOUNT.ACTIONS;
+		} else {
+			return Actions.AUTHORIZED;
+		}
+	}
+
+	@Override
+	protected ResponseValues processRequest(VitroRequest vreq) {
+		if (log.isDebugEnabled()) {
+			dumpRequestParameters(vreq);
+		}
+
+		String action = vreq.getPathInfo();
+		log.debug("action = '" + action + "'");
+
+		if (ACTION_MY_ACCOUNT.equals(action)) {
+			return handleMyAccountRequest(vreq);
+		} else if (ACTION_CREATE_PASSWORD.equals(action)) {
+			return handleCreatePasswordRequest(vreq);
+		} else if (ACTION_RESET_PASSWORD.equals(action)) {
+			return handleResetPasswordRequest(vreq);
+		} else if (ACTION_FIRST_TIME_EXTERNAL.equals(action)) {
+			return handleFirstTimeLoginFromExternalAccount(vreq);
+		} else {
+			return handleInvalidRequest(vreq);
+		}
+	}
+
+	private ResponseValues handleMyAccountRequest(VitroRequest vreq) {
+		UserAccountsMyAccountPage page = new UserAccountsMyAccountPage(vreq);
+		if (page.isSubmit() && page.isValid()) {
+			page.updateAccount();
+		}
+		return page.showPage();
+	}
+
+	private ResponseValues handleCreatePasswordRequest(VitroRequest vreq) {
+		UserAccountsCreatePasswordPage page = new UserAccountsCreatePasswordPage(
+				vreq);
+		if (page.isBogus()) {
+			return showHomePage(vreq, page.getBogusMessage());
+		} else if (page.isSubmit() && page.isValid()) {
+			page.createPassword();
+			return showHomePage(vreq, page.getSuccessMessage());
+		} else {
+			return page.showPage();
+		}
+
+	}
+
+	private ResponseValues handleResetPasswordRequest(VitroRequest vreq) {
+		UserAccountsResetPasswordPage page = new UserAccountsResetPasswordPage(
+				vreq);
+		if (page.isBogus()) {
+			return showHomePage(vreq, page.getBogusMessage());
+		} else if (page.isSubmit() && page.isValid()) {
+			page.resetPassword();
+			return showHomePage(vreq, page.getSuccessMessage());
+		} else {
+			return page.showPage();
+		}
+
+	}
+
+	private ResponseValues handleFirstTimeLoginFromExternalAccount(
+			VitroRequest vreq) {
+		UserAccountsFirstTimeExternalPage page = new UserAccountsFirstTimeExternalPage(
+				vreq);
+		if (page.isBogus()) {
+			return showHomePage(vreq, page.getBogusMessage());
+		} else if (page.isSubmit() && page.isValid()) {
+			try {
+				UserAccount userAccount = page.createAccount();
+				Authenticator auth = Authenticator.getInstance(vreq);
+				auth.recordLoginAgainstUserAccount(userAccount, EXTERNAL);
+				return showLoginRedirection(vreq, page.getAfterLoginUrl());
+			} catch (LoginNotPermitted e) {
+				// This should have been anticipated by the page.
+				return showHomePage(vreq, getBogusStandardMessage(vreq));
+			}
+		} else {
+			return page.showPage();
+		}
+	}
+
+	private ResponseValues handleInvalidRequest(VitroRequest vreq) {
+		return showHomePage(vreq, getBogusStandardMessage(vreq));
+	}
+
+	private ResponseValues showHomePage(VitroRequest vreq, String message) {
+		DisplayMessage.setMessage(vreq, message);
+		return new RedirectResponseValues("/");
+	}
+
+	private ResponseValues showLoginRedirection(VitroRequest vreq,
+			String afterLoginUrl) {
+		LoginRedirector lr = new LoginRedirector(vreq, afterLoginUrl);
+		DisplayMessage.setMessage(vreq, lr.assembleWelcomeMessage());
+		String uri = lr.getRedirectionUriForLoggedInUser();
+		return new RedirectResponseValues(stripContextPath(vreq, uri));
+	}
+
+	/**
+	 * 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) {
+		if ((uri == null) || uri.isEmpty() || uri.equals(vreq.getContextPath())) {
+			return "/";
+		}
+		if (uri.contains("://")) {
+			return uri;
+		}
+		if (uri.startsWith(vreq.getContextPath() + '/')) {
+			return uri.substring(vreq.getContextPath().length());
+		}
+		return uri;
+	}
+
+	public static String getBogusStandardMessage(HttpServletRequest req) {
+		return I18n.bundle(req).text("request_failed");
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowAuthController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowAuthController.java
index d91301a43..7fcfaba38 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowAuthController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/ShowAuthController.java
@@ -1,117 +1,117 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.admin;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.servlet.ServletContext;
-
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.HasAssociatedIndividual;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-
-/**
- * Show a summary of who is logged in and how they are to be treated by the
- * authorization system.
- */
-public class ShowAuthController extends FreemarkerHttpServlet {
-
-	@Override
-	protected Actions requiredActions(VitroRequest vreq) {
-		return Actions.AUTHORIZED;
-	}
-
-	@Override
-	protected ResponseValues processRequest(VitroRequest vreq) {
-
-		Map<String, Object> body = new HashMap<String, Object>();
-
-		body.put("identifiers", getSortedIdentifiers(vreq));
-		body.put("currentUser", LoginStatusBean.getCurrentUser(vreq));
-		body.put("associatedIndividuals", getAssociatedIndividuals(vreq));
-		body.put("factories", getIdentifierFactoryNames(vreq));
-		body.put("policies", ServletPolicyList.getPolicies(vreq));
-		body.put("matchingProperty", getMatchingProperty(vreq));
-		body.put("authenticator", Authenticator.getInstance(vreq));
-
-		return new TemplateResponseValues("admin-showAuth.ftl", body);
-	}
-
-	private List<Identifier> getSortedIdentifiers(VitroRequest vreq) {
-		Map<String, Identifier> idMap = new TreeMap<String, Identifier>();
-		for (Identifier id : RequestIdentifiers.getIdBundleForRequest(vreq)) {
-			idMap.put(id.toString(), id);
-		}
-		return new ArrayList<Identifier>(idMap.values());
-	}
-
-	private List<String> getIdentifierFactoryNames(VitroRequest vreq) {
-		ServletContext ctx = vreq.getSession().getServletContext();
-		return ActiveIdentifierBundleFactories.getFactoryNames(ctx);
-	}
-
-	private String getMatchingProperty(VitroRequest vreq) {
-		return ConfigurationProperties.getBean(vreq).getProperty(
-				"selfEditing.idMatchingProperty", "");
-	}
-
-	private List<AssociatedIndividual> getAssociatedIndividuals(
-			VitroRequest vreq) {
-		List<AssociatedIndividual> list = new ArrayList<AssociatedIndividual>();
-		IdentifierBundle ids = RequestIdentifiers.getIdBundleForRequest(vreq);
-		for (String uri : HasAssociatedIndividual.getIndividualUris(ids)) {
-			list.add(new AssociatedIndividual(uri, mayEditIndividual(vreq, uri)));
-		}
-		return list;
-	}
-
-	/**
-	 * Is the current user authorized to edit an arbitrary object property on
-	 * this individual?
-	 */
-	private boolean mayEditIndividual(VitroRequest vreq, String individualUri) {
-		RequestedAction action = new EditObjectPropertyStatement(
-				vreq.getJenaOntModel(), individualUri,
-				RequestActionConstants.SOME_URI,
-				RequestActionConstants.SOME_URI);
-		return PolicyHelper.isAuthorizedForActions(vreq, action);
-	}
-
-	public class AssociatedIndividual {
-		private final String uri;
-		private final boolean editable;
-
-		public AssociatedIndividual(String uri, boolean editable) {
-			this.uri = uri;
-			this.editable = editable;
-		}
-
-		public String getUri() {
-			return uri;
-		}
-
-		public boolean isEditable() {
-			return editable;
-		}
-
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.admin;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import javax.servlet.ServletContext;
+
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.HasAssociatedIndividual;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+
+/**
+ * Show a summary of who is logged in and how they are to be treated by the
+ * authorization system.
+ */
+public class ShowAuthController extends FreemarkerHttpServlet {
+
+	@Override
+	protected Actions requiredActions(VitroRequest vreq) {
+		return Actions.AUTHORIZED;
+	}
+
+	@Override
+	protected ResponseValues processRequest(VitroRequest vreq) {
+
+		Map<String, Object> body = new HashMap<String, Object>();
+
+		body.put("identifiers", getSortedIdentifiers(vreq));
+		body.put("currentUser", LoginStatusBean.getCurrentUser(vreq));
+		body.put("associatedIndividuals", getAssociatedIndividuals(vreq));
+		body.put("factories", getIdentifierFactoryNames(vreq));
+		body.put("policies", ServletPolicyList.getPolicies(vreq));
+		body.put("matchingProperty", getMatchingProperty(vreq));
+		body.put("authenticator", Authenticator.getInstance(vreq));
+
+		return new TemplateResponseValues("admin-showAuth.ftl", body);
+	}
+
+	private List<Identifier> getSortedIdentifiers(VitroRequest vreq) {
+		Map<String, Identifier> idMap = new TreeMap<String, Identifier>();
+		for (Identifier id : RequestIdentifiers.getIdBundleForRequest(vreq)) {
+			idMap.put(id.toString(), id);
+		}
+		return new ArrayList<Identifier>(idMap.values());
+	}
+
+	private List<String> getIdentifierFactoryNames(VitroRequest vreq) {
+		ServletContext ctx = vreq.getSession().getServletContext();
+		return ActiveIdentifierBundleFactories.getFactoryNames(ctx);
+	}
+
+	private String getMatchingProperty(VitroRequest vreq) {
+		return ConfigurationProperties.getBean(vreq).getProperty(
+				"selfEditing.idMatchingProperty", "");
+	}
+
+	private List<AssociatedIndividual> getAssociatedIndividuals(
+			VitroRequest vreq) {
+		List<AssociatedIndividual> list = new ArrayList<AssociatedIndividual>();
+		IdentifierBundle ids = RequestIdentifiers.getIdBundleForRequest(vreq);
+		for (String uri : HasAssociatedIndividual.getIndividualUris(ids)) {
+			list.add(new AssociatedIndividual(uri, mayEditIndividual(vreq, uri)));
+		}
+		return list;
+	}
+
+	/**
+	 * Is the current user authorized to edit an arbitrary object property on
+	 * this individual?
+	 */
+	private boolean mayEditIndividual(VitroRequest vreq, String individualUri) {
+		RequestedAction action = new EditObjectPropertyStatement(
+				vreq.getJenaOntModel(), individualUri,
+				RequestActionConstants.SOME_URI,
+				RequestActionConstants.SOME_URI);
+		return PolicyHelper.isAuthorizedForActions(vreq, action);
+	}
+
+	public class AssociatedIndividual {
+		private final String uri;
+		private final boolean editable;
+
+		public AssociatedIndividual(String uri, boolean editable) {
+			this.uri = uri;
+			this.editable = editable;
+		}
+
+		public String getUri() {
+			return uri;
+		}
+
+		public boolean isEditable() {
+			return editable;
+		}
+
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/StartupStatusController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/StartupStatusController.java
index fb587eb20..17e278b88 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/StartupStatusController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/admin/StartupStatusController.java
@@ -1,63 +1,63 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.admin;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
-
-/**
- * Display the startup status page.
- */
-public class StartupStatusController extends FreemarkerHttpServlet {
-
-	@Override
-	protected Actions requiredActions(VitroRequest vreq) {
-		return SimplePermission.SEE_STARTUP_STATUS.ACTIONS;
-	}
-
-	@Override
-	protected ResponseValues processRequest(VitroRequest vreq) {
-		Map<String, Object> body = new HashMap<String, Object>();
-
-		body.put("title", "Startup Status");
-		body.put("status", StartupStatus.getBean(getServletContext()));
-		body.put("contextPath", getContextPath());
-		body.put("applicationName", getApplicationName(vreq));
-
-		return new TemplateResponseValues("startupStatus-display.ftl", body);
-	}
-
-	private String getContextPath() {
-		String cp = getServletContext().getContextPath();
-		if ((cp == null) || cp.isEmpty()) {
-			return "The application";
-		} else {
-			return cp;
-		}
-	}
-
-	private Object getApplicationName(VitroRequest vreq) {
-		String name = "";
-		try {
-			name = vreq.getAppBean().getApplicationName();
-		} catch (Exception e) {
-			// deal with problems below
-		}
-
-		if ((name != null) && (!name.isEmpty())) {
-			return name;
-		} else {
-			return getContextPath();
-		}
-	}
-
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.admin;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
+
+/**
+ * Display the startup status page.
+ */
+public class StartupStatusController extends FreemarkerHttpServlet {
+
+	@Override
+	protected Actions requiredActions(VitroRequest vreq) {
+		return SimplePermission.SEE_STARTUP_STATUS.ACTIONS;
+	}
+
+	@Override
+	protected ResponseValues processRequest(VitroRequest vreq) {
+		Map<String, Object> body = new HashMap<String, Object>();
+
+		body.put("title", "Startup Status");
+		body.put("status", StartupStatus.getBean(getServletContext()));
+		body.put("contextPath", getContextPath());
+		body.put("applicationName", getApplicationName(vreq));
+
+		return new TemplateResponseValues("startupStatus-display.ftl", body);
+	}
+
+	private String getContextPath() {
+		String cp = getServletContext().getContextPath();
+		if ((cp == null) || cp.isEmpty()) {
+			return "The application";
+		} else {
+			return cp;
+		}
+	}
+
+	private Object getApplicationName(VitroRequest vreq) {
+		String name = "";
+		try {
+			name = vreq.getAppBean().getApplicationName();
+		} catch (Exception e) {
+			// deal with problems below
+		}
+
+		if ((name != null) && (!name.isEmpty())) {
+			return name;
+		} else {
+			return getContextPath();
+		}
+	}
+
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java
index 8432fc526..6c6dacbf7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlQueryAjaxController.java
@@ -1,99 +1,99 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.ajax;
-
-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.rdf.model.Model;
-
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.ajax.SparqlUtils.AjaxControllerException;
-import edu.cornell.mannlib.vitro.webapp.dao.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.
- */
-public class SparqlQueryAjaxController extends VitroAjaxController {
-	private static final Log log = LogFactory
-			.getLog(SparqlQueryAjaxController.class);
-
-	public static final String PARAMETER_QUERY = "query";
-	public static final String RESPONSE_MIME_TYPE = "application/javascript";
-
-	public static final String PARAMETER_MODEL = "model";
-	public static final String OPTION_MODEL_FULL = "full";
-	public static final String OPTION_MODEL_USER_ACCOUNTS = "userAccounts";
-
-	@Override
-	protected Actions requiredActions(VitroRequest vreq) {
-		String modelParam = getModelParam(vreq);
-		if (OPTION_MODEL_USER_ACCOUNTS.equals(modelParam)) {
-			return SimplePermission.QUERY_USER_ACCOUNTS_MODEL.ACTIONS;
-		} else {
-			return SimplePermission.QUERY_FULL_MODEL.ACTIONS;
-		}
-	}
-
-	@Override
-	protected void doRequest(VitroRequest vreq, HttpServletResponse response)
-			throws ServletException, IOException {
-		try {
-			String modelParam = getModelParam(vreq);
-			Model model = locateModel(vreq, modelParam);
-			String queryParam = locateQueryParam(vreq);
-			Query query = SparqlUtils.createQuery(queryParam);
-			SparqlUtils.executeQuery(response, query, model);
-			return;
-		} catch (AjaxControllerException e) {
-			log.error(e.getMessage());
-			response.sendError(e.getStatusCode());
-		}
-	}
-
-	private String getModelParam(HttpServletRequest req) {
-		String modelParam = req.getParameter(PARAMETER_MODEL);
-		log.debug("modelParam was: " + modelParam);
-		if ((modelParam != null) && (!modelParam.isEmpty())) {
-			return modelParam;
-		} else {
-			return OPTION_MODEL_FULL;
-		}
-
-	}
-
-	private Model locateModel(VitroRequest vreq, String modelParam) {
-		if (OPTION_MODEL_USER_ACCOUNTS.equals(modelParam)) {
-			return ModelAccess.on(vreq).getUserAccountsModel();
-		} else {
-			return ModelAccess.on(vreq).getJenaOntModel();
-		}
-	}
-
-	private String locateQueryParam(VitroRequest vreq)
-			throws AjaxControllerException {
-		String queryParam = vreq.getParameter(PARAMETER_QUERY);
-		log.debug("queryParam was: " + queryParam);
-		if ((queryParam != null) && (!queryParam.isEmpty())) {
-			return queryParam;
-		} else {
-			throw new AjaxControllerException(SC_NOT_FOUND, "'"
-					+ PARAMETER_QUERY + "' parameter is required");
-		}
-	}
-	
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.ajax;
+
+import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.rdf.model.Model;
+
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.ajax.SparqlUtils.AjaxControllerException;
+import edu.cornell.mannlib.vitro.webapp.dao.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.
+ */
+public class SparqlQueryAjaxController extends VitroAjaxController {
+	private static final Log log = LogFactory
+			.getLog(SparqlQueryAjaxController.class);
+
+	public static final String PARAMETER_QUERY = "query";
+	public static final String RESPONSE_MIME_TYPE = "application/javascript";
+
+	public static final String PARAMETER_MODEL = "model";
+	public static final String OPTION_MODEL_FULL = "full";
+	public static final String OPTION_MODEL_USER_ACCOUNTS = "userAccounts";
+
+	@Override
+	protected Actions requiredActions(VitroRequest vreq) {
+		String modelParam = getModelParam(vreq);
+		if (OPTION_MODEL_USER_ACCOUNTS.equals(modelParam)) {
+			return SimplePermission.QUERY_USER_ACCOUNTS_MODEL.ACTIONS;
+		} else {
+			return SimplePermission.QUERY_FULL_MODEL.ACTIONS;
+		}
+	}
+
+	@Override
+	protected void doRequest(VitroRequest vreq, HttpServletResponse response)
+			throws ServletException, IOException {
+		try {
+			String modelParam = getModelParam(vreq);
+			Model model = locateModel(vreq, modelParam);
+			String queryParam = locateQueryParam(vreq);
+			Query query = SparqlUtils.createQuery(queryParam);
+			SparqlUtils.executeQuery(response, query, model);
+			return;
+		} catch (AjaxControllerException e) {
+			log.error(e.getMessage());
+			response.sendError(e.getStatusCode());
+		}
+	}
+
+	private String getModelParam(HttpServletRequest req) {
+		String modelParam = req.getParameter(PARAMETER_MODEL);
+		log.debug("modelParam was: " + modelParam);
+		if ((modelParam != null) && (!modelParam.isEmpty())) {
+			return modelParam;
+		} else {
+			return OPTION_MODEL_FULL;
+		}
+
+	}
+
+	private Model locateModel(VitroRequest vreq, String modelParam) {
+		if (OPTION_MODEL_USER_ACCOUNTS.equals(modelParam)) {
+			return ModelAccess.on(vreq).getUserAccountsModel();
+		} else {
+			return ModelAccess.on(vreq).getJenaOntModel();
+		}
+	}
+
+	private String locateQueryParam(VitroRequest vreq)
+			throws AjaxControllerException {
+		String queryParam = vreq.getParameter(PARAMETER_QUERY);
+		log.debug("queryParam was: " + queryParam);
+		if ((queryParam != null) && (!queryParam.isEmpty())) {
+			return queryParam;
+		} else {
+			throw new AjaxControllerException(SC_NOT_FOUND, "'"
+					+ PARAMETER_QUERY + "' parameter is required");
+		}
+	}
+	
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlUtils.java
index 41f1da870..bbffa885a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlUtils.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/SparqlUtils.java
@@ -1,87 +1,87 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.ajax;
-
-import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
-import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.query.DatasetFactory;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.query.ResultSetFormatter;
-import com.hp.hpl.jena.query.Syntax;
-import com.hp.hpl.jena.rdf.model.Model;
-
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
-
-/**
- * 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 {
-	private static final Log log = LogFactory
-			.getLog(SparqlQueryAjaxController.class);
-
-	public static final String RESPONSE_MIME_TYPE = "application/javascript";
-
-	public static final String PARAMETER_MODEL = "model";
-	public static final String OPTION_MODEL_FULL = "full";
-	public static final String OPTION_MODEL_USER_ACCOUNTS = "userAccounts";
-
-
-	public static Query createQuery(String queryParam) throws AjaxControllerException {
-		Query query = QueryFactory.create(queryParam, Syntax.syntaxARQ);
-		if (!query.isSelectType()) {
-			throw new AjaxControllerException(SC_NOT_FOUND,
-					"Only 'select' queries are allowed.");
-		}
-		return query;
-	}
-
-	public static void executeQuery(HttpServletResponse response, Query query,
-			Model model) throws IOException {
-		Dataset dataset = DatasetFactory.create(model);
-		QueryExecution qe = QueryExecutionFactory.create(query, dataset);
-		try {
-			ResultSet results = qe.execSelect();
-			response.setContentType(RESPONSE_MIME_TYPE);
-			OutputStream out = response.getOutputStream();
-			ResultSetFormatter.outputAsJSON(out, results);
-		} finally {
-			qe.close();
-		}
-	}
-
-
-	public static class AjaxControllerException extends Exception {
-		private final int statusCode;
-
-		public AjaxControllerException(int statusCode, String message) {
-			super(message);
-			this.statusCode = statusCode;
-		}
-
-		public int getStatusCode() {
-			return statusCode;
-		}
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.ajax;
+
+import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.query.DatasetFactory;
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.query.ResultSetFormatter;
+import com.hp.hpl.jena.query.Syntax;
+import com.hp.hpl.jena.rdf.model.Model;
+
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
+
+/**
+ * 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 {
+	private static final Log log = LogFactory
+			.getLog(SparqlQueryAjaxController.class);
+
+	public static final String RESPONSE_MIME_TYPE = "application/javascript";
+
+	public static final String PARAMETER_MODEL = "model";
+	public static final String OPTION_MODEL_FULL = "full";
+	public static final String OPTION_MODEL_USER_ACCOUNTS = "userAccounts";
+
+
+	public static Query createQuery(String queryParam) throws AjaxControllerException {
+		Query query = QueryFactory.create(queryParam, Syntax.syntaxARQ);
+		if (!query.isSelectType()) {
+			throw new AjaxControllerException(SC_NOT_FOUND,
+					"Only 'select' queries are allowed.");
+		}
+		return query;
+	}
+
+	public static void executeQuery(HttpServletResponse response, Query query,
+			Model model) throws IOException {
+		Dataset dataset = DatasetFactory.create(model);
+		QueryExecution qe = QueryExecutionFactory.create(query, dataset);
+		try {
+			ResultSet results = qe.execSelect();
+			response.setContentType(RESPONSE_MIME_TYPE);
+			OutputStream out = response.getOutputStream();
+			ResultSetFormatter.outputAsJSON(out, results);
+		} finally {
+			qe.close();
+		}
+	}
+
+
+	public static class AjaxControllerException extends Exception {
+		private final int statusCode;
+
+		public AjaxControllerException(int statusCode, String message) {
+			super(message);
+			this.statusCode = statusCode;
+		}
+
+		public int getStatusCode() {
+			return statusCode;
+		}
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/VitroAjaxController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/VitroAjaxController.java
index 70d6b3e7c..955a8e2a8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/VitroAjaxController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/ajax/VitroAjaxController.java
@@ -1,96 +1,96 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.ajax;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Map;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerConfigurationLoader;
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-
-/**
- * A base class for servlets that handle AJAX requests.
- */
-public abstract class VitroAjaxController extends HttpServlet {
-
-	private static final Log log = LogFactory.getLog(VitroAjaxController.class);
-
-	/**
-	 * Sub-classes must implement this method to handle both GET and POST
-	 * requests.
-	 */
-	protected abstract void doRequest(VitroRequest vreq,
-			HttpServletResponse resp) throws ServletException, IOException;
-
-	/**
-	 * Sub-classes should not override this. Instead, implement doRequest().
-	 */
-	@Override
-	protected final void doGet(HttpServletRequest req, HttpServletResponse resp)
-			throws ServletException, IOException {
-		VitroRequest vreq = new VitroRequest(req);
-		if (PolicyHelper.isAuthorizedForActions(vreq, requiredActions(vreq))) {
-			doRequest(vreq, resp);
-		} else {
-			resp.sendError(HttpServletResponse.SC_FORBIDDEN, "Not authorized");
-		}
-	}
-
-	/**
-	 * Sub-classes should not override this. Instead, implement doRequest().
-	 */
-	@Override
-	protected final void doPost(HttpServletRequest req, HttpServletResponse resp)
-			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 
-	 *    to return the actions that require authorization.
-	 * In some cases, the choice of actions will depend on the contents of the request.
-     */
-    @SuppressWarnings("unused")
-	protected Actions requiredActions(VitroRequest vreq) {
-		return Actions.AUTHORIZED;
-	}
-
-	/**
-	 * Process data through a Freemarker template and output the result.
-	 */
-	protected void writeTemplate(String templateName, Map<String, Object> map,
-			VitroRequest vreq, HttpServletResponse response) {
-		Configuration config = FreemarkerConfigurationLoader.getConfig(vreq);
-		try {
-			Template template = config.getTemplate(templateName);
-			PrintWriter out = response.getWriter();
-			template.process(map, out);
-		} catch (Exception e) {
-			log.error(e, e);
-		}
-	}
-
-	protected void doError(HttpServletResponse response, String errorMsg,
-			int httpstatus) {
-		response.setStatus(httpstatus);
-		try {
-			response.getWriter().write(errorMsg);
-		} catch (IOException e) {
-			log.debug("IO exception during output", e);
-		}
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.ajax;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Map;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerConfigurationLoader;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+
+/**
+ * A base class for servlets that handle AJAX requests.
+ */
+public abstract class VitroAjaxController extends HttpServlet {
+
+	private static final Log log = LogFactory.getLog(VitroAjaxController.class);
+
+	/**
+	 * Sub-classes must implement this method to handle both GET and POST
+	 * requests.
+	 */
+	protected abstract void doRequest(VitroRequest vreq,
+			HttpServletResponse resp) throws ServletException, IOException;
+
+	/**
+	 * Sub-classes should not override this. Instead, implement doRequest().
+	 */
+	@Override
+	protected final void doGet(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
+		VitroRequest vreq = new VitroRequest(req);
+		if (PolicyHelper.isAuthorizedForActions(vreq, requiredActions(vreq))) {
+			doRequest(vreq, resp);
+		} else {
+			resp.sendError(HttpServletResponse.SC_FORBIDDEN, "Not authorized");
+		}
+	}
+
+	/**
+	 * Sub-classes should not override this. Instead, implement doRequest().
+	 */
+	@Override
+	protected final void doPost(HttpServletRequest req, HttpServletResponse resp)
+			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 
+	 *    to return the actions that require authorization.
+	 * In some cases, the choice of actions will depend on the contents of the request.
+     */
+    @SuppressWarnings("unused")
+	protected Actions requiredActions(VitroRequest vreq) {
+		return Actions.AUTHORIZED;
+	}
+
+	/**
+	 * Process data through a Freemarker template and output the result.
+	 */
+	protected void writeTemplate(String templateName, Map<String, Object> map,
+			VitroRequest vreq, HttpServletResponse response) {
+		Configuration config = FreemarkerConfigurationLoader.getConfig(vreq);
+		try {
+			Template template = config.getTemplate(templateName);
+			PrintWriter out = response.getWriter();
+			template.process(map, out);
+		} catch (Exception e) {
+			log.error(e, e);
+		}
+	}
+
+	protected void doError(HttpServletResponse response, String errorMsg,
+			int httpstatus) {
+		response.setStatus(httpstatus);
+		try {
+			response.getWriter().write(errorMsg);
+		} catch (IOException e) {
+			log.debug("IO exception during output", e);
+		}
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java
index c789d7e51..d7d0a9396 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AdminLoginController.java
@@ -1,195 +1,195 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
-
-import static edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource.INTERNAL;
-import static edu.cornell.mannlib.vitro.webapp.beans.UserAccount.MAX_PASSWORD_LENGTH;
-import static edu.cornell.mannlib.vitro.webapp.beans.UserAccount.MIN_PASSWORD_LENGTH;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator.LoginNotPermitted;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-
-/**
- * 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.
- */
-public class AdminLoginController extends FreemarkerHttpServlet {
-	private static final Log log = LogFactory
-			.getLog(AdminLoginController.class);
-
-	public static final String PARAMETER_EMAIL_ADDRESS = "email";
-	public static final String PARAMETER_PASSWORD = "password";
-	public static final String PARAMETER_NEW_PASSWORD = "newPassword";
-	public static final String PARAMETER_CONFIRM_PASSWORD = "confirmPassword";
-
-	public static final String URL_THIS = "/admin/login";
-	public static final String URL_HOME_PAGE = "/";
-
-	public static final String TEMPLATE_NAME = "adminLogin.ftl";
-
-	private static final String MESSAGE_NO_EMAIL_ADDRESS = "errorNoEmail";
-	private static final String MESSAGE_NO_PASSWORD = "errorNoPassword";
-	private static final String MESSAGE_LOGIN_DISABLED = "errorLoginDisabled";
-	private static final String MESSAGE_LOGIN_FAILED = "errorLoginFailed";
-	private static final String MESSAGE_NEW_PASSWORD_REQUIRED = "newPasswordRequired";
-	private static final String MESSAGE_NEW_PASSWORD_WRONG_LENGTH = "errorNewPasswordWrongLength";
-	private static final String MESSAGE_NEW_PASSWORDS_DONT_MATCH = "errorNewPasswordsDontMatch";
-	private static final String MESSAGE_NEW_PASSWORD_MATCHES_OLD = "errorNewPasswordMatchesOld";
-
-	@Override
-	protected Actions requiredActions(VitroRequest vreq) {
-		return Actions.AUTHORIZED; // No requirements to use this page.
-	}
-
-	@Override
-	protected ResponseValues processRequest(VitroRequest vreq) {
-		return new Core(vreq).process();
-	}
-
-	/**
-	 * A threadsafe holder for the controller logic.
-	 */
-	private static class Core {
-		private final Authenticator auth;
-
-		private final String emailAddress;
-		private final String password;
-		private final String newPassword;
-		private final String confirmPassword;
-		private final UserAccount userAccount;
-
-		public Core(VitroRequest vreq) {
-			this.auth = Authenticator.getInstance(vreq);
-
-			this.emailAddress = nonNull(vreq
-					.getParameter(PARAMETER_EMAIL_ADDRESS));
-			this.password = nonNull(vreq.getParameter(PARAMETER_PASSWORD));
-			this.newPassword = nonNull(vreq
-					.getParameter(PARAMETER_NEW_PASSWORD));
-			this.confirmPassword = nonNull(vreq
-					.getParameter(PARAMETER_CONFIRM_PASSWORD));
-
-			log.debug("Parameters: email='" + emailAddress + "', password='"
-					+ password + "', newPassword='" + newPassword
-					+ "', confirmPassword='" + confirmPassword + "'");
-
-			this.userAccount = this.auth
-					.getAccountForInternalAuth(emailAddress);
-		}
-
-		public ResponseValues process() {
-			if (emailAddress.isEmpty() && password.isEmpty()) {
-				return showForm();
-			}
-			if (emailAddress.isEmpty()) {
-				return showForm(MESSAGE_NO_EMAIL_ADDRESS);
-			}
-			if (password.isEmpty()) {
-				return showForm(MESSAGE_NO_PASSWORD);
-			}
-			if (!loginPermitted()) {
-				return showForm(MESSAGE_LOGIN_DISABLED);
-			}
-			if (newPasswordRequired()) {
-				if (newPassword.isEmpty()) {
-					return showForm(MESSAGE_NEW_PASSWORD_REQUIRED);
-				}
-				if (!isPasswordValidLength(newPassword)) {
-					return showForm(MESSAGE_NEW_PASSWORD_REQUIRED,
-							MESSAGE_NEW_PASSWORD_WRONG_LENGTH);
-				}
-				if (newPassword.equals(password)) {
-					return showForm(MESSAGE_NEW_PASSWORD_REQUIRED,
-							MESSAGE_NEW_PASSWORD_MATCHES_OLD);
-				}
-				if (!newPassword.equals(confirmPassword)) {
-					return showForm(MESSAGE_NEW_PASSWORD_REQUIRED,
-							MESSAGE_NEW_PASSWORDS_DONT_MATCH);
-				}
-			}
-
-			boolean loggedIn = tryToLogin();
-			if (loggedIn) {
-				return goToHomePage();
-			}
-
-			return showForm(MESSAGE_LOGIN_FAILED);
-		}
-
-		private boolean loginPermitted() {
-			return auth.isUserPermittedToLogin(userAccount);
-		}
-
-		private boolean newPasswordRequired() {
-			return auth.isCurrentPassword(userAccount, password)
-					&& (userAccount.isPasswordChangeRequired());
-		}
-
-		private boolean isPasswordValidLength(String pw) {
-			return (pw.length() >= MIN_PASSWORD_LENGTH)
-					&& (pw.length() <= MAX_PASSWORD_LENGTH);
-		}
-
-		private boolean tryToLogin() {
-			if (!auth.isCurrentPassword(userAccount, password)) {
-				return false;
-			}
-
-			try {
-				auth.recordLoginAgainstUserAccount(userAccount, INTERNAL);
-			} catch (LoginNotPermitted e) {
-				return false;
-			}
-
-			if (!newPassword.isEmpty()) {
-				auth.recordNewPassword(userAccount, newPassword);
-			}
-
-			return true;
-		}
-
-		private ResponseValues showForm(String... codes) {
-			Map<String, Object> body = new HashMap<String, Object>();
-			body.put("controllerUrl", UrlBuilder.getUrl(URL_THIS));
-			body.put("email", emailAddress);
-			body.put("password", password);
-			body.put("newPassword", newPassword);
-			body.put("confirmPassword", confirmPassword);
-			
-			body.put("minPasswordLength", MIN_PASSWORD_LENGTH);
-			body.put("maxPasswordLength", MAX_PASSWORD_LENGTH);
-
-			for (String code : codes) {
-				body.put(code, Boolean.TRUE);
-			}
-
-			log.debug("showing form with values: " + body);
-
-			return new TemplateResponseValues(TEMPLATE_NAME, body);
-		}
-
-		private ResponseValues goToHomePage() {
-			return new RedirectResponseValues(URL_HOME_PAGE);
-		}
-
-		private String nonNull(String s) {
-			return (s == null) ? "" : s;
-		}
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
+
+import static edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource.INTERNAL;
+import static edu.cornell.mannlib.vitro.webapp.beans.UserAccount.MAX_PASSWORD_LENGTH;
+import static edu.cornell.mannlib.vitro.webapp.beans.UserAccount.MIN_PASSWORD_LENGTH;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator.LoginNotPermitted;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+
+/**
+ * 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.
+ */
+public class AdminLoginController extends FreemarkerHttpServlet {
+	private static final Log log = LogFactory
+			.getLog(AdminLoginController.class);
+
+	public static final String PARAMETER_EMAIL_ADDRESS = "email";
+	public static final String PARAMETER_PASSWORD = "password";
+	public static final String PARAMETER_NEW_PASSWORD = "newPassword";
+	public static final String PARAMETER_CONFIRM_PASSWORD = "confirmPassword";
+
+	public static final String URL_THIS = "/admin/login";
+	public static final String URL_HOME_PAGE = "/";
+
+	public static final String TEMPLATE_NAME = "adminLogin.ftl";
+
+	private static final String MESSAGE_NO_EMAIL_ADDRESS = "errorNoEmail";
+	private static final String MESSAGE_NO_PASSWORD = "errorNoPassword";
+	private static final String MESSAGE_LOGIN_DISABLED = "errorLoginDisabled";
+	private static final String MESSAGE_LOGIN_FAILED = "errorLoginFailed";
+	private static final String MESSAGE_NEW_PASSWORD_REQUIRED = "newPasswordRequired";
+	private static final String MESSAGE_NEW_PASSWORD_WRONG_LENGTH = "errorNewPasswordWrongLength";
+	private static final String MESSAGE_NEW_PASSWORDS_DONT_MATCH = "errorNewPasswordsDontMatch";
+	private static final String MESSAGE_NEW_PASSWORD_MATCHES_OLD = "errorNewPasswordMatchesOld";
+
+	@Override
+	protected Actions requiredActions(VitroRequest vreq) {
+		return Actions.AUTHORIZED; // No requirements to use this page.
+	}
+
+	@Override
+	protected ResponseValues processRequest(VitroRequest vreq) {
+		return new Core(vreq).process();
+	}
+
+	/**
+	 * A threadsafe holder for the controller logic.
+	 */
+	private static class Core {
+		private final Authenticator auth;
+
+		private final String emailAddress;
+		private final String password;
+		private final String newPassword;
+		private final String confirmPassword;
+		private final UserAccount userAccount;
+
+		public Core(VitroRequest vreq) {
+			this.auth = Authenticator.getInstance(vreq);
+
+			this.emailAddress = nonNull(vreq
+					.getParameter(PARAMETER_EMAIL_ADDRESS));
+			this.password = nonNull(vreq.getParameter(PARAMETER_PASSWORD));
+			this.newPassword = nonNull(vreq
+					.getParameter(PARAMETER_NEW_PASSWORD));
+			this.confirmPassword = nonNull(vreq
+					.getParameter(PARAMETER_CONFIRM_PASSWORD));
+
+			log.debug("Parameters: email='" + emailAddress + "', password='"
+					+ password + "', newPassword='" + newPassword
+					+ "', confirmPassword='" + confirmPassword + "'");
+
+			this.userAccount = this.auth
+					.getAccountForInternalAuth(emailAddress);
+		}
+
+		public ResponseValues process() {
+			if (emailAddress.isEmpty() && password.isEmpty()) {
+				return showForm();
+			}
+			if (emailAddress.isEmpty()) {
+				return showForm(MESSAGE_NO_EMAIL_ADDRESS);
+			}
+			if (password.isEmpty()) {
+				return showForm(MESSAGE_NO_PASSWORD);
+			}
+			if (!loginPermitted()) {
+				return showForm(MESSAGE_LOGIN_DISABLED);
+			}
+			if (newPasswordRequired()) {
+				if (newPassword.isEmpty()) {
+					return showForm(MESSAGE_NEW_PASSWORD_REQUIRED);
+				}
+				if (!isPasswordValidLength(newPassword)) {
+					return showForm(MESSAGE_NEW_PASSWORD_REQUIRED,
+							MESSAGE_NEW_PASSWORD_WRONG_LENGTH);
+				}
+				if (newPassword.equals(password)) {
+					return showForm(MESSAGE_NEW_PASSWORD_REQUIRED,
+							MESSAGE_NEW_PASSWORD_MATCHES_OLD);
+				}
+				if (!newPassword.equals(confirmPassword)) {
+					return showForm(MESSAGE_NEW_PASSWORD_REQUIRED,
+							MESSAGE_NEW_PASSWORDS_DONT_MATCH);
+				}
+			}
+
+			boolean loggedIn = tryToLogin();
+			if (loggedIn) {
+				return goToHomePage();
+			}
+
+			return showForm(MESSAGE_LOGIN_FAILED);
+		}
+
+		private boolean loginPermitted() {
+			return auth.isUserPermittedToLogin(userAccount);
+		}
+
+		private boolean newPasswordRequired() {
+			return auth.isCurrentPassword(userAccount, password)
+					&& (userAccount.isPasswordChangeRequired());
+		}
+
+		private boolean isPasswordValidLength(String pw) {
+			return (pw.length() >= MIN_PASSWORD_LENGTH)
+					&& (pw.length() <= MAX_PASSWORD_LENGTH);
+		}
+
+		private boolean tryToLogin() {
+			if (!auth.isCurrentPassword(userAccount, password)) {
+				return false;
+			}
+
+			try {
+				auth.recordLoginAgainstUserAccount(userAccount, INTERNAL);
+			} catch (LoginNotPermitted e) {
+				return false;
+			}
+
+			if (!newPassword.isEmpty()) {
+				auth.recordNewPassword(userAccount, newPassword);
+			}
+
+			return true;
+		}
+
+		private ResponseValues showForm(String... codes) {
+			Map<String, Object> body = new HashMap<String, Object>();
+			body.put("controllerUrl", UrlBuilder.getUrl(URL_THIS));
+			body.put("email", emailAddress);
+			body.put("password", password);
+			body.put("newPassword", newPassword);
+			body.put("confirmPassword", confirmPassword);
+			
+			body.put("minPasswordLength", MIN_PASSWORD_LENGTH);
+			body.put("maxPasswordLength", MAX_PASSWORD_LENGTH);
+
+			for (String code : codes) {
+				body.put(code, Boolean.TRUE);
+			}
+
+			log.debug("showing form with values: " + body);
+
+			return new TemplateResponseValues(TEMPLATE_NAME, body);
+		}
+
+		private ResponseValues goToHomePage() {
+			return new RedirectResponseValues(URL_HOME_PAGE);
+		}
+
+		private String nonNull(String s) {
+			return (s == null) ? "" : s;
+		}
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/Authenticator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/Authenticator.java
index 7fe8165eb..c82231529 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/Authenticator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/Authenticator.java
@@ -1,227 +1,227 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
-
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.List;
-
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.codec.binary.Hex;
-
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-
-/**
- * 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
- * been disabled. Then, that object would provide these methods:
- * accountRequiresEditing(), getAssociatedIndividualUris(), isCurrentPassword(),
- * recordLoginAgainstUserAccount(), recordNewPassword(). If you didn't have such
- * an object, you couldn't even call these methods.
- */
-public abstract class Authenticator {
-	// ----------------------------------------------------------------------
-	// The factory
-	//
-	// Each Authenticator instance is used for a single request, so we store
-	// a factory in the context that can create these instances.
-	// ----------------------------------------------------------------------
-
-	private static final String FACTORY_ATTRIBUTE_NAME = AuthenticatorFactory.class
-			.getName();
-
-	public interface AuthenticatorFactory {
-		Authenticator getInstance(HttpServletRequest request);
-	}
-
-	/**
-	 * Ask the currently configured AuthenticatorFactory to give us an
-	 * Authenticator for this request.
-	 * 
-	 * If there is no factory, configure a Basic one.
-	 */
-	public static Authenticator getInstance(HttpServletRequest request) {
-		ServletContext ctx = request.getSession().getServletContext();
-		Object attribute = ctx.getAttribute(FACTORY_ATTRIBUTE_NAME);
-		if (!(attribute instanceof AuthenticatorFactory)) {
-			setAuthenticatorFactory(new BasicAuthenticator.Factory(), ctx);
-			attribute = ctx.getAttribute(FACTORY_ATTRIBUTE_NAME);
-		}
-		AuthenticatorFactory factory = (AuthenticatorFactory) attribute;
-
-		return factory.getInstance(request);
-	}
-
-	public static void setAuthenticatorFactory(AuthenticatorFactory factory,
-			ServletContext ctx) {
-		ctx.setAttribute(FACTORY_ATTRIBUTE_NAME, factory);
-	}
-
-	// ----------------------------------------------------------------------
-	// The interface.
-	// ----------------------------------------------------------------------
-
-	/** Maximum inactive interval for a ordinary logged-in session, in seconds. */
-	public static final int LOGGED_IN_TIMEOUT_INTERVAL = 60 * 60;
-
-	/** Maximum inactive interval for a editor (or better) session, in seconds. */
-	public static final int PRIVILEGED_TIMEOUT_INTERVAL = 60 * 60 * 8;
-
-	/**
-	 * Get the UserAccount for this external ID, or null if there is none.
-	 */
-	public abstract UserAccount getAccountForExternalAuth(String externalAuthId);
-
-	/**
-	 * Get the UserAccount for this email address, or null if there is none.
-	 */
-	public abstract UserAccount getAccountForInternalAuth(String emailAddress);
-
-	/**
-	 * 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.
-	 */
-	public abstract boolean isUserPermittedToLogin(UserAccount userAccount);
-
-	/**
-	 * Internal: does this UserAccount have this password? False if the
-	 * userAccount is null.
-	 */
-	public abstract boolean isCurrentPassword(UserAccount userAccount,
-			String clearTextPassword);
-
-	/**
-	 * Internal: record a new password for the user. Takes no action if the
-	 * userAccount is null.
-	 */
-	public abstract void recordNewPassword(UserAccount userAccount,
-			String newClearTextPassword);
-
-	/**
-	 * Is a change in name or email required when the user logs in?
-	 */
-	public abstract boolean accountRequiresEditing(UserAccount userAccount);
-
-	/**
-	 * Get the URIs of all individuals associated with this user, whether by a
-	 * self-editing property like cornellEmailNetid, or by mayEditAs.
-	 */
-	public abstract List<String> getAssociatedIndividualUris(
-			UserAccount userAccount);
-
-	/**
-	 * <pre>
-	 * 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
-	 * - refresh the Identifiers on the request
-	 * - 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()
-	 *             returns false.
-	 */
-	public abstract void recordLoginAgainstUserAccount(UserAccount userAccount,
-			AuthenticationSource authSource) throws LoginNotPermitted;
-
-	/**
-	 * <pre>
-	 * Record that the current user has logged out: - notify other users of the
-	 * model. 
-	 * - invalidate the session.
-	 * </pre>
-	 */
-	public abstract void recordUserIsLoggedOut();
-
-	// ----------------------------------------------------------------------
-	// Public utility methods.
-	// ----------------------------------------------------------------------
-
-	/**
-	 * Apply MD5 to this string, and encode as a string of hex digits. Just
-	 * right for storing passwords in the database, or hashing the password
-	 * link.
-	 */
-	public static String applyMd5Encoding(String raw) {
-		try {
-			MessageDigest md = MessageDigest.getInstance("MD5");
-			byte[] digest = md.digest(raw.getBytes());
-			char[] hexChars = Hex.encodeHex(digest);
-			return new String(hexChars).toUpperCase();
-		} catch (NoSuchAlgorithmException e) {
-			// This can't happen with a normal Java runtime.
-			throw new RuntimeException(e);
-		}
-	}
-
-	/**
-	 * 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.
-	 */
-	public static boolean isValidEmailAddress(String emailAddress) {
-		try {
-			// InternetAddress constructor will throw an exception if the
-			// address does not have valid format (if "strict" is true).
-			@SuppressWarnings("unused")
-			InternetAddress a = new InternetAddress(emailAddress, true);
-
-			// InternetAddress permits a localname without hostname.
-			// Guard against that.
-			if (emailAddress.indexOf('@') == -1) {
-				return false;
-			}
-
-			return true;
-		} catch (AddressException e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Get the IDs that would be created for this userAccount, if this user were
-	 * to log in.
-	 */
-	public static IdentifierBundle getIdsForUserAccount(HttpServletRequest req,
-			UserAccount userAccount) {
-		return ActiveIdentifierBundleFactories.getUserIdentifierBundle(req,
-				userAccount);
-	}
-
-	// ----------------------------------------------------------------------
-	// Exceptions
-	// ----------------------------------------------------------------------
-
-	public static class LoginNotPermitted extends Exception {
-		// no other information
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.List;
+
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.codec.binary.Hex;
+
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+
+/**
+ * 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
+ * been disabled. Then, that object would provide these methods:
+ * accountRequiresEditing(), getAssociatedIndividualUris(), isCurrentPassword(),
+ * recordLoginAgainstUserAccount(), recordNewPassword(). If you didn't have such
+ * an object, you couldn't even call these methods.
+ */
+public abstract class Authenticator {
+	// ----------------------------------------------------------------------
+	// The factory
+	//
+	// Each Authenticator instance is used for a single request, so we store
+	// a factory in the context that can create these instances.
+	// ----------------------------------------------------------------------
+
+	private static final String FACTORY_ATTRIBUTE_NAME = AuthenticatorFactory.class
+			.getName();
+
+	public interface AuthenticatorFactory {
+		Authenticator getInstance(HttpServletRequest request);
+	}
+
+	/**
+	 * Ask the currently configured AuthenticatorFactory to give us an
+	 * Authenticator for this request.
+	 * 
+	 * If there is no factory, configure a Basic one.
+	 */
+	public static Authenticator getInstance(HttpServletRequest request) {
+		ServletContext ctx = request.getSession().getServletContext();
+		Object attribute = ctx.getAttribute(FACTORY_ATTRIBUTE_NAME);
+		if (!(attribute instanceof AuthenticatorFactory)) {
+			setAuthenticatorFactory(new BasicAuthenticator.Factory(), ctx);
+			attribute = ctx.getAttribute(FACTORY_ATTRIBUTE_NAME);
+		}
+		AuthenticatorFactory factory = (AuthenticatorFactory) attribute;
+
+		return factory.getInstance(request);
+	}
+
+	public static void setAuthenticatorFactory(AuthenticatorFactory factory,
+			ServletContext ctx) {
+		ctx.setAttribute(FACTORY_ATTRIBUTE_NAME, factory);
+	}
+
+	// ----------------------------------------------------------------------
+	// The interface.
+	// ----------------------------------------------------------------------
+
+	/** Maximum inactive interval for a ordinary logged-in session, in seconds. */
+	public static final int LOGGED_IN_TIMEOUT_INTERVAL = 60 * 60;
+
+	/** Maximum inactive interval for a editor (or better) session, in seconds. */
+	public static final int PRIVILEGED_TIMEOUT_INTERVAL = 60 * 60 * 8;
+
+	/**
+	 * Get the UserAccount for this external ID, or null if there is none.
+	 */
+	public abstract UserAccount getAccountForExternalAuth(String externalAuthId);
+
+	/**
+	 * Get the UserAccount for this email address, or null if there is none.
+	 */
+	public abstract UserAccount getAccountForInternalAuth(String emailAddress);
+
+	/**
+	 * 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.
+	 */
+	public abstract boolean isUserPermittedToLogin(UserAccount userAccount);
+
+	/**
+	 * Internal: does this UserAccount have this password? False if the
+	 * userAccount is null.
+	 */
+	public abstract boolean isCurrentPassword(UserAccount userAccount,
+			String clearTextPassword);
+
+	/**
+	 * Internal: record a new password for the user. Takes no action if the
+	 * userAccount is null.
+	 */
+	public abstract void recordNewPassword(UserAccount userAccount,
+			String newClearTextPassword);
+
+	/**
+	 * Is a change in name or email required when the user logs in?
+	 */
+	public abstract boolean accountRequiresEditing(UserAccount userAccount);
+
+	/**
+	 * Get the URIs of all individuals associated with this user, whether by a
+	 * self-editing property like cornellEmailNetid, or by mayEditAs.
+	 */
+	public abstract List<String> getAssociatedIndividualUris(
+			UserAccount userAccount);
+
+	/**
+	 * <pre>
+	 * 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
+	 * - refresh the Identifiers on the request
+	 * - 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()
+	 *             returns false.
+	 */
+	public abstract void recordLoginAgainstUserAccount(UserAccount userAccount,
+			AuthenticationSource authSource) throws LoginNotPermitted;
+
+	/**
+	 * <pre>
+	 * Record that the current user has logged out: - notify other users of the
+	 * model. 
+	 * - invalidate the session.
+	 * </pre>
+	 */
+	public abstract void recordUserIsLoggedOut();
+
+	// ----------------------------------------------------------------------
+	// Public utility methods.
+	// ----------------------------------------------------------------------
+
+	/**
+	 * Apply MD5 to this string, and encode as a string of hex digits. Just
+	 * right for storing passwords in the database, or hashing the password
+	 * link.
+	 */
+	public static String applyMd5Encoding(String raw) {
+		try {
+			MessageDigest md = MessageDigest.getInstance("MD5");
+			byte[] digest = md.digest(raw.getBytes());
+			char[] hexChars = Hex.encodeHex(digest);
+			return new String(hexChars).toUpperCase();
+		} catch (NoSuchAlgorithmException e) {
+			// This can't happen with a normal Java runtime.
+			throw new RuntimeException(e);
+		}
+	}
+
+	/**
+	 * 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.
+	 */
+	public static boolean isValidEmailAddress(String emailAddress) {
+		try {
+			// InternetAddress constructor will throw an exception if the
+			// address does not have valid format (if "strict" is true).
+			@SuppressWarnings("unused")
+			InternetAddress a = new InternetAddress(emailAddress, true);
+
+			// InternetAddress permits a localname without hostname.
+			// Guard against that.
+			if (emailAddress.indexOf('@') == -1) {
+				return false;
+			}
+
+			return true;
+		} catch (AddressException e) {
+			return false;
+		}
+	}
+
+	/**
+	 * Get the IDs that would be created for this userAccount, if this user were
+	 * to log in.
+	 */
+	public static IdentifierBundle getIdsForUserAccount(HttpServletRequest req,
+			UserAccount userAccount) {
+		return ActiveIdentifierBundleFactories.getUserIdentifierBundle(req,
+				userAccount);
+	}
+
+	// ----------------------------------------------------------------------
+	// Exceptions
+	// ----------------------------------------------------------------------
+
+	public static class LoginNotPermitted extends Exception {
+		// no other information
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BaseLoginServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BaseLoginServlet.java
index 3892662ce..9fa5fb39c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BaseLoginServlet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BaseLoginServlet.java
@@ -1,71 +1,71 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
-
-import java.io.IOException;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean;
-import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.MLevel;
-import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.Message;
-
-/**
- * Base class for all Login servlets, whether Shibboleth, CuWebAuth, etc.
- */
-public class BaseLoginServlet extends HttpServlet {
-	private static final Log log = LogFactory.getLog(BaseLoginServlet.class);
-
-	/** A general purpose error message for the user to see. */
-	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,
-			HttpServletResponse resp, String sessionAttributeForReferrer,
-			Message message) throws IOException {
-		log.debug(message);
-		LoginProcessBean.getBean(req).setMessage(message);
-
-		String referrer = (String) req.getSession().getAttribute(
-				sessionAttributeForReferrer);
-		log.debug("returning to referrer: " + referrer);
-		if (referrer == null) {
-			referrer = figureHomePageUrl(req);
-			log.debug("returning to home page: " + referrer);
-		}
-
-		req.getSession().removeAttribute(sessionAttributeForReferrer);
-		resp.sendRedirect(referrer);
-	}
-
-	/**
-	 * If we don't have a referrer, send them to the home page.
-	 */
-	protected String figureHomePageUrl(HttpServletRequest req) {
-		StringBuffer url = req.getRequestURL();
-		String uri = req.getRequestURI();
-		int authLength = url.length() - uri.length();
-		String auth = url.substring(0, authLength);
-		return auth + req.getContextPath();
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean;
+import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.MLevel;
+import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.Message;
+
+/**
+ * Base class for all Login servlets, whether Shibboleth, CuWebAuth, etc.
+ */
+public class BaseLoginServlet extends HttpServlet {
+	private static final Log log = LogFactory.getLog(BaseLoginServlet.class);
+
+	/** A general purpose error message for the user to see. */
+	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,
+			HttpServletResponse resp, String sessionAttributeForReferrer,
+			Message message) throws IOException {
+		log.debug(message);
+		LoginProcessBean.getBean(req).setMessage(message);
+
+		String referrer = (String) req.getSession().getAttribute(
+				sessionAttributeForReferrer);
+		log.debug("returning to referrer: " + referrer);
+		if (referrer == null) {
+			referrer = figureHomePageUrl(req);
+			log.debug("returning to home page: " + referrer);
+		}
+
+		req.getSession().removeAttribute(sessionAttributeForReferrer);
+		resp.sendRedirect(referrer);
+	}
+
+	/**
+	 * If we don't have a referrer, send them to the home page.
+	 */
+	protected String figureHomePageUrl(HttpServletRequest req) {
+		StringBuffer url = req.getRequestURL();
+		String uri = req.getRequestURI();
+		int authLength = url.length() - uri.length();
+		String auth = url.substring(0, authLength);
+		return auth + req.getContextPath();
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BasicAuthenticator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BasicAuthenticator.java
index 16435125b..4cf4d889a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BasicAuthenticator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/BasicAuthenticator.java
@@ -1,314 +1,314 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.IsRootUser;
-import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.controller.edit.Authenticate;
-import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
-import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
-import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.LoginEvent;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.LogoutEvent;
-import edu.cornell.mannlib.vitro.webapp.search.indexing.IndexBuilder;
-
-/**
- * The "standard" implementation of Authenticator.
- */
-public class BasicAuthenticator extends Authenticator {
-	private static final Log log = LogFactory.getLog(BasicAuthenticator.class);
-
-	// ----------------------------------------------------------------------
-	// The factory
-	// ----------------------------------------------------------------------
-
-	public static class Factory implements AuthenticatorFactory {
-		@Override
-		public Authenticator getInstance(HttpServletRequest req) {
-			return new BasicAuthenticator(req);
-		}
-	}
-
-	// ----------------------------------------------------------------------
-	// The authenticator
-	// ----------------------------------------------------------------------
-
-	private final HttpServletRequest request;
-
-	public BasicAuthenticator(HttpServletRequest request) {
-		this.request = request;
-	}
-
-	@Override
-	public UserAccount getAccountForInternalAuth(String emailAddress) {
-		UserAccountsDao userAccountsDao = getUserAccountsDao();
-		if (userAccountsDao == null) {
-			return null;
-		}
-		return userAccountsDao.getUserAccountByEmail(emailAddress);
-	}
-
-	@Override
-	public UserAccount getAccountForExternalAuth(String externalAuthId) {
-		UserAccountsDao userAccountsDao = getUserAccountsDao();
-		if (userAccountsDao == null) {
-			return null;
-		}
-		return userAccountsDao.getUserAccountByExternalAuthId(externalAuthId);
-	}
-
-	@Override
-	public boolean isUserPermittedToLogin(UserAccount userAccount) {
-		// All users are permitted to login. If the user doesn't have an account
-		// yet (userAccount is null), an account should be created for them.
-		return true;
-	}
-
-	@Override
-	public boolean isCurrentPassword(UserAccount userAccount,
-			String clearTextPassword) {
-		if (userAccount == null) {
-			return false;
-		}
-		if (clearTextPassword == null) {
-			return false;
-		}
-		String encodedPassword = applyMd5Encoding(clearTextPassword);
-		return encodedPassword.equals(userAccount.getMd5Password());
-	}
-
-	@Override
-	public void recordNewPassword(UserAccount userAccount,
-			String newClearTextPassword) {
-		if (userAccount == null) {
-			log.error("Trying to change password on null user.");
-			return;
-		}
-		userAccount.setMd5Password(applyMd5Encoding(newClearTextPassword));
-		userAccount.setPasswordChangeRequired(false);
-		userAccount.setPasswordLinkExpires(0L);
-		getUserAccountsDao().updateUserAccount(userAccount);
-	}
-
-	@Override
-	public boolean accountRequiresEditing(UserAccount userAccount) {
-		if (userAccount == null) {
-			log.error("Trying to check for valid fields on a null user.");
-			return false;
-		}
-		if (userAccount.getFirstName().isEmpty()) {
-			return true;
-		}
-		if (userAccount.getLastName().isEmpty()) {
-			return true;
-		}
-		if (userAccount.getEmailAddress().isEmpty()) {
-			return true;
-		}
-		if (!isValidEmailAddress(userAccount.getEmailAddress())) {
-			return true;
-		}
-		return false;
-	}
-
-	@Override
-	public List<String> getAssociatedIndividualUris(UserAccount userAccount) {
-		List<String> uris = new ArrayList<String>();
-		if (userAccount == null) {
-			return uris;
-		}
-		uris.addAll(getUrisAssociatedBySelfEditorConfig(userAccount));
-		return uris;
-	}
-
-	@Override
-	public void recordLoginAgainstUserAccount(UserAccount userAccount,
-			AuthenticationSource authSource) throws LoginNotPermitted {
-		if (!isUserPermittedToLogin(userAccount)) {
-			throw new LoginNotPermitted();
-		}
-		if (userAccount == null) {
-			log.error("Trying to record the login of a null user. ");
-			return;
-		}
-
-		recordLoginOnUserRecord(userAccount);
-
-		HttpSession session = request.getSession();
-		createLoginStatusBean(userAccount.getUri(), authSource, session);
-		RequestIdentifiers.resetIdentifiers(request);
-		setSessionTimeoutLimit(userAccount, session);
-		recordInUserSessionMap(userAccount.getUri(), session);
-		notifyOtherUsers(userAccount.getUri(), session);
-
-		if (IsRootUser.isRootUser(RequestIdentifiers
-				.getIdBundleForRequest(request))) {
-			IndexBuilder.checkIndexOnRootLogin(request);
-		}
-	}
-
-	/**
-	 * Update the user record to record the login.
-	 */
-	private void recordLoginOnUserRecord(UserAccount userAccount) {
-		userAccount.setLoginCount(userAccount.getLoginCount() + 1);
-		userAccount.setLastLoginTime(new Date().getTime());
-		userAccount.setStatus(Status.ACTIVE);
-		getUserAccountsDao().updateUserAccount(userAccount);
-	}
-
-	/**
-	 * Put the login bean into the session.
-	 */
-	private void createLoginStatusBean(String userUri,
-			AuthenticationSource authSource, HttpSession session) {
-		LoginStatusBean lsb = new LoginStatusBean(userUri, authSource);
-		LoginStatusBean.setBean(session, lsb);
-		log.debug("Adding status bean: " + lsb);
-	}
-
-	/**
-	 * Editors and other privileged users get a longer timeout interval.
-	 */
-	private void setSessionTimeoutLimit(UserAccount userAccount,
-			HttpSession session) {
-		RoleLevel role = RoleLevel.getRoleFromLoginStatus(request);
-		if (role == RoleLevel.EDITOR || role == RoleLevel.CURATOR
-				|| role == RoleLevel.DB_ADMIN) {
-			session.setMaxInactiveInterval(PRIVILEGED_TIMEOUT_INTERVAL);
-		} else if (userAccount.isRootUser()) {
-			session.setMaxInactiveInterval(PRIVILEGED_TIMEOUT_INTERVAL);
-		} else {
-			session.setMaxInactiveInterval(LOGGED_IN_TIMEOUT_INTERVAL);
-		}
-	}
-
-	/**
-	 * Record the login in the user/session map.
-	 * 
-	 * TODO What is this map used for?
-	 */
-	private void recordInUserSessionMap(String userUri, HttpSession session) {
-		Map<String, HttpSession> userURISessionMap = Authenticate
-				.getUserURISessionMapFromContext(session.getServletContext());
-		userURISessionMap.put(userUri, session);
-	}
-
-	/**
-	 * Anyone listening to the model might need to know that another user is
-	 * logged in.
-	 */
-	private void notifyOtherUsers(String userUri, HttpSession session) {
-		Authenticate.sendLoginNotifyEvent(new LoginEvent(userUri),
-				session.getServletContext(), session);
-	}
-
-	private List<String> getUrisAssociatedBySelfEditorConfig(UserAccount user) {
-		List<String> uris = new ArrayList<String>();
-		if (user == null) {
-			return uris;
-		}
-
-		IndividualDao iDao = getIndividualDao();
-		if (iDao == null) {
-			return uris;
-		}
-
-		List<Individual> associatedIndividuals = SelfEditingConfiguration
-				.getBean(request).getAssociatedIndividuals(iDao, user);
-		for (Individual ind : associatedIndividuals) {
-			uris.add(ind.getURI());
-		}
-		return uris;
-	}
-
-	@Override
-	public void recordUserIsLoggedOut() {
-		HttpSession session = request.getSession();
-		notifyOtherUsersOfLogout(session);
-		session.invalidate();
-	}
-
-	private void notifyOtherUsersOfLogout(HttpSession session) {
-		String userUri = LoginStatusBean.getBean(session).getUserURI();
-		if ((userUri == null) || userUri.isEmpty()) {
-			return;
-		}
-
-		Authenticate.sendLoginNotifyEvent(new LogoutEvent(userUri),
-				session.getServletContext(), session);
-	}
-
-	/**
-	 * Get a reference to the UserAccountsDao, or null.
-	 */
-	private UserAccountsDao getUserAccountsDao() {
-		WebappDaoFactory wadf = getWebappDaoFactory();
-		if (wadf == null) {
-			return null;
-		}
-
-		UserAccountsDao userAccountsDao = wadf.getUserAccountsDao();
-		if (userAccountsDao == null) {
-			log.error("getUserAccountsDao: no UserAccountsDao");
-		}
-
-		return userAccountsDao;
-	}
-
-	/**
-	 * Get a reference to the IndividualDao, or null.
-	 */
-	private IndividualDao getIndividualDao() {
-		WebappDaoFactory wadf = getWebappDaoFactory();
-		if (wadf == null) {
-			return null;
-		}
-
-		IndividualDao individualDao = wadf.getIndividualDao();
-		if (individualDao == null) {
-			log.error("getIndividualDao: no IndividualDao");
-		}
-
-		return individualDao;
-	}
-
-	/**
-	 * Get a reference to the WebappDaoFactory, or null.
-	 */
-	private WebappDaoFactory getWebappDaoFactory() {
-		HttpSession session = request.getSession(false);
-		if (session == null) {
-			return null;
-		}
-
-		ServletContext servletContext = session.getServletContext();
-		return ModelAccess.on(servletContext).getWebappDaoFactory();
-	}
-
-	@Override
-	public String toString() {
-		return "BasicAuthenticator[" + request + "]";
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.IsRootUser;
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.SelfEditingConfiguration;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.controller.edit.Authenticate;
+import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.LoginEvent;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.LogoutEvent;
+import edu.cornell.mannlib.vitro.webapp.search.indexing.IndexBuilder;
+
+/**
+ * The "standard" implementation of Authenticator.
+ */
+public class BasicAuthenticator extends Authenticator {
+	private static final Log log = LogFactory.getLog(BasicAuthenticator.class);
+
+	// ----------------------------------------------------------------------
+	// The factory
+	// ----------------------------------------------------------------------
+
+	public static class Factory implements AuthenticatorFactory {
+		@Override
+		public Authenticator getInstance(HttpServletRequest req) {
+			return new BasicAuthenticator(req);
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// The authenticator
+	// ----------------------------------------------------------------------
+
+	private final HttpServletRequest request;
+
+	public BasicAuthenticator(HttpServletRequest request) {
+		this.request = request;
+	}
+
+	@Override
+	public UserAccount getAccountForInternalAuth(String emailAddress) {
+		UserAccountsDao userAccountsDao = getUserAccountsDao();
+		if (userAccountsDao == null) {
+			return null;
+		}
+		return userAccountsDao.getUserAccountByEmail(emailAddress);
+	}
+
+	@Override
+	public UserAccount getAccountForExternalAuth(String externalAuthId) {
+		UserAccountsDao userAccountsDao = getUserAccountsDao();
+		if (userAccountsDao == null) {
+			return null;
+		}
+		return userAccountsDao.getUserAccountByExternalAuthId(externalAuthId);
+	}
+
+	@Override
+	public boolean isUserPermittedToLogin(UserAccount userAccount) {
+		// All users are permitted to login. If the user doesn't have an account
+		// yet (userAccount is null), an account should be created for them.
+		return true;
+	}
+
+	@Override
+	public boolean isCurrentPassword(UserAccount userAccount,
+			String clearTextPassword) {
+		if (userAccount == null) {
+			return false;
+		}
+		if (clearTextPassword == null) {
+			return false;
+		}
+		String encodedPassword = applyMd5Encoding(clearTextPassword);
+		return encodedPassword.equals(userAccount.getMd5Password());
+	}
+
+	@Override
+	public void recordNewPassword(UserAccount userAccount,
+			String newClearTextPassword) {
+		if (userAccount == null) {
+			log.error("Trying to change password on null user.");
+			return;
+		}
+		userAccount.setMd5Password(applyMd5Encoding(newClearTextPassword));
+		userAccount.setPasswordChangeRequired(false);
+		userAccount.setPasswordLinkExpires(0L);
+		getUserAccountsDao().updateUserAccount(userAccount);
+	}
+
+	@Override
+	public boolean accountRequiresEditing(UserAccount userAccount) {
+		if (userAccount == null) {
+			log.error("Trying to check for valid fields on a null user.");
+			return false;
+		}
+		if (userAccount.getFirstName().isEmpty()) {
+			return true;
+		}
+		if (userAccount.getLastName().isEmpty()) {
+			return true;
+		}
+		if (userAccount.getEmailAddress().isEmpty()) {
+			return true;
+		}
+		if (!isValidEmailAddress(userAccount.getEmailAddress())) {
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public List<String> getAssociatedIndividualUris(UserAccount userAccount) {
+		List<String> uris = new ArrayList<String>();
+		if (userAccount == null) {
+			return uris;
+		}
+		uris.addAll(getUrisAssociatedBySelfEditorConfig(userAccount));
+		return uris;
+	}
+
+	@Override
+	public void recordLoginAgainstUserAccount(UserAccount userAccount,
+			AuthenticationSource authSource) throws LoginNotPermitted {
+		if (!isUserPermittedToLogin(userAccount)) {
+			throw new LoginNotPermitted();
+		}
+		if (userAccount == null) {
+			log.error("Trying to record the login of a null user. ");
+			return;
+		}
+
+		recordLoginOnUserRecord(userAccount);
+
+		HttpSession session = request.getSession();
+		createLoginStatusBean(userAccount.getUri(), authSource, session);
+		RequestIdentifiers.resetIdentifiers(request);
+		setSessionTimeoutLimit(userAccount, session);
+		recordInUserSessionMap(userAccount.getUri(), session);
+		notifyOtherUsers(userAccount.getUri(), session);
+
+		if (IsRootUser.isRootUser(RequestIdentifiers
+				.getIdBundleForRequest(request))) {
+			IndexBuilder.checkIndexOnRootLogin(request);
+		}
+	}
+
+	/**
+	 * Update the user record to record the login.
+	 */
+	private void recordLoginOnUserRecord(UserAccount userAccount) {
+		userAccount.setLoginCount(userAccount.getLoginCount() + 1);
+		userAccount.setLastLoginTime(new Date().getTime());
+		userAccount.setStatus(Status.ACTIVE);
+		getUserAccountsDao().updateUserAccount(userAccount);
+	}
+
+	/**
+	 * Put the login bean into the session.
+	 */
+	private void createLoginStatusBean(String userUri,
+			AuthenticationSource authSource, HttpSession session) {
+		LoginStatusBean lsb = new LoginStatusBean(userUri, authSource);
+		LoginStatusBean.setBean(session, lsb);
+		log.debug("Adding status bean: " + lsb);
+	}
+
+	/**
+	 * Editors and other privileged users get a longer timeout interval.
+	 */
+	private void setSessionTimeoutLimit(UserAccount userAccount,
+			HttpSession session) {
+		RoleLevel role = RoleLevel.getRoleFromLoginStatus(request);
+		if (role == RoleLevel.EDITOR || role == RoleLevel.CURATOR
+				|| role == RoleLevel.DB_ADMIN) {
+			session.setMaxInactiveInterval(PRIVILEGED_TIMEOUT_INTERVAL);
+		} else if (userAccount.isRootUser()) {
+			session.setMaxInactiveInterval(PRIVILEGED_TIMEOUT_INTERVAL);
+		} else {
+			session.setMaxInactiveInterval(LOGGED_IN_TIMEOUT_INTERVAL);
+		}
+	}
+
+	/**
+	 * Record the login in the user/session map.
+	 * 
+	 * TODO What is this map used for?
+	 */
+	private void recordInUserSessionMap(String userUri, HttpSession session) {
+		Map<String, HttpSession> userURISessionMap = Authenticate
+				.getUserURISessionMapFromContext(session.getServletContext());
+		userURISessionMap.put(userUri, session);
+	}
+
+	/**
+	 * Anyone listening to the model might need to know that another user is
+	 * logged in.
+	 */
+	private void notifyOtherUsers(String userUri, HttpSession session) {
+		Authenticate.sendLoginNotifyEvent(new LoginEvent(userUri),
+				session.getServletContext(), session);
+	}
+
+	private List<String> getUrisAssociatedBySelfEditorConfig(UserAccount user) {
+		List<String> uris = new ArrayList<String>();
+		if (user == null) {
+			return uris;
+		}
+
+		IndividualDao iDao = getIndividualDao();
+		if (iDao == null) {
+			return uris;
+		}
+
+		List<Individual> associatedIndividuals = SelfEditingConfiguration
+				.getBean(request).getAssociatedIndividuals(iDao, user);
+		for (Individual ind : associatedIndividuals) {
+			uris.add(ind.getURI());
+		}
+		return uris;
+	}
+
+	@Override
+	public void recordUserIsLoggedOut() {
+		HttpSession session = request.getSession();
+		notifyOtherUsersOfLogout(session);
+		session.invalidate();
+	}
+
+	private void notifyOtherUsersOfLogout(HttpSession session) {
+		String userUri = LoginStatusBean.getBean(session).getUserURI();
+		if ((userUri == null) || userUri.isEmpty()) {
+			return;
+		}
+
+		Authenticate.sendLoginNotifyEvent(new LogoutEvent(userUri),
+				session.getServletContext(), session);
+	}
+
+	/**
+	 * Get a reference to the UserAccountsDao, or null.
+	 */
+	private UserAccountsDao getUserAccountsDao() {
+		WebappDaoFactory wadf = getWebappDaoFactory();
+		if (wadf == null) {
+			return null;
+		}
+
+		UserAccountsDao userAccountsDao = wadf.getUserAccountsDao();
+		if (userAccountsDao == null) {
+			log.error("getUserAccountsDao: no UserAccountsDao");
+		}
+
+		return userAccountsDao;
+	}
+
+	/**
+	 * Get a reference to the IndividualDao, or null.
+	 */
+	private IndividualDao getIndividualDao() {
+		WebappDaoFactory wadf = getWebappDaoFactory();
+		if (wadf == null) {
+			return null;
+		}
+
+		IndividualDao individualDao = wadf.getIndividualDao();
+		if (individualDao == null) {
+			log.error("getIndividualDao: no IndividualDao");
+		}
+
+		return individualDao;
+	}
+
+	/**
+	 * Get a reference to the WebappDaoFactory, or null.
+	 */
+	private WebappDaoFactory getWebappDaoFactory() {
+		HttpSession session = request.getSession(false);
+		if (session == null) {
+			return null;
+		}
+
+		ServletContext servletContext = session.getServletContext();
+		return ModelAccess.on(servletContext).getWebappDaoFactory();
+	}
+
+	@Override
+	public String toString() {
+		return "BasicAuthenticator[" + request + "]";
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ExternalAuthHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ExternalAuthHelper.java
index d1bdf0dfe..a77f4d31e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ExternalAuthHelper.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ExternalAuthHelper.java
@@ -1,162 +1,162 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-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.
- */
-public class ExternalAuthHelper {
-	private static final Log log = LogFactory.getLog(ExternalAuthHelper.class);
-
-	private static final ExternalAuthHelper DUMMY_HELPER = new ExternalAuthHelper(
-			null, null);
-
-	private static final String BEAN_ATTRIBUTE = ExternalAuthHelper.class
-			.getName();
-
-	/** This configuration property points to the external authorization server. */
-	private static final String PROPERTY_EXTERNAL_AUTH_SERVER_URL = "externalAuth.serverUrl";
-
-	/** This configuration property says which HTTP header holds the auth ID. */
-	public static final String PROPERTY_EXTERNAL_AUTH_ID_HEADER = "externalAuth.netIdHeaderName";
-
-	// ----------------------------------------------------------------------
-	// static methods
-	// ----------------------------------------------------------------------
-
-	/**
-	 * Get the bean from the servlet context. If there is no bean, create one.
-	 * 
-	 * Never returns null.
-	 */
-	public static ExternalAuthHelper getHelper(ServletRequest request) {
-		if (!(request instanceof HttpServletRequest)) {
-			log.trace("Not an HttpServletRequest: " + request);
-			return DUMMY_HELPER;
-		}
-
-		HttpSession session = ((HttpServletRequest) request).getSession(false);
-		if (session == null) {
-			log.trace("No session; no need to create one.");
-			return DUMMY_HELPER;
-		}
-
-		ServletContext ctx = session.getServletContext();
-
-		Object attr = ctx.getAttribute(BEAN_ATTRIBUTE);
-		if (attr instanceof ExternalAuthHelper) {
-			log.trace("Found a bean: " + attr);
-			return (ExternalAuthHelper) attr;
-		}
-
-		ExternalAuthHelper bean = buildBean(ctx);
-		log.debug("Created a bean: " + bean);
-		setBean(ctx, bean);
-		return bean;
-	}
-
-	/** It would be private, but we want to allow calls for faking. */
-	protected static void setBean(ServletContext context,
-			ExternalAuthHelper bean) {
-		context.setAttribute(BEAN_ATTRIBUTE, bean);
-	}
-
-	private static ExternalAuthHelper buildBean(ServletContext ctx) {
-		String externalAuthServerUrl = ConfigurationProperties.getBean(ctx)
-				.getProperty(PROPERTY_EXTERNAL_AUTH_SERVER_URL);
-		String externalAuthHeaderName = ConfigurationProperties.getBean(ctx)
-				.getProperty(PROPERTY_EXTERNAL_AUTH_ID_HEADER);
-
-		return new ExternalAuthHelper(externalAuthServerUrl,
-				externalAuthHeaderName);
-	}
-
-	// ----------------------------------------------------------------------
-	// the bean
-	// ----------------------------------------------------------------------
-
-	private final String externalAuthServerUrl;
-	private final String externalAuthHeaderName;
-
-	/** It would be private, but we want to allow subclasses for faking. */
-	protected ExternalAuthHelper(String externalAuthServerUrl,
-			String externalAuthHeaderName) {
-		this.externalAuthServerUrl = trimThis(externalAuthServerUrl);
-		this.externalAuthHeaderName = trimThis(externalAuthHeaderName);
-	}
-
-	private String trimThis(String string) {
-		if (string == null) {
-			return null;
-		} else {
-			return string.trim();
-		}
-	}
-
-	public String buildExternalAuthRedirectUrl(String returnUrl) {
-		if (returnUrl == null) {
-			log.error("returnUrl is null.");
-			return null;
-		}
-
-		if (externalAuthServerUrl == null) {
-			log.debug("runtime.properties doesn't contain a value for '"
-					+ PROPERTY_EXTERNAL_AUTH_SERVER_URL
-					+ "' -- sending directly to '" + returnUrl + "'");
-			return returnUrl;
-		}
-
-		try {
-			String encodedReturnUrl = URLEncoder.encode(returnUrl, "UTF-8");
-			String externalAuthUrl = externalAuthServerUrl + "?target="
-					+ encodedReturnUrl;
-			log.debug("externalAuthUrl is '" + externalAuthUrl + "'");
-			return externalAuthUrl;
-		} catch (UnsupportedEncodingException e) {
-			throw new RuntimeException(e); // No UTF-8? Really?
-		}
-	}
-
-	public String getExternalAuthId(HttpServletRequest request) {
-		if (request == null) {
-			log.error("request is null.");
-			return null;
-		}
-
-		if (externalAuthHeaderName == null) {
-			log.error("User asked for external authentication, "
-					+ "but runtime.properties doesn't contain a value for '"
-					+ PROPERTY_EXTERNAL_AUTH_ID_HEADER + "'");
-			return null;
-		}
-
-		String externalAuthId = request.getHeader(externalAuthHeaderName);
-		log.debug("externalAuthId=" + externalAuthId);
-		return externalAuthId;
-	}
-
-	@Override
-	public String toString() {
-		return "ExternalAuthHelper[externalAuthServerUrl="
-				+ externalAuthServerUrl + ", externalAuthHeaderName="
-				+ externalAuthHeaderName + "]";
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+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.
+ */
+public class ExternalAuthHelper {
+	private static final Log log = LogFactory.getLog(ExternalAuthHelper.class);
+
+	private static final ExternalAuthHelper DUMMY_HELPER = new ExternalAuthHelper(
+			null, null);
+
+	private static final String BEAN_ATTRIBUTE = ExternalAuthHelper.class
+			.getName();
+
+	/** This configuration property points to the external authorization server. */
+	private static final String PROPERTY_EXTERNAL_AUTH_SERVER_URL = "externalAuth.serverUrl";
+
+	/** This configuration property says which HTTP header holds the auth ID. */
+	public static final String PROPERTY_EXTERNAL_AUTH_ID_HEADER = "externalAuth.netIdHeaderName";
+
+	// ----------------------------------------------------------------------
+	// static methods
+	// ----------------------------------------------------------------------
+
+	/**
+	 * Get the bean from the servlet context. If there is no bean, create one.
+	 * 
+	 * Never returns null.
+	 */
+	public static ExternalAuthHelper getHelper(ServletRequest request) {
+		if (!(request instanceof HttpServletRequest)) {
+			log.trace("Not an HttpServletRequest: " + request);
+			return DUMMY_HELPER;
+		}
+
+		HttpSession session = ((HttpServletRequest) request).getSession(false);
+		if (session == null) {
+			log.trace("No session; no need to create one.");
+			return DUMMY_HELPER;
+		}
+
+		ServletContext ctx = session.getServletContext();
+
+		Object attr = ctx.getAttribute(BEAN_ATTRIBUTE);
+		if (attr instanceof ExternalAuthHelper) {
+			log.trace("Found a bean: " + attr);
+			return (ExternalAuthHelper) attr;
+		}
+
+		ExternalAuthHelper bean = buildBean(ctx);
+		log.debug("Created a bean: " + bean);
+		setBean(ctx, bean);
+		return bean;
+	}
+
+	/** It would be private, but we want to allow calls for faking. */
+	protected static void setBean(ServletContext context,
+			ExternalAuthHelper bean) {
+		context.setAttribute(BEAN_ATTRIBUTE, bean);
+	}
+
+	private static ExternalAuthHelper buildBean(ServletContext ctx) {
+		String externalAuthServerUrl = ConfigurationProperties.getBean(ctx)
+				.getProperty(PROPERTY_EXTERNAL_AUTH_SERVER_URL);
+		String externalAuthHeaderName = ConfigurationProperties.getBean(ctx)
+				.getProperty(PROPERTY_EXTERNAL_AUTH_ID_HEADER);
+
+		return new ExternalAuthHelper(externalAuthServerUrl,
+				externalAuthHeaderName);
+	}
+
+	// ----------------------------------------------------------------------
+	// the bean
+	// ----------------------------------------------------------------------
+
+	private final String externalAuthServerUrl;
+	private final String externalAuthHeaderName;
+
+	/** It would be private, but we want to allow subclasses for faking. */
+	protected ExternalAuthHelper(String externalAuthServerUrl,
+			String externalAuthHeaderName) {
+		this.externalAuthServerUrl = trimThis(externalAuthServerUrl);
+		this.externalAuthHeaderName = trimThis(externalAuthHeaderName);
+	}
+
+	private String trimThis(String string) {
+		if (string == null) {
+			return null;
+		} else {
+			return string.trim();
+		}
+	}
+
+	public String buildExternalAuthRedirectUrl(String returnUrl) {
+		if (returnUrl == null) {
+			log.error("returnUrl is null.");
+			return null;
+		}
+
+		if (externalAuthServerUrl == null) {
+			log.debug("runtime.properties doesn't contain a value for '"
+					+ PROPERTY_EXTERNAL_AUTH_SERVER_URL
+					+ "' -- sending directly to '" + returnUrl + "'");
+			return returnUrl;
+		}
+
+		try {
+			String encodedReturnUrl = URLEncoder.encode(returnUrl, "UTF-8");
+			String externalAuthUrl = externalAuthServerUrl + "?target="
+					+ encodedReturnUrl;
+			log.debug("externalAuthUrl is '" + externalAuthUrl + "'");
+			return externalAuthUrl;
+		} catch (UnsupportedEncodingException e) {
+			throw new RuntimeException(e); // No UTF-8? Really?
+		}
+	}
+
+	public String getExternalAuthId(HttpServletRequest request) {
+		if (request == null) {
+			log.error("request is null.");
+			return null;
+		}
+
+		if (externalAuthHeaderName == null) {
+			log.error("User asked for external authentication, "
+					+ "but runtime.properties doesn't contain a value for '"
+					+ PROPERTY_EXTERNAL_AUTH_ID_HEADER + "'");
+			return null;
+		}
+
+		String externalAuthId = request.getHeader(externalAuthHeaderName);
+		log.debug("externalAuthId=" + externalAuthId);
+		return externalAuthId;
+	}
+
+	@Override
+	public String toString() {
+		return "ExternalAuthHelper[externalAuthServerUrl="
+				+ externalAuthServerUrl + ", externalAuthHeaderName="
+				+ externalAuthHeaderName + "]";
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java
index fcc1d135b..a7d7b8448 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/FakeExternalAuthController.java
@@ -1,164 +1,164 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-import edu.cornell.mannlib.vitro.webapp.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 {
-	private static final Log log = LogFactory
-			.getLog(FakeExternalAuthController.class);
-
-	private static final String URL_FAKE_CONTROLLER = "/admin/fakeExternalAuth";
-	private static final String URL_EXTERNAL_AUTH_RETURN = "/loginExternalAuthReturn";
-
-	private static final String TEMPLATE_DEFAULT = "fakeExternalAuth.ftl";
-
-	private static final String PARAMETER_USERNAME = "username";
-	private static final String PARAMETER_CANCEL = "cancel";
-
-	@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, "
-						+ "go into web.xml and comment it out.");
-	}
-
-	@Override
-	protected String getTitle(String siteName, VitroRequest vreq) {
-		return "Fake external login " + siteName;
-	}
-
-	@Override
-	protected ResponseValues processRequest(VitroRequest vreq) {
-		if (isCancelRequested(vreq)) {
-			log.debug("cancelling.");
-			setFakeExternalAuthHelper(vreq, null);
-			return makeRedirectResponse();
-		} else if (isUsernameSupplied(vreq)) {
-			log.debug("faking as '" + getUsername(vreq) + "'");
-			setFakeExternalAuthHelper(vreq, getUsername(vreq));
-			return makeRedirectResponse();
-		} else {
-			log.debug("show the form.");
-			return makeShowFormResponse();
-		}
-	}
-
-	private boolean isCancelRequested(VitroRequest vreq) {
-		String cancelString = vreq.getParameter(PARAMETER_CANCEL);
-		return (cancelString != null) && (!cancelString.isEmpty());
-	}
-
-	private void setFakeExternalAuthHelper(HttpServletRequest req,
-			String username) {
-		ExternalAuthHelper.setBean(req.getSession().getServletContext(),
-				new FakeExternalAuthHelper(username));
-	}
-
-	private boolean isUsernameSupplied(VitroRequest vreq) {
-		String username = getUsername(vreq);
-		return ((username != null) && (!username.isEmpty()));
-	}
-
-	private String getUsername(VitroRequest vreq) {
-		return vreq.getParameter(PARAMETER_USERNAME);
-	}
-
-	private TemplateResponseValues makeShowFormResponse() {
-		Map<String, Object> body = new HashMap<String, Object>();
-		body.put("controllerUrl", UrlBuilder.getUrl(URL_FAKE_CONTROLLER));
-		return new TemplateResponseValues(TEMPLATE_DEFAULT, body);
-	}
-
-	private RedirectResponseValues makeRedirectResponse() {
-		return new RedirectResponseValues(URL_EXTERNAL_AUTH_RETURN);
-	}
-
-	/**
-	 * This implementation of ExternalAuthHelper ignores any configuration
-	 * properties. This controller is used as the exernal authorization server,
-	 * and the username that is set by this controller is used as the external
-	 * username.
-	 */
-	public static class FakeExternalAuthHelper extends ExternalAuthHelper {
-		private final String username;
-
-		private FakeExternalAuthHelper(String username) {
-			super(null, null);
-			this.username = username;
-		}
-
-		@Override
-		public String buildExternalAuthRedirectUrl(String returnUrl) {
-			int lastSlash = returnUrl.lastIndexOf("/");
-			String homeUrl = returnUrl.substring(0, lastSlash);
-			String url = homeUrl + URL_FAKE_CONTROLLER;
-			log.debug("externalAuth URL is '" + url + "'");
-			return url;
-		}
-
-		@Override
-		public String getExternalAuthId(HttpServletRequest request) {
-			log.debug("external username is '" + username + "'");
-			return username;
-		}
-
-		@Override
-		public String toString() {
-			return "FakeExternalAuthHelper[username='" + username + "']";
-		}
-
-	}
-
-	/**
-	 * StartupStatus requires a ServletContextListener as the root for a warning
-	 * message. This isn't used as one, but it will satisfy that requirement.
-	 */
-	private static class SecurityWarning implements ServletContextListener {
-
-		void warn(ServletContext ctx, String message) {
-			StartupStatus.getBean(ctx).warning(this, message);
-		}
-
-		@Override
-		public void contextInitialized(ServletContextEvent arg0) {
-			// Nothing to do
-		}
-
-		@Override
-		public void contextDestroyed(ServletContextEvent arg0) {
-			// Nothing to do
-		}
-
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.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 {
+	private static final Log log = LogFactory
+			.getLog(FakeExternalAuthController.class);
+
+	private static final String URL_FAKE_CONTROLLER = "/admin/fakeExternalAuth";
+	private static final String URL_EXTERNAL_AUTH_RETURN = "/loginExternalAuthReturn";
+
+	private static final String TEMPLATE_DEFAULT = "fakeExternalAuth.ftl";
+
+	private static final String PARAMETER_USERNAME = "username";
+	private static final String PARAMETER_CANCEL = "cancel";
+
+	@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, "
+						+ "go into web.xml and comment it out.");
+	}
+
+	@Override
+	protected String getTitle(String siteName, VitroRequest vreq) {
+		return "Fake external login " + siteName;
+	}
+
+	@Override
+	protected ResponseValues processRequest(VitroRequest vreq) {
+		if (isCancelRequested(vreq)) {
+			log.debug("cancelling.");
+			setFakeExternalAuthHelper(vreq, null);
+			return makeRedirectResponse();
+		} else if (isUsernameSupplied(vreq)) {
+			log.debug("faking as '" + getUsername(vreq) + "'");
+			setFakeExternalAuthHelper(vreq, getUsername(vreq));
+			return makeRedirectResponse();
+		} else {
+			log.debug("show the form.");
+			return makeShowFormResponse();
+		}
+	}
+
+	private boolean isCancelRequested(VitroRequest vreq) {
+		String cancelString = vreq.getParameter(PARAMETER_CANCEL);
+		return (cancelString != null) && (!cancelString.isEmpty());
+	}
+
+	private void setFakeExternalAuthHelper(HttpServletRequest req,
+			String username) {
+		ExternalAuthHelper.setBean(req.getSession().getServletContext(),
+				new FakeExternalAuthHelper(username));
+	}
+
+	private boolean isUsernameSupplied(VitroRequest vreq) {
+		String username = getUsername(vreq);
+		return ((username != null) && (!username.isEmpty()));
+	}
+
+	private String getUsername(VitroRequest vreq) {
+		return vreq.getParameter(PARAMETER_USERNAME);
+	}
+
+	private TemplateResponseValues makeShowFormResponse() {
+		Map<String, Object> body = new HashMap<String, Object>();
+		body.put("controllerUrl", UrlBuilder.getUrl(URL_FAKE_CONTROLLER));
+		return new TemplateResponseValues(TEMPLATE_DEFAULT, body);
+	}
+
+	private RedirectResponseValues makeRedirectResponse() {
+		return new RedirectResponseValues(URL_EXTERNAL_AUTH_RETURN);
+	}
+
+	/**
+	 * This implementation of ExternalAuthHelper ignores any configuration
+	 * properties. This controller is used as the exernal authorization server,
+	 * and the username that is set by this controller is used as the external
+	 * username.
+	 */
+	public static class FakeExternalAuthHelper extends ExternalAuthHelper {
+		private final String username;
+
+		private FakeExternalAuthHelper(String username) {
+			super(null, null);
+			this.username = username;
+		}
+
+		@Override
+		public String buildExternalAuthRedirectUrl(String returnUrl) {
+			int lastSlash = returnUrl.lastIndexOf("/");
+			String homeUrl = returnUrl.substring(0, lastSlash);
+			String url = homeUrl + URL_FAKE_CONTROLLER;
+			log.debug("externalAuth URL is '" + url + "'");
+			return url;
+		}
+
+		@Override
+		public String getExternalAuthId(HttpServletRequest request) {
+			log.debug("external username is '" + username + "'");
+			return username;
+		}
+
+		@Override
+		public String toString() {
+			return "FakeExternalAuthHelper[username='" + username + "']";
+		}
+
+	}
+
+	/**
+	 * StartupStatus requires a ServletContextListener as the root for a warning
+	 * message. This isn't used as one, but it will satisfy that requirement.
+	 */
+	private static class SecurityWarning implements ServletContextListener {
+
+		void warn(ServletContext ctx, String message) {
+			StartupStatus.getBean(ctx).warning(this, message);
+		}
+
+		@Override
+		public void contextInitialized(ServletContextEvent arg0) {
+			// Nothing to do
+		}
+
+		@Override
+		public void contextDestroyed(ServletContextEvent arg0) {
+			// Nothing to do
+		}
+
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java
index d37c1cf7d..ab5cdb761 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthReturn.java
@@ -1,134 +1,134 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
-
-import static edu.cornell.mannlib.vitro.webapp.controller.authenticate.LoginExternalAuthSetup.ATTRIBUTE_REFERRER;
-
-import java.io.IOException;
-import java.util.Enumeration;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource;
-import edu.cornell.mannlib.vitro.webapp.beans.DisplayMessage;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.user.UserAccountsFirstTimeExternalPage;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator.LoginNotPermitted;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean;
-import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.Message;
-
-/**
- * Handle the return from the external authorization login server. If we are
- * successful, record the login. Otherwise, display the failure.
- */
-public class LoginExternalAuthReturn extends BaseLoginServlet {
-	private static final Log log = LogFactory
-			.getLog(LoginExternalAuthReturn.class);
-
-	/**
-	 * <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: 
-	 * - 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). 
-	 * - User is not recognized.
-	 * 
-	 * On entry, we expect to find:
-	 * - A LoginProcessBean, which will give us the afterLoginUrl if the login
-	 *      succeeds.
-	 * - A referrer URL, to which we will redirect if the login fails.
-	 *      TODO: is this equal to LoginProcessBean.getLoginPageUrl()?
-	 * These are removed on exit.
-	 * </pre>
-	 */
-	@Override
-	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
-			throws ServletException, IOException {
-		if (log.isDebugEnabled()) {
-			@SuppressWarnings("unchecked")
-			Enumeration<String> names = req.getHeaderNames();
-
-			log.debug("------------request:" + req.getRequestURL());
-			while (names.hasMoreElements()) {
-				String name = names.nextElement();
-				log.debug(name + "=" + req.getHeader(name));
-			}
-		}
-
-		String externalAuthId = ExternalAuthHelper.getHelper(req)
-				.getExternalAuthId(req);
-		log.debug("externalAuthID='" + externalAuthId + "'");
-
-		if (externalAuthId == null) {
-			complainAndReturnToReferrer(req, resp, ATTRIBUTE_REFERRER,
-					messageLoginFailed(req));
-			return;
-		}
-
-		String afterLoginUrl = LoginProcessBean.getBean(req).getAfterLoginUrl();
-		removeLoginProcessArtifacts(req);
-
-		UserAccount userAccount = getAuthenticator(req)
-				.getAccountForExternalAuth(externalAuthId);
-
-		if (!getAuthenticator(req).isUserPermittedToLogin(userAccount)) {
-			log.debug("Logins disabled for " + userAccount);
-			complainAndReturnToReferrer(req, resp, ATTRIBUTE_REFERRER,
-					messageLoginDisabled(req));
-			return;
-		}
-
-		if (userAccount == null) {
-			log.debug("Creating new account for " + externalAuthId
-					+ ", return to '" + afterLoginUrl + "'");
-			UserAccountsFirstTimeExternalPage.setExternalLoginInfo(req,
-					externalAuthId, afterLoginUrl);
-			resp.sendRedirect(UrlBuilder.getUrl("/accounts/firstTimeExternal"));
-			return;
-		}
-
-		try {
-			log.debug("Logging in as " + userAccount.getUri());
-			getAuthenticator(req).recordLoginAgainstUserAccount(userAccount,
-					AuthenticationSource.EXTERNAL);
-			new LoginRedirector(req, afterLoginUrl).redirectLoggedInUser(resp);
-			return;
-		} catch (LoginNotPermitted e) {
-			// should have been caught by isUserPermittedToLogin()
-			log.debug("Logins disabled for " + userAccount);
-			complainAndReturnToReferrer(req, resp, ATTRIBUTE_REFERRER,
-					messageLoginDisabled(req));
-			return;
-		}
-	}
-
-	@Override
-	protected void complainAndReturnToReferrer(HttpServletRequest req,
-			HttpServletResponse resp, String sessionAttributeForReferrer,
-			Message message) throws IOException {
-		DisplayMessage.setMessage(req, message.getText());
-		super.complainAndReturnToReferrer(req, resp,
-				sessionAttributeForReferrer, message);
-	}
-
-	private void removeLoginProcessArtifacts(HttpServletRequest req) {
-		req.getSession().removeAttribute(ATTRIBUTE_REFERRER);
-		LoginProcessBean.removeBean(req);
-	}
-
-	@Override
-	protected void doGet(HttpServletRequest request,
-			HttpServletResponse response) throws ServletException, IOException {
-		doPost(request, response);
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
+
+import static edu.cornell.mannlib.vitro.webapp.controller.authenticate.LoginExternalAuthSetup.ATTRIBUTE_REFERRER;
+
+import java.io.IOException;
+import java.util.Enumeration;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource;
+import edu.cornell.mannlib.vitro.webapp.beans.DisplayMessage;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.user.UserAccountsFirstTimeExternalPage;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator.LoginNotPermitted;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean;
+import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.Message;
+
+/**
+ * Handle the return from the external authorization login server. If we are
+ * successful, record the login. Otherwise, display the failure.
+ */
+public class LoginExternalAuthReturn extends BaseLoginServlet {
+	private static final Log log = LogFactory
+			.getLog(LoginExternalAuthReturn.class);
+
+	/**
+	 * <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: 
+	 * - 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). 
+	 * - User is not recognized.
+	 * 
+	 * On entry, we expect to find:
+	 * - A LoginProcessBean, which will give us the afterLoginUrl if the login
+	 *      succeeds.
+	 * - A referrer URL, to which we will redirect if the login fails.
+	 *      TODO: is this equal to LoginProcessBean.getLoginPageUrl()?
+	 * These are removed on exit.
+	 * </pre>
+	 */
+	@Override
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
+		if (log.isDebugEnabled()) {
+			@SuppressWarnings("unchecked")
+			Enumeration<String> names = req.getHeaderNames();
+
+			log.debug("------------request:" + req.getRequestURL());
+			while (names.hasMoreElements()) {
+				String name = names.nextElement();
+				log.debug(name + "=" + req.getHeader(name));
+			}
+		}
+
+		String externalAuthId = ExternalAuthHelper.getHelper(req)
+				.getExternalAuthId(req);
+		log.debug("externalAuthID='" + externalAuthId + "'");
+
+		if (externalAuthId == null) {
+			complainAndReturnToReferrer(req, resp, ATTRIBUTE_REFERRER,
+					messageLoginFailed(req));
+			return;
+		}
+
+		String afterLoginUrl = LoginProcessBean.getBean(req).getAfterLoginUrl();
+		removeLoginProcessArtifacts(req);
+
+		UserAccount userAccount = getAuthenticator(req)
+				.getAccountForExternalAuth(externalAuthId);
+
+		if (!getAuthenticator(req).isUserPermittedToLogin(userAccount)) {
+			log.debug("Logins disabled for " + userAccount);
+			complainAndReturnToReferrer(req, resp, ATTRIBUTE_REFERRER,
+					messageLoginDisabled(req));
+			return;
+		}
+
+		if (userAccount == null) {
+			log.debug("Creating new account for " + externalAuthId
+					+ ", return to '" + afterLoginUrl + "'");
+			UserAccountsFirstTimeExternalPage.setExternalLoginInfo(req,
+					externalAuthId, afterLoginUrl);
+			resp.sendRedirect(UrlBuilder.getUrl("/accounts/firstTimeExternal"));
+			return;
+		}
+
+		try {
+			log.debug("Logging in as " + userAccount.getUri());
+			getAuthenticator(req).recordLoginAgainstUserAccount(userAccount,
+					AuthenticationSource.EXTERNAL);
+			new LoginRedirector(req, afterLoginUrl).redirectLoggedInUser(resp);
+			return;
+		} catch (LoginNotPermitted e) {
+			// should have been caught by isUserPermittedToLogin()
+			log.debug("Logins disabled for " + userAccount);
+			complainAndReturnToReferrer(req, resp, ATTRIBUTE_REFERRER,
+					messageLoginDisabled(req));
+			return;
+		}
+	}
+
+	@Override
+	protected void complainAndReturnToReferrer(HttpServletRequest req,
+			HttpServletResponse resp, String sessionAttributeForReferrer,
+			Message message) throws IOException {
+		DisplayMessage.setMessage(req, message.getText());
+		super.complainAndReturnToReferrer(req, resp,
+				sessionAttributeForReferrer, message);
+	}
+
+	private void removeLoginProcessArtifacts(HttpServletRequest req) {
+		req.getSession().removeAttribute(ATTRIBUTE_REFERRER);
+		LoginProcessBean.removeBean(req);
+	}
+
+	@Override
+	protected void doGet(HttpServletRequest request,
+			HttpServletResponse response) throws ServletException, IOException {
+		doPost(request, response);
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthSetup.java
index 55c3a074a..7c3c17958 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginExternalAuthSetup.java
@@ -1,96 +1,96 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
-
-import java.io.IOException;
-import java.util.Enumeration;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-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.
- */
-public class LoginExternalAuthSetup extends BaseLoginServlet {
-	private static final Log log = LogFactory
-			.getLog(LoginExternalAuthSetup.class);
-
-	/** This session attribute tells where we came from. */
-	static final String ATTRIBUTE_REFERRER = LoginExternalAuthSetup.class
-			.getName() + ".referrer";
-
-	private static final String RETURN_SERVLET_URL = "/loginExternalAuthReturn";
-
-	/** This http header holds the referring page. */
-	private static final String HEADING_REFERRER = "referer";
-
-	/**
-	 * Write down the referring page, record that we are logging in, and
-	 * redirect to the external authorization server URL.
-	 */
-	@Override
-	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
-			throws ServletException, IOException {
-		storeTheReferringPage(req);
-
-		LoginProcessBean.getBean(req).setState(
-				LoginProcessBean.State.LOGGING_IN);
-
-		String returnUrl = buildReturnUrl(req);
-		String redirectUrl = ExternalAuthHelper.getHelper(req)
-				.buildExternalAuthRedirectUrl(returnUrl);
-
-		if (redirectUrl == null) {
-			complainAndReturnToReferrer(req, resp, ATTRIBUTE_REFERRER,
-					messageLoginFailed(req));
-		}
-
-		log.debug("redirecting to '" + redirectUrl + "'");
-		resp.sendRedirect(redirectUrl);
-	}
-
-	/** Remember where we came from - we'll need to go back there. */
-	private void storeTheReferringPage(HttpServletRequest req) {
-		String referrer = req.getHeader(HEADING_REFERRER);
-		if (referrer == null) {
-			dumpRequestHeaders(req);
-			referrer = figureHomePageUrl(req);
-		}
-		log.debug("Referring page is '" + referrer + "'");
-		req.getSession().setAttribute(ATTRIBUTE_REFERRER, referrer);
-	}
-
-	/** What is the URL of the LoginExternalAuthReturn servlet? */
-	private String buildReturnUrl(HttpServletRequest req) {
-		return figureHomePageUrl(req) + RETURN_SERVLET_URL;
-	}
-
-	private void dumpRequestHeaders(HttpServletRequest req) {
-		if (log.isDebugEnabled()) {
-			@SuppressWarnings("unchecked")
-			Enumeration<String> names = req.getHeaderNames();
-			while (names.hasMoreElements()) {
-				String name = names.nextElement();
-				log.debug("header: " + name + "=" + req.getHeader(name));
-			}
-		}
-	}
-
-	@Override
-	protected void doGet(HttpServletRequest request,
-			HttpServletResponse response) throws ServletException, IOException {
-		doPost(request, response);
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
+
+import java.io.IOException;
+import java.util.Enumeration;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+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.
+ */
+public class LoginExternalAuthSetup extends BaseLoginServlet {
+	private static final Log log = LogFactory
+			.getLog(LoginExternalAuthSetup.class);
+
+	/** This session attribute tells where we came from. */
+	static final String ATTRIBUTE_REFERRER = LoginExternalAuthSetup.class
+			.getName() + ".referrer";
+
+	private static final String RETURN_SERVLET_URL = "/loginExternalAuthReturn";
+
+	/** This http header holds the referring page. */
+	private static final String HEADING_REFERRER = "referer";
+
+	/**
+	 * Write down the referring page, record that we are logging in, and
+	 * redirect to the external authorization server URL.
+	 */
+	@Override
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
+		storeTheReferringPage(req);
+
+		LoginProcessBean.getBean(req).setState(
+				LoginProcessBean.State.LOGGING_IN);
+
+		String returnUrl = buildReturnUrl(req);
+		String redirectUrl = ExternalAuthHelper.getHelper(req)
+				.buildExternalAuthRedirectUrl(returnUrl);
+
+		if (redirectUrl == null) {
+			complainAndReturnToReferrer(req, resp, ATTRIBUTE_REFERRER,
+					messageLoginFailed(req));
+		}
+
+		log.debug("redirecting to '" + redirectUrl + "'");
+		resp.sendRedirect(redirectUrl);
+	}
+
+	/** Remember where we came from - we'll need to go back there. */
+	private void storeTheReferringPage(HttpServletRequest req) {
+		String referrer = req.getHeader(HEADING_REFERRER);
+		if (referrer == null) {
+			dumpRequestHeaders(req);
+			referrer = figureHomePageUrl(req);
+		}
+		log.debug("Referring page is '" + referrer + "'");
+		req.getSession().setAttribute(ATTRIBUTE_REFERRER, referrer);
+	}
+
+	/** What is the URL of the LoginExternalAuthReturn servlet? */
+	private String buildReturnUrl(HttpServletRequest req) {
+		return figureHomePageUrl(req) + RETURN_SERVLET_URL;
+	}
+
+	private void dumpRequestHeaders(HttpServletRequest req) {
+		if (log.isDebugEnabled()) {
+			@SuppressWarnings("unchecked")
+			Enumeration<String> names = req.getHeaderNames();
+			while (names.hasMoreElements()) {
+				String name = names.nextElement();
+				log.debug("header: " + name + "=" + req.getHeader(name));
+			}
+		}
+	}
+
+	@Override
+	protected void doGet(HttpServletRequest request,
+			HttpServletResponse response) throws ServletException, IOException {
+		doPost(request, response);
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginInProcessFlag.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginInProcessFlag.java
index 04f583a59..4a1dc2c2c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginInProcessFlag.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginInProcessFlag.java
@@ -1,54 +1,54 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
-
-import javax.servlet.http.HttpServletRequest;
-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.
- */
-public class LoginInProcessFlag {
-	private static final String ATTRIBUTE_NAME = LoginInProcessFlag.class
-			.getName();
-
-	/**
-	 * Set the flag, saying that a login session is in process.
-	 */
-	public static void set(HttpServletRequest request) {
-		if (request == null) {
-			throw new NullPointerException("request may not be null.");
-		}
-		
-		request.getSession().setAttribute(ATTRIBUTE_NAME, Boolean.TRUE);
-	}
-
-	/**
-	 * Check to see whether the flag is set. Reset it.
-	 */
-	public static boolean checkAndReset(HttpServletRequest request) {
-		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;
-		}
-
-		session.removeAttribute(ATTRIBUTE_NAME);
-		return true;
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
+
+import javax.servlet.http.HttpServletRequest;
+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.
+ */
+public class LoginInProcessFlag {
+	private static final String ATTRIBUTE_NAME = LoginInProcessFlag.class
+			.getName();
+
+	/**
+	 * Set the flag, saying that a login session is in process.
+	 */
+	public static void set(HttpServletRequest request) {
+		if (request == null) {
+			throw new NullPointerException("request may not be null.");
+		}
+		
+		request.getSession().setAttribute(ATTRIBUTE_NAME, Boolean.TRUE);
+	}
+
+	/**
+	 * Check to see whether the flag is set. Reset it.
+	 */
+	public static boolean checkAndReset(HttpServletRequest request) {
+		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;
+		}
+
+		session.removeAttribute(ATTRIBUTE_NAME);
+		return true;
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginRedirector.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginRedirector.java
index 1fa147663..13ea3e1ae 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginRedirector.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LoginRedirector.java
@@ -1,195 +1,195 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
-import edu.cornell.mannlib.vitro.webapp.beans.DisplayMessage;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
-import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
-import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
-
-/**
- * A user has just completed the login process. What page do we direct them to?
- */
-public class LoginRedirector {
-	private static final Log log = LogFactory.getLog(LoginRedirector.class);
-
-	private final HttpServletRequest request;
-	private final HttpSession session;
-	private final I18nBundle i18n;
-
-	private final String uriOfAssociatedIndividual;
-	private final String afterLoginPage;
-
-	public LoginRedirector(HttpServletRequest request, String afterLoginPage) {
-		this.request = request;
-		this.session = request.getSession();
-		this.i18n = I18n.bundle(request);
-		this.afterLoginPage = afterLoginPage;
-
-		uriOfAssociatedIndividual = getAssociatedIndividualUri();
-	}
-
-	/** Is there an Individual associated with this user? */
-	private String getAssociatedIndividualUri() {
-		UserAccount userAccount = LoginStatusBean.getCurrentUser(request);
-		if (userAccount == null) {
-			log.debug("Not logged in? Must be cancelling the password change");
-			return null;
-		}
-
-		List<String> uris = Authenticator.getInstance(request)
-				.getAssociatedIndividualUris(userAccount);
-		if (uris.isEmpty()) {
-			log.debug("'" + userAccount.getEmailAddress()
-					+ "' is not associated with an individual.");
-			return null;
-		} else {
-			String uri = uris.get(0);
-			log.debug("'" + userAccount.getEmailAddress()
-					+ "' is associated with an individual: " + uri);
-			return uri;
-		}
-	}
-
-	public String getRedirectionUriForLoggedInUser() {
-		if (isSelfEditorWithIndividual()) {
-			log.debug("Going to Individual home page.");
-			return getAssociatedIndividualHomePage();
-		}
-
-		if (!canSeeSiteAdminPage()) {
-			log.debug("User not recognized. Going to application home.");
-			return getApplicationHomePageUrl();
-		}
-
-		if (isLoginPage(afterLoginPage)) {
-			log.debug("Coming from /login. Going to site admin page.");
-			return getSiteAdminPageUrl();
-		} else if (null != afterLoginPage) {
-			log.debug("Returning to requested page: " + afterLoginPage);
-			return afterLoginPage;
-		} else {
-			log.debug("Don't know what to do. Go home.");
-			return getApplicationHomePageUrl();
-		}
-	}
-
-	public String getRedirectionUriForCancellingUser() {
-		if (isLoginPage(afterLoginPage)) {
-			log.debug("Coming from /login. Going to home.");
-			return getApplicationHomePageUrl();
-		} else if (null != afterLoginPage) {
-			log.debug("Returning to requested page: " + afterLoginPage);
-			return afterLoginPage;
-		} else {
-			log.debug("Don't know what to do. Go home.");
-			return getApplicationHomePageUrl();
-		}
-	}
-
-	public void redirectLoggedInUser(HttpServletResponse response)
-			throws IOException {
-		try {
-			DisplayMessage.setMessage(request, assembleWelcomeMessage());
-			response.sendRedirect(getRedirectionUriForLoggedInUser());
-		} catch (IOException e) {
-			log.debug("Problem with re-direction", e);
-			response.sendRedirect(getApplicationHomePageUrl());
-		}
-	}
-
-	public String assembleWelcomeMessage() {
-		if (!canSeeSiteAdminPage() && !isSelfEditorWithIndividual()) {
-			// A special message for unrecognized self-editors:
-			return i18n.text("logged_in_but_no_profile");
-		}
-
-		String greeting = i18n.text("unknown_user_name");
-		int loginCount = 0;
-
-		UserAccount userAccount = LoginStatusBean.getCurrentUser(request);
-		if (userAccount != null) {
-			loginCount = userAccount.getLoginCount();
-			if (StringUtils.isNotEmpty(userAccount.getFirstName())) {
-				greeting = userAccount.getFirstName();
-			} else if (StringUtils.isNotEmpty(userAccount.getEmailAddress())) {
-				greeting = userAccount.getEmailAddress();
-			}
-		}
-
-		return i18n.text("login_welcome_message", greeting, loginCount);
-	}
-
-	public void redirectCancellingUser(HttpServletResponse response)
-			throws IOException {
-		try {
-			response.sendRedirect(getRedirectionUriForCancellingUser());
-		} catch (IOException e) {
-			log.debug("Problem with re-direction", e);
-			response.sendRedirect(getApplicationHomePageUrl());
-		}
-	}
-
-	private boolean canSeeSiteAdminPage() {
-		return PolicyHelper.isAuthorizedForActions(request,
-				SimplePermission.SEE_SITE_ADMIN_PAGE.ACTIONS);
-	}
-
-	private boolean isLoginPage(String page) {
-		return ((page != null) && page.endsWith(request.getContextPath()
-				+ Controllers.LOGIN));
-	}
-
-	private String getSiteAdminPageUrl() {
-		String contextPath = request.getContextPath();
-		return contextPath + Controllers.SITE_ADMIN;
-	}
-
-	private boolean isSelfEditorWithIndividual() {
-		return uriOfAssociatedIndividual != null;
-	}
-
-	private String getAssociatedIndividualHomePage() {
-		try {
-			return request.getContextPath() + "/individual?uri="
-					+ URLEncoder.encode(uriOfAssociatedIndividual, "UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			throw new IllegalStateException("No UTF-8 encoding? Really?", e);
-		}
-	}
-
-	/**
-	 * The application home page can be overridden by an attribute in the
-	 * ServletContext. Further, it can either be an absolute URL, or it can be
-	 * relative to the application. Weird.
-	 */
-	private String getApplicationHomePageUrl() {
-		String contextRedirect = (String) session.getServletContext()
-				.getAttribute("postLoginRequest");
-		if (contextRedirect != null) {
-			if (contextRedirect.indexOf(":") == -1) {
-				return request.getContextPath() + contextRedirect;
-			} else {
-				return contextRedirect;
-			}
-		}
-		return request.getContextPath();
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.beans.DisplayMessage;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18nBundle;
+
+/**
+ * A user has just completed the login process. What page do we direct them to?
+ */
+public class LoginRedirector {
+	private static final Log log = LogFactory.getLog(LoginRedirector.class);
+
+	private final HttpServletRequest request;
+	private final HttpSession session;
+	private final I18nBundle i18n;
+
+	private final String uriOfAssociatedIndividual;
+	private final String afterLoginPage;
+
+	public LoginRedirector(HttpServletRequest request, String afterLoginPage) {
+		this.request = request;
+		this.session = request.getSession();
+		this.i18n = I18n.bundle(request);
+		this.afterLoginPage = afterLoginPage;
+
+		uriOfAssociatedIndividual = getAssociatedIndividualUri();
+	}
+
+	/** Is there an Individual associated with this user? */
+	private String getAssociatedIndividualUri() {
+		UserAccount userAccount = LoginStatusBean.getCurrentUser(request);
+		if (userAccount == null) {
+			log.debug("Not logged in? Must be cancelling the password change");
+			return null;
+		}
+
+		List<String> uris = Authenticator.getInstance(request)
+				.getAssociatedIndividualUris(userAccount);
+		if (uris.isEmpty()) {
+			log.debug("'" + userAccount.getEmailAddress()
+					+ "' is not associated with an individual.");
+			return null;
+		} else {
+			String uri = uris.get(0);
+			log.debug("'" + userAccount.getEmailAddress()
+					+ "' is associated with an individual: " + uri);
+			return uri;
+		}
+	}
+
+	public String getRedirectionUriForLoggedInUser() {
+		if (isSelfEditorWithIndividual()) {
+			log.debug("Going to Individual home page.");
+			return getAssociatedIndividualHomePage();
+		}
+
+		if (!canSeeSiteAdminPage()) {
+			log.debug("User not recognized. Going to application home.");
+			return getApplicationHomePageUrl();
+		}
+
+		if (isLoginPage(afterLoginPage)) {
+			log.debug("Coming from /login. Going to site admin page.");
+			return getSiteAdminPageUrl();
+		} else if (null != afterLoginPage) {
+			log.debug("Returning to requested page: " + afterLoginPage);
+			return afterLoginPage;
+		} else {
+			log.debug("Don't know what to do. Go home.");
+			return getApplicationHomePageUrl();
+		}
+	}
+
+	public String getRedirectionUriForCancellingUser() {
+		if (isLoginPage(afterLoginPage)) {
+			log.debug("Coming from /login. Going to home.");
+			return getApplicationHomePageUrl();
+		} else if (null != afterLoginPage) {
+			log.debug("Returning to requested page: " + afterLoginPage);
+			return afterLoginPage;
+		} else {
+			log.debug("Don't know what to do. Go home.");
+			return getApplicationHomePageUrl();
+		}
+	}
+
+	public void redirectLoggedInUser(HttpServletResponse response)
+			throws IOException {
+		try {
+			DisplayMessage.setMessage(request, assembleWelcomeMessage());
+			response.sendRedirect(getRedirectionUriForLoggedInUser());
+		} catch (IOException e) {
+			log.debug("Problem with re-direction", e);
+			response.sendRedirect(getApplicationHomePageUrl());
+		}
+	}
+
+	public String assembleWelcomeMessage() {
+		if (!canSeeSiteAdminPage() && !isSelfEditorWithIndividual()) {
+			// A special message for unrecognized self-editors:
+			return i18n.text("logged_in_but_no_profile");
+		}
+
+		String greeting = i18n.text("unknown_user_name");
+		int loginCount = 0;
+
+		UserAccount userAccount = LoginStatusBean.getCurrentUser(request);
+		if (userAccount != null) {
+			loginCount = userAccount.getLoginCount();
+			if (StringUtils.isNotEmpty(userAccount.getFirstName())) {
+				greeting = userAccount.getFirstName();
+			} else if (StringUtils.isNotEmpty(userAccount.getEmailAddress())) {
+				greeting = userAccount.getEmailAddress();
+			}
+		}
+
+		return i18n.text("login_welcome_message", greeting, loginCount);
+	}
+
+	public void redirectCancellingUser(HttpServletResponse response)
+			throws IOException {
+		try {
+			response.sendRedirect(getRedirectionUriForCancellingUser());
+		} catch (IOException e) {
+			log.debug("Problem with re-direction", e);
+			response.sendRedirect(getApplicationHomePageUrl());
+		}
+	}
+
+	private boolean canSeeSiteAdminPage() {
+		return PolicyHelper.isAuthorizedForActions(request,
+				SimplePermission.SEE_SITE_ADMIN_PAGE.ACTIONS);
+	}
+
+	private boolean isLoginPage(String page) {
+		return ((page != null) && page.endsWith(request.getContextPath()
+				+ Controllers.LOGIN));
+	}
+
+	private String getSiteAdminPageUrl() {
+		String contextPath = request.getContextPath();
+		return contextPath + Controllers.SITE_ADMIN;
+	}
+
+	private boolean isSelfEditorWithIndividual() {
+		return uriOfAssociatedIndividual != null;
+	}
+
+	private String getAssociatedIndividualHomePage() {
+		try {
+			return request.getContextPath() + "/individual?uri="
+					+ URLEncoder.encode(uriOfAssociatedIndividual, "UTF-8");
+		} catch (UnsupportedEncodingException e) {
+			throw new IllegalStateException("No UTF-8 encoding? Really?", e);
+		}
+	}
+
+	/**
+	 * The application home page can be overridden by an attribute in the
+	 * ServletContext. Further, it can either be an absolute URL, or it can be
+	 * relative to the application. Weird.
+	 */
+	private String getApplicationHomePageUrl() {
+		String contextRedirect = (String) session.getServletContext()
+				.getAttribute("postLoginRequest");
+		if (contextRedirect != null) {
+			if (contextRedirect.indexOf(":") == -1) {
+				return request.getContextPath() + contextRedirect;
+			} else {
+				return contextRedirect;
+			}
+		}
+		return request.getContextPath();
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LogoutRedirector.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LogoutRedirector.java
index 66d81dc08..c1882f15c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LogoutRedirector.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/LogoutRedirector.java
@@ -1,107 +1,107 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
-
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * When a user logs out, where will they go?
- */
-public class LogoutRedirector {
-	private static final Log log = LogFactory.getLog(LogoutRedirector.class);
-	private static final String ATTRIBUTE_RESTRICTED_PAGE_URIS = "uris_of_restricted_pages";
-
-	/**
-	 * If the page they were on was not restricted, send them back to it.
-	 * Otherwise, send them to the home page.
-	 */
-	public static String getRedirectUrl(HttpServletRequest request,
-			HttpServletResponse response, String referrer) throws IOException {
-		String referringUri = figureUriFromUrl(request, referrer);
-
-		log.debug("referringUri: '" + referringUri + "', restrictedUris="
-				+ getRestrictedPageUris(request));
-
-		if ((referringUri == null)
-				|| (getRestrictedPageUris(request).contains(referringUri))) {
-			log.debug("Sending to home page.");
-			return request.getContextPath();
-		} else {
-			log.debug("Sending back to referring page.");
-			return referrer;
-		}
-	}
-
-	private static String figureUriFromUrl(HttpServletRequest request,
-			String referrer) {
-		String postContext = breakBeforeContextPath(request.getContextPath(),
-				referrer);
-		String uri = removeQueryString(postContext);
-		log.debug("referrer='" + referrer + "', uri='" + uri + "'");
-		return uri;
-	}
-
-	private static String breakBeforeContextPath(String contextPath, String url) {
-		if (url == null) {
-			return null;
-		}
-
-		int contextHere = url.indexOf(contextPath);
-		if (contextHere == -1) {
-			return null;
-		} else {
-			return url.substring(contextHere);
-		}
-	}
-
-	private static String removeQueryString(String fragment) {
-		if (fragment == null) {
-			return null;
-		}
-
-		int questionHere = fragment.indexOf('?');
-		if (questionHere == -1) {
-			return fragment;
-		} else {
-			return fragment.substring(0, questionHere);
-		}
-	}
-
-	/**
-	 * 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.
-	 */
-	public static void recordRestrictedPageUri(HttpServletRequest request) {
-		String uri = request.getRequestURI();
-		log.debug("Recording restricted URI: '" + uri + "'");
-		getRestrictedPageUris(request).add(uri);
-	}
-
-	private static Set<String> getRestrictedPageUris(HttpServletRequest request) {
-		HttpSession session = request.getSession();
-
-		@SuppressWarnings("unchecked")
-		Set<String> restrictedPageUris = (Set<String>) session
-				.getAttribute(ATTRIBUTE_RESTRICTED_PAGE_URIS);
-
-		if (restrictedPageUris == null) {
-			restrictedPageUris = new HashSet<String>();
-			session.setAttribute(ATTRIBUTE_RESTRICTED_PAGE_URIS,
-					restrictedPageUris);
-		}
-
-		return restrictedPageUris;
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * When a user logs out, where will they go?
+ */
+public class LogoutRedirector {
+	private static final Log log = LogFactory.getLog(LogoutRedirector.class);
+	private static final String ATTRIBUTE_RESTRICTED_PAGE_URIS = "uris_of_restricted_pages";
+
+	/**
+	 * If the page they were on was not restricted, send them back to it.
+	 * Otherwise, send them to the home page.
+	 */
+	public static String getRedirectUrl(HttpServletRequest request,
+			HttpServletResponse response, String referrer) throws IOException {
+		String referringUri = figureUriFromUrl(request, referrer);
+
+		log.debug("referringUri: '" + referringUri + "', restrictedUris="
+				+ getRestrictedPageUris(request));
+
+		if ((referringUri == null)
+				|| (getRestrictedPageUris(request).contains(referringUri))) {
+			log.debug("Sending to home page.");
+			return request.getContextPath();
+		} else {
+			log.debug("Sending back to referring page.");
+			return referrer;
+		}
+	}
+
+	private static String figureUriFromUrl(HttpServletRequest request,
+			String referrer) {
+		String postContext = breakBeforeContextPath(request.getContextPath(),
+				referrer);
+		String uri = removeQueryString(postContext);
+		log.debug("referrer='" + referrer + "', uri='" + uri + "'");
+		return uri;
+	}
+
+	private static String breakBeforeContextPath(String contextPath, String url) {
+		if (url == null) {
+			return null;
+		}
+
+		int contextHere = url.indexOf(contextPath);
+		if (contextHere == -1) {
+			return null;
+		} else {
+			return url.substring(contextHere);
+		}
+	}
+
+	private static String removeQueryString(String fragment) {
+		if (fragment == null) {
+			return null;
+		}
+
+		int questionHere = fragment.indexOf('?');
+		if (questionHere == -1) {
+			return fragment;
+		} else {
+			return fragment.substring(0, questionHere);
+		}
+	}
+
+	/**
+	 * 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.
+	 */
+	public static void recordRestrictedPageUri(HttpServletRequest request) {
+		String uri = request.getRequestURI();
+		log.debug("Recording restricted URI: '" + uri + "'");
+		getRestrictedPageUris(request).add(uri);
+	}
+
+	private static Set<String> getRestrictedPageUris(HttpServletRequest request) {
+		HttpSession session = request.getSession();
+
+		@SuppressWarnings("unchecked")
+		Set<String> restrictedPageUris = (Set<String>) session
+				.getAttribute(ATTRIBUTE_RESTRICTED_PAGE_URIS);
+
+		if (restrictedPageUris == null) {
+			restrictedPageUris = new HashSet<String>();
+			session.setAttribute(ATTRIBUTE_RESTRICTED_PAGE_URIS,
+					restrictedPageUris);
+		}
+
+		return restrictedPageUris;
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLogin.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLogin.java
index ab3c05577..97af0ac42 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLogin.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLogin.java
@@ -1,198 +1,198 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
-
-import static edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource.INTERNAL;
-import static edu.cornell.mannlib.vitro.webapp.beans.UserAccount.MAX_PASSWORD_LENGTH;
-import static edu.cornell.mannlib.vitro.webapp.beans.UserAccount.MIN_PASSWORD_LENGTH;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator.LoginNotPermitted;
-
-/**
- * Provide a means for programmatic login If they provide the right parameters,
- * log them in and send 200. Otherwise, send 403 error.
- */
-public class ProgramLogin extends HttpServlet {
-	private static final Log log = LogFactory.getLog(ProgramLogin.class);
-
-	@Override
-	protected void doGet(HttpServletRequest req, HttpServletResponse resp)
-			throws ServletException, IOException {
-		try {
-			new ProgramLoginCore(req, resp).process();
-		} catch (LoginNotPermitted e) {
-			// This should have been prevented by the test for loginDisabled()
-			throw new ServletException(e);
-		}
-	}
-
-	@Override
-	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
-			throws ServletException, IOException {
-		doGet(req, resp);
-	}
-
-	static class ProgramLoginCore {
-		public static final String PARAM_EMAIL_ADDRESS = "email";
-		public static final String PARAM_PASSWORD = "password";
-		public static final String PARAM_NEW_PASSWORD = "newPassword";
-		public static final int ERROR_CODE = 403;
-
-		private static final String MESSAGE_NEED_EMAIL_ADDRESS = PARAM_EMAIL_ADDRESS
-				+ " parameter is required.";
-		private static final String MESSAGE_NEED_PASSWORD = PARAM_PASSWORD
-				+ " parameter is required.";
-		private static final String MESSAGE_WRONG_USER_OR_PASSWORD = PARAM_EMAIL_ADDRESS
-				+ " or " + PARAM_PASSWORD + " is incorrect.";
-		private static final String MESSAGE_LOGIN_DISABLED = "User logins are "
-				+ "temporarily disabled while the system is being maintained.";
-		private static final String MESSAGE_NEED_NEW_PASSWORD = "first-time login: "
-				+ PARAM_NEW_PASSWORD + " parameter is required.";
-		private static final String MESSAGE_NEW_PASSWORD_NOT_NEEDED = "not first-time login: "
-				+ PARAM_NEW_PASSWORD + " parameter is not allowed.";
-		private static final String MESSAGE_NEW_PASSWORD_WRONG_LENGTH = PARAM_NEW_PASSWORD
-				+ " must be between "
-				+ MIN_PASSWORD_LENGTH
-				+ " and "
-				+ MAX_PASSWORD_LENGTH + " characters.";
-		private static final String MESSAGE_PASSWORD_MUST_BE_DIFFERENT = PARAM_NEW_PASSWORD
-				+ " must not be the same as " + PARAM_PASSWORD;
-		private static final String MESSAGE_SUCCESS_FIRST_TIME = "first-time login successful.";
-		private static final String MESSAGE_SUCCESS = "login successful.";
-
-		private final HttpServletRequest req;
-		private final HttpServletResponse resp;
-		private final Authenticator auth;
-
-		private final String emailAddress;
-		private final String password;
-		private final String newPassword;
-		private final UserAccount userAccount;
-
-		ProgramLoginCore(HttpServletRequest req, HttpServletResponse resp) {
-			this.req = req;
-			this.resp = resp;
-
-			this.emailAddress = getParameter(PARAM_EMAIL_ADDRESS);
-			this.password = getParameter(PARAM_PASSWORD);
-			this.newPassword = getParameter(PARAM_NEW_PASSWORD);
-
-			log.debug("request: email='" + emailAddress + "', password='"
-					+ password + "', newPassword='" + newPassword + "'");
-
-			this.auth = Authenticator.getInstance(req);
-
-			this.userAccount = auth
-					.getAccountForInternalAuth(this.emailAddress);
-		}
-
-		void process() throws IOException, LoginNotPermitted {
-			if (emailAddress.isEmpty()) {
-				sendError(MESSAGE_NEED_EMAIL_ADDRESS);
-				return;
-			}
-			if (password.isEmpty()) {
-				sendError(MESSAGE_NEED_PASSWORD);
-				return;
-			}
-			if (!usernameAndPasswordAreValid()) {
-				sendError(MESSAGE_WRONG_USER_OR_PASSWORD);
-				return;
-			}
-
-			if (loginDisabled()) {
-				sendError(MESSAGE_LOGIN_DISABLED);
-				return;
-			}
-
-			if (!isPasswordChangeRequired()) {
-				if (!newPassword.isEmpty()) {
-					sendError(MESSAGE_NEW_PASSWORD_NOT_NEEDED);
-					return;
-				}
-				recordLogin();
-				sendSuccess(MESSAGE_SUCCESS);
-				return;
-			}
-
-			if (isPasswordChangeRequired()) {
-				if (newPassword.isEmpty()) {
-					sendError(MESSAGE_NEED_NEW_PASSWORD);
-					return;
-				}
-				if (!newPasswordIsValidPasswordLength()) {
-					sendError(MESSAGE_NEW_PASSWORD_WRONG_LENGTH);
-					return;
-				}
-				if (newPasswordMatchesCurrentPassword()) {
-					sendError(MESSAGE_PASSWORD_MUST_BE_DIFFERENT);
-					return;
-				}
-				recordLoginWithPasswordChange();
-				sendSuccess(MESSAGE_SUCCESS_FIRST_TIME);
-				return;
-			}
-
-		}
-
-		private String getParameter(String key) {
-			String value = req.getParameter(key);
-			if (value != null) {
-				return value.trim();
-			} else {
-				return "";
-			}
-		}
-
-		private boolean usernameAndPasswordAreValid() {
-			return auth.isCurrentPassword(userAccount, password);
-		}
-
-		private boolean loginDisabled() {
-			return !auth.isUserPermittedToLogin(userAccount);
-		}
-
-		private boolean newPasswordIsValidPasswordLength() {
-			return (newPassword.length() >= MIN_PASSWORD_LENGTH)
-					&& (newPassword.length() <= MAX_PASSWORD_LENGTH);
-		}
-
-		private boolean newPasswordMatchesCurrentPassword() {
-			return newPassword.equals(password);
-		}
-
-		private boolean isPasswordChangeRequired() {
-			return (userAccount.isPasswordChangeRequired());
-		}
-
-		private void recordLogin() throws LoginNotPermitted {
-			auth.recordLoginAgainstUserAccount(userAccount, INTERNAL);
-		}
-
-		private void recordLoginWithPasswordChange() throws LoginNotPermitted {
-			auth.recordNewPassword(userAccount, newPassword);
-			auth.recordLoginAgainstUserAccount(userAccount, INTERNAL);
-		}
-
-		private void sendError(String message) throws IOException {
-			resp.sendError(ERROR_CODE, message);
-		}
-
-		private void sendSuccess(String message) throws IOException {
-			PrintWriter writer = resp.getWriter();
-			writer.println(message);
-		}
-	}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
+
+import static edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource.INTERNAL;
+import static edu.cornell.mannlib.vitro.webapp.beans.UserAccount.MAX_PASSWORD_LENGTH;
+import static edu.cornell.mannlib.vitro.webapp.beans.UserAccount.MIN_PASSWORD_LENGTH;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator.LoginNotPermitted;
+
+/**
+ * Provide a means for programmatic login If they provide the right parameters,
+ * log them in and send 200. Otherwise, send 403 error.
+ */
+public class ProgramLogin extends HttpServlet {
+	private static final Log log = LogFactory.getLog(ProgramLogin.class);
+
+	@Override
+	protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
+		try {
+			new ProgramLoginCore(req, resp).process();
+		} catch (LoginNotPermitted e) {
+			// This should have been prevented by the test for loginDisabled()
+			throw new ServletException(e);
+		}
+	}
+
+	@Override
+	protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+			throws ServletException, IOException {
+		doGet(req, resp);
+	}
+
+	static class ProgramLoginCore {
+		public static final String PARAM_EMAIL_ADDRESS = "email";
+		public static final String PARAM_PASSWORD = "password";
+		public static final String PARAM_NEW_PASSWORD = "newPassword";
+		public static final int ERROR_CODE = 403;
+
+		private static final String MESSAGE_NEED_EMAIL_ADDRESS = PARAM_EMAIL_ADDRESS
+				+ " parameter is required.";
+		private static final String MESSAGE_NEED_PASSWORD = PARAM_PASSWORD
+				+ " parameter is required.";
+		private static final String MESSAGE_WRONG_USER_OR_PASSWORD = PARAM_EMAIL_ADDRESS
+				+ " or " + PARAM_PASSWORD + " is incorrect.";
+		private static final String MESSAGE_LOGIN_DISABLED = "User logins are "
+				+ "temporarily disabled while the system is being maintained.";
+		private static final String MESSAGE_NEED_NEW_PASSWORD = "first-time login: "
+				+ PARAM_NEW_PASSWORD + " parameter is required.";
+		private static final String MESSAGE_NEW_PASSWORD_NOT_NEEDED = "not first-time login: "
+				+ PARAM_NEW_PASSWORD + " parameter is not allowed.";
+		private static final String MESSAGE_NEW_PASSWORD_WRONG_LENGTH = PARAM_NEW_PASSWORD
+				+ " must be between "
+				+ MIN_PASSWORD_LENGTH
+				+ " and "
+				+ MAX_PASSWORD_LENGTH + " characters.";
+		private static final String MESSAGE_PASSWORD_MUST_BE_DIFFERENT = PARAM_NEW_PASSWORD
+				+ " must not be the same as " + PARAM_PASSWORD;
+		private static final String MESSAGE_SUCCESS_FIRST_TIME = "first-time login successful.";
+		private static final String MESSAGE_SUCCESS = "login successful.";
+
+		private final HttpServletRequest req;
+		private final HttpServletResponse resp;
+		private final Authenticator auth;
+
+		private final String emailAddress;
+		private final String password;
+		private final String newPassword;
+		private final UserAccount userAccount;
+
+		ProgramLoginCore(HttpServletRequest req, HttpServletResponse resp) {
+			this.req = req;
+			this.resp = resp;
+
+			this.emailAddress = getParameter(PARAM_EMAIL_ADDRESS);
+			this.password = getParameter(PARAM_PASSWORD);
+			this.newPassword = getParameter(PARAM_NEW_PASSWORD);
+
+			log.debug("request: email='" + emailAddress + "', password='"
+					+ password + "', newPassword='" + newPassword + "'");
+
+			this.auth = Authenticator.getInstance(req);
+
+			this.userAccount = auth
+					.getAccountForInternalAuth(this.emailAddress);
+		}
+
+		void process() throws IOException, LoginNotPermitted {
+			if (emailAddress.isEmpty()) {
+				sendError(MESSAGE_NEED_EMAIL_ADDRESS);
+				return;
+			}
+			if (password.isEmpty()) {
+				sendError(MESSAGE_NEED_PASSWORD);
+				return;
+			}
+			if (!usernameAndPasswordAreValid()) {
+				sendError(MESSAGE_WRONG_USER_OR_PASSWORD);
+				return;
+			}
+
+			if (loginDisabled()) {
+				sendError(MESSAGE_LOGIN_DISABLED);
+				return;
+			}
+
+			if (!isPasswordChangeRequired()) {
+				if (!newPassword.isEmpty()) {
+					sendError(MESSAGE_NEW_PASSWORD_NOT_NEEDED);
+					return;
+				}
+				recordLogin();
+				sendSuccess(MESSAGE_SUCCESS);
+				return;
+			}
+
+			if (isPasswordChangeRequired()) {
+				if (newPassword.isEmpty()) {
+					sendError(MESSAGE_NEED_NEW_PASSWORD);
+					return;
+				}
+				if (!newPasswordIsValidPasswordLength()) {
+					sendError(MESSAGE_NEW_PASSWORD_WRONG_LENGTH);
+					return;
+				}
+				if (newPasswordMatchesCurrentPassword()) {
+					sendError(MESSAGE_PASSWORD_MUST_BE_DIFFERENT);
+					return;
+				}
+				recordLoginWithPasswordChange();
+				sendSuccess(MESSAGE_SUCCESS_FIRST_TIME);
+				return;
+			}
+
+		}
+
+		private String getParameter(String key) {
+			String value = req.getParameter(key);
+			if (value != null) {
+				return value.trim();
+			} else {
+				return "";
+			}
+		}
+
+		private boolean usernameAndPasswordAreValid() {
+			return auth.isCurrentPassword(userAccount, password);
+		}
+
+		private boolean loginDisabled() {
+			return !auth.isUserPermittedToLogin(userAccount);
+		}
+
+		private boolean newPasswordIsValidPasswordLength() {
+			return (newPassword.length() >= MIN_PASSWORD_LENGTH)
+					&& (newPassword.length() <= MAX_PASSWORD_LENGTH);
+		}
+
+		private boolean newPasswordMatchesCurrentPassword() {
+			return newPassword.equals(password);
+		}
+
+		private boolean isPasswordChangeRequired() {
+			return (userAccount.isPasswordChangeRequired());
+		}
+
+		private void recordLogin() throws LoginNotPermitted {
+			auth.recordLoginAgainstUserAccount(userAccount, INTERNAL);
+		}
+
+		private void recordLoginWithPasswordChange() throws LoginNotPermitted {
+			auth.recordNewPassword(userAccount, newPassword);
+			auth.recordLoginAgainstUserAccount(userAccount, INTERNAL);
+		}
+
+		private void sendError(String message) throws IOException {
+			resp.sendError(ERROR_CODE, message);
+		}
+
+		private void sendSuccess(String message) throws IOException {
+			PrintWriter writer = resp.getWriter();
+			writer.println(message);
+		}
+	}
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java
index c2b19e638..262db6590 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/Classes2ClassesRetryController.java
@@ -1,7 +1,7 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller.edit;
-
+package edu.cornell.mannlib.vitro.webapp.controller.edit;
+
 import java.util.HashMap;
 
 import javax.servlet.RequestDispatcher;
@@ -20,85 +20,85 @@ import edu.cornell.mannlib.vitro.webapp.beans.Classes2Classes;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 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) {
+
+public class Classes2ClassesRetryController extends BaseEditController {
+	
+	private static final Log log = LogFactory.getLog(Classes2ClassesRetryController.class.getName());
+
+    public void doPost (HttpServletRequest req, HttpServletResponse response) {
         if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) {
         	return;
         }
 
-    	VitroRequest request = new VitroRequest(req);
-
-        //create an EditProcessObject for this and put it in the session
-        EditProcessObject epo = super.createEpo(request);
-
-        String action = null;
-        if (epo.getAction() == null) {
-            action = "insert";
-            epo.setAction("insert");
-        } else {
-            action = epo.getAction();
-        }
-
-        VClassDao vcDao = request.getUnfilteredWebappDaoFactory().getVClassDao();
-        epo.setDataAccessObject(vcDao);
-        Classes2Classes objectForEditing = new Classes2Classes();
-
-        String superclassURIstr = request.getParameter("SuperclassURI");
-        String subclassURIstr = request.getParameter("SubclassURI");
-        if (superclassURIstr != null && superclassURIstr.length()>0)
-            objectForEditing.setSuperclassURI(superclassURIstr);
-        if (subclassURIstr != null && subclassURIstr.length()>0)
-            objectForEditing.setSubclassURI(subclassURIstr);
-
-        epo.setOriginalBean(objectForEditing);
-
-        populateBeanFromParams(objectForEditing, request);
-
-        HashMap hash = new HashMap();
-        hash.put("SuperclassURI", FormUtils.makeOptionListFromBeans(vcDao.getAllVclasses(),"URI","LocalNameWithPrefix",objectForEditing.getSuperclassURI(),null));
-        hash.put("SubclassURI", FormUtils.makeOptionListFromBeans(vcDao.getAllVclasses(),"URI","LocalNameWithPrefix",objectForEditing.getSubclassURI(),null));
-
-        FormObject foo = new FormObject();
-        foo.setOptionLists(hash);
-
-        epo.setFormObject(foo);
-
-        RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
-        request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp");
-        request.setAttribute("scripts","/templates/edit/formBasic.js");
-        String modeStr = request.getParameter("opMode");
-        if (modeStr != null && modeStr.equals("disjointWith")) {
-        	request.setAttribute("editAction","classes2ClassesOp");
-        	request.setAttribute("formJsp","/templates/edit/specific/disjointClasses_retry.jsp");
-        	request.setAttribute("title","Disjointness Axiom Editing Form");
-        } else if (modeStr != null && modeStr.equals("equivalentClass")){
-        	request.setAttribute("editAction","classes2ClassesOp");
-        	request.setAttribute("formJsp","/templates/edit/specific/equivalentClasses_retry.jsp");
-        	request.setAttribute("title","Equivalent Class Editing Form");
-        } else {
-        	request.setAttribute("formJsp","/templates/edit/specific/class2classes_retry.jsp");
-        	request.setAttribute("title","Super/Subclass Editing Form");
-        }
-        request.setAttribute("_action",action);
-        request.setAttribute("unqualifiedClassName","Classes2Classes");
-        setRequestAttributes(request,epo);
-
-        try {
-            rd.forward(request, response);
-        } catch (Exception e) {
-            log.error("Classes2ClassesRetryController could not forward to view.");
-            log.error(e.getMessage());
-            log.error(e.getStackTrace());
-        }
-
-    }
-
-    public void doGet (HttpServletRequest request, HttpServletResponse response) {
-        doPost(request, response);
-    }
-
-}
+    	VitroRequest request = new VitroRequest(req);
+
+        //create an EditProcessObject for this and put it in the session
+        EditProcessObject epo = super.createEpo(request);
+
+        String action = null;
+        if (epo.getAction() == null) {
+            action = "insert";
+            epo.setAction("insert");
+        } else {
+            action = epo.getAction();
+        }
+
+        VClassDao vcDao = request.getUnfilteredWebappDaoFactory().getVClassDao();
+        epo.setDataAccessObject(vcDao);
+        Classes2Classes objectForEditing = new Classes2Classes();
+
+        String superclassURIstr = request.getParameter("SuperclassURI");
+        String subclassURIstr = request.getParameter("SubclassURI");
+        if (superclassURIstr != null && superclassURIstr.length()>0)
+            objectForEditing.setSuperclassURI(superclassURIstr);
+        if (subclassURIstr != null && subclassURIstr.length()>0)
+            objectForEditing.setSubclassURI(subclassURIstr);
+
+        epo.setOriginalBean(objectForEditing);
+
+        populateBeanFromParams(objectForEditing, request);
+
+        HashMap hash = new HashMap();
+        hash.put("SuperclassURI", FormUtils.makeOptionListFromBeans(vcDao.getAllVclasses(),"URI","LocalNameWithPrefix",objectForEditing.getSuperclassURI(),null));
+        hash.put("SubclassURI", FormUtils.makeOptionListFromBeans(vcDao.getAllVclasses(),"URI","LocalNameWithPrefix",objectForEditing.getSubclassURI(),null));
+
+        FormObject foo = new FormObject();
+        foo.setOptionLists(hash);
+
+        epo.setFormObject(foo);
+
+        RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
+        request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp");
+        request.setAttribute("scripts","/templates/edit/formBasic.js");
+        String modeStr = request.getParameter("opMode");
+        if (modeStr != null && modeStr.equals("disjointWith")) {
+        	request.setAttribute("editAction","classes2ClassesOp");
+        	request.setAttribute("formJsp","/templates/edit/specific/disjointClasses_retry.jsp");
+        	request.setAttribute("title","Disjointness Axiom Editing Form");
+        } else if (modeStr != null && modeStr.equals("equivalentClass")){
+        	request.setAttribute("editAction","classes2ClassesOp");
+        	request.setAttribute("formJsp","/templates/edit/specific/equivalentClasses_retry.jsp");
+        	request.setAttribute("title","Equivalent Class Editing Form");
+        } else {
+        	request.setAttribute("formJsp","/templates/edit/specific/class2classes_retry.jsp");
+        	request.setAttribute("title","Super/Subclass Editing Form");
+        }
+        request.setAttribute("_action",action);
+        request.setAttribute("unqualifiedClassName","Classes2Classes");
+        setRequestAttributes(request,epo);
+
+        try {
+            rd.forward(request, response);
+        } catch (Exception e) {
+            log.error("Classes2ClassesRetryController could not forward to view.");
+            log.error(e.getMessage());
+            log.error(e.getStackTrace());
+        }
+
+    }
+
+    public void doGet (HttpServletRequest request, HttpServletResponse response) {
+        doPost(request, response);
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java
index cb05dfd4a..c11f66c96 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/ClassgroupRetryController.java
@@ -1,7 +1,7 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller.edit;
-
+package edu.cornell.mannlib.vitro.webapp.controller.edit;
+
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -26,119 +26,119 @@ import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 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) {
+
+
+public class ClassgroupRetryController extends BaseEditController {
+	
+	private static final Log log = LogFactory.getLog(ClassgroupRetryController.class.getName());
+
+    public void doPost (HttpServletRequest req, HttpServletResponse response) {
 		if (!isAuthorizedToDisplayPage(req, response,
 				SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTIONS)) {
         	return;
         }
-
-    	VitroRequest request = new VitroRequest(req);
-
-        //create an EditProcessObject for this and put it in the session
-        EditProcessObject epo = super.createEpo(request);
-
-        String action = null;
-        if (epo.getAction() == null) {
-            action = "insert";
-            epo.setAction("insert");
-        } else {
-            action = epo.getAction();
-        }
-
-        VClassGroupDao cgDao = request.getUnfilteredWebappDaoFactory().getVClassGroupDao();
-
-        epo.setDataAccessObject(cgDao);
-
-        VClassGroup vclassGroupForEditing = null;
-        if (!epo.getUseRecycledBean()){
-            if (request.getParameter("uri") != null) {
-                try {
-                    vclassGroupForEditing = (VClassGroup)cgDao.getGroupByURI(request.getParameter("uri"));
-                    action = "update";
-                    epo.setAction("update");
-                } catch (NullPointerException e) {
-                    log.error("Need to implement 'record not found' error message.");
-                }
-                if (vclassGroupForEditing == null) {
-                    try {
-                        String uriToFind = new String(request.getParameter("uri").getBytes("ISO-8859-1"),"UTF-8");
-                        vclassGroupForEditing = (VClassGroup)cgDao.getGroupByURI(uriToFind);
-                    } catch (java.io.UnsupportedEncodingException uee) {
-                        // forget it
-                    }
-                }
-            } else {
-                vclassGroupForEditing = new VClassGroup();
-            }
-            epo.setOriginalBean(vclassGroupForEditing);
-        } else {
-            vclassGroupForEditing = (VClassGroup) epo.getNewBean();
+
+    	VitroRequest request = new VitroRequest(req);
+
+        //create an EditProcessObject for this and put it in the session
+        EditProcessObject epo = super.createEpo(request);
+
+        String action = null;
+        if (epo.getAction() == null) {
+            action = "insert";
+            epo.setAction("insert");
+        } else {
+            action = epo.getAction();
+        }
+
+        VClassGroupDao cgDao = request.getUnfilteredWebappDaoFactory().getVClassGroupDao();
+
+        epo.setDataAccessObject(cgDao);
+
+        VClassGroup vclassGroupForEditing = null;
+        if (!epo.getUseRecycledBean()){
+            if (request.getParameter("uri") != null) {
+                try {
+                    vclassGroupForEditing = (VClassGroup)cgDao.getGroupByURI(request.getParameter("uri"));
+                    action = "update";
+                    epo.setAction("update");
+                } catch (NullPointerException e) {
+                    log.error("Need to implement 'record not found' error message.");
+                }
+                if (vclassGroupForEditing == null) {
+                    try {
+                        String uriToFind = new String(request.getParameter("uri").getBytes("ISO-8859-1"),"UTF-8");
+                        vclassGroupForEditing = (VClassGroup)cgDao.getGroupByURI(uriToFind);
+                    } catch (java.io.UnsupportedEncodingException uee) {
+                        // forget it
+                    }
+                }
+            } else {
+                vclassGroupForEditing = new VClassGroup();
+            }
+            epo.setOriginalBean(vclassGroupForEditing);
+        } else {
+            vclassGroupForEditing = (VClassGroup) epo.getNewBean();
         }
         
         //validators
         List<Validator> validatorList = new ArrayList<Validator>();
         validatorList.add(new RequiredFieldValidator());
-        epo.getValidatorMap().put("PublicName", validatorList);
-
-        //make a postinsert pageforwarder that will send us to a new class's fetch screen
-        epo.setPostInsertPageForwarder(new VclassGroupInsertPageForwarder());
-        //make a postdelete pageforwarder that will send us to the list of classes
-        epo.setPostDeletePageForwarder(new UrlForwarder("listGroups"));
-
-        //set the getMethod so we can retrieve a new bean after we've inserted it
-        try {
-            Class[] args = new Class[1];
-            args[0] = String.class;
-            epo.setGetMethod(cgDao.getClass().getDeclaredMethod("getGroupByURI",args));
-        } catch (NoSuchMethodException e) {
-            log.error(this.getClass().getName()+" could not find the getGroupByURI method");
-        }
-
-        FormObject foo = new FormObject();
-        foo.setErrorMap(epo.getErrMsgMap());
-        epo.setFormObject(foo);
-
-        FormUtils.populateFormFromBean(vclassGroupForEditing,action,foo,epo.getBadValueMap());
-
-        RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
-        request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp");
-        request.setAttribute("formJsp","/templates/edit/specific/classgroup_retry.jsp");
-        request.setAttribute("scripts","/templates/edit/formBasic.js");
-        request.setAttribute("title","Classgroup Editing Form");
-        request.setAttribute("_action",action);
-        request.setAttribute("unqualifiedClassName","VClassGroup");
-        setRequestAttributes(request,epo);
-
-        try {
-            rd.forward(request, response);
-        } catch (Exception e) {
-            log.error("VclassGroupRetryController could not forward to view.");
-            log.error(e.getMessage());
-            log.error(e.getStackTrace());
-        }
-
-    }
-
-    public void doGet (HttpServletRequest request, HttpServletResponse response) {
-        doPost(request, response);
-    }
-
-    class VclassGroupInsertPageForwarder implements PageForwarder {
-
-        public void doForward(HttpServletRequest request, HttpServletResponse response, EditProcessObject epo){
-            String newVclassGroupUrl = "listGroups";
-            try {
-                response.sendRedirect(newVclassGroupUrl);
-            } catch (IOException ioe) {
-                log.error("VclassGroupInsertPageForwarder could not send redirect.");
-            }
-        }
-    }
-
-}
+        epo.getValidatorMap().put("PublicName", validatorList);
+
+        //make a postinsert pageforwarder that will send us to a new class's fetch screen
+        epo.setPostInsertPageForwarder(new VclassGroupInsertPageForwarder());
+        //make a postdelete pageforwarder that will send us to the list of classes
+        epo.setPostDeletePageForwarder(new UrlForwarder("listGroups"));
+
+        //set the getMethod so we can retrieve a new bean after we've inserted it
+        try {
+            Class[] args = new Class[1];
+            args[0] = String.class;
+            epo.setGetMethod(cgDao.getClass().getDeclaredMethod("getGroupByURI",args));
+        } catch (NoSuchMethodException e) {
+            log.error(this.getClass().getName()+" could not find the getGroupByURI method");
+        }
+
+        FormObject foo = new FormObject();
+        foo.setErrorMap(epo.getErrMsgMap());
+        epo.setFormObject(foo);
+
+        FormUtils.populateFormFromBean(vclassGroupForEditing,action,foo,epo.getBadValueMap());
+
+        RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
+        request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp");
+        request.setAttribute("formJsp","/templates/edit/specific/classgroup_retry.jsp");
+        request.setAttribute("scripts","/templates/edit/formBasic.js");
+        request.setAttribute("title","Classgroup Editing Form");
+        request.setAttribute("_action",action);
+        request.setAttribute("unqualifiedClassName","VClassGroup");
+        setRequestAttributes(request,epo);
+
+        try {
+            rd.forward(request, response);
+        } catch (Exception e) {
+            log.error("VclassGroupRetryController could not forward to view.");
+            log.error(e.getMessage());
+            log.error(e.getStackTrace());
+        }
+
+    }
+
+    public void doGet (HttpServletRequest request, HttpServletResponse response) {
+        doPost(request, response);
+    }
+
+    class VclassGroupInsertPageForwarder implements PageForwarder {
+
+        public void doForward(HttpServletRequest request, HttpServletResponse response, EditProcessObject epo){
+            String newVclassGroupUrl = "listGroups";
+            try {
+                response.sendRedirect(newVclassGroupUrl);
+            } catch (IOException ioe) {
+                log.error("VclassGroupInsertPageForwarder could not send redirect.");
+            }
+        }
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
index 9cbae8acc..301611599 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropEditController.java
@@ -1,203 +1,203 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.edit;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vedit.beans.EditProcessObject;
-import edu.cornell.mannlib.vedit.beans.FormObject;
-import edu.cornell.mannlib.vedit.controller.BaseEditController;
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
-import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
-import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
-import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
-import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
-
-public class DatapropEditController extends BaseEditController {
-	
-	private static final Log log = LogFactory.getLog(DatapropEditController.class.getName());
-
-    public void doPost (HttpServletRequest request, HttpServletResponse response) {
-        if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) {
-        	return;
-        }
-
-    	VitroRequest vreq = new VitroRequest(request);
-    	
-        final int NUM_COLS=17;
-
-        String datapropURI = request.getParameter("uri");
-
-        DataPropertyDao dpDao = vreq.getUnfilteredWebappDaoFactory().getDataPropertyDao();
-        DataProperty dp = dpDao.getDataPropertyByURI(datapropURI);
-        PropertyGroupDao pgDao = vreq.getUnfilteredWebappDaoFactory().getPropertyGroupDao();
-
-        ArrayList results = new ArrayList();
-        results.add("data property");         // column 1
-        results.add("public display label");  // column 2
-        results.add("property group");        // column 3
-        results.add("ontology");              // column 4
-        results.add("RDF local name");        // column 5
-        results.add("domain class");          // column 6
-        results.add("range datatype");        // column 7
-        results.add("functional");            // column 8
-        results.add("public description");    // column 9
-        results.add("example");               // column 10
-        results.add("editor description");    // column 11
-        results.add("display level");         // column 12
-        results.add("update level");          // column 13
-        results.add("display tier");          // column 14
-        results.add("display limit");         // column 15
-        results.add("custom entry form");     // column 16
-        results.add("URI");                   // column 17
-
-        RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
-
-        results.add(dp.getLocalNameWithPrefix()); // 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) {
-                results.add(pGroup.getName()); // column 3
-            } else {
-                results.add(dp.getGroupURI());
-            }
-        } else {
-            results.add("(unspecified)");
-        }
-        
-        String ontologyName = null;
-        if (dp.getNamespace() != null) {
-            Ontology ont = vreq.getUnfilteredWebappDaoFactory().getOntologyDao().getOntologyByURI(dp.getNamespace());
-            if ( (ont != null) && (ont.getName() != null) ) {
-                ontologyName = ont.getName();
-            }
-        }
-        results.add(ontologyName==null ? "(not identified)" : ontologyName); // column 4
-
-        results.add(dp.getLocalName()); // column 5
-
-        // 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);
-        
-        // TODO - need unionOf/intersectionOf-style domains for domain class
-        String domainStr="";
-        try {
-            domainStr = (dp.getDomainClassURI() == null) ? "" : "<a href=\"vclassEdit?uri="+URLEncoder.encode(dp.getDomainClassURI(),"UTF-8")+"\">"+dp.getDomainClassURI()+"</a>";
-        } catch (UnsupportedEncodingException e) {
-            log.error(e, e);
-        }
-        results.add(domainStr); // column 6
-
-        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);        
-        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().getLabel()); // column 12
-        results.add(dp.getProhibitedFromUpdateBelowRoleLevel() == null ? "(unspecified)" : dp.getProhibitedFromUpdateBelowRoleLevel().getLabel()); // column 13
-        results.add(String.valueOf(dp.getDisplayTier()));  // column 14
-        results.add(String.valueOf(dp.getDisplayLimit()));  // column 15
-        results.add(dp.getCustomEntryForm() == null ? "(unspecified)" : dp.getCustomEntryForm());  // column 16
-        results.add(dp.getURI() == null ? "" : dp.getURI()); // column 17
-        request.setAttribute("results",results);
-        request.setAttribute("columncount",NUM_COLS);
-        request.setAttribute("suppressquery","true");
-
-        boolean FORCE_NEW = true;
-        
-        EditProcessObject epo = super.createEpo(request, FORCE_NEW);
-        FormObject foo = new FormObject();
-        HashMap OptionMap = new HashMap();
-        // add the options
-        foo.setOptionLists(OptionMap);
-        epo.setFormObject(foo);
-
-        DataPropertyDao assertionsDpDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getDataPropertyDao();
-        
-        List superURIs = assertionsDpDao.getSuperPropertyURIs(dp.getURI(),false);
-        List superProperties = new ArrayList();
-        Iterator superURIit = superURIs.iterator();
-        while (superURIit.hasNext()) {
-            String superURI = (String) superURIit.next();
-            if (superURI != null) {
-                DataProperty superProperty = assertionsDpDao.getDataPropertyByURI(superURI);
-                if (superProperty != null) {
-                    superProperties.add(superProperty);
-                }
-            }
-        }
-        request.setAttribute("superproperties",superProperties);
-
-        List subURIs = assertionsDpDao.getSubPropertyURIs(dp.getURI());
-        List subProperties = new ArrayList();
-        Iterator subURIit = subURIs.iterator();
-        while (subURIit.hasNext()) {
-            String subURI = (String) subURIit.next();
-            DataProperty subProperty = dpDao.getDataPropertyByURI(subURI);
-            if (subProperty != null) {
-                subProperties.add(subProperty);
-            }
-        }
-        request.setAttribute("subproperties",subProperties);
-        
-        List eqURIs = assertionsDpDao.getEquivalentPropertyURIs(dp.getURI());
-        List eqProperties = new ArrayList();
-        Iterator eqURIit = eqURIs.iterator();
-        while (eqURIit.hasNext()) {
-            String eqURI = (String) eqURIit.next();
-            DataProperty eqProperty = dpDao.getDataPropertyByURI(eqURI);
-            if (eqProperty != null) {
-                eqProperties.add(eqProperty);
-            }
-        }
-        request.setAttribute("equivalentProperties", eqProperties);
-        
-        ApplicationBean appBean = vreq.getAppBean();
-        
-        request.setAttribute("epoKey",epo.getKey());
-        request.setAttribute("datatypeProperty", dp);
-        request.setAttribute("bodyJsp","/templates/edit/specific/dataprops_edit.jsp");
-        request.setAttribute("title","Data Property Control Panel");
-        request.setAttribute("css", "<link rel=\"stylesheet\" type=\"text/css\" href=\""+appBean.getThemeDir()+"css/edit.css\"/>");
-
-        try {
-            rd.forward(request, response);
-        } catch (Exception e) {
-            log.error("DatapropEditController could not forward to view.");
-            log.error(e.getMessage());
-            log.error(e.getStackTrace());
-        }
-
-    }
-
-    public void doGet (HttpServletRequest request, HttpServletResponse response) {
-        doPost(request,response);
-    }
-
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.edit;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vedit.beans.EditProcessObject;
+import edu.cornell.mannlib.vedit.beans.FormObject;
+import edu.cornell.mannlib.vedit.controller.BaseEditController;
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
+import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
+import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
+import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
+
+public class DatapropEditController extends BaseEditController {
+	
+	private static final Log log = LogFactory.getLog(DatapropEditController.class.getName());
+
+    public void doPost (HttpServletRequest request, HttpServletResponse response) {
+        if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) {
+        	return;
+        }
+
+    	VitroRequest vreq = new VitroRequest(request);
+    	
+        final int NUM_COLS=17;
+
+        String datapropURI = request.getParameter("uri");
+
+        DataPropertyDao dpDao = vreq.getUnfilteredWebappDaoFactory().getDataPropertyDao();
+        DataProperty dp = dpDao.getDataPropertyByURI(datapropURI);
+        PropertyGroupDao pgDao = vreq.getUnfilteredWebappDaoFactory().getPropertyGroupDao();
+
+        ArrayList results = new ArrayList();
+        results.add("data property");         // column 1
+        results.add("public display label");  // column 2
+        results.add("property group");        // column 3
+        results.add("ontology");              // column 4
+        results.add("RDF local name");        // column 5
+        results.add("domain class");          // column 6
+        results.add("range datatype");        // column 7
+        results.add("functional");            // column 8
+        results.add("public description");    // column 9
+        results.add("example");               // column 10
+        results.add("editor description");    // column 11
+        results.add("display level");         // column 12
+        results.add("update level");          // column 13
+        results.add("display tier");          // column 14
+        results.add("display limit");         // column 15
+        results.add("custom entry form");     // column 16
+        results.add("URI");                   // column 17
+
+        RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
+
+        results.add(dp.getLocalNameWithPrefix()); // 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) {
+                results.add(pGroup.getName()); // column 3
+            } else {
+                results.add(dp.getGroupURI());
+            }
+        } else {
+            results.add("(unspecified)");
+        }
+        
+        String ontologyName = null;
+        if (dp.getNamespace() != null) {
+            Ontology ont = vreq.getUnfilteredWebappDaoFactory().getOntologyDao().getOntologyByURI(dp.getNamespace());
+            if ( (ont != null) && (ont.getName() != null) ) {
+                ontologyName = ont.getName();
+            }
+        }
+        results.add(ontologyName==null ? "(not identified)" : ontologyName); // column 4
+
+        results.add(dp.getLocalName()); // column 5
+
+        // 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);
+        
+        // TODO - need unionOf/intersectionOf-style domains for domain class
+        String domainStr="";
+        try {
+            domainStr = (dp.getDomainClassURI() == null) ? "" : "<a href=\"vclassEdit?uri="+URLEncoder.encode(dp.getDomainClassURI(),"UTF-8")+"\">"+dp.getDomainClassURI()+"</a>";
+        } catch (UnsupportedEncodingException e) {
+            log.error(e, e);
+        }
+        results.add(domainStr); // column 6
+
+        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);        
+        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().getLabel()); // column 12
+        results.add(dp.getProhibitedFromUpdateBelowRoleLevel() == null ? "(unspecified)" : dp.getProhibitedFromUpdateBelowRoleLevel().getLabel()); // column 13
+        results.add(String.valueOf(dp.getDisplayTier()));  // column 14
+        results.add(String.valueOf(dp.getDisplayLimit()));  // column 15
+        results.add(dp.getCustomEntryForm() == null ? "(unspecified)" : dp.getCustomEntryForm());  // column 16
+        results.add(dp.getURI() == null ? "" : dp.getURI()); // column 17
+        request.setAttribute("results",results);
+        request.setAttribute("columncount",NUM_COLS);
+        request.setAttribute("suppressquery","true");
+
+        boolean FORCE_NEW = true;
+        
+        EditProcessObject epo = super.createEpo(request, FORCE_NEW);
+        FormObject foo = new FormObject();
+        HashMap OptionMap = new HashMap();
+        // add the options
+        foo.setOptionLists(OptionMap);
+        epo.setFormObject(foo);
+
+        DataPropertyDao assertionsDpDao = vreq.getUnfilteredAssertionsWebappDaoFactory().getDataPropertyDao();
+        
+        List superURIs = assertionsDpDao.getSuperPropertyURIs(dp.getURI(),false);
+        List superProperties = new ArrayList();
+        Iterator superURIit = superURIs.iterator();
+        while (superURIit.hasNext()) {
+            String superURI = (String) superURIit.next();
+            if (superURI != null) {
+                DataProperty superProperty = assertionsDpDao.getDataPropertyByURI(superURI);
+                if (superProperty != null) {
+                    superProperties.add(superProperty);
+                }
+            }
+        }
+        request.setAttribute("superproperties",superProperties);
+
+        List subURIs = assertionsDpDao.getSubPropertyURIs(dp.getURI());
+        List subProperties = new ArrayList();
+        Iterator subURIit = subURIs.iterator();
+        while (subURIit.hasNext()) {
+            String subURI = (String) subURIit.next();
+            DataProperty subProperty = dpDao.getDataPropertyByURI(subURI);
+            if (subProperty != null) {
+                subProperties.add(subProperty);
+            }
+        }
+        request.setAttribute("subproperties",subProperties);
+        
+        List eqURIs = assertionsDpDao.getEquivalentPropertyURIs(dp.getURI());
+        List eqProperties = new ArrayList();
+        Iterator eqURIit = eqURIs.iterator();
+        while (eqURIit.hasNext()) {
+            String eqURI = (String) eqURIit.next();
+            DataProperty eqProperty = dpDao.getDataPropertyByURI(eqURI);
+            if (eqProperty != null) {
+                eqProperties.add(eqProperty);
+            }
+        }
+        request.setAttribute("equivalentProperties", eqProperties);
+        
+        ApplicationBean appBean = vreq.getAppBean();
+        
+        request.setAttribute("epoKey",epo.getKey());
+        request.setAttribute("datatypeProperty", dp);
+        request.setAttribute("bodyJsp","/templates/edit/specific/dataprops_edit.jsp");
+        request.setAttribute("title","Data Property Control Panel");
+        request.setAttribute("css", "<link rel=\"stylesheet\" type=\"text/css\" href=\""+appBean.getThemeDir()+"css/edit.css\"/>");
+
+        try {
+            rd.forward(request, response);
+        } catch (Exception e) {
+            log.error("DatapropEditController could not forward to view.");
+            log.error(e.getMessage());
+            log.error(e.getStackTrace());
+        }
+
+    }
+
+    public void doGet (HttpServletRequest request, HttpServletResponse response) {
+        doPost(request,response);
+    }
+
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java
index 111645a33..ac443de7c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DatapropRetryController.java
@@ -1,7 +1,7 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller.edit;
-
+package edu.cornell.mannlib.vitro.webapp.controller.edit;
+
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
@@ -36,108 +36,108 @@ import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.DatatypeDao;
 import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
-
-
-public class DatapropRetryController extends BaseEditController {
-	
-	private static final Log log = LogFactory.getLog(DatapropRetryController.class.getName());
-
+
+
+public class DatapropRetryController extends BaseEditController {
+	
+	private static final Log log = LogFactory.getLog(DatapropRetryController.class.getName());
+
     @Override
-	public void doPost (HttpServletRequest request, HttpServletResponse response) {
+	public void doPost (HttpServletRequest request, HttpServletResponse response) {
         if (!isAuthorizedToDisplayPage(request, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) {
         	return;
         }
-
-        //create an EditProcessObject for this and put it in the session
-        EditProcessObject epo = super.createEpo(request);
+
+        //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);
-
-        DatatypeDao dDao = vreq.getUnfilteredWebappDaoFactory().getDatatypeDao();
-        DataPropertyDao dpDao = vreq.getUnfilteredWebappDaoFactory().getDataPropertyDao();
-        epo.setDataAccessObject(dpDao);
-        OntologyDao ontDao = vreq.getUnfilteredWebappDaoFactory().getOntologyDao();
-        VClassDao vclassDao = vreq.getUnfilteredWebappDaoFactory().getVClassDao();
-
-        DataProperty objectForEditing = null;
-        String action = null;
-        if (epo.getAction() == null) {
-            action = "insert";
-            epo.setAction("insert");
-        } else {
-            action = epo.getAction();
-        }
-        if (epo.getUseRecycledBean()) {
-            objectForEditing = (DataProperty) epo.getNewBean();
-        } else {
-            String uri = request.getParameter("uri");
-            if (uri != null) {
-                try {
-                    objectForEditing = dpDao.getDataPropertyByURI(uri);
-                    epo.setOriginalBean(objectForEditing);
-                    action = "update";
-                    epo.setAction("update");
-                } catch (NullPointerException e) {
-                    log.error("Need to implement 'record not found' error message.");
-                }
-            } else {
-                action = "insert";
-                epo.setAction("insert");
-                objectForEditing = new DataProperty();
-                epo.setOriginalBean(objectForEditing);
-            }
-        }
-
-        //put this in the parent class?
-        //make a simple mask for the class's id
-        Object[] simpleMaskPair = new Object[2];
-        simpleMaskPair[0]="URI";
-        simpleMaskPair[1]=objectForEditing.getURI();
-        epo.getSimpleMask().add(simpleMaskPair);
-
-        //set any validators
-
-        LinkedList lnList = new LinkedList();
-        lnList.add(new XMLNameValidator());
-        epo.getValidatorMap().put("LocalName",lnList);
-
-        LinkedList vlist = new LinkedList();
-        vlist.add(new IntValidator(0,99));
-        epo.getValidatorMap().put("StatusId",vlist);
-
-        //set the getMethod so we can retrieve a new bean after we've inserted it
-        try {
-            Class[] args = new Class[1];
-            args[0] = String.class;
-            epo.setGetMethod(dpDao.getClass().getDeclaredMethod("getDataPropertyByURI",args));
-        } catch (NoSuchMethodException e) {
-            log.error("DatapropRetryController could not find the getDataPropertyByURI method in the facade");
-        }
-
-        //make a postinsert pageforwarder that will send us to a new class's fetch screen
-        epo.setPostInsertPageForwarder(new DataPropertyInsertPageForwarder());
-        //make a postdelete pageforwarder that will send us to the list of properties
-        epo.setPostDeletePageForwarder(new UrlForwarder("listDatatypeProperties"));
-
-        //set up any listeners
-        List changeListenerList = new ArrayList();
-        changeListenerList.add(new PropertyRestrictionListener(getServletContext()));
-        epo.setChangeListenerList(changeListenerList);
-
-
-        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);
-        
+        VitroRequest vreq = new VitroRequest(request);
+
+        DatatypeDao dDao = vreq.getUnfilteredWebappDaoFactory().getDatatypeDao();
+        DataPropertyDao dpDao = vreq.getUnfilteredWebappDaoFactory().getDataPropertyDao();
+        epo.setDataAccessObject(dpDao);
+        OntologyDao ontDao = vreq.getUnfilteredWebappDaoFactory().getOntologyDao();
+        VClassDao vclassDao = vreq.getUnfilteredWebappDaoFactory().getVClassDao();
+
+        DataProperty objectForEditing = null;
+        String action = null;
+        if (epo.getAction() == null) {
+            action = "insert";
+            epo.setAction("insert");
+        } else {
+            action = epo.getAction();
+        }
+        if (epo.getUseRecycledBean()) {
+            objectForEditing = (DataProperty) epo.getNewBean();
+        } else {
+            String uri = request.getParameter("uri");
+            if (uri != null) {
+                try {
+                    objectForEditing = dpDao.getDataPropertyByURI(uri);
+                    epo.setOriginalBean(objectForEditing);
+                    action = "update";
+                    epo.setAction("update");
+                } catch (NullPointerException e) {
+                    log.error("Need to implement 'record not found' error message.");
+                }
+            } else {
+                action = "insert";
+                epo.setAction("insert");
+                objectForEditing = new DataProperty();
+                epo.setOriginalBean(objectForEditing);
+            }
+        }
+
+        //put this in the parent class?
+        //make a simple mask for the class's id
+        Object[] simpleMaskPair = new Object[2];
+        simpleMaskPair[0]="URI";
+        simpleMaskPair[1]=objectForEditing.getURI();
+        epo.getSimpleMask().add(simpleMaskPair);
+
+        //set any validators
+
+        LinkedList lnList = new LinkedList();
+        lnList.add(new XMLNameValidator());
+        epo.getValidatorMap().put("LocalName",lnList);
+
+        LinkedList vlist = new LinkedList();
+        vlist.add(new IntValidator(0,99));
+        epo.getValidatorMap().put("StatusId",vlist);
+
+        //set the getMethod so we can retrieve a new bean after we've inserted it
+        try {
+            Class[] args = new Class[1];
+            args[0] = String.class;
+            epo.setGetMethod(dpDao.getClass().getDeclaredMethod("getDataPropertyByURI",args));
+        } catch (NoSuchMethodException e) {
+            log.error("DatapropRetryController could not find the getDataPropertyByURI method in the facade");
+        }
+
+        //make a postinsert pageforwarder that will send us to a new class's fetch screen
+        epo.setPostInsertPageForwarder(new DataPropertyInsertPageForwarder());
+        //make a postdelete pageforwarder that will send us to the list of properties
+        epo.setPostDeletePageForwarder(new UrlForwarder("listDatatypeProperties"));
+
+        //set up any listeners
+        List changeListenerList = new ArrayList();
+        changeListenerList.add(new PropertyRestrictionListener(getServletContext()));
+        epo.setChangeListenerList(changeListenerList);
+
+
+        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()
@@ -148,74 +148,74 @@ public class DatapropRetryController extends BaseEditController {
         			    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));
-        groupOptList.add(0,new Option("","none"));
-        optionMap.put("GroupURI", groupOptList);
-
-        optionMap.put("HiddenFromDisplayBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getDisplayOptionsList(objectForEditing));    
-        optionMap.put("ProhibitedFromUpdateBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getUpdateOptionsList(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);
-        }
-
-        foo.setErrorMap(epo.getErrMsgMap());
-
-        RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
-        request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp");
-        request.setAttribute("colspan","4");
-        request.setAttribute("scripts","/templates/edit/formBasic.js");
-        request.setAttribute("formJsp","/templates/edit/specific/dataprop_retry.jsp");
-        request.setAttribute("title","Data Property Editing Form");
-        request.setAttribute("_action",action);
-        request.setAttribute("unqualifiedClassName","DatatypeProperty");
-        setRequestAttributes(request,epo);
-
-        try {
-            rd.forward(request, response);
-        } catch (Exception e) {
-            log.error("DatatypeRetryController could not forward to view.");
-            log.error(e.getMessage());
-            log.error(e.getStackTrace());
-        }
-
-    }
-
-    public void doGet (HttpServletRequest request, HttpServletResponse response) {
-        doPost(request, response);
-    }
-
+        }
+        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));
+        groupOptList.add(0,new Option("","none"));
+        optionMap.put("GroupURI", groupOptList);
+
+        optionMap.put("HiddenFromDisplayBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getDisplayOptionsList(objectForEditing));    
+        optionMap.put("ProhibitedFromUpdateBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getUpdateOptionsList(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);
+        }
+
+        foo.setErrorMap(epo.getErrMsgMap());
+
+        RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
+        request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp");
+        request.setAttribute("colspan","4");
+        request.setAttribute("scripts","/templates/edit/formBasic.js");
+        request.setAttribute("formJsp","/templates/edit/specific/dataprop_retry.jsp");
+        request.setAttribute("title","Data Property Editing Form");
+        request.setAttribute("_action",action);
+        request.setAttribute("unqualifiedClassName","DatatypeProperty");
+        setRequestAttributes(request,epo);
+
+        try {
+            rd.forward(request, response);
+        } catch (Exception e) {
+            log.error("DatatypeRetryController could not forward to view.");
+            log.error(e.getMessage());
+            log.error(e.getStackTrace());
+        }
+
+    }
+
+    public void doGet (HttpServletRequest request, HttpServletResponse response) {
+        doPost(request, response);
+    }
+
     class DataPropertyInsertPageForwarder implements PageForwarder {
-    	
-        public void doForward(HttpServletRequest request, HttpServletResponse response, EditProcessObject epo){
-            String newPropertyUrl = "datapropEdit?uri=";
-            DataProperty p = (DataProperty) epo.getNewBean();
-            try {
-                newPropertyUrl += URLEncoder.encode(p.getURI(),"UTF-8");
-            } catch (Exception e) {
-                log.error(this.getClass().getName()+" could not use UTF-8 encoding to encode new URL");
-            }
-            try {
-                response.sendRedirect(newPropertyUrl);
-            } catch (IOException ioe) {
-                log.error("DataPropertyInsertPageForwarder could not send redirect.");
-            }
-        }
-
-    }
-
-}
+    	
+        public void doForward(HttpServletRequest request, HttpServletResponse response, EditProcessObject epo){
+            String newPropertyUrl = "datapropEdit?uri=";
+            DataProperty p = (DataProperty) epo.getNewBean();
+            try {
+                newPropertyUrl += URLEncoder.encode(p.getURI(),"UTF-8");
+            } catch (Exception e) {
+                log.error(this.getClass().getName()+" could not use UTF-8 encoding to encode new URL");
+            }
+            try {
+                response.sendRedirect(newPropertyUrl);
+            } catch (IOException ioe) {
+                log.error("DataPropertyInsertPageForwarder could not send redirect.");
+            }
+        }
+
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DeletePageController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DeletePageController.java
index d66f93b2d..dec1b8df1 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DeletePageController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/DeletePageController.java
@@ -1,169 +1,169 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.edit;
-
-
-import java.io.IOException;
-import java.io.StringWriter;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.shared.Lock;
-
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
-
-/**
- *Process deletions for page, deleting page, data getters and any associated menu items.
- */
-public class DeletePageController extends VitroHttpServlet {
-   
-   private final static String REDIRECT_URL = "/pageList";
-   private static Model removeStatements = null; 
-    
-    @Override
-    protected void doPost(HttpServletRequest rawRequest, HttpServletResponse resp)
-            throws ServletException, IOException {
-    	if (!isAuthorizedToDisplayPage(rawRequest, resp, SimplePermission.MANAGE_MENUS.ACTION)) {
-    		return;
-    	}
-    	removeStatements = ModelFactory.createDefaultModel();
-    	VitroRequest vreq = new VitroRequest(rawRequest);
-    	String pageUri = vreq.getParameter("pageURI");
-     	if(pageUri != null) {
-    		doDeletePage(pageUri, vreq, resp);
-    	}
-		resp.sendRedirect(rawRequest.getContextPath() + REDIRECT_URL);
-    }
-
-    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 {
-    		log.debug("Statement to be removed are ");
-    		StringWriter r = new StringWriter();
-			removeStatements.write(r, "N3");
-    		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.";
-    	}finally {
-    		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 
-    	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();		
-		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) {
-			removeModel.add(displayModel.listStatements(menuItemResource, null, (RDFNode) null));
-			//Also remove any statements where menu item resource is an object
-			removeModel.add(displayModel.listStatements(null, null, menuItemResource));
-		}
-		//Get all data getter statements
-		Model associatedDataGettersModel = getDataGettersStatements(pageResource, displayModel);
-		removeModel.add(associatedDataGettersModel);
-		return removeModel;
-	}
-
-	//Get all data getters associated with page
-	private Model getDataGettersStatements(Resource pageResource, OntModel displayModel) {
-		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), 
-				(RDFNode) null);
-		while(dataGetterIt.hasNext()) {
-			Statement dataGetterStmt = dataGetterIt.nextStatement();
-			Resource dataGetterResource = dataGetterStmt.getResource();
-			dataGettersModel.add(displayModel.listStatements(dataGetterResource, null, (RDFNode) null));
-		}
-		return dataGettersModel;
-	}
-
-
-
-
-	private Resource getExistingPage(String pageUri, OntModel displayModel) {
-		return ResourceFactory.createResource(pageUri);
-	}
-
-	private Resource getExistingMenuItem(Resource pageResource,  OntModel displayModel) {
-		Resource menuItemResource = null;
-		StmtIterator menuItemIt = displayModel.listStatements(null, 
-				DisplayVocabulary.TO_PAGE, 
-				pageResource);
-		while(menuItemIt.hasNext()) {
-			Statement menuStmt = menuItemIt.nextStatement();
-			menuItemResource = menuStmt.getSubject();
-		}
-		return menuItemResource;
-	}
-
-	//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();    
-    }
-    
-    Log log = LogFactory.getLog(MenuManagementEdit.class);
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.edit;
+
+
+import java.io.IOException;
+import java.io.StringWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.rdf.model.StmtIterator;
+import com.hp.hpl.jena.shared.Lock;
+
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+
+/**
+ *Process deletions for page, deleting page, data getters and any associated menu items.
+ */
+public class DeletePageController extends VitroHttpServlet {
+   
+   private final static String REDIRECT_URL = "/pageList";
+   private static Model removeStatements = null; 
+    
+    @Override
+    protected void doPost(HttpServletRequest rawRequest, HttpServletResponse resp)
+            throws ServletException, IOException {
+    	if (!isAuthorizedToDisplayPage(rawRequest, resp, SimplePermission.MANAGE_MENUS.ACTION)) {
+    		return;
+    	}
+    	removeStatements = ModelFactory.createDefaultModel();
+    	VitroRequest vreq = new VitroRequest(rawRequest);
+    	String pageUri = vreq.getParameter("pageURI");
+     	if(pageUri != null) {
+    		doDeletePage(pageUri, vreq, resp);
+    	}
+		resp.sendRedirect(rawRequest.getContextPath() + REDIRECT_URL);
+    }
+
+    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 {
+    		log.debug("Statement to be removed are ");
+    		StringWriter r = new StringWriter();
+			removeStatements.write(r, "N3");
+    		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.";
+    	}finally {
+    		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 
+    	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();		
+		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) {
+			removeModel.add(displayModel.listStatements(menuItemResource, null, (RDFNode) null));
+			//Also remove any statements where menu item resource is an object
+			removeModel.add(displayModel.listStatements(null, null, menuItemResource));
+		}
+		//Get all data getter statements
+		Model associatedDataGettersModel = getDataGettersStatements(pageResource, displayModel);
+		removeModel.add(associatedDataGettersModel);
+		return removeModel;
+	}
+
+	//Get all data getters associated with page
+	private Model getDataGettersStatements(Resource pageResource, OntModel displayModel) {
+		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), 
+				(RDFNode) null);
+		while(dataGetterIt.hasNext()) {
+			Statement dataGetterStmt = dataGetterIt.nextStatement();
+			Resource dataGetterResource = dataGetterStmt.getResource();
+			dataGettersModel.add(displayModel.listStatements(dataGetterResource, null, (RDFNode) null));
+		}
+		return dataGettersModel;
+	}
+
+
+
+
+	private Resource getExistingPage(String pageUri, OntModel displayModel) {
+		return ResourceFactory.createResource(pageUri);
+	}
+
+	private Resource getExistingMenuItem(Resource pageResource,  OntModel displayModel) {
+		Resource menuItemResource = null;
+		StmtIterator menuItemIt = displayModel.listStatements(null, 
+				DisplayVocabulary.TO_PAGE, 
+				pageResource);
+		while(menuItemIt.hasNext()) {
+			Statement menuStmt = menuItemIt.nextStatement();
+			menuItemResource = menuStmt.getSubject();
+		}
+		return menuItemResource;
+	}
+
+	//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();    
+    }
+    
+    Log log = LogFactory.getLog(MenuManagementEdit.class);
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java
index fc48f2d54..41d42f77e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityEditController.java
@@ -1,7 +1,7 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller.edit;
-
+package edu.cornell.mannlib.vitro.webapp.controller.edit;
+
 import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -33,24 +33,24 @@ import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.PropertyInstanceDao;
-
-public class EntityEditController extends BaseEditController {
-	
-	private static final Log log = LogFactory.getLog(EntityEditController.class.getName());
-
-    public void doGet (HttpServletRequest request, HttpServletResponse response) {
+
+public class EntityEditController extends BaseEditController {
+	
+	private static final Log log = LogFactory.getLog(EntityEditController.class.getName());
+
+    public void doGet (HttpServletRequest request, HttpServletResponse response) {
 		if (!isAuthorizedToDisplayPage(request, response,
 				SimplePermission.DO_BACK_END_EDITING.ACTIONS)) {
         	return;
         }
-
-        String entURI = request.getParameter("uri");
-        VitroRequest vreq = (new VitroRequest(request));
+
+        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) {
+        
+        //Individual ent = vreq.getWebappDaoFactory().getIndividualDao().getIndividualByURI(entURI);
+        Individual ent = vreq.getUnfilteredAssertionsWebappDaoFactory().getIndividualDao().getIndividualByURI(entURI);
+        if (ent == null) {
         	try {
         		RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
         		request.setAttribute("bodyJsp","/jenaIngest/notfound.jsp");
@@ -61,151 +61,151 @@ public class EntityEditController extends BaseEditController {
                 log.error("EntityEditController could not forward to view.");
                 log.error(e.getMessage());
                 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>();
-        int colCount = 4;
-        results.add("Name");
-        results.add("class");
-        results.add("display level");
-        results.add("edit level");
-        results.add("last updated");
-        colCount++;
-        results.add("URI");
-        colCount++;
-        
-        String rName = null;
-        if (ent.getName() != null && ent.getName().length() > 0) {
-        	rName = ent.getName();
-        } else if (ent.getLocalName() != null && ent.getLocalName().length() > 0) {
-        	rName = ent.getLocalName();
-        } else if (ent.isAnonymous()) {
-        	rName = "[anonymous resource]";
-        } else {
-        	rName = "[resource]";
-        }
-        results.add(rName);
-        
-        String classStr = "";
-        List<VClass> classList = inferredEnt.getVClasses(false);
-        if (classList != null) {
-	        for (Iterator<VClass> classIt = classList.iterator(); classIt.hasNext();) {
-	        	VClass vc = classIt.next();
-	        	String rClassName = "";
-	            try {
+            }
+        }
+        
+        Individual inferredEnt = vreq.getUnfilteredWebappDaoFactory().getIndividualDao().getIndividualByURI(entURI);
+        if (inferredEnt == null) {
+        	inferredEnt = new IndividualImpl(entURI);
+        }
+        
+        request.setAttribute("entity",ent);
+
+        ArrayList<String> results = new ArrayList<String>();
+        int colCount = 4;
+        results.add("Name");
+        results.add("class");
+        results.add("display level");
+        results.add("edit level");
+        results.add("last updated");
+        colCount++;
+        results.add("URI");
+        colCount++;
+        
+        String rName = null;
+        if (ent.getName() != null && ent.getName().length() > 0) {
+        	rName = ent.getName();
+        } else if (ent.getLocalName() != null && ent.getLocalName().length() > 0) {
+        	rName = ent.getLocalName();
+        } else if (ent.isAnonymous()) {
+        	rName = "[anonymous resource]";
+        } else {
+        	rName = "[resource]";
+        }
+        results.add(rName);
+        
+        String classStr = "";
+        List<VClass> classList = inferredEnt.getVClasses(false);
+        if (classList != null) {
+	        for (Iterator<VClass> classIt = classList.iterator(); classIt.hasNext();) {
+	        	VClass vc = classIt.next();
+	        	String rClassName = "";
+	            try {
 	                rClassName = "<a href=\"vclassEdit?uri=" +
 	                		URLEncoder.encode(vc.getURI(),"UTF-8")+"\">" + 
-	                		vc.getLocalNameWithPrefix()+"</a>";
-	            } catch (Exception e) {
-	                rClassName = vc.getLocalNameWithPrefix();
-	            }
-	            classStr += rClassName;
-	            if (classIt.hasNext()) {
-	            	classStr += ", ";
-	            }
-	        }
-        }
-        results.add(classStr);
-                
-        results.add(ent.getHiddenFromDisplayBelowRoleLevel()  == null ? "unspecified" : ent.getHiddenFromDisplayBelowRoleLevel().getLabel());
-        results.add(ent.getProhibitedFromUpdateBelowRoleLevel() == null ? "unspecified" : ent.getProhibitedFromUpdateBelowRoleLevel().getLabel());
-
-        String rModTime = (ent.getModTime()==null) ? "" : publicDateFormat.format(ent.getModTime());
-        results.add(rModTime);
-        results.add( (ent.getURI() == null) ? "[anonymous individual]" : ent.getURI() );
-        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>>();
-        
-        request.setAttribute("types",ent.getVClasses(false)); // we're displaying all assertions, including indirect types
-        
-        try {
-            List<Option> externalIdOptionList = new LinkedList<Option>();
-            if (ent.getExternalIds() != null) {
-                Iterator<DataPropertyStatement> externalIdIt = ent.getExternalIds().iterator();
-                while (externalIdIt.hasNext()) {
-                    DataPropertyStatement eid = externalIdIt.next();
-                    String multiplexedString = new String ("DatapropURI:" + new String(Base64.encodeBase64(eid.getDatapropURI().getBytes())) + ";" + "Data:" + new String(Base64.encodeBase64(eid.getData().getBytes())));
-                    externalIdOptionList.add(new Option(multiplexedString, eid.getData()));
-                }
-            }
-            OptionMap.put("externalIds", externalIdOptionList);
-        } catch (Exception e) {
-            log.error(e, e);
-        }
-                
-        try{
-            OptionMap.put("VClassURI", FormUtils.makeOptionListFromBeans(
-                    vreq.getUnfilteredWebappDaoFactory().getVClassDao().getAllVclasses(),
-                            "URI", "PickListName", ent.getVClassURI(), null, false));        
+	                		vc.getLocalNameWithPrefix()+"</a>";
+	            } catch (Exception e) {
+	                rClassName = vc.getLocalNameWithPrefix();
+	            }
+	            classStr += rClassName;
+	            if (classIt.hasNext()) {
+	            	classStr += ", ";
+	            }
+	        }
+        }
+        results.add(classStr);
+                
+        results.add(ent.getHiddenFromDisplayBelowRoleLevel()  == null ? "unspecified" : ent.getHiddenFromDisplayBelowRoleLevel().getLabel());
+        results.add(ent.getProhibitedFromUpdateBelowRoleLevel() == null ? "unspecified" : ent.getProhibitedFromUpdateBelowRoleLevel().getLabel());
+
+        String rModTime = (ent.getModTime()==null) ? "" : publicDateFormat.format(ent.getModTime());
+        results.add(rModTime);
+        results.add( (ent.getURI() == null) ? "[anonymous individual]" : ent.getURI() );
+        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>>();
+        
+        request.setAttribute("types",ent.getVClasses(false)); // we're displaying all assertions, including indirect types
+        
+        try {
+            List<Option> externalIdOptionList = new LinkedList<Option>();
+            if (ent.getExternalIds() != null) {
+                Iterator<DataPropertyStatement> externalIdIt = ent.getExternalIds().iterator();
+                while (externalIdIt.hasNext()) {
+                    DataPropertyStatement eid = externalIdIt.next();
+                    String multiplexedString = new String ("DatapropURI:" + new String(Base64.encodeBase64(eid.getDatapropURI().getBytes())) + ";" + "Data:" + new String(Base64.encodeBase64(eid.getData().getBytes())));
+                    externalIdOptionList.add(new Option(multiplexedString, eid.getData()));
+                }
+            }
+            OptionMap.put("externalIds", externalIdOptionList);
         } catch (Exception e) {
             log.error(e, e);
         }
-        
-        PropertyInstanceDao piDao = vreq.getUnfilteredWebappDaoFactory().getPropertyInstanceDao();
-        // existing property statements
-        try {
-            List epiOptionList = new LinkedList();
-            Collection<PropertyInstance> epiColl = piDao.getExistingProperties(ent.getURI(),null);
-            Iterator<PropertyInstance> epiIt = epiColl.iterator();
-            while (epiIt.hasNext()) {
-                PropertyInstance pi = epiIt.next();
-                String multiplexedString = new String ("PropertyURI:" + new String(Base64.encodeBase64(pi.getPropertyURI().getBytes())) + ";" + "ObjectEntURI:" + new String(Base64.encodeBase64(pi.getObjectEntURI().getBytes())));
-                epiOptionList.add(new Option(multiplexedString, pi.getDomainPublic()+" "+pi.getObjectName()));
-            }
-            OptionMap.put("ExistingPropertyInstances", epiOptionList);
-        } catch (Exception e) {
-            log.error(e, e);
-        }
-        // possible property statements
-        try {
-            Collection piColl = piDao.getAllPossiblePropInstForIndividual(ent.getURI());
-            List piList = new ArrayList();
-            piList.addAll(piColl);
-            OptionMap.put("PropertyURI", FormUtils.makeOptionListFromBeans(piList, "PropertyURI", "DomainPublic", (String)null, (String)null, false));
-        } catch (Exception e) {
-            log.error(e, e);
-        }
-
-        foo.setOptionLists(OptionMap);
-
-        epo.setFormObject(foo);
-
-        RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
-        request.setAttribute("epoKey",epo.getKey());
-        request.setAttribute("entityWebapp", ent);
-        request.setAttribute("bodyJsp","/templates/edit/specific/ents_edit.jsp");
-        request.setAttribute("title","Individual Control Panel");
-        request.setAttribute("css", "<link rel=\"stylesheet\" type=\"text/css\" href=\""+application.getThemeDir()+"css/edit.css\"/>");
-        request.setAttribute("scripts", "/templates/edit/specific/ents_edit_head.jsp");
-
-        try {
-            rd.forward(request, response);
-        } catch (Exception e) {
-            log.error("EntityEditController could not forward to view.");
-            log.error(e.getMessage());
-            log.error(e.getStackTrace());
-        }
-
-    }
-
-    public void doPost (HttpServletRequest request, HttpServletResponse response) {
-    	log.trace("Please don't POST to the "+this.getClass().getName()+". Use GET instead as there should be no change of state.");
-        doPost(request,response);
-    }
-
-}
+                
+        try{
+            OptionMap.put("VClassURI", FormUtils.makeOptionListFromBeans(
+                    vreq.getUnfilteredWebappDaoFactory().getVClassDao().getAllVclasses(),
+                            "URI", "PickListName", ent.getVClassURI(), null, false));        
+        } catch (Exception e) {
+            log.error(e, e);
+        }
+        
+        PropertyInstanceDao piDao = vreq.getUnfilteredWebappDaoFactory().getPropertyInstanceDao();
+        // existing property statements
+        try {
+            List epiOptionList = new LinkedList();
+            Collection<PropertyInstance> epiColl = piDao.getExistingProperties(ent.getURI(),null);
+            Iterator<PropertyInstance> epiIt = epiColl.iterator();
+            while (epiIt.hasNext()) {
+                PropertyInstance pi = epiIt.next();
+                String multiplexedString = new String ("PropertyURI:" + new String(Base64.encodeBase64(pi.getPropertyURI().getBytes())) + ";" + "ObjectEntURI:" + new String(Base64.encodeBase64(pi.getObjectEntURI().getBytes())));
+                epiOptionList.add(new Option(multiplexedString, pi.getDomainPublic()+" "+pi.getObjectName()));
+            }
+            OptionMap.put("ExistingPropertyInstances", epiOptionList);
+        } catch (Exception e) {
+            log.error(e, e);
+        }
+        // possible property statements
+        try {
+            Collection piColl = piDao.getAllPossiblePropInstForIndividual(ent.getURI());
+            List piList = new ArrayList();
+            piList.addAll(piColl);
+            OptionMap.put("PropertyURI", FormUtils.makeOptionListFromBeans(piList, "PropertyURI", "DomainPublic", (String)null, (String)null, false));
+        } catch (Exception e) {
+            log.error(e, e);
+        }
+
+        foo.setOptionLists(OptionMap);
+
+        epo.setFormObject(foo);
+
+        RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
+        request.setAttribute("epoKey",epo.getKey());
+        request.setAttribute("entityWebapp", ent);
+        request.setAttribute("bodyJsp","/templates/edit/specific/ents_edit.jsp");
+        request.setAttribute("title","Individual Control Panel");
+        request.setAttribute("css", "<link rel=\"stylesheet\" type=\"text/css\" href=\""+application.getThemeDir()+"css/edit.css\"/>");
+        request.setAttribute("scripts", "/templates/edit/specific/ents_edit_head.jsp");
+
+        try {
+            rd.forward(request, response);
+        } catch (Exception e) {
+            log.error("EntityEditController could not forward to view.");
+            log.error(e.getMessage());
+            log.error(e.getStackTrace());
+        }
+
+    }
+
+    public void doPost (HttpServletRequest request, HttpServletResponse response) {
+    	log.trace("Please don't POST to the "+this.getClass().getName()+". Use GET instead as there should be no change of state.");
+        doPost(request,response);
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java
index 863784b32..3aade392a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/EntityRetryController.java
@@ -1,337 +1,337 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.edit;
-
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.collections.map.ListOrderedMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vedit.beans.DynamicField;
-import edu.cornell.mannlib.vedit.beans.DynamicFieldRow;
-import edu.cornell.mannlib.vedit.beans.EditProcessObject;
-import edu.cornell.mannlib.vedit.beans.FormObject;
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
-import edu.cornell.mannlib.vedit.beans.Option;
-import edu.cornell.mannlib.vedit.controller.BaseEditController;
-import edu.cornell.mannlib.vedit.forwarder.PageForwarder;
-import edu.cornell.mannlib.vedit.forwarder.impl.UrlForwarder;
-import edu.cornell.mannlib.vedit.util.FormUtils;
-import edu.cornell.mannlib.vedit.validator.impl.RequiredFieldValidator;
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
-import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
-import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.edit.utils.RoleLevelOptionsSetup;
-import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
-import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
-import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
-import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.edit.listener.impl.IndividualDataPropertyStatementProcessor;
-
-public class EntityRetryController extends BaseEditController {
-	
-	private static final Log log = LogFactory.getLog(EntityRetryController.class.getName());
-
-    public void doPost (HttpServletRequest request, HttpServletResponse response) {
-		if (!isAuthorizedToDisplayPage(request, response,
-				SimplePermission.DO_BACK_END_EDITING.ACTIONS)) {
-        	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);
-
-        String action = null;
-        if (epo.getAction() == null) {
-            action = "insert";
-            epo.setAction("insert");
-        } else {
-            action = epo.getAction();
-        }
-        
-        LoginStatusBean loginBean = LoginStatusBean.getBean(request);
-        WebappDaoFactory myWebappDaoFactory = getWebappDaoFactory(loginBean.getUserURI());
-
-        IndividualDao ewDao = myWebappDaoFactory.getIndividualDao();
-        epo.setDataAccessObject(ewDao);
-        VClassDao vcDao = myWebappDaoFactory.getVClassDao();
-        VClassGroupDao cgDao = myWebappDaoFactory.getVClassGroupDao();
-        DataPropertyDao dpDao = myWebappDaoFactory.getDataPropertyDao();
-
-        Individual individualForEditing = null;
-        if (epo.getUseRecycledBean()) {
-            individualForEditing = (Individual)epo.getNewBean();
-        } else {
-            String uri = vreq.getParameter("uri");
-            if (uri != null) {
-                try {
-                    individualForEditing = (Individual)ewDao.getIndividualByURI(uri);
-                    action = "update";
-                    epo.setAction("update");
-                } catch (NullPointerException e) {
-                    log.error("Need to implement 'record not found' error message.");
-                }
-            } else {
-                individualForEditing = new IndividualImpl();
-                if (vreq.getParameter("VClassURI") != null) {
-                    individualForEditing.setVClassURI(vreq.getParameter("VClassURI"));
-                }
-            }
-
-            epo.setOriginalBean(individualForEditing);
-
-            //make a simple mask for the entity's id
-            Object[] simpleMaskPair = new Object[2];
-            simpleMaskPair[0]="URI";
-            simpleMaskPair[1]=individualForEditing.getURI();
-            epo.getSimpleMask().add(simpleMaskPair);
-
-        }
-
-        //set any validators
-
-        LinkedList lnList = new LinkedList();
-        lnList.add(new RequiredFieldValidator());
-        epo.getValidatorMap().put("Name",lnList);
-
-        //make a postinsert pageforwarder that will send us to a new entity's fetch screen
-        epo.setPostInsertPageForwarder(new EntityInsertPageForwarder());
-        epo.setPostDeletePageForwarder(new UrlForwarder(siteAdminUrl));
-
-        //set the getMethod so we can retrieve a new bean after we've inserted it
-        try {
-            Class[] args = new Class[1];
-            args[0] = String.class;
-            epo.setGetMethod(ewDao.getClass().getDeclaredMethod("getIndividualByURI",args));
-        } catch (NoSuchMethodException e) {
-            log.error("EntityRetryController could not find the entityByURI method in the dao");
-        }
-
-        epo.setIdFieldName("URI");
-        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
-	        Iterator classGroupIt = classGroups.iterator();
-	        ListOrderedMap optGroupMap = new ListOrderedMap();
-	        while (classGroupIt.hasNext()) {
-	            VClassGroup group = (VClassGroup)classGroupIt.next();
-	            List classes = group.getVitroClassList();
-	            optGroupMap.put(group.getPublicName(),FormUtils.makeOptionListFromBeans(classes,"URI","Name",individualForEditing.getVClassURI(),null,false));
-	        }
-	        hash.put("VClassURI", optGroupMap);
-        } else {
-        	VClass vClass = null;
-        	Option opt = null;
-        	try {
-        		vClass = vcDao.getVClassByURI(individualForEditing.getVClassURI());
-        	} catch (Exception e) {}
-    		if (vClass != null) {
-    			opt = new Option(vClass.getURI(),vClass.getName(),true);
-    		} else {
-    			opt = new Option(individualForEditing.getVClassURI(),individualForEditing.getVClassURI(),true);
-    		}
-    		List<Option> optList  = new LinkedList<Option>();
-    		optList.add(opt);
-			hash.put("VClassURI", optList);
-        }
-        
-        hash.put("HiddenFromDisplayBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getDisplayOptionsList(individualForEditing));    
-        hash.put("ProhibitedFromUpdateBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getUpdateOptionsList(individualForEditing));
-
-        FormObject foo = new FormObject();
-        foo.setOptionLists(hash);
-
-        ListOrderedMap dpMap = new ListOrderedMap();
-
-        //make dynamic datatype property fields
-        List<VClass> vclasses = individualForEditing.getVClasses(true);
-        if (vclasses == null) {
-        	vclasses = new ArrayList<VClass>();
-        	if (individualForEditing.getVClassURI() != null) {
-        		try {
-	        		VClass cls = vreq.getUnfilteredWebappDaoFactory().getVClassDao().getVClassByURI(individualForEditing.getVClassURI());
-	        		if (cls != null) {
-	        			vclasses.add(cls);
-	        		}
-        		} catch (Exception e) {}
-        	}
-        }
-        List<DataProperty> allApplicableDataprops = new ArrayList<DataProperty>();
-        for (VClass cls : vclasses) {
-        	List<DataProperty> dataprops = dpDao.getDataPropertiesForVClass(cls.getURI());
-        	for (DataProperty dp : dataprops) {
-        		boolean notDuplicate = true;
-        		for (DataProperty existingDp : allApplicableDataprops) {
-        			if (existingDp.getURI().equals(dp.getURI())) {
-        				notDuplicate = false;
-        				break;
-        			}
-        		}
-        		if (notDuplicate) {
-        			allApplicableDataprops.add(dp);
-        		}
-        	}
-        }
-        Collections.sort(allApplicableDataprops);
-        
-        if (allApplicableDataprops != null) {
-            Iterator<DataProperty> datapropsIt = allApplicableDataprops.iterator();
-
-            while (datapropsIt.hasNext()){
-                DataProperty d = datapropsIt.next();
-                if (!dpMap.containsKey(d.getURI())) {
-                    dpMap.put(d.getURI(),d);
-                }
-            }
-
-            if (individualForEditing.getDataPropertyList() != null) {
-                Iterator<DataProperty> existingDps = individualForEditing.getDataPropertyList().iterator();
-                while (existingDps.hasNext()) {
-                    DataProperty existingDp = existingDps.next();
-                    dpMap.put(existingDp.getURI(),existingDp);
-                }
-            }
-
-            List<DynamicField> dynamicFields = new ArrayList();
-            Iterator<String> dpHashIt = dpMap.orderedMapIterator();
-            while (dpHashIt.hasNext()) {
-                String uri = dpHashIt.next();
-                DataProperty dp = (DataProperty) dpMap.get(uri);
-                DynamicField dynamo = new DynamicField();
-                dynamo.setName(dp.getPublicName());
-                dynamo.setTable("DataPropertyStatement");
-                dynamo.setVisible(dp.getDisplayLimit());
-                dynamo.setDeleteable(true);
-                DynamicFieldRow rowTemplate = new DynamicFieldRow();
-                Map parameterMap = new HashMap();
-                parameterMap.put("DatatypePropertyURI", dp.getURI());
-                rowTemplate.setParameterMap(parameterMap);
-                dynamo.setRowTemplate(rowTemplate);
-                try {
-                    Iterator<DataPropertyStatement> existingValues = dp.getDataPropertyStatements().iterator();
-                    while (existingValues.hasNext()) {
-                        DataPropertyStatement existingValue = existingValues.next();
-                        DynamicFieldRow row = new DynamicFieldRow();
-                        //TODO: UGH
-                        //row.setId(existingValue.getId());
-                        row.setParameterMap(parameterMap);
-                        row.setValue(existingValue.getData());
-                        if (dynamo.getRowList() == null)
-                            dynamo.setRowList(new ArrayList());
-                        dynamo.getRowList().add(row);
-                    }
-                } catch (NullPointerException npe) {
-                    //whatever
-                }
-                if (dynamo.getRowList() == null)
-                    dynamo.setRowList(new ArrayList());
-                dynamo.getRowList().add(rowTemplate);
-                dynamicFields.add(dynamo);
-            }
-            foo.setDynamicFields(dynamicFields);
-        }
-
-        foo.setErrorMap(epo.getErrMsgMap());
-
-        epo.setFormObject(foo);
-
-        // DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        DateFormat minutesOnlyDateFormat = new SimpleDateFormat ("yyyy-MM-dd HH:mm");
-        DateFormat dateOnlyFormat = new SimpleDateFormat("yyyy-MM-dd");
-        FormUtils.populateFormFromBean(individualForEditing,action,epo,foo,epo.getBadValueMap());
-
-        List cList = new ArrayList();
-        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();
-        
-        RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
-        request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp");
-        request.setAttribute("formJsp","/templates/edit/specific/entity_retry.jsp");
-        request.setAttribute("epoKey",epo.getKey());
-        request.setAttribute("title","Individual Editing Form");
-        request.setAttribute("css", "<link rel=\"stylesheet\" type=\"text/css\" href=\""+appBean.getThemeDir()+"css/edit.css\"/>");
-        request.setAttribute("scripts", "/js/edit/entityRetry.js");
-        // NC Commenting this out for now. Going to pass on DWR for moniker and use jQuery instead
-        // request.setAttribute("bodyAttr"," onLoad=\"monikerInit()\"");
-        request.setAttribute("_action",action);
-        request.setAttribute("unqualifiedClassName","Individual");
-        setRequestAttributes(request,epo);
-
-        try {
-            rd.forward(request, response);
-        } catch (Exception e) {
-            log.error("EntityRetryController could not forward to view.");
-            log.error(e.getMessage());
-            log.error(e.getStackTrace());
-        }
-
-    }
-
-    public void doGet (HttpServletRequest request, HttpServletResponse response) {
-        doPost(request, response);
-    }
-
-    class EntityInsertPageForwarder implements PageForwarder {
-
-        public void doForward(HttpServletRequest request, HttpServletResponse response, EditProcessObject epo){
-            String newEntityUrl = "entityEdit?uri=";
-            Individual ent = (Individual) epo.getNewBean();
-            //log.error(ent.getName() + " : " + ent.getURI()+" ; "+ent.getNamespace()+" ; "+ent.getLocalName());
-            if (ent != null && ent.getURI() != null) {
-                try {
-                    newEntityUrl += URLEncoder.encode(ent.getURI(),"UTF-8");
-                    response.sendRedirect(newEntityUrl);
-                } catch (Exception e) {
-                    log.error("EntityInsertPageForwarder could not send redirect.");
-                }
-            } else {
-                try {
-                	String siteAdminUrl = request.getContextPath() + Controllers.SITE_ADMIN;
-                    response.sendRedirect(siteAdminUrl);
-                } catch (IOException e) {
-                    log.error("EntityInsertPageForwarder could not redirect to about page.");
-                }
-            }
-        }
-    }
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.edit;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.collections.map.ListOrderedMap;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vedit.beans.DynamicField;
+import edu.cornell.mannlib.vedit.beans.DynamicFieldRow;
+import edu.cornell.mannlib.vedit.beans.EditProcessObject;
+import edu.cornell.mannlib.vedit.beans.FormObject;
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vedit.beans.Option;
+import edu.cornell.mannlib.vedit.controller.BaseEditController;
+import edu.cornell.mannlib.vedit.forwarder.PageForwarder;
+import edu.cornell.mannlib.vedit.forwarder.impl.UrlForwarder;
+import edu.cornell.mannlib.vedit.util.FormUtils;
+import edu.cornell.mannlib.vedit.validator.impl.RequiredFieldValidator;
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
+import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.edit.utils.RoleLevelOptionsSetup;
+import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
+import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.edit.listener.impl.IndividualDataPropertyStatementProcessor;
+
+public class EntityRetryController extends BaseEditController {
+	
+	private static final Log log = LogFactory.getLog(EntityRetryController.class.getName());
+
+    public void doPost (HttpServletRequest request, HttpServletResponse response) {
+		if (!isAuthorizedToDisplayPage(request, response,
+				SimplePermission.DO_BACK_END_EDITING.ACTIONS)) {
+        	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);
+
+        String action = null;
+        if (epo.getAction() == null) {
+            action = "insert";
+            epo.setAction("insert");
+        } else {
+            action = epo.getAction();
+        }
+        
+        LoginStatusBean loginBean = LoginStatusBean.getBean(request);
+        WebappDaoFactory myWebappDaoFactory = getWebappDaoFactory(loginBean.getUserURI());
+
+        IndividualDao ewDao = myWebappDaoFactory.getIndividualDao();
+        epo.setDataAccessObject(ewDao);
+        VClassDao vcDao = myWebappDaoFactory.getVClassDao();
+        VClassGroupDao cgDao = myWebappDaoFactory.getVClassGroupDao();
+        DataPropertyDao dpDao = myWebappDaoFactory.getDataPropertyDao();
+
+        Individual individualForEditing = null;
+        if (epo.getUseRecycledBean()) {
+            individualForEditing = (Individual)epo.getNewBean();
+        } else {
+            String uri = vreq.getParameter("uri");
+            if (uri != null) {
+                try {
+                    individualForEditing = (Individual)ewDao.getIndividualByURI(uri);
+                    action = "update";
+                    epo.setAction("update");
+                } catch (NullPointerException e) {
+                    log.error("Need to implement 'record not found' error message.");
+                }
+            } else {
+                individualForEditing = new IndividualImpl();
+                if (vreq.getParameter("VClassURI") != null) {
+                    individualForEditing.setVClassURI(vreq.getParameter("VClassURI"));
+                }
+            }
+
+            epo.setOriginalBean(individualForEditing);
+
+            //make a simple mask for the entity's id
+            Object[] simpleMaskPair = new Object[2];
+            simpleMaskPair[0]="URI";
+            simpleMaskPair[1]=individualForEditing.getURI();
+            epo.getSimpleMask().add(simpleMaskPair);
+
+        }
+
+        //set any validators
+
+        LinkedList lnList = new LinkedList();
+        lnList.add(new RequiredFieldValidator());
+        epo.getValidatorMap().put("Name",lnList);
+
+        //make a postinsert pageforwarder that will send us to a new entity's fetch screen
+        epo.setPostInsertPageForwarder(new EntityInsertPageForwarder());
+        epo.setPostDeletePageForwarder(new UrlForwarder(siteAdminUrl));
+
+        //set the getMethod so we can retrieve a new bean after we've inserted it
+        try {
+            Class[] args = new Class[1];
+            args[0] = String.class;
+            epo.setGetMethod(ewDao.getClass().getDeclaredMethod("getIndividualByURI",args));
+        } catch (NoSuchMethodException e) {
+            log.error("EntityRetryController could not find the entityByURI method in the dao");
+        }
+
+        epo.setIdFieldName("URI");
+        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
+	        Iterator classGroupIt = classGroups.iterator();
+	        ListOrderedMap optGroupMap = new ListOrderedMap();
+	        while (classGroupIt.hasNext()) {
+	            VClassGroup group = (VClassGroup)classGroupIt.next();
+	            List classes = group.getVitroClassList();
+	            optGroupMap.put(group.getPublicName(),FormUtils.makeOptionListFromBeans(classes,"URI","Name",individualForEditing.getVClassURI(),null,false));
+	        }
+	        hash.put("VClassURI", optGroupMap);
+        } else {
+        	VClass vClass = null;
+        	Option opt = null;
+        	try {
+        		vClass = vcDao.getVClassByURI(individualForEditing.getVClassURI());
+        	} catch (Exception e) {}
+    		if (vClass != null) {
+    			opt = new Option(vClass.getURI(),vClass.getName(),true);
+    		} else {
+    			opt = new Option(individualForEditing.getVClassURI(),individualForEditing.getVClassURI(),true);
+    		}
+    		List<Option> optList  = new LinkedList<Option>();
+    		optList.add(opt);
+			hash.put("VClassURI", optList);
+        }
+        
+        hash.put("HiddenFromDisplayBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getDisplayOptionsList(individualForEditing));    
+        hash.put("ProhibitedFromUpdateBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getUpdateOptionsList(individualForEditing));
+
+        FormObject foo = new FormObject();
+        foo.setOptionLists(hash);
+
+        ListOrderedMap dpMap = new ListOrderedMap();
+
+        //make dynamic datatype property fields
+        List<VClass> vclasses = individualForEditing.getVClasses(true);
+        if (vclasses == null) {
+        	vclasses = new ArrayList<VClass>();
+        	if (individualForEditing.getVClassURI() != null) {
+        		try {
+	        		VClass cls = vreq.getUnfilteredWebappDaoFactory().getVClassDao().getVClassByURI(individualForEditing.getVClassURI());
+	        		if (cls != null) {
+	        			vclasses.add(cls);
+	        		}
+        		} catch (Exception e) {}
+        	}
+        }
+        List<DataProperty> allApplicableDataprops = new ArrayList<DataProperty>();
+        for (VClass cls : vclasses) {
+        	List<DataProperty> dataprops = dpDao.getDataPropertiesForVClass(cls.getURI());
+        	for (DataProperty dp : dataprops) {
+        		boolean notDuplicate = true;
+        		for (DataProperty existingDp : allApplicableDataprops) {
+        			if (existingDp.getURI().equals(dp.getURI())) {
+        				notDuplicate = false;
+        				break;
+        			}
+        		}
+        		if (notDuplicate) {
+        			allApplicableDataprops.add(dp);
+        		}
+        	}
+        }
+        Collections.sort(allApplicableDataprops);
+        
+        if (allApplicableDataprops != null) {
+            Iterator<DataProperty> datapropsIt = allApplicableDataprops.iterator();
+
+            while (datapropsIt.hasNext()){
+                DataProperty d = datapropsIt.next();
+                if (!dpMap.containsKey(d.getURI())) {
+                    dpMap.put(d.getURI(),d);
+                }
+            }
+
+            if (individualForEditing.getDataPropertyList() != null) {
+                Iterator<DataProperty> existingDps = individualForEditing.getDataPropertyList().iterator();
+                while (existingDps.hasNext()) {
+                    DataProperty existingDp = existingDps.next();
+                    dpMap.put(existingDp.getURI(),existingDp);
+                }
+            }
+
+            List<DynamicField> dynamicFields = new ArrayList();
+            Iterator<String> dpHashIt = dpMap.orderedMapIterator();
+            while (dpHashIt.hasNext()) {
+                String uri = dpHashIt.next();
+                DataProperty dp = (DataProperty) dpMap.get(uri);
+                DynamicField dynamo = new DynamicField();
+                dynamo.setName(dp.getPublicName());
+                dynamo.setTable("DataPropertyStatement");
+                dynamo.setVisible(dp.getDisplayLimit());
+                dynamo.setDeleteable(true);
+                DynamicFieldRow rowTemplate = new DynamicFieldRow();
+                Map parameterMap = new HashMap();
+                parameterMap.put("DatatypePropertyURI", dp.getURI());
+                rowTemplate.setParameterMap(parameterMap);
+                dynamo.setRowTemplate(rowTemplate);
+                try {
+                    Iterator<DataPropertyStatement> existingValues = dp.getDataPropertyStatements().iterator();
+                    while (existingValues.hasNext()) {
+                        DataPropertyStatement existingValue = existingValues.next();
+                        DynamicFieldRow row = new DynamicFieldRow();
+                        //TODO: UGH
+                        //row.setId(existingValue.getId());
+                        row.setParameterMap(parameterMap);
+                        row.setValue(existingValue.getData());
+                        if (dynamo.getRowList() == null)
+                            dynamo.setRowList(new ArrayList());
+                        dynamo.getRowList().add(row);
+                    }
+                } catch (NullPointerException npe) {
+                    //whatever
+                }
+                if (dynamo.getRowList() == null)
+                    dynamo.setRowList(new ArrayList());
+                dynamo.getRowList().add(rowTemplate);
+                dynamicFields.add(dynamo);
+            }
+            foo.setDynamicFields(dynamicFields);
+        }
+
+        foo.setErrorMap(epo.getErrMsgMap());
+
+        epo.setFormObject(foo);
+
+        // DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        DateFormat minutesOnlyDateFormat = new SimpleDateFormat ("yyyy-MM-dd HH:mm");
+        DateFormat dateOnlyFormat = new SimpleDateFormat("yyyy-MM-dd");
+        FormUtils.populateFormFromBean(individualForEditing,action,epo,foo,epo.getBadValueMap());
+
+        List cList = new ArrayList();
+        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();
+        
+        RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
+        request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp");
+        request.setAttribute("formJsp","/templates/edit/specific/entity_retry.jsp");
+        request.setAttribute("epoKey",epo.getKey());
+        request.setAttribute("title","Individual Editing Form");
+        request.setAttribute("css", "<link rel=\"stylesheet\" type=\"text/css\" href=\""+appBean.getThemeDir()+"css/edit.css\"/>");
+        request.setAttribute("scripts", "/js/edit/entityRetry.js");
+        // NC Commenting this out for now. Going to pass on DWR for moniker and use jQuery instead
+        // request.setAttribute("bodyAttr"," onLoad=\"monikerInit()\"");
+        request.setAttribute("_action",action);
+        request.setAttribute("unqualifiedClassName","Individual");
+        setRequestAttributes(request,epo);
+
+        try {
+            rd.forward(request, response);
+        } catch (Exception e) {
+            log.error("EntityRetryController could not forward to view.");
+            log.error(e.getMessage());
+            log.error(e.getStackTrace());
+        }
+
+    }
+
+    public void doGet (HttpServletRequest request, HttpServletResponse response) {
+        doPost(request, response);
+    }
+
+    class EntityInsertPageForwarder implements PageForwarder {
+
+        public void doForward(HttpServletRequest request, HttpServletResponse response, EditProcessObject epo){
+            String newEntityUrl = "entityEdit?uri=";
+            Individual ent = (Individual) epo.getNewBean();
+            //log.error(ent.getName() + " : " + ent.getURI()+" ; "+ent.getNamespace()+" ; "+ent.getLocalName());
+            if (ent != null && ent.getURI() != null) {
+                try {
+                    newEntityUrl += URLEncoder.encode(ent.getURI(),"UTF-8");
+                    response.sendRedirect(newEntityUrl);
+                } catch (Exception e) {
+                    log.error("EntityInsertPageForwarder could not send redirect.");
+                }
+            } else {
+                try {
+                	String siteAdminUrl = request.getContextPath() + Controllers.SITE_ADMIN;
+                    response.sendRedirect(siteAdminUrl);
+                } catch (IOException e) {
+                    log.error("EntityInsertPageForwarder could not redirect to about page.");
+                }
+            }
+        }
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java
index 2e2eb1422..8735b79f7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/MenuManagementEdit.java
@@ -1,205 +1,205 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.edit;
-
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.json.JSONObject;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.jena.shared.Lock;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
-
-/**
- *Process edits from display model editing, so form should submit to this page which should
- *then process the parameters and then make the necessary changes to the model.
- */
-public class MenuManagementEdit extends VitroHttpServlet {
-   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; 
-    
-    @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);
-    	} else {
-    		log.error("Command is null");
-    	}
-        //Need to redirect correctly
-    	if(!isReorder(command)){
-    		resp.sendRedirect(rawRequest.getContextPath() + REDIRECT_URL);
-    	} else {
-    		
-    	}
-    }
-
-
-	public String getCommand(VitroRequest vreq) {
-    	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) {
-
-    	OntModel displayModel = getDisplayModel(vreq);
-    	if(displayModel == null) {
-    		//Throw some kind of exception
-    		log.error("Display model not being retrieved correctly");
-    	}
-    	//if Add, then create new menu item and new page elements, and use the values above
-    	String errorMessage = "";
-    	if(isReorder(command)) {
-    		errorMessage = processReorder(displayModel, vreq);
-    	}
-    	
-    	//Edits to model occur here
-    	displayModel.enterCriticalSection(Lock.WRITE);
-    	try {
-    		//Output statements to be removed to log
-    		log.debug("Statement to be removed are ");
-    		StringWriter r = new StringWriter();
-			removeStatements.write(r, "N3");
-    		log.debug(r.toString());
-    		r.close();
-    		//Output statements to be added to log
-    		log.debug("Statements to be added are ");
-    		StringWriter a = new StringWriter();
-    		addStatements.write(a, "N3");
-    		log.debug(a.toString());
-    		a.close();
-    		//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); 
-		} else {
-			errorMessage = "No individuals passed";
-		}
-		return errorMessage;
-	}
-    
-    private void sendReorderResponse(String errorMessage, HttpServletResponse resp) {
-    	try{
-			JSONObject rObj = new JSONObject();
-			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) {
-			log.error("Error creating JSON object for response", ex);
-		}
-    }
-
-
-	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, 
-					(RDFNode) null));
-			
-		}
-		
-		return removePositionStatements;
-	}
-
-	private Model addPositionStatements(OntModel displayModel,
-			String[] individuals) {
-		Model addPositionStatements = ModelFactory.createDefaultModel();
-		int index = 0;
-		int len = individuals.length;
-		for(index = 0; index < len; index++) {
-			Resource individualResource = ResourceFactory.createResource(individuals[index]);
-			int position = index + 1;
-			addPositionStatements.add(addPositionStatements.createStatement(
-					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) {
-    	if(vreq.getAttribute(vreq.SPECIAL_WRITE_MODEL) != null) {
-    		return vreq.getJenaOntModel();
-    	} else {
-    		return vreq.getDisplayModel();
-    	}
-    }
-    Log log = LogFactory.getLog(MenuManagementEdit.class);
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.edit;
+
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONObject;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+import com.hp.hpl.jena.shared.Lock;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+
+/**
+ *Process edits from display model editing, so form should submit to this page which should
+ *then process the parameters and then make the necessary changes to the model.
+ */
+public class MenuManagementEdit extends VitroHttpServlet {
+   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; 
+    
+    @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);
+    	} else {
+    		log.error("Command is null");
+    	}
+        //Need to redirect correctly
+    	if(!isReorder(command)){
+    		resp.sendRedirect(rawRequest.getContextPath() + REDIRECT_URL);
+    	} else {
+    		
+    	}
+    }
+
+
+	public String getCommand(VitroRequest vreq) {
+    	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) {
+
+    	OntModel displayModel = getDisplayModel(vreq);
+    	if(displayModel == null) {
+    		//Throw some kind of exception
+    		log.error("Display model not being retrieved correctly");
+    	}
+    	//if Add, then create new menu item and new page elements, and use the values above
+    	String errorMessage = "";
+    	if(isReorder(command)) {
+    		errorMessage = processReorder(displayModel, vreq);
+    	}
+    	
+    	//Edits to model occur here
+    	displayModel.enterCriticalSection(Lock.WRITE);
+    	try {
+    		//Output statements to be removed to log
+    		log.debug("Statement to be removed are ");
+    		StringWriter r = new StringWriter();
+			removeStatements.write(r, "N3");
+    		log.debug(r.toString());
+    		r.close();
+    		//Output statements to be added to log
+    		log.debug("Statements to be added are ");
+    		StringWriter a = new StringWriter();
+    		addStatements.write(a, "N3");
+    		log.debug(a.toString());
+    		a.close();
+    		//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); 
+		} else {
+			errorMessage = "No individuals passed";
+		}
+		return errorMessage;
+	}
+    
+    private void sendReorderResponse(String errorMessage, HttpServletResponse resp) {
+    	try{
+			JSONObject rObj = new JSONObject();
+			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) {
+			log.error("Error creating JSON object for response", ex);
+		}
+    }
+
+
+	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, 
+					(RDFNode) null));
+			
+		}
+		
+		return removePositionStatements;
+	}
+
+	private Model addPositionStatements(OntModel displayModel,
+			String[] individuals) {
+		Model addPositionStatements = ModelFactory.createDefaultModel();
+		int index = 0;
+		int len = individuals.length;
+		for(index = 0; index < len; index++) {
+			Resource individualResource = ResourceFactory.createResource(individuals[index]);
+			int position = index + 1;
+			addPositionStatements.add(addPositionStatements.createStatement(
+					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) {
+    	if(vreq.getAttribute(vreq.SPECIAL_WRITE_MODEL) != null) {
+    		return vreq.getJenaOntModel();
+    	} else {
+    		return vreq.getDisplayModel();
+    	}
+    }
+    Log log = LogFactory.getLog(MenuManagementEdit.class);
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java
index 8f23b99d6..760c1905b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/PropertyRetryController.java
@@ -1,7 +1,7 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller.edit;
-
+package edu.cornell.mannlib.vitro.webapp.controller.edit;
+
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.text.Collator;
@@ -40,173 +40,173 @@ import edu.cornell.mannlib.vitro.webapp.controller.edit.utils.RoleLevelOptionsSe
 import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
-
-public class PropertyRetryController extends BaseEditController {
-    
-    private static final Log log = LogFactory.getLog(PropertyRetryController.class.getName());
-    
+
+public class PropertyRetryController extends BaseEditController {
+    
+    private static final Log log = LogFactory.getLog(PropertyRetryController.class.getName());
+    
     @Override
-    public void doPost (HttpServletRequest req, HttpServletResponse response) {
+    public void doPost (HttpServletRequest req, HttpServletResponse response) {
         if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) {
             return;
         }
 
-        VitroRequest request = new VitroRequest(req);
-
-        //create an EditProcessObject for this and put it in the session
-        EditProcessObject epo = super.createEpo(request);
-
-        /*for testing*/
-        ObjectProperty testMask = new ObjectProperty();
-        epo.setBeanClass(ObjectProperty.class);
-        epo.setBeanMask(testMask);
-
-        String action = null;
-        if (epo.getAction() == null) {
-            action = "insert";
-            epo.setAction("insert");
-        } else {
-            action = epo.getAction();
-        }
-
-        ObjectPropertyDao propDao = request.getUnfilteredWebappDaoFactory().getObjectPropertyDao();
-        epo.setDataAccessObject(propDao);
-        OntologyDao ontDao = request.getUnfilteredWebappDaoFactory().getOntologyDao();
-        VClassDao vclassDao = request.getUnfilteredWebappDaoFactory().getVClassDao();
-
-        ObjectProperty propertyForEditing = null;
-        if (!epo.getUseRecycledBean()){
-            String uri = request.getParameter("uri");
-            if (uri != null) {
-                try {
-                    propertyForEditing = propDao.getObjectPropertyByURI(uri);
-                    action = "update";
-                    epo.setAction("update");
-                } catch (NullPointerException e) {
-                    log.error("Need to implement 'record not found' error message.");
-                }
-            } else {
-                propertyForEditing = new ObjectProperty();
-                if (request.getParameter("parentId") != null) {
-                    propertyForEditing.setParentURI(request.getParameter("parentId"));
-                }
-                if (request.getParameter("domainClassUri") != null) {
-                    propertyForEditing.setDomainVClassURI(request.getParameter("domainClassUri"));
-                }
-            }
-            epo.setOriginalBean(propertyForEditing);
-        } else {
-            propertyForEditing = (ObjectProperty) epo.getNewBean();
-        }
-
-        //make a simple mask for the class's id
-        Object[] simpleMaskPair = new Object[2];
-        simpleMaskPair[0]="Id";
-        simpleMaskPair[1]=propertyForEditing.getURI();
-        epo.getSimpleMask().add(simpleMaskPair);
-
-
-        //set any validators
-        List localNameValidatorList = new ArrayList();
-        localNameValidatorList.add(new XMLNameValidator());
-        List localNameInverseValidatorList = new ArrayList();
-        localNameInverseValidatorList.add(new XMLNameValidator(true));
-        epo.getValidatorMap().put("LocalName", localNameValidatorList);
+        VitroRequest request = new VitroRequest(req);
+
+        //create an EditProcessObject for this and put it in the session
+        EditProcessObject epo = super.createEpo(request);
+
+        /*for testing*/
+        ObjectProperty testMask = new ObjectProperty();
+        epo.setBeanClass(ObjectProperty.class);
+        epo.setBeanMask(testMask);
+
+        String action = null;
+        if (epo.getAction() == null) {
+            action = "insert";
+            epo.setAction("insert");
+        } else {
+            action = epo.getAction();
+        }
+
+        ObjectPropertyDao propDao = request.getUnfilteredWebappDaoFactory().getObjectPropertyDao();
+        epo.setDataAccessObject(propDao);
+        OntologyDao ontDao = request.getUnfilteredWebappDaoFactory().getOntologyDao();
+        VClassDao vclassDao = request.getUnfilteredWebappDaoFactory().getVClassDao();
+
+        ObjectProperty propertyForEditing = null;
+        if (!epo.getUseRecycledBean()){
+            String uri = request.getParameter("uri");
+            if (uri != null) {
+                try {
+                    propertyForEditing = propDao.getObjectPropertyByURI(uri);
+                    action = "update";
+                    epo.setAction("update");
+                } catch (NullPointerException e) {
+                    log.error("Need to implement 'record not found' error message.");
+                }
+            } else {
+                propertyForEditing = new ObjectProperty();
+                if (request.getParameter("parentId") != null) {
+                    propertyForEditing.setParentURI(request.getParameter("parentId"));
+                }
+                if (request.getParameter("domainClassUri") != null) {
+                    propertyForEditing.setDomainVClassURI(request.getParameter("domainClassUri"));
+                }
+            }
+            epo.setOriginalBean(propertyForEditing);
+        } else {
+            propertyForEditing = (ObjectProperty) epo.getNewBean();
+        }
+
+        //make a simple mask for the class's id
+        Object[] simpleMaskPair = new Object[2];
+        simpleMaskPair[0]="Id";
+        simpleMaskPair[1]=propertyForEditing.getURI();
+        epo.getSimpleMask().add(simpleMaskPair);
+
+
+        //set any validators
+        List localNameValidatorList = new ArrayList();
+        localNameValidatorList.add(new XMLNameValidator());
+        List localNameInverseValidatorList = new ArrayList();
+        localNameInverseValidatorList.add(new XMLNameValidator(true));
+        epo.getValidatorMap().put("LocalName", localNameValidatorList);
         epo.getValidatorMap().put("LocalNameInverse", localNameInverseValidatorList);
         List<Validator> displayRankValidatorList = new ArrayList<Validator>();
         displayRankValidatorList.add(new IntValidator());
-        epo.getValidatorMap().put("DisplayRank", displayRankValidatorList);
-
-        //set up any listeners
-        List changeListenerList = new ArrayList();
-        changeListenerList.add(new PropertyRestrictionListener(getServletContext()));
-        epo.setChangeListenerList(changeListenerList);
-
-        //make a postinsert pageforwarder that will send us to a new class's fetch screen
-        epo.setPostInsertPageForwarder(new PropertyInsertPageForwarder());
-        //make a postdelete pageforwarder that will send us to the list of properties
-        epo.setPostDeletePageForwarder(new UrlForwarder("listPropertyWebapps"));
-
-        //set the getMethod so we can retrieve a new bean after we've inserted it
-        try {
-            Class[] args = new Class[1];
-            args[0] = String.class;
-            epo.setGetMethod(propDao.getClass().getDeclaredMethod("getObjectPropertyByURI",args));
-        } catch (NoSuchMethodException e) {
-            log.error("PropertyRetryController could not find the getPropertyByURI method in the PropertyWebappDao");
-        }
-
-        FormObject foo = new FormObject();
-        foo.setErrorMap(epo.getErrMsgMap());     
-
-        HashMap<String, List<Option>> optionMap = new HashMap<String, List<Option>>();
-        try {
-            populateOptionMap(optionMap, propertyForEditing, request, ontDao, propDao);
-        } catch (Exception e) {
+        epo.getValidatorMap().put("DisplayRank", displayRankValidatorList);
+
+        //set up any listeners
+        List changeListenerList = new ArrayList();
+        changeListenerList.add(new PropertyRestrictionListener(getServletContext()));
+        epo.setChangeListenerList(changeListenerList);
+
+        //make a postinsert pageforwarder that will send us to a new class's fetch screen
+        epo.setPostInsertPageForwarder(new PropertyInsertPageForwarder());
+        //make a postdelete pageforwarder that will send us to the list of properties
+        epo.setPostDeletePageForwarder(new UrlForwarder("listPropertyWebapps"));
+
+        //set the getMethod so we can retrieve a new bean after we've inserted it
+        try {
+            Class[] args = new Class[1];
+            args[0] = String.class;
+            epo.setGetMethod(propDao.getClass().getDeclaredMethod("getObjectPropertyByURI",args));
+        } catch (NoSuchMethodException e) {
+            log.error("PropertyRetryController could not find the getPropertyByURI method in the PropertyWebappDao");
+        }
+
+        FormObject foo = new FormObject();
+        foo.setErrorMap(epo.getErrMsgMap());     
+
+        HashMap<String, List<Option>> optionMap = new HashMap<String, List<Option>>();
+        try {
+            populateOptionMap(optionMap, propertyForEditing, request, ontDao, propDao);
+        } catch (Exception e) {
             log.error(e, e);
-            throw new RuntimeException(e);
-        }
-
-        optionMap.put("HiddenFromDisplayBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getDisplayOptionsList(propertyForEditing));    
-        optionMap.put("ProhibitedFromUpdateBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getUpdateOptionsList(propertyForEditing));
-
-        List groupOptList = FormUtils.makeOptionListFromBeans(request.getUnfilteredWebappDaoFactory().getPropertyGroupDao().getPublicGroups(true),"URI","Name", ((propertyForEditing.getGroupURI()==null) ? "" : propertyForEditing.getGroupURI()), null, (propertyForEditing.getGroupURI()!=null));
+            throw new RuntimeException(e);
+        }
+
+        optionMap.put("HiddenFromDisplayBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getDisplayOptionsList(propertyForEditing));    
+        optionMap.put("ProhibitedFromUpdateBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getUpdateOptionsList(propertyForEditing));
+
+        List 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);
-        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());
-        request.setAttribute("inverseFunctional",propertyForEditing.getInverseFunctional());
-        request.setAttribute("selectFromExisting",propertyForEditing.getSelectFromExisting());
-        request.setAttribute("offerCreateNewOption", propertyForEditing.getOfferCreateNewOption());
+        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());
+        request.setAttribute("inverseFunctional",propertyForEditing.getInverseFunctional());
+        request.setAttribute("selectFromExisting",propertyForEditing.getSelectFromExisting());
+        request.setAttribute("offerCreateNewOption", propertyForEditing.getOfferCreateNewOption());
         //request.setAttribute("stubObjectRelation", propertyForEditing.getStubObjectRelation());
         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);
-            propertyForEditing.setSymmetric(false);
-            propertyForEditing.setFunctional(false);
-            propertyForEditing.setInverseFunctional(false);
-            propertyForEditing.setSelectFromExisting(false);
-            propertyForEditing.setOfferCreateNewOption(false);
+        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);
+            propertyForEditing.setSymmetric(false);
+            propertyForEditing.setFunctional(false);
+            propertyForEditing.setInverseFunctional(false);
+            propertyForEditing.setSelectFromExisting(false);
+            propertyForEditing.setOfferCreateNewOption(false);
             //propertyForEditing.setStubObjectRelation(false);
-            propertyForEditing.setCollateBySubclass(false);
-        }
-
-        epo.setFormObject(foo);
-
-        FormUtils.populateFormFromBean(propertyForEditing,action,foo,epo.getBadValueMap());
-
-        RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
-        request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp");
-        request.setAttribute("colspan","5");
-        request.setAttribute("formJsp","/templates/edit/specific/property_retry.jsp");
-        request.setAttribute("scripts","/templates/edit/formBasic.js");
-        request.setAttribute("title","Property Editing Form");
-        request.setAttribute("_action",action);
-        setRequestAttributes(request,epo);
-
-        try {
-            rd.forward(request, response);
-        } catch (Exception e) {
-            log.error("PropertyRetryController could not forward to view.");
-            log.error(e.getMessage());
-            log.error(e.getStackTrace());
-        }
-
-    }
-
-    public void doGet (HttpServletRequest request, HttpServletResponse response) {
-        doPost(request, response);
-    }
+            propertyForEditing.setCollateBySubclass(false);
+        }
+
+        epo.setFormObject(foo);
+
+        FormUtils.populateFormFromBean(propertyForEditing,action,foo,epo.getBadValueMap());
+
+        RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
+        request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp");
+        request.setAttribute("colspan","5");
+        request.setAttribute("formJsp","/templates/edit/specific/property_retry.jsp");
+        request.setAttribute("scripts","/templates/edit/formBasic.js");
+        request.setAttribute("title","Property Editing Form");
+        request.setAttribute("_action",action);
+        setRequestAttributes(request,epo);
+
+        try {
+            rd.forward(request, response);
+        } catch (Exception e) {
+            log.error("PropertyRetryController could not forward to view.");
+            log.error(e.getMessage());
+            log.error(e.getStackTrace());
+        }
+
+    }
+
+    public void doGet (HttpServletRequest request, HttpServletResponse response) {
+        doPost(request, response);
+    }
 
     private void populateOptionMap(HashMap<String, List<Option>> optionMap, 
                                    ObjectProperty propertyForEditing, 
@@ -283,35 +283,35 @@ public class PropertyRetryController extends BaseEditController {
         rangeOptionList.add(0, new Option("","(none specified)"));
         optionMap.put("RangeVClassURI", rangeOptionList);
     }
-    
-    private List<VClass> makeVClassListForOptions(String VClassURI, List<VClass> allClassBeanList, VClassDao vclassDao) {
-        List<VClass> currentClassList = new ArrayList<VClass>();
-        VClass currentVClass = vclassDao.getVClassByURI(VClassURI);
-        if (currentVClass != null && currentVClass.isAnonymous()) {
-            currentClassList.addAll(allClassBeanList);
-            currentClassList.add(0,currentVClass);
-        } else {
-            currentClassList = allClassBeanList; 
-        }
-        return currentClassList;
-    }
-    
-    class PropertyInsertPageForwarder implements PageForwarder {
-
-        public void doForward(HttpServletRequest request, HttpServletResponse response, EditProcessObject epo){
-            String newPropertyUrl = "propertyEdit?uri=";
-            ObjectProperty p = (ObjectProperty) epo.getNewBean();
-            try {
-                newPropertyUrl += URLEncoder.encode(p.getURI(),"UTF-8");
-            } catch (Exception e) {
-                log.error(this.getClass().getName()+" could not use UTF-8 encoding to encode new URL");
-            }
-            try {
-                response.sendRedirect(newPropertyUrl);
-            } catch (IOException ioe) {
-                log.error("PropertyInsertPageForwarder could not send redirect.");
-            }
-        }
+    
+    private List<VClass> makeVClassListForOptions(String VClassURI, List<VClass> allClassBeanList, VClassDao vclassDao) {
+        List<VClass> currentClassList = new ArrayList<VClass>();
+        VClass currentVClass = vclassDao.getVClassByURI(VClassURI);
+        if (currentVClass != null && currentVClass.isAnonymous()) {
+            currentClassList.addAll(allClassBeanList);
+            currentClassList.add(0,currentVClass);
+        } else {
+            currentClassList = allClassBeanList; 
+        }
+        return currentClassList;
+    }
+    
+    class PropertyInsertPageForwarder implements PageForwarder {
+
+        public void doForward(HttpServletRequest request, HttpServletResponse response, EditProcessObject epo){
+            String newPropertyUrl = "propertyEdit?uri=";
+            ObjectProperty p = (ObjectProperty) epo.getNewBean();
+            try {
+                newPropertyUrl += URLEncoder.encode(p.getURI(),"UTF-8");
+            } catch (Exception e) {
+                log.error(this.getClass().getName()+" could not use UTF-8 encoding to encode new URL");
+            }
+            try {
+                response.sendRedirect(newPropertyUrl);
+            } catch (IOException ioe) {
+                log.error("PropertyInsertPageForwarder could not send redirect.");
+            }
+        }
     }
     
     public List<Option> getSortedList(HashMap<String,Option> hashMap, List<Option> optionList){
@@ -342,5 +342,5 @@ public class PropertyRetryController extends BaseEditController {
               options.add(hashMap.get(itrStr.next()));
           }
           return options;
-      }
-}
+      }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java
index f643fe304..2e871b756 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/VclassRetryController.java
@@ -1,227 +1,227 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.edit;
-
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vedit.beans.EditProcessObject;
-import edu.cornell.mannlib.vedit.beans.FormObject;
-import edu.cornell.mannlib.vedit.beans.Option;
-import edu.cornell.mannlib.vedit.controller.BaseEditController;
-import edu.cornell.mannlib.vedit.forwarder.PageForwarder;
-import edu.cornell.mannlib.vedit.forwarder.impl.UrlForwarder;
-import edu.cornell.mannlib.vedit.listener.ChangeListener;
-import edu.cornell.mannlib.vedit.util.FormUtils;
-import edu.cornell.mannlib.vedit.validator.impl.XMLNameValidator;
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.beans.Classes2Classes;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.edit.utils.RoleLevelOptionsSetup;
-import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
-import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
-import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-
-public class VclassRetryController extends BaseEditController {
-	
-	private static final Log log = LogFactory.getLog(VclassRetryController.class.getName());
-
-    public void doPost (HttpServletRequest req, HttpServletResponse response) {
-        if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) {
-        	return;
-        }
-
-    	VitroRequest request = new VitroRequest(req);
-    	
-        //create an EditProcessObject for this and put it in the session
-        EditProcessObject epo = super.createEpo(request);
-
-        /*for testing*/
-        VClass testMask = new VClass();
-        epo.setBeanClass(VClass.class);
-        epo.setImplementationClass(VClass.class);
-        epo.setBeanMask(testMask);
-
-        String action = null;
-        if (epo.getAction() == null) {
-            action = "insert";
-            epo.setAction("insert");
-        } else {
-            action = epo.getAction();
-        }
-
-        VClassDao vcwDao = request.getUnfilteredAssertionsWebappDaoFactory().getVClassDao();
-        epo.setDataAccessObject(vcwDao);
-        VClassGroupDao cgDao = request.getUnfilteredWebappDaoFactory().getVClassGroupDao();
-        OntologyDao oDao = request.getUnfilteredWebappDaoFactory().getOntologyDao();
-
-        VClass vclassForEditing = null;
-        if (!epo.getUseRecycledBean()){
-            if (request.getParameter("uri") != null) {
-                try {
-                    vclassForEditing = (VClass)vcwDao.getVClassByURI(request.getParameter("uri"));
-                    action = "update";
-                    epo.setAction("update");
-                } catch (NullPointerException e) {
-                    log.error("Need to implement 'record not found' error message.");
-                }
-            } else {
-                vclassForEditing = new VClass();
-                if (request.getParameter("GroupId") != null) {
-                    try {
-                        vclassForEditing.setGroupURI(request.getParameter("GroupURI"));
-                    } catch (NumberFormatException e) {
-                        // too bad
-                    }
-                }
-            }
-            epo.setOriginalBean(vclassForEditing);
-        } else {
-            vclassForEditing = (VClass) epo.getNewBean();
-            // action = "update";
-            // log.error("using newBean");
-        }
-
-        //make a simple mask for the class's id
-        Object[] simpleMaskPair = new Object[2];
-        simpleMaskPair[0]="URI";
-        simpleMaskPair[1]=vclassForEditing.getURI();
-        epo.getSimpleMask().add(simpleMaskPair);
-
-        //validators
-        List localNameValidatorList = new ArrayList();
-        localNameValidatorList.add(new XMLNameValidator());
-        epo.getValidatorMap().put("LocalName",localNameValidatorList);
-
-        //set up any listeners
-        List changeListenerList = new LinkedList();
-        if (request.getParameter("superclassUri") != null) {
-            changeListenerList.add(new SubclassListener(request.getParameter("superclassUri"), request.getUnfilteredWebappDaoFactory()));
-        }
-        epo.setChangeListenerList(changeListenerList);
-
-        //make a postinsert pageforwarder that will send us to a new class's fetch screen
-        epo.setPostInsertPageForwarder(new VclassInsertPageForwarder());
-        //make a postdelete pageforwarder that will send us to the list of classes
-        epo.setPostDeletePageForwarder(new UrlForwarder("showClassHierarchy"));
-
-        //set the getMethod so we can retrieve a new bean after we've inserted it
-        try {
-            Class[] args = new Class[1];
-            args[0] = String.class;
-            epo.setGetMethod(VClassDao.class.getDeclaredMethod("getVClassByURI",args));
-        } catch (NoSuchMethodException e) {
-            log.error(this.getClass().getName()+" could not find the getVClassByURI method");
-        }
-
-        HashMap<String, List<Option>> optionMap = new HashMap<String,List<Option>>();
-        try {
-            VClassGroupDao vcgDao = request.getUnfilteredWebappDaoFactory().getVClassGroupDao();
-            List classGroupOptionList = FormUtils.makeOptionListFromBeans(vcgDao.getPublicGroupsWithVClasses(),"URI","PublicName",vclassForEditing.getGroupURI(),null,(vclassForEditing.getGroupURI()!=null && !(vclassForEditing.getGroupURI().equals(""))));
-            classGroupOptionList.add(0,new Option("", "none", ("update".equals(action) && (vclassForEditing.getGroupURI()==null || vclassForEditing.getGroupURI().equals("")))));
-            optionMap.put("GroupURI", classGroupOptionList);
-
-        } catch (Exception e) {
-            log.error("unable to create GroupId option list");
-        }
-        try {
-            List namespaceIdList = (action.equals("insert"))
-                    ? FormUtils.makeOptionListFromBeans(oDao.getAllOntologies(),"URI","Name", ((vclassForEditing.getNamespace()==null) ? "" : vclassForEditing.getNamespace()), null, false)
-                    : FormUtils.makeOptionListFromBeans(oDao.getAllOntologies(),"URI","Name", ((vclassForEditing.getNamespace()==null) ? "" : vclassForEditing.getNamespace()), null, true);
-	        namespaceIdList.add(0, new Option(request.getUnfilteredWebappDaoFactory().getDefaultNamespace(),"default"));
-            optionMap.put("Namespace", namespaceIdList);
-        } catch (Exception e) {
-            log.error(this.getClass().getName() + "unable to create Namespace option list");
-        }
-
-        optionMap.put("HiddenFromDisplayBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getDisplayOptionsList(vclassForEditing));    
-        optionMap.put("ProhibitedFromUpdateBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getUpdateOptionsList(vclassForEditing));
-
-        FormObject foo = new FormObject();
-        foo.setErrorMap(epo.getErrMsgMap());
-        foo.setOptionLists(optionMap);
-
-        epo.setFormObject(foo);
-
-        request.setAttribute("formValue",foo.getValues());
-
-        FormUtils.populateFormFromBean(vclassForEditing,action,foo,epo.getBadValueMap());
-
-        RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
-        request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp");
-        request.setAttribute("formJsp","/templates/edit/specific/vclass_retry.jsp");
-        request.setAttribute("colspan","4");
-        request.setAttribute("scripts","/templates/edit/formBasic.js");
-        request.setAttribute("title","Class Editing Form");
-        request.setAttribute("_action",action);
-        request.setAttribute("unqualifiedClassName","VClass");
-        setRequestAttributes(request,epo);
-
-        try {
-            rd.forward(request, response);
-        } catch (Exception e) {
-            log.error("VclassRetryController could not forward to view.", e);
-            throw new RuntimeException(e);
-        }
-
-    }
-
-    public void doGet (HttpServletRequest request, HttpServletResponse response) {
-        doPost(request, response);
-    }
-
-    /** This listener allows us to link a new class to a parent upon creation */
-    class SubclassListener implements ChangeListener {
-        String superclassURI = null;
-        WebappDaoFactory daoFactory = null;
-        public SubclassListener(String superclassURI, WebappDaoFactory cdf) {
-            this.superclassURI = superclassURI;
-            this.daoFactory = cdf;
-        }
-        public void doInserted(Object newObj, EditProcessObject epo) {
-            Classes2Classes c2c = new Classes2Classes();
-            c2c.setSubclassURI(((VClass)newObj).getURI());
-            c2c.setSuperclassURI(superclassURI);
-            daoFactory.getVClassDao().insertNewClasses2Classes(c2c);            
-        }
-        public void doUpdated(Object oldObj, Object newObj, EditProcessObject epo) {
-            // nothing to do
-        }
-        public void doDeleted(Object oldObj, EditProcessObject epo) {
-            // nothing to do
-        }
-    }
-
-    class VclassInsertPageForwarder implements PageForwarder {
-
-        public void doForward(HttpServletRequest request, HttpServletResponse response, EditProcessObject epo){
-            String newVclassUrl = "vclassEdit?uri=";
-            VClass vcl = (VClass) epo.getNewBean();
-            try {
-                newVclassUrl += URLEncoder.encode(vcl.getURI(),"UTF-8");
-            } catch (Exception e) {
-                log.error(this.getClass().getName()+" could not use UTF-8 encoding to encode new URL");
-            }
-            try {
-                response.sendRedirect(newVclassUrl);
-            } catch (IOException ioe) {
-                log.error("VclassInsertPageForwarder could not send redirect.");
-            }
-        }
-    }
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.edit;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vedit.beans.EditProcessObject;
+import edu.cornell.mannlib.vedit.beans.FormObject;
+import edu.cornell.mannlib.vedit.beans.Option;
+import edu.cornell.mannlib.vedit.controller.BaseEditController;
+import edu.cornell.mannlib.vedit.forwarder.PageForwarder;
+import edu.cornell.mannlib.vedit.forwarder.impl.UrlForwarder;
+import edu.cornell.mannlib.vedit.listener.ChangeListener;
+import edu.cornell.mannlib.vedit.util.FormUtils;
+import edu.cornell.mannlib.vedit.validator.impl.XMLNameValidator;
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.beans.Classes2Classes;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.edit.utils.RoleLevelOptionsSetup;
+import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+
+public class VclassRetryController extends BaseEditController {
+	
+	private static final Log log = LogFactory.getLog(VclassRetryController.class.getName());
+
+    public void doPost (HttpServletRequest req, HttpServletResponse response) {
+        if (!isAuthorizedToDisplayPage(req, response, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) {
+        	return;
+        }
+
+    	VitroRequest request = new VitroRequest(req);
+    	
+        //create an EditProcessObject for this and put it in the session
+        EditProcessObject epo = super.createEpo(request);
+
+        /*for testing*/
+        VClass testMask = new VClass();
+        epo.setBeanClass(VClass.class);
+        epo.setImplementationClass(VClass.class);
+        epo.setBeanMask(testMask);
+
+        String action = null;
+        if (epo.getAction() == null) {
+            action = "insert";
+            epo.setAction("insert");
+        } else {
+            action = epo.getAction();
+        }
+
+        VClassDao vcwDao = request.getUnfilteredAssertionsWebappDaoFactory().getVClassDao();
+        epo.setDataAccessObject(vcwDao);
+        VClassGroupDao cgDao = request.getUnfilteredWebappDaoFactory().getVClassGroupDao();
+        OntologyDao oDao = request.getUnfilteredWebappDaoFactory().getOntologyDao();
+
+        VClass vclassForEditing = null;
+        if (!epo.getUseRecycledBean()){
+            if (request.getParameter("uri") != null) {
+                try {
+                    vclassForEditing = (VClass)vcwDao.getVClassByURI(request.getParameter("uri"));
+                    action = "update";
+                    epo.setAction("update");
+                } catch (NullPointerException e) {
+                    log.error("Need to implement 'record not found' error message.");
+                }
+            } else {
+                vclassForEditing = new VClass();
+                if (request.getParameter("GroupId") != null) {
+                    try {
+                        vclassForEditing.setGroupURI(request.getParameter("GroupURI"));
+                    } catch (NumberFormatException e) {
+                        // too bad
+                    }
+                }
+            }
+            epo.setOriginalBean(vclassForEditing);
+        } else {
+            vclassForEditing = (VClass) epo.getNewBean();
+            // action = "update";
+            // log.error("using newBean");
+        }
+
+        //make a simple mask for the class's id
+        Object[] simpleMaskPair = new Object[2];
+        simpleMaskPair[0]="URI";
+        simpleMaskPair[1]=vclassForEditing.getURI();
+        epo.getSimpleMask().add(simpleMaskPair);
+
+        //validators
+        List localNameValidatorList = new ArrayList();
+        localNameValidatorList.add(new XMLNameValidator());
+        epo.getValidatorMap().put("LocalName",localNameValidatorList);
+
+        //set up any listeners
+        List changeListenerList = new LinkedList();
+        if (request.getParameter("superclassUri") != null) {
+            changeListenerList.add(new SubclassListener(request.getParameter("superclassUri"), request.getUnfilteredWebappDaoFactory()));
+        }
+        epo.setChangeListenerList(changeListenerList);
+
+        //make a postinsert pageforwarder that will send us to a new class's fetch screen
+        epo.setPostInsertPageForwarder(new VclassInsertPageForwarder());
+        //make a postdelete pageforwarder that will send us to the list of classes
+        epo.setPostDeletePageForwarder(new UrlForwarder("showClassHierarchy"));
+
+        //set the getMethod so we can retrieve a new bean after we've inserted it
+        try {
+            Class[] args = new Class[1];
+            args[0] = String.class;
+            epo.setGetMethod(VClassDao.class.getDeclaredMethod("getVClassByURI",args));
+        } catch (NoSuchMethodException e) {
+            log.error(this.getClass().getName()+" could not find the getVClassByURI method");
+        }
+
+        HashMap<String, List<Option>> optionMap = new HashMap<String,List<Option>>();
+        try {
+            VClassGroupDao vcgDao = request.getUnfilteredWebappDaoFactory().getVClassGroupDao();
+            List classGroupOptionList = FormUtils.makeOptionListFromBeans(vcgDao.getPublicGroupsWithVClasses(),"URI","PublicName",vclassForEditing.getGroupURI(),null,(vclassForEditing.getGroupURI()!=null && !(vclassForEditing.getGroupURI().equals(""))));
+            classGroupOptionList.add(0,new Option("", "none", ("update".equals(action) && (vclassForEditing.getGroupURI()==null || vclassForEditing.getGroupURI().equals("")))));
+            optionMap.put("GroupURI", classGroupOptionList);
+
+        } catch (Exception e) {
+            log.error("unable to create GroupId option list");
+        }
+        try {
+            List namespaceIdList = (action.equals("insert"))
+                    ? FormUtils.makeOptionListFromBeans(oDao.getAllOntologies(),"URI","Name", ((vclassForEditing.getNamespace()==null) ? "" : vclassForEditing.getNamespace()), null, false)
+                    : FormUtils.makeOptionListFromBeans(oDao.getAllOntologies(),"URI","Name", ((vclassForEditing.getNamespace()==null) ? "" : vclassForEditing.getNamespace()), null, true);
+	        namespaceIdList.add(0, new Option(request.getUnfilteredWebappDaoFactory().getDefaultNamespace(),"default"));
+            optionMap.put("Namespace", namespaceIdList);
+        } catch (Exception e) {
+            log.error(this.getClass().getName() + "unable to create Namespace option list");
+        }
+
+        optionMap.put("HiddenFromDisplayBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getDisplayOptionsList(vclassForEditing));    
+        optionMap.put("ProhibitedFromUpdateBelowRoleLevelUsingRoleUri",RoleLevelOptionsSetup.getUpdateOptionsList(vclassForEditing));
+
+        FormObject foo = new FormObject();
+        foo.setErrorMap(epo.getErrMsgMap());
+        foo.setOptionLists(optionMap);
+
+        epo.setFormObject(foo);
+
+        request.setAttribute("formValue",foo.getValues());
+
+        FormUtils.populateFormFromBean(vclassForEditing,action,foo,epo.getBadValueMap());
+
+        RequestDispatcher rd = request.getRequestDispatcher(Controllers.BASIC_JSP);
+        request.setAttribute("bodyJsp","/templates/edit/formBasic.jsp");
+        request.setAttribute("formJsp","/templates/edit/specific/vclass_retry.jsp");
+        request.setAttribute("colspan","4");
+        request.setAttribute("scripts","/templates/edit/formBasic.js");
+        request.setAttribute("title","Class Editing Form");
+        request.setAttribute("_action",action);
+        request.setAttribute("unqualifiedClassName","VClass");
+        setRequestAttributes(request,epo);
+
+        try {
+            rd.forward(request, response);
+        } catch (Exception e) {
+            log.error("VclassRetryController could not forward to view.", e);
+            throw new RuntimeException(e);
+        }
+
+    }
+
+    public void doGet (HttpServletRequest request, HttpServletResponse response) {
+        doPost(request, response);
+    }
+
+    /** This listener allows us to link a new class to a parent upon creation */
+    class SubclassListener implements ChangeListener {
+        String superclassURI = null;
+        WebappDaoFactory daoFactory = null;
+        public SubclassListener(String superclassURI, WebappDaoFactory cdf) {
+            this.superclassURI = superclassURI;
+            this.daoFactory = cdf;
+        }
+        public void doInserted(Object newObj, EditProcessObject epo) {
+            Classes2Classes c2c = new Classes2Classes();
+            c2c.setSubclassURI(((VClass)newObj).getURI());
+            c2c.setSuperclassURI(superclassURI);
+            daoFactory.getVClassDao().insertNewClasses2Classes(c2c);            
+        }
+        public void doUpdated(Object oldObj, Object newObj, EditProcessObject epo) {
+            // nothing to do
+        }
+        public void doDeleted(Object oldObj, EditProcessObject epo) {
+            // nothing to do
+        }
+    }
+
+    class VclassInsertPageForwarder implements PageForwarder {
+
+        public void doForward(HttpServletRequest request, HttpServletResponse response, EditProcessObject epo){
+            String newVclassUrl = "vclassEdit?uri=";
+            VClass vcl = (VClass) epo.getNewBean();
+            try {
+                newVclassUrl += URLEncoder.encode(vcl.getURI(),"UTF-8");
+            } catch (Exception e) {
+                log.error(this.getClass().getName()+" could not use UTF-8 encoding to encode new URL");
+            }
+            try {
+                response.sendRedirect(newVclassUrl);
+            } catch (IOException ioe) {
+                log.error("VclassInsertPageForwarder could not send redirect.");
+            }
+        }
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java
index 190157827..399434fc1 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/utils/LocalNamespaceClassUtils.java
@@ -1,89 +1,89 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.edit.utils;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.HashMap;
-import edu.cornell.mannlib.vedit.beans.Option;
-import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
-import edu.cornell.mannlib.vitro.webapp.beans.ResourceBean;
-import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
-
-import org.apache.commons.logging.Log;
-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) {
-       HashMap<String, String> localClasses = new HashMap<String, String>();
-       List<VClass> allClasses = vreq.getWebappDaoFactory().getVClassDao().getAllVclasses();
-       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(")"));
-    		   localClasses.put(classUri, v.getName() + " ( " + prefix + ")");
-    	   }
-       }
-       return localClasses;
-    }
-    
-    private static HashMap<String, String> convertToHash(List<String> namespaces) {
-    	HashMap<String, String> namespaceHash = new HashMap<String, String>();
-    	for(String n: namespaces){
-    		namespaceHash.put(n, "true");
-    	}
-    	return namespaceHash;
-    }
-    
-    //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
-        if(defaultNamespacePattern != null) {
-	    	 OntologyDao dao = vreq.getUnfilteredWebappDaoFactory().getOntologyDao();
-	         List<Ontology> onts = dao.getAllOntologies();
-	         for(Ontology on: onts) {
-	        	String uri = on.getURI();
-	        	if(uri.startsWith(defaultNamespacePattern)) {
-	        		String name =  on.getName();
-	        		String prefix = on.getPrefix();
-	        		foundNamespaces.put(uri, name + " (" + prefix + ")");
-	        	}
-	         }
-        }
-    	
-        return foundNamespaces;
-    }
-    
-    public static String getDefaultOntologyNamespace(VitroRequest vreq) {
-    	String defaultNamespace= vreq.getWebappDaoFactory().getDefaultNamespace();
-    	//Assuming following linked data approach so expects /individual at end
-    	int lastIndex = defaultNamespace.lastIndexOf("/individual");
-    	//if namespace is correct
-    	if(lastIndex != -1) {
-    		defaultNamespace = defaultNamespace.substring(0, lastIndex) + "/ontology/";
-    		return defaultNamespace;
-    	} else {
-    		log.error("Default namespace " + defaultNamespace + " should have /individual, returning null for default namespace");
-    		return null;
-    	}
-    }
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.edit.utils;
+
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.HashMap;
+import edu.cornell.mannlib.vedit.beans.Option;
+import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
+import edu.cornell.mannlib.vitro.webapp.beans.ResourceBean;
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
+
+import org.apache.commons.logging.Log;
+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) {
+       HashMap<String, String> localClasses = new HashMap<String, String>();
+       List<VClass> allClasses = vreq.getWebappDaoFactory().getVClassDao().getAllVclasses();
+       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(")"));
+    		   localClasses.put(classUri, v.getName() + " ( " + prefix + ")");
+    	   }
+       }
+       return localClasses;
+    }
+    
+    private static HashMap<String, String> convertToHash(List<String> namespaces) {
+    	HashMap<String, String> namespaceHash = new HashMap<String, String>();
+    	for(String n: namespaces){
+    		namespaceHash.put(n, "true");
+    	}
+    	return namespaceHash;
+    }
+    
+    //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
+        if(defaultNamespacePattern != null) {
+	    	 OntologyDao dao = vreq.getUnfilteredWebappDaoFactory().getOntologyDao();
+	         List<Ontology> onts = dao.getAllOntologies();
+	         for(Ontology on: onts) {
+	        	String uri = on.getURI();
+	        	if(uri.startsWith(defaultNamespacePattern)) {
+	        		String name =  on.getName();
+	        		String prefix = on.getPrefix();
+	        		foundNamespaces.put(uri, name + " (" + prefix + ")");
+	        	}
+	         }
+        }
+    	
+        return foundNamespaces;
+    }
+    
+    public static String getDefaultOntologyNamespace(VitroRequest vreq) {
+    	String defaultNamespace= vreq.getWebappDaoFactory().getDefaultNamespace();
+    	//Assuming following linked data approach so expects /individual at end
+    	int lastIndex = defaultNamespace.lastIndexOf("/individual");
+    	//if namespace is correct
+    	if(lastIndex != -1) {
+    		defaultNamespace = defaultNamespace.substring(0, lastIndex) + "/ontology/";
+    		return defaultNamespace;
+    	} else {
+    		log.error("Default namespace " + defaultNamespace + " should have /individual, returning null for default namespace");
+    		return null;
+    	}
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
index 57a00d2fd..69d25aa44 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
@@ -1,212 +1,212 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vedit.beans.Option;
-import edu.cornell.mannlib.vedit.util.FormUtils;
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
-import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener;
-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";
-
-    public static final Actions REQUIRED_ACTIONS = SimplePermission.SEE_SITE_ADMIN_PAGE.ACTIONS;
-    
-    @Override
-	protected Actions requiredActions(VitroRequest vreq) {
-    	return REQUIRED_ACTIONS;
-	}
-
-	@Override
-	public String getTitle(String siteName, VitroRequest vreq) {
-        return siteName + " Site Administration";
-	}
-
-    @Override
-    protected ResponseValues processRequest(VitroRequest vreq) {
-        
-        Map<String, Object> body = new HashMap<String, Object>();        
-
-        body.put("dataInput", getDataInputData(vreq));
-        body.put("siteConfig", getSiteConfigData(vreq));        
-        body.put("indexCacheRebuild", getIndexCacheRebuildUrls(vreq));     
-        body.put("ontologyEditor", getOntologyEditorData(vreq));
-        body.put("dataTools", getDataToolsUrls(vreq));
-
-        return new TemplateResponseValues(TEMPLATE_DEFAULT, body);
-    }
-    
-    protected Map<String, String> getIndexCacheRebuildUrls(VitroRequest vreq) {
-        
-        Map<String, String> urls = new HashMap<String, String>();
-
-        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTIONS)) {
-            urls.put("recomputeInferences", UrlBuilder.getUrl("/RecomputeInferences"));     
-            urls.put("rebuildClassGroupCache", UrlBuilder.getUrl("/browse?clearcache=1"));
-        }
-        
-		if (PolicyHelper.isAuthorizedForActions(vreq, IndexController.REQUIRED_ACTIONS)) {
-			urls.put("rebuildSearchIndex", UrlBuilder.getUrl("/SearchIndex"));
-		}
-		
-        return urls;
-    }
-
-    protected Map<String, Object> getDataInputData(VitroRequest vreq) {
-    
-        Map<String, Object> map = new HashMap<String, Object>();
-        
-		if (PolicyHelper.isAuthorizedForActions(vreq,
-				SimplePermission.DO_BACK_END_EDITING.ACTIONS)) {
-
-            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();            
-                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
-                    orderedClassGroups.put(group.getPublicName() + " ("+group.getURI()+")", opts);
-                }else if( group.getPublicName() == null ){
-                    //have an unlabeled group, stick in the URI
-                    orderedClassGroups.put("unnamed group ("+group.getURI()+")", opts);
-                }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>();
-        
-        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.MANAGE_USER_ACCOUNTS.ACTIONS)) {
-        	data.put("userAccounts", UrlBuilder.getUrl("/accountsAdmin"));
-        }
- 
-        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.MANAGE_PROXIES.ACTIONS)) {
-        	data.put("manageProxies", UrlBuilder.getUrl("/manageProxies"));
-        }
-        
-        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.EDIT_SITE_INFORMATION.ACTIONS)) {
-            data.put("siteInfo", UrlBuilder.getUrl("/editForm", "controller", "ApplicationBean"));
-        }
-        
-        //TODO: Add specific permissions for page management
-        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.MANAGE_MENUS.ACTIONS)) {
-            data.put("menuManagement", UrlBuilder.getUrl("/individual",
-                    "uri", "http://vitro.mannlib.cornell.edu/ontologies/display/1.1#DefaultMenu",
-                    "switchToDisplayModel", "true"));
-            data.put("pageManagement", UrlBuilder.getUrl("/pageList"));
-        }
-        
-        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.SEE_STARTUP_STATUS.ACTIONS)) {
-        	data.put("startupStatus", UrlBuilder.getUrl("/startupStatus"));
-        	data.put("startupStatusAlert", !StartupStatus.getBean(getServletContext()).allClear());
-        }
-        
-        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.LOGIN_DURING_MAINTENANCE.ACTIONS)) {
-            data.put("restrictLogins", UrlBuilder.getUrl("/admin/restrictLogins"));
-        }
-        
-        return data;
-    }
-    
-    protected Map<String, Object> getOntologyEditorData(VitroRequest vreq) {
-
-        Map<String, Object> map = new HashMap<String, Object>();
- 
-        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) {
-            
-            String pelletError = null;
-            String pelletExplanation = null;
-            Object plObj = getServletContext().getAttribute("pelletListener");
-            if ( (plObj != null) && (plObj instanceof PelletListener) ) {
-                PelletListener pelletListener = (PelletListener) plObj;
-                if (!pelletListener.isConsistent()) {
-                    pelletError = "INCONSISTENT ONTOLOGY: reasoning halted.";
-                    pelletExplanation = pelletListener.getExplanation();
-                } else if ( pelletListener.isInErrorState() ) {
-                    pelletError = "An error occurred during reasoning. Reasoning has been halted. See error log for details.";
-                }
-            }
-    
-            if (pelletError != null) {
-                Map<String, String> pellet = new HashMap<String, String>();
-                pellet.put("error", pelletError);
-                if (pelletExplanation != null) {
-                    pellet.put("explanation", pelletExplanation);
-                }
-                map.put("pellet", pellet);
-            }
-                    
-            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("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.ACTIONS)) {            
-            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.ACTIONS)) {            
-        	urls.put("sparqlQuery", UrlBuilder.getUrl("/admin/sparqlquery"));
-        }
-        
-        return urls;
-    }
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vedit.beans.Option;
+import edu.cornell.mannlib.vedit.util.FormUtils;
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.PolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener;
+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";
+
+    public static final Actions REQUIRED_ACTIONS = SimplePermission.SEE_SITE_ADMIN_PAGE.ACTIONS;
+    
+    @Override
+	protected Actions requiredActions(VitroRequest vreq) {
+    	return REQUIRED_ACTIONS;
+	}
+
+	@Override
+	public String getTitle(String siteName, VitroRequest vreq) {
+        return siteName + " Site Administration";
+	}
+
+    @Override
+    protected ResponseValues processRequest(VitroRequest vreq) {
+        
+        Map<String, Object> body = new HashMap<String, Object>();        
+
+        body.put("dataInput", getDataInputData(vreq));
+        body.put("siteConfig", getSiteConfigData(vreq));        
+        body.put("indexCacheRebuild", getIndexCacheRebuildUrls(vreq));     
+        body.put("ontologyEditor", getOntologyEditorData(vreq));
+        body.put("dataTools", getDataToolsUrls(vreq));
+
+        return new TemplateResponseValues(TEMPLATE_DEFAULT, body);
+    }
+    
+    protected Map<String, String> getIndexCacheRebuildUrls(VitroRequest vreq) {
+        
+        Map<String, String> urls = new HashMap<String, String>();
+
+        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.USE_MISCELLANEOUS_ADMIN_PAGES.ACTIONS)) {
+            urls.put("recomputeInferences", UrlBuilder.getUrl("/RecomputeInferences"));     
+            urls.put("rebuildClassGroupCache", UrlBuilder.getUrl("/browse?clearcache=1"));
+        }
+        
+		if (PolicyHelper.isAuthorizedForActions(vreq, IndexController.REQUIRED_ACTIONS)) {
+			urls.put("rebuildSearchIndex", UrlBuilder.getUrl("/SearchIndex"));
+		}
+		
+        return urls;
+    }
+
+    protected Map<String, Object> getDataInputData(VitroRequest vreq) {
+    
+        Map<String, Object> map = new HashMap<String, Object>();
+        
+		if (PolicyHelper.isAuthorizedForActions(vreq,
+				SimplePermission.DO_BACK_END_EDITING.ACTIONS)) {
+
+            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();            
+                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
+                    orderedClassGroups.put(group.getPublicName() + " ("+group.getURI()+")", opts);
+                }else if( group.getPublicName() == null ){
+                    //have an unlabeled group, stick in the URI
+                    orderedClassGroups.put("unnamed group ("+group.getURI()+")", opts);
+                }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>();
+        
+        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.MANAGE_USER_ACCOUNTS.ACTIONS)) {
+        	data.put("userAccounts", UrlBuilder.getUrl("/accountsAdmin"));
+        }
+ 
+        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.MANAGE_PROXIES.ACTIONS)) {
+        	data.put("manageProxies", UrlBuilder.getUrl("/manageProxies"));
+        }
+        
+        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.EDIT_SITE_INFORMATION.ACTIONS)) {
+            data.put("siteInfo", UrlBuilder.getUrl("/editForm", "controller", "ApplicationBean"));
+        }
+        
+        //TODO: Add specific permissions for page management
+        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.MANAGE_MENUS.ACTIONS)) {
+            data.put("menuManagement", UrlBuilder.getUrl("/individual",
+                    "uri", "http://vitro.mannlib.cornell.edu/ontologies/display/1.1#DefaultMenu",
+                    "switchToDisplayModel", "true"));
+            data.put("pageManagement", UrlBuilder.getUrl("/pageList"));
+        }
+        
+        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.SEE_STARTUP_STATUS.ACTIONS)) {
+        	data.put("startupStatus", UrlBuilder.getUrl("/startupStatus"));
+        	data.put("startupStatusAlert", !StartupStatus.getBean(getServletContext()).allClear());
+        }
+        
+        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.LOGIN_DURING_MAINTENANCE.ACTIONS)) {
+            data.put("restrictLogins", UrlBuilder.getUrl("/admin/restrictLogins"));
+        }
+        
+        return data;
+    }
+    
+    protected Map<String, Object> getOntologyEditorData(VitroRequest vreq) {
+
+        Map<String, Object> map = new HashMap<String, Object>();
+ 
+        if (PolicyHelper.isAuthorizedForActions(vreq, SimplePermission.EDIT_ONTOLOGY.ACTIONS)) {
+            
+            String pelletError = null;
+            String pelletExplanation = null;
+            Object plObj = getServletContext().getAttribute("pelletListener");
+            if ( (plObj != null) && (plObj instanceof PelletListener) ) {
+                PelletListener pelletListener = (PelletListener) plObj;
+                if (!pelletListener.isConsistent()) {
+                    pelletError = "INCONSISTENT ONTOLOGY: reasoning halted.";
+                    pelletExplanation = pelletListener.getExplanation();
+                } else if ( pelletListener.isInErrorState() ) {
+                    pelletError = "An error occurred during reasoning. Reasoning has been halted. See error log for details.";
+                }
+            }
+    
+            if (pelletError != null) {
+                Map<String, String> pellet = new HashMap<String, String>();
+                pellet.put("error", pelletError);
+                if (pelletExplanation != null) {
+                    pellet.put("explanation", pelletExplanation);
+                }
+                map.put("pellet", pellet);
+            }
+                    
+            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("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.ACTIONS)) {            
+            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.ACTIONS)) {            
+        	urls.put("sparqlQuery", UrlBuilder.getUrl("/admin/sparqlquery"));
+        }
+        
+        return urls;
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java
index adee026f1..82b4eea0d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ContactFormController.java
@@ -1,7 +1,7 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
-
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -14,12 +14,12 @@ import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
 import edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory;
-
-/**
- *  Controller for comments ("contact us") page
- *  * @author bjl23
- */
-public class ContactFormController extends FreemarkerHttpServlet {
+
+/**
+ *  Controller for comments ("contact us") page
+ *  * @author bjl23
+ */
+public class ContactFormController extends FreemarkerHttpServlet {
 
     private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(ContactFormController.class.getName());
@@ -33,7 +33,7 @@ public class ContactFormController extends FreemarkerHttpServlet {
     }
     
     @Override
-    protected ResponseValues processRequest(VitroRequest vreq) {
+    protected ResponseValues processRequest(VitroRequest vreq) {
 
         ApplicationBean appBean = vreq.getAppBean();
     	
@@ -68,5 +68,5 @@ public class ContactFormController extends FreemarkerHttpServlet {
         }
         
         return new TemplateResponseValues(templateName, body);
-    }
-}
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java
index 2f2200c15..b1aca2123 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/DeletePropertyController.java
@@ -1,227 +1,227 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
-
-import java.util.HashMap;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
-import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3EditUtils;
-import edu.cornell.mannlib.vitro.webapp.web.URLEncoder;
-/*
- * 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.
- */
-public class DeletePropertyController extends FreemarkerHttpServlet {
-    private static final Log log = LogFactory.getLog(DeletePropertyController.class);
- 
-    @Override
-	protected Actions requiredActions(VitroRequest vreq) {
-    	return SimplePermission.DO_FRONT_END_EDITING.ACTIONS ;
-	}
-
-    @Override
-    protected ResponseValues processRequest(VitroRequest vreq) {
-    	//if error conditions then return here
-    	String errorMessage = handleErrors(vreq);
-    	if(errorMessage != null) {
-    		return doErrorMessage(errorMessage);
-    	}
-    	
-    	//handle based on whether object property or data property
-    	if(EditConfigurationUtils.isObjectProperty(
-    			EditConfigurationUtils.getPredicateUri(vreq), vreq))
-    	{
-    		processObjectProperty(vreq);
-    	} 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);
-    	String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-    	int hashIndex = predicateUri.lastIndexOf("#");
-    	String localName = predicateUri.substring(hashIndex + 1);
-    	String redirectUrl =  "/entity?uri=" + URLEncoder.encode(subjectUri);
-		return redirectUrl + "#" + URLEncoder.encode(localName);
-	}
-
-
-	private String handleErrors(VitroRequest vreq) {
-		//If subject or property empty then need to return error
-    	WebappDaoFactory wdf = vreq.getWebappDaoFactory();
-    	if(wdf == null) {
-    		   return "could not get a WebappDaoFactory";
-    	}
-    	Individual subject = EditConfigurationUtils.getSubjectIndividual(vreq);
-    	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)) {
-    		ObjectProperty prop = EditConfigurationUtils.getObjectProperty(vreq);
-    		if(prop == null) {
-    			return "In delete property controller, could not find object property " + predicateUri;
-    		}
-    	} 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) {
-		//This is the standard mechanism but note that datapropStmtDelete uses wdf with user aware
-
-		//DataProperty prop = EditConfigurationUtils.getDataProperty(vreq);
-		String editorUri = N3EditUtils.getEditorUri(vreq);
-		WebappDaoFactory wdf = vreq.getWebappDaoFactory().getUserAwareDaoFactory(editorUri);
-		DataProperty prop = wdf.getDataPropertyDao().getDataPropertyByURI(
-				EditConfigurationUtils.getPredicateUri(vreq));
-		return prop;
-	}
-
-
-	private TemplateResponseValues doErrorMessage(String errorMessage) {
-		HashMap<String,Object> map = new HashMap<String,Object>();
-	   	map.put("errorMessage", errorMessage);
-	   	return new TemplateResponseValues("error-message.ftl", map); 
-	}
-		
-
-
-	//process data property
-    private void processDataProperty(VitroRequest vreq) {
-    	deleteDataPropertyStatement(vreq);		
-    }
-    
-    private void deleteDataPropertyStatement(VitroRequest vreq) {
-    	String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
-		String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-
-    	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);
-			wdf.getDataPropertyStatementDao().deleteDataPropertyStatement(dps);
-		}
-	}
-
-
-	private void processDataPropertyStatement(
-			DataPropertyStatement dps, String subjectUri, String predicateUri) {
-		 //if no individual Uri set to subject uri
-		if( dps.getIndividualURI() == null || dps.getIndividualURI().trim().length() == 0){
-	        log.debug("adding missing subjectURI to DataPropertyStatement" );
-	        dps.setIndividualURI( subjectUri );
-	    }
-		//if no predicate, set predicate uri
-	    if( dps.getDatapropURI() == null || dps.getDatapropURI().trim().length() == 0){
-	        log.debug("adding missing datapropUri to DataPropertyStatement");
-	        dps.setDatapropURI( predicateUri );
-	    }
-	}
-
-
-	private void logDataPropertyDeletionMessages(DataPropertyStatement dps) {
-		log.debug("attempting to delete dataPropertyStatement: subjectURI <" + dps.getIndividualURI() +">");
-        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() ));       
-		
-	}
-
-
-	
-
-
-	//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
-    	if(prop.getStubObjectRelation())
-    	{
-    		deleteObjectIndividual(vreq);
-    	}
-    	
-    	deleteObjectPropertyStatement(vreq);
-		
-    }
-    
-    private void deleteObjectPropertyStatement(VitroRequest vreq) {
-		WebappDaoFactory wdf = vreq.getWebappDaoFactory();
-    	String objectUri = EditConfigurationUtils.getObjectUri(vreq);
-		String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
-		String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-		//delete object property statement
-		wdf.getPropertyInstanceDao().deleteObjectPropertyStatement(subjectUri, predicateUri, objectUri);
-	}
-
-	private Individual getObjectIndividualForStubRelation(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);
-    	Individual object = getObjectIndividualForStubRelation(vreq, objectUri);
-    	if(object != null) {
-    		log.warn("Deleting individual " + object.getName() + "since property has been set to force range object deletion");
-    		WebappDaoFactory wdf = vreq.getWebappDaoFactory();
-    		wdf.getIndividualDao().deleteIndividual(object);
-    	} else {
-    		//TODO: Throw error?
-    		log.error("could not find object as request attribute or in model " + objectUri);
-    	}
-    }
-
-    
-
-    
-    
-    
-    
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
+
+import java.util.HashMap;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3EditUtils;
+import edu.cornell.mannlib.vitro.webapp.web.URLEncoder;
+/*
+ * 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.
+ */
+public class DeletePropertyController extends FreemarkerHttpServlet {
+    private static final Log log = LogFactory.getLog(DeletePropertyController.class);
+ 
+    @Override
+	protected Actions requiredActions(VitroRequest vreq) {
+    	return SimplePermission.DO_FRONT_END_EDITING.ACTIONS ;
+	}
+
+    @Override
+    protected ResponseValues processRequest(VitroRequest vreq) {
+    	//if error conditions then return here
+    	String errorMessage = handleErrors(vreq);
+    	if(errorMessage != null) {
+    		return doErrorMessage(errorMessage);
+    	}
+    	
+    	//handle based on whether object property or data property
+    	if(EditConfigurationUtils.isObjectProperty(
+    			EditConfigurationUtils.getPredicateUri(vreq), vreq))
+    	{
+    		processObjectProperty(vreq);
+    	} 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);
+    	String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
+    	int hashIndex = predicateUri.lastIndexOf("#");
+    	String localName = predicateUri.substring(hashIndex + 1);
+    	String redirectUrl =  "/entity?uri=" + URLEncoder.encode(subjectUri);
+		return redirectUrl + "#" + URLEncoder.encode(localName);
+	}
+
+
+	private String handleErrors(VitroRequest vreq) {
+		//If subject or property empty then need to return error
+    	WebappDaoFactory wdf = vreq.getWebappDaoFactory();
+    	if(wdf == null) {
+    		   return "could not get a WebappDaoFactory";
+    	}
+    	Individual subject = EditConfigurationUtils.getSubjectIndividual(vreq);
+    	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)) {
+    		ObjectProperty prop = EditConfigurationUtils.getObjectProperty(vreq);
+    		if(prop == null) {
+    			return "In delete property controller, could not find object property " + predicateUri;
+    		}
+    	} 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) {
+		//This is the standard mechanism but note that datapropStmtDelete uses wdf with user aware
+
+		//DataProperty prop = EditConfigurationUtils.getDataProperty(vreq);
+		String editorUri = N3EditUtils.getEditorUri(vreq);
+		WebappDaoFactory wdf = vreq.getWebappDaoFactory().getUserAwareDaoFactory(editorUri);
+		DataProperty prop = wdf.getDataPropertyDao().getDataPropertyByURI(
+				EditConfigurationUtils.getPredicateUri(vreq));
+		return prop;
+	}
+
+
+	private TemplateResponseValues doErrorMessage(String errorMessage) {
+		HashMap<String,Object> map = new HashMap<String,Object>();
+	   	map.put("errorMessage", errorMessage);
+	   	return new TemplateResponseValues("error-message.ftl", map); 
+	}
+		
+
+
+	//process data property
+    private void processDataProperty(VitroRequest vreq) {
+    	deleteDataPropertyStatement(vreq);		
+    }
+    
+    private void deleteDataPropertyStatement(VitroRequest vreq) {
+    	String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
+		String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
+
+    	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);
+			wdf.getDataPropertyStatementDao().deleteDataPropertyStatement(dps);
+		}
+	}
+
+
+	private void processDataPropertyStatement(
+			DataPropertyStatement dps, String subjectUri, String predicateUri) {
+		 //if no individual Uri set to subject uri
+		if( dps.getIndividualURI() == null || dps.getIndividualURI().trim().length() == 0){
+	        log.debug("adding missing subjectURI to DataPropertyStatement" );
+	        dps.setIndividualURI( subjectUri );
+	    }
+		//if no predicate, set predicate uri
+	    if( dps.getDatapropURI() == null || dps.getDatapropURI().trim().length() == 0){
+	        log.debug("adding missing datapropUri to DataPropertyStatement");
+	        dps.setDatapropURI( predicateUri );
+	    }
+	}
+
+
+	private void logDataPropertyDeletionMessages(DataPropertyStatement dps) {
+		log.debug("attempting to delete dataPropertyStatement: subjectURI <" + dps.getIndividualURI() +">");
+        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() ));       
+		
+	}
+
+
+	
+
+
+	//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
+    	if(prop.getStubObjectRelation())
+    	{
+    		deleteObjectIndividual(vreq);
+    	}
+    	
+    	deleteObjectPropertyStatement(vreq);
+		
+    }
+    
+    private void deleteObjectPropertyStatement(VitroRequest vreq) {
+		WebappDaoFactory wdf = vreq.getWebappDaoFactory();
+    	String objectUri = EditConfigurationUtils.getObjectUri(vreq);
+		String subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
+		String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
+		//delete object property statement
+		wdf.getPropertyInstanceDao().deleteObjectPropertyStatement(subjectUri, predicateUri, objectUri);
+	}
+
+	private Individual getObjectIndividualForStubRelation(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);
+    	Individual object = getObjectIndividualForStubRelation(vreq, objectUri);
+    	if(object != null) {
+    		log.warn("Deleting individual " + object.getName() + "since property has been set to force range object deletion");
+    		WebappDaoFactory wdf = vreq.getWebappDaoFactory();
+    		wdf.getIndividualDao().deleteIndividual(object);
+    	} else {
+    		//TODO: Throw error?
+    		log.error("could not find object as request attribute or in model " + objectUri);
+    	}
+    }
+
+    
+
+    
+    
+    
+    
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FlatteningTemplateLoader.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FlatteningTemplateLoader.java
index 1011e8f90..23f625291 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FlatteningTemplateLoader.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FlatteningTemplateLoader.java
@@ -1,162 +1,162 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.Reader;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import freemarker.cache.TemplateLoader;
-
-/**
- * <p>
- * A {@link TemplateLoader} that treats a directory and its sub-directories as a
- * flat namespace.
- * </p>
- * <p>
- * When a request is made to find a template source, the loader will search its
- * base directory and any sub-directories for a file with a matching name. So a
- * request for <code>myFile.ftl</code> might return a reference to a file at
- * <code>base/myFile.ftl</code> or at <code>base/this/myFile.ftl</code>
- * </p>
- * <p>
- * The order in which the sub-directories are searched is unspecified. The first
- * matching file will be returned.
- * </p>
- * <p>
- * A path (absolute or relative) on the source name would be meaningless, so any
- * such path will be stripped before the search is made. That is, a request for
- * <code>path/file.ftl</code> or <code>/absolute/path/file.ftl</code>is
- * functionally identical to a request for <code>file.ftl</code>
- * </p>
- * <p>
- * </p>
- */
-public class FlatteningTemplateLoader implements TemplateLoader {
-	private static final Log log = LogFactory
-			.getLog(FlatteningTemplateLoader.class);
-
-	private final File baseDir;
-
-	public FlatteningTemplateLoader(File baseDir) {
-		if (baseDir == null) {
-			throw new NullPointerException("baseDir may not be null.");
-		}
-		if (!baseDir.exists()) {
-			throw new IllegalArgumentException("Template directory '"
-					+ baseDir.getAbsolutePath() + "' does not exist");
-		}
-		if (!baseDir.isDirectory()) {
-			throw new IllegalArgumentException("Template directory '"
-					+ baseDir.getAbsolutePath() + "' is not a directory");
-		}
-		if (!baseDir.canRead()) {
-			throw new IllegalArgumentException("Can't read template "
-					+ "directory '" + baseDir.getAbsolutePath() + "'");
-		}
-
-		log.debug("Created template loader - baseDir is '"
-				+ baseDir.getAbsolutePath() + "'");
-		this.baseDir = baseDir;
-	}
-
-	/**
-	 * Look for a file by this name in the base directory, or its
-	 * subdirectories, disregarding any path information.
-	 * 
-	 * @return a {@link File} that can be used in subsequent calls the template
-	 *         loader methods, or <code>null</code> if no template is found.
-	 */
-	@Override
-	public Object findTemplateSource(String name) throws IOException {
-		if (name == null) {
-			return null;
-		}
-
-		int lastSlashHere = name.indexOf('/');
-		String trimmedName = (lastSlashHere == -1) ? name : name
-				.substring(lastSlashHere + 1);
-
-		// start the recursive search.
-		File source = findFile(trimmedName, baseDir);
-		if (source == null) {
-			log.debug("For template name '" + name
-					+ "', found no template file.");
-		} else {
-			log.debug("For template name '" + name + "', template file is "
-					+ source.getAbsolutePath());
-		}
-		return source;
-	}
-
-	/**
-	 * Recursively search for a file of this name.
-	 */
-	private File findFile(String name, File dir) {
-		for (File child : dir.listFiles()) {
-			if (child.isDirectory()) {
-				File file = findFile(name, child);
-				if (file != null) {
-					return file;
-				}
-			} else {
-				if (child.getName().equals(name)) {
-					return child;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Ask the file when it was last modified.
-	 * 
-	 * @param templateSource
-	 *            a {@link File} that was obtained earlier from
-	 *            {@link #findTemplateSource(String)}.
-	 */
-	@Override
-	public long getLastModified(Object templateSource) {
-		if (!(templateSource instanceof File)) {
-			throw new IllegalArgumentException("templateSource is not a File: "
-					+ templateSource);
-		}
-
-		return ((File) templateSource).lastModified();
-	}
-
-	/**
-	 * Get a {@link Reader} on this {@link File}. The framework will see that
-	 * the {@link Reader} is closed when it has been read.
-	 * 
-	 * @param templateSource
-	 *            a {@link File} that was obtained earlier from
-	 *            {@link #findTemplateSource(String)}.
-	 */
-	@Override
-	public Reader getReader(Object templateSource, String encoding)
-			throws IOException {
-		if (!(templateSource instanceof File)) {
-			throw new IllegalArgumentException("templateSource is not a File: "
-					+ templateSource);
-		}
-
-		return new FileReader(((File) templateSource));
-	}
-
-	/**
-	 * Nothing to do here. No resources to free up.
-	 * 
-	 * @param templateSource
-	 *            a {@link File} that was obtained earlier from
-	 *            {@link #findTemplateSource(String)}.
-	 */
-	@Override
-	public void closeTemplateSource(Object templateSource) throws IOException {
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.Reader;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import freemarker.cache.TemplateLoader;
+
+/**
+ * <p>
+ * A {@link TemplateLoader} that treats a directory and its sub-directories as a
+ * flat namespace.
+ * </p>
+ * <p>
+ * When a request is made to find a template source, the loader will search its
+ * base directory and any sub-directories for a file with a matching name. So a
+ * request for <code>myFile.ftl</code> might return a reference to a file at
+ * <code>base/myFile.ftl</code> or at <code>base/this/myFile.ftl</code>
+ * </p>
+ * <p>
+ * The order in which the sub-directories are searched is unspecified. The first
+ * matching file will be returned.
+ * </p>
+ * <p>
+ * A path (absolute or relative) on the source name would be meaningless, so any
+ * such path will be stripped before the search is made. That is, a request for
+ * <code>path/file.ftl</code> or <code>/absolute/path/file.ftl</code>is
+ * functionally identical to a request for <code>file.ftl</code>
+ * </p>
+ * <p>
+ * </p>
+ */
+public class FlatteningTemplateLoader implements TemplateLoader {
+	private static final Log log = LogFactory
+			.getLog(FlatteningTemplateLoader.class);
+
+	private final File baseDir;
+
+	public FlatteningTemplateLoader(File baseDir) {
+		if (baseDir == null) {
+			throw new NullPointerException("baseDir may not be null.");
+		}
+		if (!baseDir.exists()) {
+			throw new IllegalArgumentException("Template directory '"
+					+ baseDir.getAbsolutePath() + "' does not exist");
+		}
+		if (!baseDir.isDirectory()) {
+			throw new IllegalArgumentException("Template directory '"
+					+ baseDir.getAbsolutePath() + "' is not a directory");
+		}
+		if (!baseDir.canRead()) {
+			throw new IllegalArgumentException("Can't read template "
+					+ "directory '" + baseDir.getAbsolutePath() + "'");
+		}
+
+		log.debug("Created template loader - baseDir is '"
+				+ baseDir.getAbsolutePath() + "'");
+		this.baseDir = baseDir;
+	}
+
+	/**
+	 * Look for a file by this name in the base directory, or its
+	 * subdirectories, disregarding any path information.
+	 * 
+	 * @return a {@link File} that can be used in subsequent calls the template
+	 *         loader methods, or <code>null</code> if no template is found.
+	 */
+	@Override
+	public Object findTemplateSource(String name) throws IOException {
+		if (name == null) {
+			return null;
+		}
+
+		int lastSlashHere = name.indexOf('/');
+		String trimmedName = (lastSlashHere == -1) ? name : name
+				.substring(lastSlashHere + 1);
+
+		// start the recursive search.
+		File source = findFile(trimmedName, baseDir);
+		if (source == null) {
+			log.debug("For template name '" + name
+					+ "', found no template file.");
+		} else {
+			log.debug("For template name '" + name + "', template file is "
+					+ source.getAbsolutePath());
+		}
+		return source;
+	}
+
+	/**
+	 * Recursively search for a file of this name.
+	 */
+	private File findFile(String name, File dir) {
+		for (File child : dir.listFiles()) {
+			if (child.isDirectory()) {
+				File file = findFile(name, child);
+				if (file != null) {
+					return file;
+				}
+			} else {
+				if (child.getName().equals(name)) {
+					return child;
+				}
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Ask the file when it was last modified.
+	 * 
+	 * @param templateSource
+	 *            a {@link File} that was obtained earlier from
+	 *            {@link #findTemplateSource(String)}.
+	 */
+	@Override
+	public long getLastModified(Object templateSource) {
+		if (!(templateSource instanceof File)) {
+			throw new IllegalArgumentException("templateSource is not a File: "
+					+ templateSource);
+		}
+
+		return ((File) templateSource).lastModified();
+	}
+
+	/**
+	 * Get a {@link Reader} on this {@link File}. The framework will see that
+	 * the {@link Reader} is closed when it has been read.
+	 * 
+	 * @param templateSource
+	 *            a {@link File} that was obtained earlier from
+	 *            {@link #findTemplateSource(String)}.
+	 */
+	@Override
+	public Reader getReader(Object templateSource, String encoding)
+			throws IOException {
+		if (!(templateSource instanceof File)) {
+			throw new IllegalArgumentException("templateSource is not a File: "
+					+ templateSource);
+		}
+
+		return new FileReader(((File) templateSource));
+	}
+
+	/**
+	 * Nothing to do here. No resources to free up.
+	 * 
+	 * @param templateSource
+	 *            a {@link File} that was obtained earlier from
+	 *            {@link #findTemplateSource(String)}.
+	 */
+	@Override
+	public void closeTemplateSource(Object templateSource) throws IOException {
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java
index 627b0e877..33f0ee2ec 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadController.java
@@ -1,670 +1,670 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
-
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.UnavailableException;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.DropObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ForwardResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorage;
-import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageSetup;
-import edu.cornell.mannlib.vitro.webapp.filestorage.model.FileInfo;
-import edu.cornell.mannlib.vitro.webapp.filestorage.model.ImageInfo;
-import edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest.FileUploadServletRequest;
-import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
-import edu.cornell.mannlib.vitro.webapp.web.images.PlaceholderUtil;
-
-/**
- * Handle adding, replacing or deleting the main image on an Individual.
- */
-public class ImageUploadController extends FreemarkerHttpServlet {
-	private static final long serialVersionUID = 1L;
-	private static final Log log = LogFactory
-			.getLog(ImageUploadController.class);
-
-	private static final String ATTRIBUTE_REFERRING_PAGE = "ImageUploadController.referringPage";
-
-	private static final String ERROR_CODE_UNRECOGNIZED_URI = "imageUpload.errorUnrecognizedURI";
-	private static final String ERROR_CODE_NO_URI = "imageUpload.errorNoURI";
-
-	/** Limit file size to 6 megabytes. */
-	public static final int MAXIMUM_FILE_SIZE = 6 * 1024 * 1024;
-
-	/** Generated thumbnails will be this big. */
-	public static final int THUMBNAIL_HEIGHT = 200;
-	public static final int THUMBNAIL_WIDTH = 200;
-
-	/** The form field that tells what we are doing: uploading? deleting? */
-	public static final String PARAMETER_ACTION = "action";
-
-	/** The form field that identifies the Individual. */
-	public static final String PARAMETER_ENTITY_URI = "entityUri";
-
-	/** The form field of the uploaded file; use as a key to the FileItem map. */
-	public static final String PARAMETER_UPLOADED_FILE = "datafile";
-
-	/** Here is the main image file. Hold on to it. */
-	public static final String ACTION_UPLOAD = "upload";
-
-	/** Here is the cropping info; we're ready to save the image. */
-	public static final String ACTION_SAVE = "save";
-
-	/** A request to delete the file and return to the referring page. */
-	public static final String ACTION_DELETE = "delete";
-
-	/** A request to delete the file and return to the "new image" screen. */
-	public static final String ACTION_DELETE_EDIT = "deleteEdit";
-
-	public static final String BODY_TITLE = "title";
-	public static final String BODY_ENTITY_NAME = "entityName";
-	public static final String BODY_MAIN_IMAGE_URL = "imageUrl";
-	public static final String BODY_MAIN_IMAGE_HEIGHT = "imageHeight";
-	public static final String BODY_MAIN_IMAGE_WIDTH = "imageWidth";
-	public static final String BODY_THUMBNAIL_URL = "thumbnailUrl";
-	public static final String BODY_CANCEL_URL = "cancelUrl";
-	public static final String BODY_DELETE_URL = "deleteUrl";
-	public static final String BODY_FORM_ACTION = "formAction";
-	public static final String BODY_ERROR_MESSAGE = "errorMessage";
-	public static final String BODY_MAX_FILE_SIZE = "maxFileSize";
-	public static final String BODY_THUMBNAIL_WIDTH = "thumbnailWidth";
-	public static final String BODY_THUMBNAIL_HEIGHT = "thumbnailHeight";
-
-	public static final String TEMPLATE_NEW = "imageUpload-newImage.ftl";
-	public static final String TEMPLATE_REPLACE = "imageUpload-replaceImage.ftl";
-	public static final String TEMPLATE_CROP = "imageUpload-cropImage.ftl";
-	public static final String TEMPLATE_ERROR = "error-standard.ftl";
-
-	private static final String URL_HERE = UrlBuilder.getUrl("/uploadImages");
-
-	private static final String TEXT_BUNDLE = "imageUpload";
-	private static final String TEXT_STRING_UPLOAD_TITLE = "upload_page_title";
-	private static final String TEXT_STRING_UPLOAD_TITLE_WITH_NAME = "upload_page_title_with_name";
-	private static final String TEXT_STRING_REPLACE_TITLE = "replace_page_title";
-	private static final String TEXT_STRING_REPLACE_TITLE_WITH_NAME = "replace_page_title_with_name";
-	private static final String TEXT_STRING_CROP_TITLE = "crop_page_title";
-	private static final String TEXT_STRING_CROP_TITLE_WITH_NAME = "crop_page_title_with_name";
-
-	private FileStorage fileStorage;
-
-	/**
-	 * When initialized, get a reference to the File Storage system. Without
-	 * that, we can do nothing.
-	 */
-	@Override
-	public void init() throws ServletException {
-		super.init();
-		Object o = getServletContext().getAttribute(
-				FileStorageSetup.ATTRIBUTE_NAME);
-		if (o instanceof FileStorage) {
-			fileStorage = (FileStorage) o;
-		} else if (o == null) {
-			throw new UnavailableException(this.getClass().getSimpleName()
-					+ " could not initialize. Attribute '"
-					+ FileStorageSetup.ATTRIBUTE_NAME
-					+ "' was not set in the servlet context.");
-		} else {
-			throw new UnavailableException(this.getClass().getSimpleName()
-					+ " could not initialize. Attribute '"
-					+ FileStorageSetup.ATTRIBUTE_NAME
-					+ "' in the servlet context contained an instance of '"
-					+ o.getClass().getName() + "' instead of '"
-					+ FileStorage.class.getName() + "'");
-		}
-	}
-
-	/**
-	 * The required action depends on what we are trying to do.
-	 */
-	@Override
-	protected Actions requiredActions(VitroRequest vreq) {
-		try {
-			String action = vreq.getParameter(PARAMETER_ACTION);
-			Individual entity = validateEntityUri(vreq);
-			String imageUri = entity.getMainImageUri();
-
-			RequestedAction ra;
-			if (ACTION_DELETE.equals(action)
-					|| ACTION_DELETE_EDIT.equals(action)) {
-				ra = new DropObjectPropertyStatement(vreq.getJenaOntModel(),
-						entity.getURI(), VitroVocabulary.IND_MAIN_IMAGE,
-						imageUri);
-			} else if (imageUri != null) {
-				ra = new EditObjectPropertyStatement(vreq.getJenaOntModel(),
-						entity.getURI(), VitroVocabulary.IND_MAIN_IMAGE,
-						imageUri);
-			} else {
-				ra = new AddObjectPropertyStatement(vreq.getJenaOntModel(),
-						entity.getURI(), VitroVocabulary.IND_MAIN_IMAGE,
-						RequestActionConstants.SOME_URI);
-			}
-			return new Actions(ra);
-		} catch (UserMistakeException e) {
-			return Actions.UNAUTHORIZED;
-		}
-	}
-
-	/**
-	 * <p>
-	 * Parse the multi-part request, process the request, and produce the
-	 * output.
-	 * </p>
-	 * <p>
-	 * If the request was a multi-part file upload, it will parse to a
-	 * normal-looking request with a "file_item_map" attribute.
-	 * </p>
-	 * <p>
-	 * The processing will produce a {@link ResponseValues} object, which
-	 * represents either a request for a FreeMarker template or a forwarding
-	 * operation.
-	 * <ul>
-	 * <li>If a FreeMarker template, we emulate the actions that
-	 * FreeMarkerHttpServlet would have taken to produce the output.</li>
-	 * <li>If a forwarding operation, we create a {@link RequestDispatcher} to
-	 * do the forwarding.</li>
-	 * </ul>
-	 * </p>
-	 */
-
-	@Override
-	protected ResponseValues processRequest(VitroRequest vreq) {
-		try {
-			// Parse the multi-part request.
-			FileUploadServletRequest.parseRequest(vreq, MAXIMUM_FILE_SIZE);
-			if (log.isTraceEnabled()) {
-				dumpRequestDetails(vreq);
-			}
-
-			return buildTheResponse(vreq);
-		} catch (Exception e) {
-			// log.error("Could not produce response page", e);
-			return new ExceptionResponseValues(e);
-		}
-	}
-
-	/**
-	 * Handle the different actions. If not specified, the default action is to
-	 * show the intro screen.
-	 */
-	private ResponseValues buildTheResponse(VitroRequest vreq) {
-		String action = vreq.getParameter(PARAMETER_ACTION);
-
-		try {
-			Individual entity = validateEntityUri(vreq);
-			if (ACTION_UPLOAD.equals(action)) {
-				return doUploadImage(vreq, entity);
-			} else if (ACTION_SAVE.equals(action)) {
-				return doCreateThumbnail(vreq, entity);
-			} else if (ACTION_DELETE.equals(action)) {
-				captureReferringUrl(vreq);
-				return doDeleteImage(vreq, entity);
-			} else if (ACTION_DELETE_EDIT.equals(action)) {
-				return doDeleteThenEdit(vreq, entity);
-			} else {
-				captureReferringUrl(vreq);
-				return doIntroScreen(vreq, entity);
-			}
-		} catch (UserMistakeException e) {
-			// Can't find the entity? Complain.
-			return showAddImagePageWithError(vreq, null, e.formatMessage(vreq));
-		} catch (Exception e) {
-			// We weren't expecting this - log it, and apologize to the user.
-			return new ExceptionResponseValues(e);
-		}
-	}
-
-	/**
-	 * We are just starting the upload process. Record where we came from, so if
-	 * they hit "cancel" we know where to send them. If we have problems, just
-	 * clear it.
-	 */
-	private void captureReferringUrl(VitroRequest vreq) {
-		String referrer = vreq.getHeader("Referer");
-		if (referrer == null) {
-			vreq.getSession().removeAttribute(ATTRIBUTE_REFERRING_PAGE);
-		} else {
-			vreq.getSession().setAttribute(ATTRIBUTE_REFERRING_PAGE, referrer);
-		}
-	}
-
-	/**
-	 * Show the first screen in the upload process: Add or Replace.
-	 */
-	private ResponseValues doIntroScreen(VitroRequest vreq, Individual entity) {
-		ImageInfo imageInfo = ImageInfo.instanceFromEntityUri(
-				vreq.getUnfilteredWebappDaoFactory(), entity);
-		if (imageInfo == null) {
-			return showAddImagePage(vreq, entity);
-		} else {
-			return showReplaceImagePage(vreq, entity, imageInfo);
-		}
-	}
-
-	/**
-	 * The user has selected their main image file. Remove any previous main
-	 * image (and thumbnail), and attach the new main image.
-	 */
-	private ResponseValues doUploadImage(VitroRequest vreq, Individual entity) {
-		ImageUploadHelper helper = new ImageUploadHelper(fileStorage,
-				vreq.getUnfilteredWebappDaoFactory(), getServletContext());
-
-		try {
-			// Did they provide a file to upload? If not, show an error.
-			FileItem fileItem = helper.validateImageFromRequest(vreq);
-
-			// Put it in the file system, and store a reference in the session.
-			FileInfo fileInfo = helper.storeNewImage(fileItem, vreq);
-
-			// How big is the new image? If not big enough, show an error.
-			Dimensions size = helper.getNewImageSize(fileInfo);
-
-			// Go to the cropping page.
-			return showCropImagePage(vreq, entity,
-					fileInfo.getBytestreamAliasUrl(), size);
-		} catch (UserMistakeException e) {
-			return showErrorMessage(vreq, entity, e.formatMessage(vreq));
-		}
-	}
-
-	/**
-	 * Are we writing the error message to the "Add" page or to the "Replace"
-	 * page?
-	 */
-	private ResponseValues showErrorMessage(VitroRequest vreq,
-			Individual entity, String message) {
-
-		ImageInfo imageInfo = ImageInfo.instanceFromEntityUri(
-				vreq.getUnfilteredWebappDaoFactory(), entity);
-		if (imageInfo == null) {
-			return showAddImagePageWithError(vreq, entity, message);
-		} else {
-			return showReplaceImagePageWithError(vreq, entity, imageInfo,
-					message);
-		}
-	}
-
-	/**
-	 * The user has specified how to crop the thumbnail. Crop it and attach it
-	 * to the main image.
-	 */
-	private ResponseValues doCreateThumbnail(VitroRequest vreq,
-			Individual entity) {
-		ImageUploadHelper helper = new ImageUploadHelper(fileStorage,
-				vreq.getUnfilteredWebappDaoFactory(), getServletContext());
-
-		try {
-			CropRectangle crop = validateCropCoordinates(vreq);
-			FileInfo newImage = helper.getNewImageInfo(vreq);
-			FileInfo thumbnail = helper.generateThumbnail(crop, newImage);
-
-			helper.removeExistingImage(entity);
-			helper.storeImageFiles(entity, newImage, thumbnail);
-
-			return showExitPage(vreq, entity);
-		} catch (UserMistakeException e) {
-			return showErrorMessage(vreq, entity, e.formatMessage(vreq));
-		}
-	}
-
-	/**
-	 * Delete the main image and the thumbnail, and go back to the referring
-	 * page.
-	 */
-	private ResponseValues doDeleteImage(VitroRequest vreq, Individual entity) {
-		ImageUploadHelper helper = new ImageUploadHelper(fileStorage,
-				vreq.getUnfilteredWebappDaoFactory(), getServletContext());
-
-		helper.removeExistingImage(entity);
-
-		return showExitPage(vreq, entity);
-	}
-
-	/**
-	 * Delete the main image and the thumbnail, and go to the "add image"
-	 * screen.
-	 */
-	private ResponseValues doDeleteThenEdit(VitroRequest vreq, Individual entity) {
-		ImageUploadHelper helper = new ImageUploadHelper(fileStorage,
-				vreq.getUnfilteredWebappDaoFactory(), getServletContext());
-
-		helper.removeExistingImage(entity);
-
-		return showAddImagePage(vreq, entity);
-	}
-
-	/**
-	 * We need to be talking about an actual Individual here.
-	 */
-	private Individual validateEntityUri(VitroRequest vreq)
-			throws UserMistakeException {
-		String entityUri = vreq.getParameter(PARAMETER_ENTITY_URI);
-		if (entityUri == null) {
-			throw new UserMistakeException(ERROR_CODE_NO_URI);
-		}
-
-		Individual entity = vreq.getUnfilteredWebappDaoFactory().getIndividualDao()
-				.getIndividualByURI(entityUri);
-		if (entity == null) {
-			throw new UserMistakeException(ERROR_CODE_UNRECOGNIZED_URI,
-					entityUri);
-		}
-		return entity;
-	}
-
-	/**
-	 * Did we get the cropping coordinates?
-	 */
-	private CropRectangle validateCropCoordinates(VitroRequest vreq) {
-		int x = getIntegerParameter(vreq, "x", 0);
-		int y = getIntegerParameter(vreq, "y", 0);
-		int h = getIntegerParameter(vreq, "h", THUMBNAIL_HEIGHT);
-		int w = getIntegerParameter(vreq, "w", THUMBNAIL_WIDTH);
-		return new CropRectangle(x, y, h, w);
-	}
-
-	/**
-	 * We need this parameter on the request, and it must be a valid integer.
-	 */
-	private int getIntegerParameter(HttpServletRequest req, String key,
-			int defaultValue) {
-		String string = req.getParameter(key);
-		if ((string == null) || (string.isEmpty())) {
-			log.debug("No value for '" + key + "'; using default value = "
-					+ defaultValue);
-			return defaultValue;
-		}
-		try {
-			return Integer.parseInt(string);
-		} catch (NumberFormatException e) {
-			log.warn("Value for '" + key + "' was not a valid integer: '"
-					+ string + "'; using default value = " + defaultValue);
-			return defaultValue;
-		}
-	}
-
-	/**
-	 * 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.
-	 */
-	private TemplateResponseValues showAddImagePage(VitroRequest vreq,
-			Individual entity) {
-
-		String formAction = (entity == null) ? "" : formAction(entity.getURI(),
-				ACTION_UPLOAD);
-		String cancelUrl = (entity == null) ? "" : exitPageUrl(vreq,
-				entity.getURI());
-		String placeholderUrl = (entity == null) ? "" : UrlBuilder
-				.getUrl(PlaceholderUtil.getPlaceholderImagePathForIndividual(
-						vreq, entity.getURI()));
-
-		TemplateResponseValues rv = new TemplateResponseValues(TEMPLATE_NEW);
-
-		rv.put(BODY_THUMBNAIL_URL, placeholderUrl);
-		rv.put(BODY_FORM_ACTION, formAction);
-		rv.put(BODY_CANCEL_URL, cancelUrl);
-		rv.put(BODY_TITLE, figureUploadPageTitle(vreq, entity));
-		rv.put(BODY_MAX_FILE_SIZE, MAXIMUM_FILE_SIZE / (1024 * 1024));
-		rv.put(BODY_THUMBNAIL_HEIGHT, THUMBNAIL_HEIGHT);
-		rv.put(BODY_THUMBNAIL_WIDTH, THUMBNAIL_WIDTH);
-		return rv;
-	}
-
-	/**
-	 * The individual has no image, but the user did something wrong.
-	 */
-	private TemplateResponseValues showAddImagePageWithError(VitroRequest vreq,
-			Individual entity, String message) {
-		return showAddImagePage(vreq, entity).put(BODY_ERROR_MESSAGE, message);
-	}
-
-	/**
-	 * The individual has an image - go to the Replace Image page.
-	 */
-	private TemplateResponseValues showReplaceImagePage(VitroRequest vreq,
-			Individual entity, ImageInfo imageInfo) {
-		TemplateResponseValues rv = new TemplateResponseValues(TEMPLATE_REPLACE);
-		rv.put(BODY_THUMBNAIL_URL, UrlBuilder.getUrl(imageInfo.getThumbnail()
-				.getBytestreamAliasUrl()));
-		rv.put(BODY_DELETE_URL, formAction(entity.getURI(), ACTION_DELETE_EDIT));
-		rv.put(BODY_FORM_ACTION, formAction(entity.getURI(), ACTION_UPLOAD));
-		rv.put(BODY_CANCEL_URL, exitPageUrl(vreq, entity.getURI()));
-		rv.put(BODY_TITLE, figureReplacePageTitle(vreq, entity));
-		rv.put(BODY_MAX_FILE_SIZE, MAXIMUM_FILE_SIZE / (1024 * 1024));
-		rv.put(BODY_THUMBNAIL_HEIGHT, THUMBNAIL_HEIGHT);
-		rv.put(BODY_THUMBNAIL_WIDTH, THUMBNAIL_WIDTH);
-		return rv;
-	}
-
-	/**
-	 * The individual has an image, but the user did something wrong.
-	 */
-	private TemplateResponseValues showReplaceImagePageWithError(
-			VitroRequest vreq, Individual entity, ImageInfo imageInfo,
-			String message) {
-		TemplateResponseValues rv = showReplaceImagePage(vreq, entity,
-				imageInfo);
-		rv.put(BODY_ERROR_MESSAGE, message);
-		return rv;
-	}
-
-	/**
-	 * We got their main image - go to the Crop Image page.
-	 */
-	private TemplateResponseValues showCropImagePage(VitroRequest vreq,
-			Individual entity, String imageUrl, Dimensions dimensions) {
-		TemplateResponseValues rv = new TemplateResponseValues(TEMPLATE_CROP);
-		rv.put(BODY_MAIN_IMAGE_URL, UrlBuilder.getUrl(imageUrl));
-		rv.put(BODY_MAIN_IMAGE_HEIGHT, dimensions.height);
-		rv.put(BODY_MAIN_IMAGE_WIDTH, dimensions.width);
-		rv.put(BODY_FORM_ACTION, formAction(entity.getURI(), ACTION_SAVE));
-		rv.put(BODY_CANCEL_URL, exitPageUrl(vreq, entity.getURI()));
-		rv.put(BODY_TITLE, figureCropPageTitle(vreq, entity));
-		return rv;
-	}
-
-	/**
-	 * All done - go to the individual display page.
-	 */
-	private ForwardResponseValues showExitPage(VitroRequest vreq,
-			Individual entity) {
-		return new ForwardResponseValues(exitPageUrl(vreq, entity.getURI()));
-	}
-
-	/**
-	 * When we complete the process, by success or by cancellation, go to the
-	 * initial referring page. If there wasn't one, go to the individual display
-	 * page.
-	 */
-	private String exitPageUrl(VitroRequest vreq, String entityUri) {
-		String referrer = (String) vreq.getSession().getAttribute(
-				ATTRIBUTE_REFERRING_PAGE);
-		if (referrer != null) {
-			return referrer;
-		}
-
-		String defaultNamespace = getDefaultNamespace();
-		if (defaultNamespace == null) {
-			return "";
-		} else if (!entityUri.startsWith(defaultNamespace)) {
-			return "";
-		} else {
-			String tail = entityUri.substring(defaultNamespace.length());
-			if (!tail.startsWith("/")) {
-				tail = "/" + tail;
-			}
-			return "display" + tail;
-		}
-	}
-
-	/**
-	 * The "action" parameter on the HTML "form" tag should include the path
-	 * back to this controller, along with the desired action and the Entity
-	 * URI.
-	 */
-	private String formAction(String entityUri, String action) {
-		ParamMap params = new ParamMap(PARAMETER_ENTITY_URI, entityUri,
-				PARAMETER_ACTION, action);
-		return UrlBuilder.getPath(URL_HERE, params);
-	}
-
-	/**
-	 * Format the title for the Upload page.
-	 */
-	private String figureUploadPageTitle(HttpServletRequest req,
-			Individual entity) {
-		return figurePageTitle(req, entity, TEXT_STRING_UPLOAD_TITLE,
-				TEXT_STRING_UPLOAD_TITLE_WITH_NAME);
-	}
-
-	/**
-	 * Format the title for the Replace page.
-	 */
-	private String figureReplacePageTitle(HttpServletRequest req,
-			Individual entity) {
-		return figurePageTitle(req, entity, TEXT_STRING_REPLACE_TITLE,
-				TEXT_STRING_REPLACE_TITLE_WITH_NAME);
-	}
-
-	/**
-	 * Format the title for the Crop page.
-	 */
-	private String figureCropPageTitle(HttpServletRequest req, Individual entity) {
-		return figurePageTitle(req, entity, TEXT_STRING_CROP_TITLE,
-				TEXT_STRING_CROP_TITLE_WITH_NAME);
-	}
-
-	/**
-	 * Format one of two page titles, depending on whether the entity has a
-	 * name.
-	 */
-	private String figurePageTitle(HttpServletRequest req, Individual entity,
-			String noNameTitleKey, String nameTitleKey) {
-		if (entity != null) {
-			String name = entity.getName();
-			if (name != null) {
-				return I18n.text(req, TEXT_BUNDLE, nameTitleKey, name);
-			}
-		}
-		return I18n.text(req, TEXT_BUNDLE, noNameTitleKey);
-	}
-
-	/**
-	 * Holds an error message to use as a complaint to the user.
-	 */
-	static class UserMistakeException extends Exception {
-		private final Object[] parameters;
-
-		UserMistakeException(String message, Object... parameters) {
-			super(message);
-			this.parameters = parameters;
-		}
-
-		public String formatMessage(HttpServletRequest req) {
-			return I18n.text(req, getMessage(), parameters);
-		}
-	}
-
-	/**
-	 * Holds the coordinates that we use to crop the main image.
-	 */
-	public static class CropRectangle {
-		public final int x;
-		public final int y;
-		public final int height;
-		public final int width;
-
-		public CropRectangle(int x, int y, int height, int width) {
-			this.x = x;
-			this.y = y;
-			this.height = height;
-			this.width = width;
-		}
-
-		/** Produce a new crop rectangle that compensates for scaling. */
-		public CropRectangle unscale(float scale) {
-			int newX = (int) (x / scale);
-			int newY = (int) (y / scale);
-			int newHeight = (int) (height / scale);
-			int newWidth = (int) (width / scale);
-			return new CropRectangle(newX, newY, newHeight, newWidth);
-		}
-
-		@Override
-		public String toString() {
-			return "CropRectangle[x=" + x + ", y=" + y + ", w=" + width
-					+ ", h=" + height + "]";
-		}
-
-	}
-
-	/**
-	 * For debugging, dump all sorts of information about the request.
-	 * 
-	 * WARNING: if "req" represents a Multi-part request which has not yet been
-	 * parsed, then reading these parameters will consume them.
-	 */
-	@SuppressWarnings("unchecked")
-	private void dumpRequestDetails(HttpServletRequest req) {
-		log.trace("Request is " + req.getClass().getName());
-
-		Map<String, String[]> parms = req.getParameterMap();
-		for (Entry<String, String[]> entry : parms.entrySet()) {
-			log.trace("Parameter '" + entry.getKey() + "'="
-					+ Arrays.deepToString(entry.getValue()));
-		}
-
-		Enumeration<String> attrs = req.getAttributeNames();
-		while (attrs.hasMoreElements()) {
-			String key = attrs.nextElement();
-			String valueString = String.valueOf(req.getAttribute(key));
-			String valueOneLine = valueString.replace("\n", " | ");
-			log.trace("Attribute '" + key + "'=" + valueOneLine);
-		}
-	}
-
-	static class Dimensions {
-		final int width;
-		final int height;
-
-		Dimensions(int width, int height) {
-			this.width = width;
-			this.height = height;
-		}
-
-		@Override
-		public String toString() {
-			return "Dimensions[width=" + width + ", height=" + height + "]";
-		}
-	}
-
-	private String getDefaultNamespace() {
-		return ConfigurationProperties.getBean(getServletContext())
-				.getProperty("Vitro.defaultNamespace");
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
+
+import java.util.Arrays;
+import java.util.Enumeration;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.UnavailableException;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestActionConstants;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.DropObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ForwardResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorage;
+import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageSetup;
+import edu.cornell.mannlib.vitro.webapp.filestorage.model.FileInfo;
+import edu.cornell.mannlib.vitro.webapp.filestorage.model.ImageInfo;
+import edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest.FileUploadServletRequest;
+import edu.cornell.mannlib.vitro.webapp.i18n.I18n;
+import edu.cornell.mannlib.vitro.webapp.web.images.PlaceholderUtil;
+
+/**
+ * Handle adding, replacing or deleting the main image on an Individual.
+ */
+public class ImageUploadController extends FreemarkerHttpServlet {
+	private static final long serialVersionUID = 1L;
+	private static final Log log = LogFactory
+			.getLog(ImageUploadController.class);
+
+	private static final String ATTRIBUTE_REFERRING_PAGE = "ImageUploadController.referringPage";
+
+	private static final String ERROR_CODE_UNRECOGNIZED_URI = "imageUpload.errorUnrecognizedURI";
+	private static final String ERROR_CODE_NO_URI = "imageUpload.errorNoURI";
+
+	/** Limit file size to 6 megabytes. */
+	public static final int MAXIMUM_FILE_SIZE = 6 * 1024 * 1024;
+
+	/** Generated thumbnails will be this big. */
+	public static final int THUMBNAIL_HEIGHT = 200;
+	public static final int THUMBNAIL_WIDTH = 200;
+
+	/** The form field that tells what we are doing: uploading? deleting? */
+	public static final String PARAMETER_ACTION = "action";
+
+	/** The form field that identifies the Individual. */
+	public static final String PARAMETER_ENTITY_URI = "entityUri";
+
+	/** The form field of the uploaded file; use as a key to the FileItem map. */
+	public static final String PARAMETER_UPLOADED_FILE = "datafile";
+
+	/** Here is the main image file. Hold on to it. */
+	public static final String ACTION_UPLOAD = "upload";
+
+	/** Here is the cropping info; we're ready to save the image. */
+	public static final String ACTION_SAVE = "save";
+
+	/** A request to delete the file and return to the referring page. */
+	public static final String ACTION_DELETE = "delete";
+
+	/** A request to delete the file and return to the "new image" screen. */
+	public static final String ACTION_DELETE_EDIT = "deleteEdit";
+
+	public static final String BODY_TITLE = "title";
+	public static final String BODY_ENTITY_NAME = "entityName";
+	public static final String BODY_MAIN_IMAGE_URL = "imageUrl";
+	public static final String BODY_MAIN_IMAGE_HEIGHT = "imageHeight";
+	public static final String BODY_MAIN_IMAGE_WIDTH = "imageWidth";
+	public static final String BODY_THUMBNAIL_URL = "thumbnailUrl";
+	public static final String BODY_CANCEL_URL = "cancelUrl";
+	public static final String BODY_DELETE_URL = "deleteUrl";
+	public static final String BODY_FORM_ACTION = "formAction";
+	public static final String BODY_ERROR_MESSAGE = "errorMessage";
+	public static final String BODY_MAX_FILE_SIZE = "maxFileSize";
+	public static final String BODY_THUMBNAIL_WIDTH = "thumbnailWidth";
+	public static final String BODY_THUMBNAIL_HEIGHT = "thumbnailHeight";
+
+	public static final String TEMPLATE_NEW = "imageUpload-newImage.ftl";
+	public static final String TEMPLATE_REPLACE = "imageUpload-replaceImage.ftl";
+	public static final String TEMPLATE_CROP = "imageUpload-cropImage.ftl";
+	public static final String TEMPLATE_ERROR = "error-standard.ftl";
+
+	private static final String URL_HERE = UrlBuilder.getUrl("/uploadImages");
+
+	private static final String TEXT_BUNDLE = "imageUpload";
+	private static final String TEXT_STRING_UPLOAD_TITLE = "upload_page_title";
+	private static final String TEXT_STRING_UPLOAD_TITLE_WITH_NAME = "upload_page_title_with_name";
+	private static final String TEXT_STRING_REPLACE_TITLE = "replace_page_title";
+	private static final String TEXT_STRING_REPLACE_TITLE_WITH_NAME = "replace_page_title_with_name";
+	private static final String TEXT_STRING_CROP_TITLE = "crop_page_title";
+	private static final String TEXT_STRING_CROP_TITLE_WITH_NAME = "crop_page_title_with_name";
+
+	private FileStorage fileStorage;
+
+	/**
+	 * When initialized, get a reference to the File Storage system. Without
+	 * that, we can do nothing.
+	 */
+	@Override
+	public void init() throws ServletException {
+		super.init();
+		Object o = getServletContext().getAttribute(
+				FileStorageSetup.ATTRIBUTE_NAME);
+		if (o instanceof FileStorage) {
+			fileStorage = (FileStorage) o;
+		} else if (o == null) {
+			throw new UnavailableException(this.getClass().getSimpleName()
+					+ " could not initialize. Attribute '"
+					+ FileStorageSetup.ATTRIBUTE_NAME
+					+ "' was not set in the servlet context.");
+		} else {
+			throw new UnavailableException(this.getClass().getSimpleName()
+					+ " could not initialize. Attribute '"
+					+ FileStorageSetup.ATTRIBUTE_NAME
+					+ "' in the servlet context contained an instance of '"
+					+ o.getClass().getName() + "' instead of '"
+					+ FileStorage.class.getName() + "'");
+		}
+	}
+
+	/**
+	 * The required action depends on what we are trying to do.
+	 */
+	@Override
+	protected Actions requiredActions(VitroRequest vreq) {
+		try {
+			String action = vreq.getParameter(PARAMETER_ACTION);
+			Individual entity = validateEntityUri(vreq);
+			String imageUri = entity.getMainImageUri();
+
+			RequestedAction ra;
+			if (ACTION_DELETE.equals(action)
+					|| ACTION_DELETE_EDIT.equals(action)) {
+				ra = new DropObjectPropertyStatement(vreq.getJenaOntModel(),
+						entity.getURI(), VitroVocabulary.IND_MAIN_IMAGE,
+						imageUri);
+			} else if (imageUri != null) {
+				ra = new EditObjectPropertyStatement(vreq.getJenaOntModel(),
+						entity.getURI(), VitroVocabulary.IND_MAIN_IMAGE,
+						imageUri);
+			} else {
+				ra = new AddObjectPropertyStatement(vreq.getJenaOntModel(),
+						entity.getURI(), VitroVocabulary.IND_MAIN_IMAGE,
+						RequestActionConstants.SOME_URI);
+			}
+			return new Actions(ra);
+		} catch (UserMistakeException e) {
+			return Actions.UNAUTHORIZED;
+		}
+	}
+
+	/**
+	 * <p>
+	 * Parse the multi-part request, process the request, and produce the
+	 * output.
+	 * </p>
+	 * <p>
+	 * If the request was a multi-part file upload, it will parse to a
+	 * normal-looking request with a "file_item_map" attribute.
+	 * </p>
+	 * <p>
+	 * The processing will produce a {@link ResponseValues} object, which
+	 * represents either a request for a FreeMarker template or a forwarding
+	 * operation.
+	 * <ul>
+	 * <li>If a FreeMarker template, we emulate the actions that
+	 * FreeMarkerHttpServlet would have taken to produce the output.</li>
+	 * <li>If a forwarding operation, we create a {@link RequestDispatcher} to
+	 * do the forwarding.</li>
+	 * </ul>
+	 * </p>
+	 */
+
+	@Override
+	protected ResponseValues processRequest(VitroRequest vreq) {
+		try {
+			// Parse the multi-part request.
+			FileUploadServletRequest.parseRequest(vreq, MAXIMUM_FILE_SIZE);
+			if (log.isTraceEnabled()) {
+				dumpRequestDetails(vreq);
+			}
+
+			return buildTheResponse(vreq);
+		} catch (Exception e) {
+			// log.error("Could not produce response page", e);
+			return new ExceptionResponseValues(e);
+		}
+	}
+
+	/**
+	 * Handle the different actions. If not specified, the default action is to
+	 * show the intro screen.
+	 */
+	private ResponseValues buildTheResponse(VitroRequest vreq) {
+		String action = vreq.getParameter(PARAMETER_ACTION);
+
+		try {
+			Individual entity = validateEntityUri(vreq);
+			if (ACTION_UPLOAD.equals(action)) {
+				return doUploadImage(vreq, entity);
+			} else if (ACTION_SAVE.equals(action)) {
+				return doCreateThumbnail(vreq, entity);
+			} else if (ACTION_DELETE.equals(action)) {
+				captureReferringUrl(vreq);
+				return doDeleteImage(vreq, entity);
+			} else if (ACTION_DELETE_EDIT.equals(action)) {
+				return doDeleteThenEdit(vreq, entity);
+			} else {
+				captureReferringUrl(vreq);
+				return doIntroScreen(vreq, entity);
+			}
+		} catch (UserMistakeException e) {
+			// Can't find the entity? Complain.
+			return showAddImagePageWithError(vreq, null, e.formatMessage(vreq));
+		} catch (Exception e) {
+			// We weren't expecting this - log it, and apologize to the user.
+			return new ExceptionResponseValues(e);
+		}
+	}
+
+	/**
+	 * We are just starting the upload process. Record where we came from, so if
+	 * they hit "cancel" we know where to send them. If we have problems, just
+	 * clear it.
+	 */
+	private void captureReferringUrl(VitroRequest vreq) {
+		String referrer = vreq.getHeader("Referer");
+		if (referrer == null) {
+			vreq.getSession().removeAttribute(ATTRIBUTE_REFERRING_PAGE);
+		} else {
+			vreq.getSession().setAttribute(ATTRIBUTE_REFERRING_PAGE, referrer);
+		}
+	}
+
+	/**
+	 * Show the first screen in the upload process: Add or Replace.
+	 */
+	private ResponseValues doIntroScreen(VitroRequest vreq, Individual entity) {
+		ImageInfo imageInfo = ImageInfo.instanceFromEntityUri(
+				vreq.getUnfilteredWebappDaoFactory(), entity);
+		if (imageInfo == null) {
+			return showAddImagePage(vreq, entity);
+		} else {
+			return showReplaceImagePage(vreq, entity, imageInfo);
+		}
+	}
+
+	/**
+	 * The user has selected their main image file. Remove any previous main
+	 * image (and thumbnail), and attach the new main image.
+	 */
+	private ResponseValues doUploadImage(VitroRequest vreq, Individual entity) {
+		ImageUploadHelper helper = new ImageUploadHelper(fileStorage,
+				vreq.getUnfilteredWebappDaoFactory(), getServletContext());
+
+		try {
+			// Did they provide a file to upload? If not, show an error.
+			FileItem fileItem = helper.validateImageFromRequest(vreq);
+
+			// Put it in the file system, and store a reference in the session.
+			FileInfo fileInfo = helper.storeNewImage(fileItem, vreq);
+
+			// How big is the new image? If not big enough, show an error.
+			Dimensions size = helper.getNewImageSize(fileInfo);
+
+			// Go to the cropping page.
+			return showCropImagePage(vreq, entity,
+					fileInfo.getBytestreamAliasUrl(), size);
+		} catch (UserMistakeException e) {
+			return showErrorMessage(vreq, entity, e.formatMessage(vreq));
+		}
+	}
+
+	/**
+	 * Are we writing the error message to the "Add" page or to the "Replace"
+	 * page?
+	 */
+	private ResponseValues showErrorMessage(VitroRequest vreq,
+			Individual entity, String message) {
+
+		ImageInfo imageInfo = ImageInfo.instanceFromEntityUri(
+				vreq.getUnfilteredWebappDaoFactory(), entity);
+		if (imageInfo == null) {
+			return showAddImagePageWithError(vreq, entity, message);
+		} else {
+			return showReplaceImagePageWithError(vreq, entity, imageInfo,
+					message);
+		}
+	}
+
+	/**
+	 * The user has specified how to crop the thumbnail. Crop it and attach it
+	 * to the main image.
+	 */
+	private ResponseValues doCreateThumbnail(VitroRequest vreq,
+			Individual entity) {
+		ImageUploadHelper helper = new ImageUploadHelper(fileStorage,
+				vreq.getUnfilteredWebappDaoFactory(), getServletContext());
+
+		try {
+			CropRectangle crop = validateCropCoordinates(vreq);
+			FileInfo newImage = helper.getNewImageInfo(vreq);
+			FileInfo thumbnail = helper.generateThumbnail(crop, newImage);
+
+			helper.removeExistingImage(entity);
+			helper.storeImageFiles(entity, newImage, thumbnail);
+
+			return showExitPage(vreq, entity);
+		} catch (UserMistakeException e) {
+			return showErrorMessage(vreq, entity, e.formatMessage(vreq));
+		}
+	}
+
+	/**
+	 * Delete the main image and the thumbnail, and go back to the referring
+	 * page.
+	 */
+	private ResponseValues doDeleteImage(VitroRequest vreq, Individual entity) {
+		ImageUploadHelper helper = new ImageUploadHelper(fileStorage,
+				vreq.getUnfilteredWebappDaoFactory(), getServletContext());
+
+		helper.removeExistingImage(entity);
+
+		return showExitPage(vreq, entity);
+	}
+
+	/**
+	 * Delete the main image and the thumbnail, and go to the "add image"
+	 * screen.
+	 */
+	private ResponseValues doDeleteThenEdit(VitroRequest vreq, Individual entity) {
+		ImageUploadHelper helper = new ImageUploadHelper(fileStorage,
+				vreq.getUnfilteredWebappDaoFactory(), getServletContext());
+
+		helper.removeExistingImage(entity);
+
+		return showAddImagePage(vreq, entity);
+	}
+
+	/**
+	 * We need to be talking about an actual Individual here.
+	 */
+	private Individual validateEntityUri(VitroRequest vreq)
+			throws UserMistakeException {
+		String entityUri = vreq.getParameter(PARAMETER_ENTITY_URI);
+		if (entityUri == null) {
+			throw new UserMistakeException(ERROR_CODE_NO_URI);
+		}
+
+		Individual entity = vreq.getUnfilteredWebappDaoFactory().getIndividualDao()
+				.getIndividualByURI(entityUri);
+		if (entity == null) {
+			throw new UserMistakeException(ERROR_CODE_UNRECOGNIZED_URI,
+					entityUri);
+		}
+		return entity;
+	}
+
+	/**
+	 * Did we get the cropping coordinates?
+	 */
+	private CropRectangle validateCropCoordinates(VitroRequest vreq) {
+		int x = getIntegerParameter(vreq, "x", 0);
+		int y = getIntegerParameter(vreq, "y", 0);
+		int h = getIntegerParameter(vreq, "h", THUMBNAIL_HEIGHT);
+		int w = getIntegerParameter(vreq, "w", THUMBNAIL_WIDTH);
+		return new CropRectangle(x, y, h, w);
+	}
+
+	/**
+	 * We need this parameter on the request, and it must be a valid integer.
+	 */
+	private int getIntegerParameter(HttpServletRequest req, String key,
+			int defaultValue) {
+		String string = req.getParameter(key);
+		if ((string == null) || (string.isEmpty())) {
+			log.debug("No value for '" + key + "'; using default value = "
+					+ defaultValue);
+			return defaultValue;
+		}
+		try {
+			return Integer.parseInt(string);
+		} catch (NumberFormatException e) {
+			log.warn("Value for '" + key + "' was not a valid integer: '"
+					+ string + "'; using default value = " + defaultValue);
+			return defaultValue;
+		}
+	}
+
+	/**
+	 * 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.
+	 */
+	private TemplateResponseValues showAddImagePage(VitroRequest vreq,
+			Individual entity) {
+
+		String formAction = (entity == null) ? "" : formAction(entity.getURI(),
+				ACTION_UPLOAD);
+		String cancelUrl = (entity == null) ? "" : exitPageUrl(vreq,
+				entity.getURI());
+		String placeholderUrl = (entity == null) ? "" : UrlBuilder
+				.getUrl(PlaceholderUtil.getPlaceholderImagePathForIndividual(
+						vreq, entity.getURI()));
+
+		TemplateResponseValues rv = new TemplateResponseValues(TEMPLATE_NEW);
+
+		rv.put(BODY_THUMBNAIL_URL, placeholderUrl);
+		rv.put(BODY_FORM_ACTION, formAction);
+		rv.put(BODY_CANCEL_URL, cancelUrl);
+		rv.put(BODY_TITLE, figureUploadPageTitle(vreq, entity));
+		rv.put(BODY_MAX_FILE_SIZE, MAXIMUM_FILE_SIZE / (1024 * 1024));
+		rv.put(BODY_THUMBNAIL_HEIGHT, THUMBNAIL_HEIGHT);
+		rv.put(BODY_THUMBNAIL_WIDTH, THUMBNAIL_WIDTH);
+		return rv;
+	}
+
+	/**
+	 * The individual has no image, but the user did something wrong.
+	 */
+	private TemplateResponseValues showAddImagePageWithError(VitroRequest vreq,
+			Individual entity, String message) {
+		return showAddImagePage(vreq, entity).put(BODY_ERROR_MESSAGE, message);
+	}
+
+	/**
+	 * The individual has an image - go to the Replace Image page.
+	 */
+	private TemplateResponseValues showReplaceImagePage(VitroRequest vreq,
+			Individual entity, ImageInfo imageInfo) {
+		TemplateResponseValues rv = new TemplateResponseValues(TEMPLATE_REPLACE);
+		rv.put(BODY_THUMBNAIL_URL, UrlBuilder.getUrl(imageInfo.getThumbnail()
+				.getBytestreamAliasUrl()));
+		rv.put(BODY_DELETE_URL, formAction(entity.getURI(), ACTION_DELETE_EDIT));
+		rv.put(BODY_FORM_ACTION, formAction(entity.getURI(), ACTION_UPLOAD));
+		rv.put(BODY_CANCEL_URL, exitPageUrl(vreq, entity.getURI()));
+		rv.put(BODY_TITLE, figureReplacePageTitle(vreq, entity));
+		rv.put(BODY_MAX_FILE_SIZE, MAXIMUM_FILE_SIZE / (1024 * 1024));
+		rv.put(BODY_THUMBNAIL_HEIGHT, THUMBNAIL_HEIGHT);
+		rv.put(BODY_THUMBNAIL_WIDTH, THUMBNAIL_WIDTH);
+		return rv;
+	}
+
+	/**
+	 * The individual has an image, but the user did something wrong.
+	 */
+	private TemplateResponseValues showReplaceImagePageWithError(
+			VitroRequest vreq, Individual entity, ImageInfo imageInfo,
+			String message) {
+		TemplateResponseValues rv = showReplaceImagePage(vreq, entity,
+				imageInfo);
+		rv.put(BODY_ERROR_MESSAGE, message);
+		return rv;
+	}
+
+	/**
+	 * We got their main image - go to the Crop Image page.
+	 */
+	private TemplateResponseValues showCropImagePage(VitroRequest vreq,
+			Individual entity, String imageUrl, Dimensions dimensions) {
+		TemplateResponseValues rv = new TemplateResponseValues(TEMPLATE_CROP);
+		rv.put(BODY_MAIN_IMAGE_URL, UrlBuilder.getUrl(imageUrl));
+		rv.put(BODY_MAIN_IMAGE_HEIGHT, dimensions.height);
+		rv.put(BODY_MAIN_IMAGE_WIDTH, dimensions.width);
+		rv.put(BODY_FORM_ACTION, formAction(entity.getURI(), ACTION_SAVE));
+		rv.put(BODY_CANCEL_URL, exitPageUrl(vreq, entity.getURI()));
+		rv.put(BODY_TITLE, figureCropPageTitle(vreq, entity));
+		return rv;
+	}
+
+	/**
+	 * All done - go to the individual display page.
+	 */
+	private ForwardResponseValues showExitPage(VitroRequest vreq,
+			Individual entity) {
+		return new ForwardResponseValues(exitPageUrl(vreq, entity.getURI()));
+	}
+
+	/**
+	 * When we complete the process, by success or by cancellation, go to the
+	 * initial referring page. If there wasn't one, go to the individual display
+	 * page.
+	 */
+	private String exitPageUrl(VitroRequest vreq, String entityUri) {
+		String referrer = (String) vreq.getSession().getAttribute(
+				ATTRIBUTE_REFERRING_PAGE);
+		if (referrer != null) {
+			return referrer;
+		}
+
+		String defaultNamespace = getDefaultNamespace();
+		if (defaultNamespace == null) {
+			return "";
+		} else if (!entityUri.startsWith(defaultNamespace)) {
+			return "";
+		} else {
+			String tail = entityUri.substring(defaultNamespace.length());
+			if (!tail.startsWith("/")) {
+				tail = "/" + tail;
+			}
+			return "display" + tail;
+		}
+	}
+
+	/**
+	 * The "action" parameter on the HTML "form" tag should include the path
+	 * back to this controller, along with the desired action and the Entity
+	 * URI.
+	 */
+	private String formAction(String entityUri, String action) {
+		ParamMap params = new ParamMap(PARAMETER_ENTITY_URI, entityUri,
+				PARAMETER_ACTION, action);
+		return UrlBuilder.getPath(URL_HERE, params);
+	}
+
+	/**
+	 * Format the title for the Upload page.
+	 */
+	private String figureUploadPageTitle(HttpServletRequest req,
+			Individual entity) {
+		return figurePageTitle(req, entity, TEXT_STRING_UPLOAD_TITLE,
+				TEXT_STRING_UPLOAD_TITLE_WITH_NAME);
+	}
+
+	/**
+	 * Format the title for the Replace page.
+	 */
+	private String figureReplacePageTitle(HttpServletRequest req,
+			Individual entity) {
+		return figurePageTitle(req, entity, TEXT_STRING_REPLACE_TITLE,
+				TEXT_STRING_REPLACE_TITLE_WITH_NAME);
+	}
+
+	/**
+	 * Format the title for the Crop page.
+	 */
+	private String figureCropPageTitle(HttpServletRequest req, Individual entity) {
+		return figurePageTitle(req, entity, TEXT_STRING_CROP_TITLE,
+				TEXT_STRING_CROP_TITLE_WITH_NAME);
+	}
+
+	/**
+	 * Format one of two page titles, depending on whether the entity has a
+	 * name.
+	 */
+	private String figurePageTitle(HttpServletRequest req, Individual entity,
+			String noNameTitleKey, String nameTitleKey) {
+		if (entity != null) {
+			String name = entity.getName();
+			if (name != null) {
+				return I18n.text(req, TEXT_BUNDLE, nameTitleKey, name);
+			}
+		}
+		return I18n.text(req, TEXT_BUNDLE, noNameTitleKey);
+	}
+
+	/**
+	 * Holds an error message to use as a complaint to the user.
+	 */
+	static class UserMistakeException extends Exception {
+		private final Object[] parameters;
+
+		UserMistakeException(String message, Object... parameters) {
+			super(message);
+			this.parameters = parameters;
+		}
+
+		public String formatMessage(HttpServletRequest req) {
+			return I18n.text(req, getMessage(), parameters);
+		}
+	}
+
+	/**
+	 * Holds the coordinates that we use to crop the main image.
+	 */
+	public static class CropRectangle {
+		public final int x;
+		public final int y;
+		public final int height;
+		public final int width;
+
+		public CropRectangle(int x, int y, int height, int width) {
+			this.x = x;
+			this.y = y;
+			this.height = height;
+			this.width = width;
+		}
+
+		/** Produce a new crop rectangle that compensates for scaling. */
+		public CropRectangle unscale(float scale) {
+			int newX = (int) (x / scale);
+			int newY = (int) (y / scale);
+			int newHeight = (int) (height / scale);
+			int newWidth = (int) (width / scale);
+			return new CropRectangle(newX, newY, newHeight, newWidth);
+		}
+
+		@Override
+		public String toString() {
+			return "CropRectangle[x=" + x + ", y=" + y + ", w=" + width
+					+ ", h=" + height + "]";
+		}
+
+	}
+
+	/**
+	 * For debugging, dump all sorts of information about the request.
+	 * 
+	 * WARNING: if "req" represents a Multi-part request which has not yet been
+	 * parsed, then reading these parameters will consume them.
+	 */
+	@SuppressWarnings("unchecked")
+	private void dumpRequestDetails(HttpServletRequest req) {
+		log.trace("Request is " + req.getClass().getName());
+
+		Map<String, String[]> parms = req.getParameterMap();
+		for (Entry<String, String[]> entry : parms.entrySet()) {
+			log.trace("Parameter '" + entry.getKey() + "'="
+					+ Arrays.deepToString(entry.getValue()));
+		}
+
+		Enumeration<String> attrs = req.getAttributeNames();
+		while (attrs.hasMoreElements()) {
+			String key = attrs.nextElement();
+			String valueString = String.valueOf(req.getAttribute(key));
+			String valueOneLine = valueString.replace("\n", " | ");
+			log.trace("Attribute '" + key + "'=" + valueOneLine);
+		}
+	}
+
+	static class Dimensions {
+		final int width;
+		final int height;
+
+		Dimensions(int width, int height) {
+			this.width = width;
+			this.height = height;
+		}
+
+		@Override
+		public String toString() {
+			return "Dimensions[width=" + width + ", height=" + height + "]";
+		}
+	}
+
+	private String getDefaultNamespace() {
+		return ConfigurationProperties.getBean(getServletContext())
+				.getProperty("Vitro.defaultNamespace");
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadHelper.java
index e0052b7bd..68d0d00f6 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadHelper.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadHelper.java
@@ -1,422 +1,422 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
-
-import static edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.MAXIMUM_FILE_SIZE;
-import static edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.PARAMETER_UPLOADED_FILE;
-import static edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.THUMBNAIL_HEIGHT;
-import static edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.THUMBNAIL_WIDTH;
-import static edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest.FileUploadServletRequest.FILE_ITEM_MAP;
-import static edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest.FileUploadServletRequest.FILE_UPLOAD_EXCEPTION;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.media.jai.JAI;
-import javax.media.jai.RenderedOp;
-import javax.media.jai.util.ImagingListener;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.sun.media.jai.codec.MemoryCacheSeekableStream;
-
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.CropRectangle;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.Dimensions;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.UserMistakeException;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.filestorage.TempFileHolder;
-import edu.cornell.mannlib.vitro.webapp.filestorage.UploadedFileHelper;
-import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileAlreadyExistsException;
-import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorage;
-import edu.cornell.mannlib.vitro.webapp.filestorage.model.FileInfo;
-import edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest.FileUploadServletRequest;
-
-/**
- * Handle the mechanics of validating, storing, and deleting file images.
- */
-public class ImageUploadHelper {
-	private static final Log log = LogFactory.getLog(ImageUploadHelper.class);
-
-	/*
-	 * Keys to text strings for error messages.
-	 */
-	private static final String ERROR_CODE_NO_IMAGE_TO_CROP = "imageUpload.errorNoImageForCropping";
-	private static final String ERROR_CODE_IMAGE_TOO_SMALL = "imageUpload.errorImageTooSmall";
-	private static final String ERROR_CODE_UNKNOWN = "imageUpload.errorUnknown";
-	private static final String ERROR_CODE_FILE_TOO_BIG = "imageUpload.errorFileTooBig";
-	private static final String ERROR_CODE_UNRECOGNIZED_FILE_TYPE = "imageUpload.errorUnrecognizedFileType";
-	private static final String ERROR_CODE_NO_PHOTO_SELECTED = "imageUpload.errorNoPhotoSelected";
-	private static final String ERROR_CODE_BAD_MULTIPART_REQUEST = "imageUpload.errorBadMultipartRequest";
-	private static final String ERROR_CODE_FORM_FIELD_MISSING = "imageUpload.errorFormFieldMissing";
-
-	/**
-	 * When they upload a new image, store it as this session attribute until
-	 * we're ready to attach it to the Individual.
-	 */
-	public static final String ATTRIBUTE_TEMP_FILE = "ImageUploadHelper.tempFile";
-
-	/**
-	 * If the main image is larger than this, it will be displayed at reduced
-	 * scale.
-	 */
-	public static final int MAXIMUM_IMAGE_DISPLAY_WIDTH = 500;
-
-	/** Recognized file extensions mapped to MIME-types. */
-	private static final Map<String, String> RECOGNIZED_FILE_TYPES = createFileTypesMap();
-
-	/** Browser-specific MIME-types mapped to recognized MIME-types. */
-	private static final Map<String, String> NON_STANDARD_MIME_TYPES = createNonStandardMimeTypesMap();
-
-	private static Map<String, String> createFileTypesMap() {
-		Map<String, String> map = new HashMap<String, String>();
-		map.put(".gif", "image/gif");
-		map.put(".png", "image/png");
-		map.put(".jpg", "image/jpeg");
-		map.put(".jpeg", "image/jpeg");
-		map.put(".jpe", "image/jpeg");
-		return Collections.unmodifiableMap(map);
-	}
-
-	/**
-	 * Internet Explorer can tell us that an image has a funky
-	 * Microsoft-specific MIME-type, and we can replace it with one that
-	 * everyone recognizes. This table records those types.
-	 */
-	private static Map<String, String> createNonStandardMimeTypesMap() {
-		Map<String, String> map = new HashMap<String, String>();
-		map.put("image/x-png", "image/png");
-		map.put("image/pjpeg", "image/jpeg");
-		return Collections.unmodifiableMap(map);
-	}
-
-	/*
-	 * Prevent Java Advanced Imaging from complaining about the lack of
-	 * accelerator classes.
-	 */
-	static {
-		JAI.getDefaultInstance().setImagingListener(
-				new NonNoisyImagingListener());
-	}
-
-	private final FileStorage fileStorage;
-	private final UploadedFileHelper uploadedFileHelper;
-
-	ImageUploadHelper(FileStorage fileStorage,
-			WebappDaoFactory webAppDaoFactory, ServletContext ctx) {
-		this.fileStorage = fileStorage;
-		this.uploadedFileHelper = new UploadedFileHelper(fileStorage,
-				webAppDaoFactory, ctx);
-	}
-
-	/**
-	 * 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 {@link 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.
-	 */
-	@SuppressWarnings("unchecked")
-	FileItem validateImageFromRequest(HttpServletRequest request)
-			throws UserMistakeException {
-		Object exception = request.getAttribute(FILE_UPLOAD_EXCEPTION);
-		if (exception != null) {
-			int limit = MAXIMUM_FILE_SIZE / (1024 * 1024);
-			throw new UserMistakeException(ERROR_CODE_FILE_TOO_BIG, limit);
-		}
-
-		Map<String, List<FileItem>> map = (Map<String, List<FileItem>>) request
-				.getAttribute(FILE_ITEM_MAP);
-		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,
-					PARAMETER_UPLOADED_FILE);
-		}
-
-		FileItem file = list.get(0);
-		if (file.getSize() == 0) {
-			throw new UserMistakeException(ERROR_CODE_NO_PHOTO_SELECTED);
-		}
-
-		String filename = getSimpleFilename(file);
-		String mimeType = getMimeType(file);
-		if (!RECOGNIZED_FILE_TYPES.containsValue(mimeType)) {
-			log.debug("Unrecognized MIME type: '" + mimeType + "'");
-			throw new UserMistakeException(ERROR_CODE_UNRECOGNIZED_FILE_TYPE,
-					filename);
-		}
-
-		return file;
-	}
-
-	/**
-	 * 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.
-	 */
-	FileInfo storeNewImage(FileItem fileItem, VitroRequest vreq) {
-		InputStream inputStream = null;
-		try {
-			inputStream = fileItem.getInputStream();
-			String mimeType = getMimeType(fileItem);
-			String filename = getSimpleFilename(fileItem);
-			FileInfo fileInfo = uploadedFileHelper.createFile(filename,
-					mimeType, inputStream);
-
-			TempFileHolder.attach(vreq.getSession(), ATTRIBUTE_TEMP_FILE,
-					fileInfo);
-
-			return fileInfo;
-		} catch (FileAlreadyExistsException e) {
-			throw new IllegalStateException("Can't create the new image file.",
-					e);
-		} catch (IOException e) {
-			throw new IllegalStateException("Can't create the new image file.",
-					e);
-		} finally {
-			if (inputStream != null) {
-				try {
-					inputStream.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-
-	/**
-	 * Find out how big this image is.
-	 * 
-	 * @throws UserMistakeException
-	 *             if the image is smaller than a thumbnail.
-	 */
-	Dimensions getNewImageSize(FileInfo fileInfo) throws UserMistakeException {
-		InputStream source = null;
-		try {
-			String uri = fileInfo.getBytestreamUri();
-			String filename = fileInfo.getFilename();
-
-			source = fileStorage.getInputStream(uri, filename);
-			MemoryCacheSeekableStream stream = new MemoryCacheSeekableStream(
-					source);
-			RenderedOp image = JAI.create("stream", stream);
-
-			Dimensions size = new Dimensions(image.getWidth(),
-					image.getHeight());
-			log.debug("new image size is " + size);
-
-			if ((size.height < THUMBNAIL_HEIGHT)
-					|| (size.width < THUMBNAIL_WIDTH)) {
-				throw new UserMistakeException(ERROR_CODE_IMAGE_TOO_SMALL,
-						THUMBNAIL_HEIGHT, THUMBNAIL_WIDTH);
-			}
-
-			return size;
-		} catch (FileNotFoundException e) {
-			throw new IllegalStateException("File not found: " + fileInfo, e);
-		} catch (IOException e) {
-			throw new IllegalStateException("Can't read image file: "
-					+ fileInfo, e);
-		} catch (UserMistakeException e) {
-			throw e;
-		} catch (Exception e) {
-			log.warn("Unexpected exception in image handling", e);
-			throw new UserMistakeException(ERROR_CODE_UNKNOWN);
-		} finally {
-			if (source != null) {
-				try {
-					source.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-
-	/**
-	 * Get the info for the new image, from where we stored it in the session.
-	 * 
-	 * @throws UserMistakeException
-	 *             if it isn't there.
-	 */
-	FileInfo getNewImageInfo(VitroRequest vreq) throws UserMistakeException {
-		FileInfo fileInfo = TempFileHolder.remove(vreq.getSession(),
-				ATTRIBUTE_TEMP_FILE);
-
-		if (fileInfo == null) {
-			throw new UserMistakeException(ERROR_CODE_NO_IMAGE_TO_CROP);
-		}
-
-		return fileInfo;
-	}
-
-	/**
-	 * Crop the main image to create the thumbnail, and put it into the file
-	 * storage system.
-	 */
-	FileInfo generateThumbnail(CropRectangle crop, FileInfo newImage) {
-		InputStream mainStream = null;
-		InputStream thumbStream = null;
-		try {
-			String mainBytestreamUri = newImage.getBytestreamUri();
-			String mainFilename = newImage.getFilename();
-			mainStream = fileStorage.getInputStream(mainBytestreamUri,
-					mainFilename);
-
-			thumbStream = new ImageUploadThumbnailer(THUMBNAIL_HEIGHT,
-					THUMBNAIL_WIDTH).cropAndScale(mainStream, crop);
-
-			String mimeType = RECOGNIZED_FILE_TYPES.get(".jpg");
-			String filename = createThumbnailFilename(mainFilename);
-			FileInfo fileInfo = uploadedFileHelper.createFile(filename,
-					mimeType, thumbStream);
-
-			log.debug("Created thumbnail: " + fileInfo);
-			return fileInfo;
-		} catch (FileAlreadyExistsException e) {
-			throw new IllegalStateException("Can't create the thumbnail file: "
-					+ e.getMessage(), e);
-		} catch (IOException e) {
-			throw new IllegalStateException("Can't create the thumbnail file",
-					e);
-		} finally {
-			if (mainStream != null) {
-				try {
-					mainStream.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-			if (thumbStream != null) {
-				try {
-					thumbStream.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-
-	/**
-	 * If this entity already had a main image, remove it. If the image and the
-	 * thumbnail are no longer used by anyone, throw them away.
-	 */
-	void removeExistingImage(Individual person) {
-		uploadedFileHelper.removeMainImage(person);
-	}
-
-	/**
-	 * Store the image on the entity, and the thumbnail on the image.
-	 */
-	void storeImageFiles(Individual entity, FileInfo newImage,
-			FileInfo thumbnail) {
-		uploadedFileHelper.setImagesOnEntity(entity.getURI(), newImage,
-				thumbnail);
-	}
-
-	/**
-	 * Internet Explorer and Opera will give you the full path along with the
-	 * filename. This will remove the path.
-	 */
-	private String getSimpleFilename(FileItem item) {
-		String fileName = item.getName();
-		if (fileName == null) {
-			return null;
-		} else {
-			return FilenameUtils.getName(fileName);
-		}
-	}
-
-	/**
-	 * Get the MIME type as supplied by the browser. If none, try to infer it
-	 * from the filename extension and the map of recognized MIME types.
-	 */
-	private String getMimeType(FileItem file) {
-		String mimeType = file.getContentType();
-		if (mimeType != null) {
-			// If the browser supplied the MIME type, we may need to
-			// replace it with the standard value.
-			if (NON_STANDARD_MIME_TYPES.containsKey(mimeType)) {
-				mimeType = NON_STANDARD_MIME_TYPES.get(mimeType);
-			}
-			return mimeType;
-		}
-
-		String filename = getSimpleFilename(file);
-		int periodHere = filename.lastIndexOf('.');
-		if (periodHere == -1) {
-			return null;
-		}
-
-		String extension = filename.substring(periodHere);
-		return RECOGNIZED_FILE_TYPES.get(extension);
-	}
-
-	/**
-	 * Create a name for the thumbnail from the name of the original file.
-	 * "myPicture.anything" becomes "thumbnail_myPicture.jpg".
-	 */
-	private String createThumbnailFilename(String filename) {
-		String prefix = "thumbnail_";
-		String extension = ".jpg";
-		int periodHere = filename.lastIndexOf('.');
-		if (periodHere == -1) {
-			return prefix + filename + extension;
-		} else {
-			return prefix + filename.substring(0, periodHere) + extension;
-		}
-	}
-
-	/**
-	 * <p>
-	 * This {@link ImagingListener} means that Java Advanced Imaging won't dump
-	 * an exception log to {@link System#out}. It writes to the log, instead.
-	 * </p>
-	 * <p>
-	 * Further, since the lack of native accelerator classes isn't an error, it
-	 * is written as a simple log message.
-	 * </p>
-	 */
-	static class NonNoisyImagingListener implements ImagingListener {
-		@Override
-		public boolean errorOccurred(String message, Throwable thrown,
-				Object where, boolean isRetryable) throws RuntimeException {
-			if (thrown instanceof RuntimeException) {
-				throw (RuntimeException) thrown;
-			}
-			if ((thrown instanceof NoClassDefFoundError)
-					&& (thrown.getMessage()
-							.contains("com/sun/medialib/mlib/Image"))) {
-				log.info("Java Advanced Imaging: Could not find mediaLib "
-						+ "accelerator wrapper classes. "
-						+ "Continuing in pure Java mode.");
-				return false;
-			}
-			log.error(thrown, thrown);
-			return false;
-		}
-
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
+
+import static edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.MAXIMUM_FILE_SIZE;
+import static edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.PARAMETER_UPLOADED_FILE;
+import static edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.THUMBNAIL_HEIGHT;
+import static edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.THUMBNAIL_WIDTH;
+import static edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest.FileUploadServletRequest.FILE_ITEM_MAP;
+import static edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest.FileUploadServletRequest.FILE_UPLOAD_EXCEPTION;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.media.jai.JAI;
+import javax.media.jai.RenderedOp;
+import javax.media.jai.util.ImagingListener;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.sun.media.jai.codec.MemoryCacheSeekableStream;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.CropRectangle;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.Dimensions;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.UserMistakeException;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.filestorage.TempFileHolder;
+import edu.cornell.mannlib.vitro.webapp.filestorage.UploadedFileHelper;
+import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileAlreadyExistsException;
+import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorage;
+import edu.cornell.mannlib.vitro.webapp.filestorage.model.FileInfo;
+import edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest.FileUploadServletRequest;
+
+/**
+ * Handle the mechanics of validating, storing, and deleting file images.
+ */
+public class ImageUploadHelper {
+	private static final Log log = LogFactory.getLog(ImageUploadHelper.class);
+
+	/*
+	 * Keys to text strings for error messages.
+	 */
+	private static final String ERROR_CODE_NO_IMAGE_TO_CROP = "imageUpload.errorNoImageForCropping";
+	private static final String ERROR_CODE_IMAGE_TOO_SMALL = "imageUpload.errorImageTooSmall";
+	private static final String ERROR_CODE_UNKNOWN = "imageUpload.errorUnknown";
+	private static final String ERROR_CODE_FILE_TOO_BIG = "imageUpload.errorFileTooBig";
+	private static final String ERROR_CODE_UNRECOGNIZED_FILE_TYPE = "imageUpload.errorUnrecognizedFileType";
+	private static final String ERROR_CODE_NO_PHOTO_SELECTED = "imageUpload.errorNoPhotoSelected";
+	private static final String ERROR_CODE_BAD_MULTIPART_REQUEST = "imageUpload.errorBadMultipartRequest";
+	private static final String ERROR_CODE_FORM_FIELD_MISSING = "imageUpload.errorFormFieldMissing";
+
+	/**
+	 * When they upload a new image, store it as this session attribute until
+	 * we're ready to attach it to the Individual.
+	 */
+	public static final String ATTRIBUTE_TEMP_FILE = "ImageUploadHelper.tempFile";
+
+	/**
+	 * If the main image is larger than this, it will be displayed at reduced
+	 * scale.
+	 */
+	public static final int MAXIMUM_IMAGE_DISPLAY_WIDTH = 500;
+
+	/** Recognized file extensions mapped to MIME-types. */
+	private static final Map<String, String> RECOGNIZED_FILE_TYPES = createFileTypesMap();
+
+	/** Browser-specific MIME-types mapped to recognized MIME-types. */
+	private static final Map<String, String> NON_STANDARD_MIME_TYPES = createNonStandardMimeTypesMap();
+
+	private static Map<String, String> createFileTypesMap() {
+		Map<String, String> map = new HashMap<String, String>();
+		map.put(".gif", "image/gif");
+		map.put(".png", "image/png");
+		map.put(".jpg", "image/jpeg");
+		map.put(".jpeg", "image/jpeg");
+		map.put(".jpe", "image/jpeg");
+		return Collections.unmodifiableMap(map);
+	}
+
+	/**
+	 * Internet Explorer can tell us that an image has a funky
+	 * Microsoft-specific MIME-type, and we can replace it with one that
+	 * everyone recognizes. This table records those types.
+	 */
+	private static Map<String, String> createNonStandardMimeTypesMap() {
+		Map<String, String> map = new HashMap<String, String>();
+		map.put("image/x-png", "image/png");
+		map.put("image/pjpeg", "image/jpeg");
+		return Collections.unmodifiableMap(map);
+	}
+
+	/*
+	 * Prevent Java Advanced Imaging from complaining about the lack of
+	 * accelerator classes.
+	 */
+	static {
+		JAI.getDefaultInstance().setImagingListener(
+				new NonNoisyImagingListener());
+	}
+
+	private final FileStorage fileStorage;
+	private final UploadedFileHelper uploadedFileHelper;
+
+	ImageUploadHelper(FileStorage fileStorage,
+			WebappDaoFactory webAppDaoFactory, ServletContext ctx) {
+		this.fileStorage = fileStorage;
+		this.uploadedFileHelper = new UploadedFileHelper(fileStorage,
+				webAppDaoFactory, ctx);
+	}
+
+	/**
+	 * 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 {@link 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.
+	 */
+	@SuppressWarnings("unchecked")
+	FileItem validateImageFromRequest(HttpServletRequest request)
+			throws UserMistakeException {
+		Object exception = request.getAttribute(FILE_UPLOAD_EXCEPTION);
+		if (exception != null) {
+			int limit = MAXIMUM_FILE_SIZE / (1024 * 1024);
+			throw new UserMistakeException(ERROR_CODE_FILE_TOO_BIG, limit);
+		}
+
+		Map<String, List<FileItem>> map = (Map<String, List<FileItem>>) request
+				.getAttribute(FILE_ITEM_MAP);
+		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,
+					PARAMETER_UPLOADED_FILE);
+		}
+
+		FileItem file = list.get(0);
+		if (file.getSize() == 0) {
+			throw new UserMistakeException(ERROR_CODE_NO_PHOTO_SELECTED);
+		}
+
+		String filename = getSimpleFilename(file);
+		String mimeType = getMimeType(file);
+		if (!RECOGNIZED_FILE_TYPES.containsValue(mimeType)) {
+			log.debug("Unrecognized MIME type: '" + mimeType + "'");
+			throw new UserMistakeException(ERROR_CODE_UNRECOGNIZED_FILE_TYPE,
+					filename);
+		}
+
+		return file;
+	}
+
+	/**
+	 * 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.
+	 */
+	FileInfo storeNewImage(FileItem fileItem, VitroRequest vreq) {
+		InputStream inputStream = null;
+		try {
+			inputStream = fileItem.getInputStream();
+			String mimeType = getMimeType(fileItem);
+			String filename = getSimpleFilename(fileItem);
+			FileInfo fileInfo = uploadedFileHelper.createFile(filename,
+					mimeType, inputStream);
+
+			TempFileHolder.attach(vreq.getSession(), ATTRIBUTE_TEMP_FILE,
+					fileInfo);
+
+			return fileInfo;
+		} catch (FileAlreadyExistsException e) {
+			throw new IllegalStateException("Can't create the new image file.",
+					e);
+		} catch (IOException e) {
+			throw new IllegalStateException("Can't create the new image file.",
+					e);
+		} finally {
+			if (inputStream != null) {
+				try {
+					inputStream.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+	/**
+	 * Find out how big this image is.
+	 * 
+	 * @throws UserMistakeException
+	 *             if the image is smaller than a thumbnail.
+	 */
+	Dimensions getNewImageSize(FileInfo fileInfo) throws UserMistakeException {
+		InputStream source = null;
+		try {
+			String uri = fileInfo.getBytestreamUri();
+			String filename = fileInfo.getFilename();
+
+			source = fileStorage.getInputStream(uri, filename);
+			MemoryCacheSeekableStream stream = new MemoryCacheSeekableStream(
+					source);
+			RenderedOp image = JAI.create("stream", stream);
+
+			Dimensions size = new Dimensions(image.getWidth(),
+					image.getHeight());
+			log.debug("new image size is " + size);
+
+			if ((size.height < THUMBNAIL_HEIGHT)
+					|| (size.width < THUMBNAIL_WIDTH)) {
+				throw new UserMistakeException(ERROR_CODE_IMAGE_TOO_SMALL,
+						THUMBNAIL_HEIGHT, THUMBNAIL_WIDTH);
+			}
+
+			return size;
+		} catch (FileNotFoundException e) {
+			throw new IllegalStateException("File not found: " + fileInfo, e);
+		} catch (IOException e) {
+			throw new IllegalStateException("Can't read image file: "
+					+ fileInfo, e);
+		} catch (UserMistakeException e) {
+			throw e;
+		} catch (Exception e) {
+			log.warn("Unexpected exception in image handling", e);
+			throw new UserMistakeException(ERROR_CODE_UNKNOWN);
+		} finally {
+			if (source != null) {
+				try {
+					source.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get the info for the new image, from where we stored it in the session.
+	 * 
+	 * @throws UserMistakeException
+	 *             if it isn't there.
+	 */
+	FileInfo getNewImageInfo(VitroRequest vreq) throws UserMistakeException {
+		FileInfo fileInfo = TempFileHolder.remove(vreq.getSession(),
+				ATTRIBUTE_TEMP_FILE);
+
+		if (fileInfo == null) {
+			throw new UserMistakeException(ERROR_CODE_NO_IMAGE_TO_CROP);
+		}
+
+		return fileInfo;
+	}
+
+	/**
+	 * Crop the main image to create the thumbnail, and put it into the file
+	 * storage system.
+	 */
+	FileInfo generateThumbnail(CropRectangle crop, FileInfo newImage) {
+		InputStream mainStream = null;
+		InputStream thumbStream = null;
+		try {
+			String mainBytestreamUri = newImage.getBytestreamUri();
+			String mainFilename = newImage.getFilename();
+			mainStream = fileStorage.getInputStream(mainBytestreamUri,
+					mainFilename);
+
+			thumbStream = new ImageUploadThumbnailer(THUMBNAIL_HEIGHT,
+					THUMBNAIL_WIDTH).cropAndScale(mainStream, crop);
+
+			String mimeType = RECOGNIZED_FILE_TYPES.get(".jpg");
+			String filename = createThumbnailFilename(mainFilename);
+			FileInfo fileInfo = uploadedFileHelper.createFile(filename,
+					mimeType, thumbStream);
+
+			log.debug("Created thumbnail: " + fileInfo);
+			return fileInfo;
+		} catch (FileAlreadyExistsException e) {
+			throw new IllegalStateException("Can't create the thumbnail file: "
+					+ e.getMessage(), e);
+		} catch (IOException e) {
+			throw new IllegalStateException("Can't create the thumbnail file",
+					e);
+		} finally {
+			if (mainStream != null) {
+				try {
+					mainStream.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+			if (thumbStream != null) {
+				try {
+					thumbStream.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+	/**
+	 * If this entity already had a main image, remove it. If the image and the
+	 * thumbnail are no longer used by anyone, throw them away.
+	 */
+	void removeExistingImage(Individual person) {
+		uploadedFileHelper.removeMainImage(person);
+	}
+
+	/**
+	 * Store the image on the entity, and the thumbnail on the image.
+	 */
+	void storeImageFiles(Individual entity, FileInfo newImage,
+			FileInfo thumbnail) {
+		uploadedFileHelper.setImagesOnEntity(entity.getURI(), newImage,
+				thumbnail);
+	}
+
+	/**
+	 * Internet Explorer and Opera will give you the full path along with the
+	 * filename. This will remove the path.
+	 */
+	private String getSimpleFilename(FileItem item) {
+		String fileName = item.getName();
+		if (fileName == null) {
+			return null;
+		} else {
+			return FilenameUtils.getName(fileName);
+		}
+	}
+
+	/**
+	 * Get the MIME type as supplied by the browser. If none, try to infer it
+	 * from the filename extension and the map of recognized MIME types.
+	 */
+	private String getMimeType(FileItem file) {
+		String mimeType = file.getContentType();
+		if (mimeType != null) {
+			// If the browser supplied the MIME type, we may need to
+			// replace it with the standard value.
+			if (NON_STANDARD_MIME_TYPES.containsKey(mimeType)) {
+				mimeType = NON_STANDARD_MIME_TYPES.get(mimeType);
+			}
+			return mimeType;
+		}
+
+		String filename = getSimpleFilename(file);
+		int periodHere = filename.lastIndexOf('.');
+		if (periodHere == -1) {
+			return null;
+		}
+
+		String extension = filename.substring(periodHere);
+		return RECOGNIZED_FILE_TYPES.get(extension);
+	}
+
+	/**
+	 * Create a name for the thumbnail from the name of the original file.
+	 * "myPicture.anything" becomes "thumbnail_myPicture.jpg".
+	 */
+	private String createThumbnailFilename(String filename) {
+		String prefix = "thumbnail_";
+		String extension = ".jpg";
+		int periodHere = filename.lastIndexOf('.');
+		if (periodHere == -1) {
+			return prefix + filename + extension;
+		} else {
+			return prefix + filename.substring(0, periodHere) + extension;
+		}
+	}
+
+	/**
+	 * <p>
+	 * This {@link ImagingListener} means that Java Advanced Imaging won't dump
+	 * an exception log to {@link System#out}. It writes to the log, instead.
+	 * </p>
+	 * <p>
+	 * Further, since the lack of native accelerator classes isn't an error, it
+	 * is written as a simple log message.
+	 * </p>
+	 */
+	static class NonNoisyImagingListener implements ImagingListener {
+		@Override
+		public boolean errorOccurred(String message, Throwable thrown,
+				Object where, boolean isRetryable) throws RuntimeException {
+			if (thrown instanceof RuntimeException) {
+				throw (RuntimeException) thrown;
+			}
+			if ((thrown instanceof NoClassDefFoundError)
+					&& (thrown.getMessage()
+							.contains("com/sun/medialib/mlib/Image"))) {
+				log.info("Java Advanced Imaging: Could not find mediaLib "
+						+ "accelerator wrapper classes. "
+						+ "Continuing in pure Java mode.");
+				return false;
+			}
+			log.error(thrown, thrown);
+			return false;
+		}
+
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadThumbnailer.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadThumbnailer.java
index 262830008..68c585af6 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadThumbnailer.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploadThumbnailer.java
@@ -1,186 +1,186 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
-
-import java.awt.geom.AffineTransform;
-import java.awt.image.AffineTransformOp;
-import java.awt.image.BufferedImage;
-import java.awt.image.ColorModel;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import javax.imageio.ImageIO;
-import javax.media.jai.RenderedOp;
-import javax.media.jai.operator.BandSelectDescriptor;
-import javax.media.jai.operator.StreamDescriptor;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.sun.media.jai.codec.MemoryCacheSeekableStream;
-
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.CropRectangle;
-
-/**
- * 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 ImageUploadThumbnailer {
-	/** If an image has 3 color bands and 1 alpha band, we want these. */
-	private static final int[] COLOR_BAND_INDEXES = new int[] { 0, 1, 2 };
-
-	private static final Log log = LogFactory
-			.getLog(ImageUploadThumbnailer.class);
-
-	/** We won't let you crop to smaller than this many pixels wide or high. */
-	private static final int MINIMUM_CROP_SIZE = 5;
-
-	private final int thumbnailHeight;
-	private final int thumbnailWidth;
-
-	public ImageUploadThumbnailer(int thumbnailHeight, int thumbnailWidth) {
-		this.thumbnailHeight = thumbnailHeight;
-		this.thumbnailWidth = thumbnailWidth;
-	}
-
-	/**
-	 * Crop the main image according to this rectangle, and scale it to the
-	 * correct size for a thumbnail.
-	 */
-	public InputStream cropAndScale(InputStream mainImageStream,
-			CropRectangle crop) {
-		try {
-			RenderedOp mainImage = loadImage(mainImageStream);
-			RenderedOp opaqueImage = makeImageOpaque(mainImage);
-
-			BufferedImage bufferedImage = opaqueImage.getAsBufferedImage();
-			log.debug("initial image: " + imageSize(bufferedImage));
-
-			log.debug("initial crop: " + crop);
-			CropRectangle boundedCrop = limitCropRectangleToImageBounds(
-					bufferedImage, crop);
-			log.debug("bounded crop: " + boundedCrop);
-
-			float scaleFactor = figureScaleFactor(boundedCrop);
-			log.debug("scale factor: " + scaleFactor);
-
-			BufferedImage scaledImage = scaleImage(bufferedImage, scaleFactor);
-			log.debug("scaled image: " + imageSize(scaledImage));
-
-			CropRectangle rawScaledCrop = adjustCropRectangleToScaledImage(
-					boundedCrop, scaleFactor);
-			log.debug("scaled crop: " + rawScaledCrop);
-			CropRectangle scaledCrop = limitCropRectangleToImageBounds(
-					scaledImage, rawScaledCrop);
-			log.debug("bounded scaled crop: " + scaledCrop);
-
-			BufferedImage croppedImage = cropImage(scaledImage, scaledCrop);
-			log.debug("cropped image: " + imageSize(croppedImage));
-
-			byte[] jpegBytes = encodeAsJpeg(croppedImage);
-			return new ByteArrayInputStream(jpegBytes);
-		} catch (Exception e) {
-			throw new IllegalStateException("Failed to scale the image", e);
-		}
-	}
-
-	private String imageSize(BufferedImage image) {
-		return image.getWidth() + " by " + image.getHeight();
-	}
-
-	private RenderedOp loadImage(InputStream imageStream) {
-		return StreamDescriptor.create(new MemoryCacheSeekableStream(
-				imageStream), null, null);
-	}
-
-	private RenderedOp makeImageOpaque(RenderedOp image) {
-		ColorModel colorModel = image.getColorModel();
-
-		if (!colorModel.hasAlpha()) {
-			// The image is already opaque.
-			return image;
-		}
-
-		if (image.getNumBands() == 4) {
-			// The image has a separate alpha channel. Drop the alpha channel.
-			return BandSelectDescriptor.create(image, COLOR_BAND_INDEXES, null);
-		}
-
-		// Don't know how to handle it. Probably a GIF with a transparent
-		// background. Give up.
-		return image;
-	}
-
-	private CropRectangle limitCropRectangleToImageBounds(BufferedImage image,
-			CropRectangle crop) {
-
-		int imageWidth = image.getWidth();
-		int imageHeight = image.getHeight();
-
-		// Ensure that x and y are at least zero, but not big enough to push the
-		// crop rectangle out of the image.
-		int greatestX = imageWidth - MINIMUM_CROP_SIZE;
-		int greatestY = imageHeight - MINIMUM_CROP_SIZE;
-		int x = Math.max(0, Math.min(greatestX, Math.abs(crop.x)));
-		int y = Math.max(0, Math.min(greatestY, Math.abs(crop.y)));
-
-		// Ensure that width and height are at least as big as the minimum, but
-		// no so big as to extend beyond the image.
-		int greatestW = imageWidth - x;
-		int greatestH = imageHeight - y;
-		int w = Math.max(MINIMUM_CROP_SIZE, Math.min(greatestW, crop.width));
-		int h = Math.max(MINIMUM_CROP_SIZE, Math.min(greatestH, crop.height));
-
-		return new CropRectangle(x, y, h, w);
-	}
-
-	private float figureScaleFactor(CropRectangle boundedCrop) {
-		float horizontalScale = ((float) thumbnailWidth)
-				/ ((float) boundedCrop.width);
-		float verticalScale = ((float) thumbnailHeight)
-				/ ((float) boundedCrop.height);
-		return Math.min(horizontalScale, verticalScale);
-	}
-
-	private BufferedImage cropImage(BufferedImage image, CropRectangle crop) {
-		return image.getSubimage(crop.x, crop.y, crop.width, crop.height);
-	}
-
-	private BufferedImage scaleImage(BufferedImage image, float scaleFactor) {
-		AffineTransform transform = AffineTransform.getScaleInstance(
-				scaleFactor, scaleFactor);
-		AffineTransformOp atoOp = new AffineTransformOp(transform, null);
-		return atoOp.filter(image, null);
-	}
-
-	private CropRectangle adjustCropRectangleToScaledImage(CropRectangle crop,
-			float scaleFactor) {
-		int newX = (int) (crop.x * scaleFactor);
-		int newY = (int) (crop.y * scaleFactor);
-		int newHeight = (int) (crop.height * scaleFactor);
-		int newWidth = (int) (crop.width * scaleFactor);
-		return new CropRectangle(newX, newY, newHeight, newWidth);
-	}
-
-	private byte[] encodeAsJpeg(BufferedImage image) throws IOException {
-		ByteArrayOutputStream bytes = new ByteArrayOutputStream();
-		ImageIO.write(image, "JPG", bytes);
-		return bytes.toByteArray();
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
+
+import java.awt.geom.AffineTransform;
+import java.awt.image.AffineTransformOp;
+import java.awt.image.BufferedImage;
+import java.awt.image.ColorModel;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.imageio.ImageIO;
+import javax.media.jai.RenderedOp;
+import javax.media.jai.operator.BandSelectDescriptor;
+import javax.media.jai.operator.StreamDescriptor;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.sun.media.jai.codec.MemoryCacheSeekableStream;
+
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.CropRectangle;
+
+/**
+ * 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 ImageUploadThumbnailer {
+	/** If an image has 3 color bands and 1 alpha band, we want these. */
+	private static final int[] COLOR_BAND_INDEXES = new int[] { 0, 1, 2 };
+
+	private static final Log log = LogFactory
+			.getLog(ImageUploadThumbnailer.class);
+
+	/** We won't let you crop to smaller than this many pixels wide or high. */
+	private static final int MINIMUM_CROP_SIZE = 5;
+
+	private final int thumbnailHeight;
+	private final int thumbnailWidth;
+
+	public ImageUploadThumbnailer(int thumbnailHeight, int thumbnailWidth) {
+		this.thumbnailHeight = thumbnailHeight;
+		this.thumbnailWidth = thumbnailWidth;
+	}
+
+	/**
+	 * Crop the main image according to this rectangle, and scale it to the
+	 * correct size for a thumbnail.
+	 */
+	public InputStream cropAndScale(InputStream mainImageStream,
+			CropRectangle crop) {
+		try {
+			RenderedOp mainImage = loadImage(mainImageStream);
+			RenderedOp opaqueImage = makeImageOpaque(mainImage);
+
+			BufferedImage bufferedImage = opaqueImage.getAsBufferedImage();
+			log.debug("initial image: " + imageSize(bufferedImage));
+
+			log.debug("initial crop: " + crop);
+			CropRectangle boundedCrop = limitCropRectangleToImageBounds(
+					bufferedImage, crop);
+			log.debug("bounded crop: " + boundedCrop);
+
+			float scaleFactor = figureScaleFactor(boundedCrop);
+			log.debug("scale factor: " + scaleFactor);
+
+			BufferedImage scaledImage = scaleImage(bufferedImage, scaleFactor);
+			log.debug("scaled image: " + imageSize(scaledImage));
+
+			CropRectangle rawScaledCrop = adjustCropRectangleToScaledImage(
+					boundedCrop, scaleFactor);
+			log.debug("scaled crop: " + rawScaledCrop);
+			CropRectangle scaledCrop = limitCropRectangleToImageBounds(
+					scaledImage, rawScaledCrop);
+			log.debug("bounded scaled crop: " + scaledCrop);
+
+			BufferedImage croppedImage = cropImage(scaledImage, scaledCrop);
+			log.debug("cropped image: " + imageSize(croppedImage));
+
+			byte[] jpegBytes = encodeAsJpeg(croppedImage);
+			return new ByteArrayInputStream(jpegBytes);
+		} catch (Exception e) {
+			throw new IllegalStateException("Failed to scale the image", e);
+		}
+	}
+
+	private String imageSize(BufferedImage image) {
+		return image.getWidth() + " by " + image.getHeight();
+	}
+
+	private RenderedOp loadImage(InputStream imageStream) {
+		return StreamDescriptor.create(new MemoryCacheSeekableStream(
+				imageStream), null, null);
+	}
+
+	private RenderedOp makeImageOpaque(RenderedOp image) {
+		ColorModel colorModel = image.getColorModel();
+
+		if (!colorModel.hasAlpha()) {
+			// The image is already opaque.
+			return image;
+		}
+
+		if (image.getNumBands() == 4) {
+			// The image has a separate alpha channel. Drop the alpha channel.
+			return BandSelectDescriptor.create(image, COLOR_BAND_INDEXES, null);
+		}
+
+		// Don't know how to handle it. Probably a GIF with a transparent
+		// background. Give up.
+		return image;
+	}
+
+	private CropRectangle limitCropRectangleToImageBounds(BufferedImage image,
+			CropRectangle crop) {
+
+		int imageWidth = image.getWidth();
+		int imageHeight = image.getHeight();
+
+		// Ensure that x and y are at least zero, but not big enough to push the
+		// crop rectangle out of the image.
+		int greatestX = imageWidth - MINIMUM_CROP_SIZE;
+		int greatestY = imageHeight - MINIMUM_CROP_SIZE;
+		int x = Math.max(0, Math.min(greatestX, Math.abs(crop.x)));
+		int y = Math.max(0, Math.min(greatestY, Math.abs(crop.y)));
+
+		// Ensure that width and height are at least as big as the minimum, but
+		// no so big as to extend beyond the image.
+		int greatestW = imageWidth - x;
+		int greatestH = imageHeight - y;
+		int w = Math.max(MINIMUM_CROP_SIZE, Math.min(greatestW, crop.width));
+		int h = Math.max(MINIMUM_CROP_SIZE, Math.min(greatestH, crop.height));
+
+		return new CropRectangle(x, y, h, w);
+	}
+
+	private float figureScaleFactor(CropRectangle boundedCrop) {
+		float horizontalScale = ((float) thumbnailWidth)
+				/ ((float) boundedCrop.width);
+		float verticalScale = ((float) thumbnailHeight)
+				/ ((float) boundedCrop.height);
+		return Math.min(horizontalScale, verticalScale);
+	}
+
+	private BufferedImage cropImage(BufferedImage image, CropRectangle crop) {
+		return image.getSubimage(crop.x, crop.y, crop.width, crop.height);
+	}
+
+	private BufferedImage scaleImage(BufferedImage image, float scaleFactor) {
+		AffineTransform transform = AffineTransform.getScaleInstance(
+				scaleFactor, scaleFactor);
+		AffineTransformOp atoOp = new AffineTransformOp(transform, null);
+		return atoOp.filter(image, null);
+	}
+
+	private CropRectangle adjustCropRectangleToScaledImage(CropRectangle crop,
+			float scaleFactor) {
+		int newX = (int) (crop.x * scaleFactor);
+		int newY = (int) (crop.y * scaleFactor);
+		int newHeight = (int) (crop.height * scaleFactor);
+		int newWidth = (int) (crop.width * scaleFactor);
+		return new CropRectangle(newX, newY, newHeight, newWidth);
+	}
+
+	private byte[] encodeAsJpeg(BufferedImage image) throws IOException {
+		ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+		ImageIO.write(image, "JPG", bytes);
+		return bytes.toByteArray();
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java
index bfb20522d..be1cb0705 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/RevisionInfoController.java
@@ -1,43 +1,43 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
-import edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-
-/**
- * Display the detailed revision information.
- */
-public class RevisionInfoController extends FreemarkerHttpServlet {
-	private static final long serialVersionUID = 1L;
-    private static final String TEMPLATE_DEFAULT = "revisionInfo.ftl";
-    
-    public static final Actions REQUIRED_ACTIONS = SimplePermission.SEE_REVISION_INFO.ACTIONS;
-    
-    @Override
-    protected Actions 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);
-    }
-
-    @Override
-    protected String getTitle(String siteName, VitroRequest vreq) {
-    	return "Revision Information for " + siteName;
-    }
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+
+/**
+ * Display the detailed revision information.
+ */
+public class RevisionInfoController extends FreemarkerHttpServlet {
+	private static final long serialVersionUID = 1L;
+    private static final String TEMPLATE_DEFAULT = "revisionInfo.ftl";
+    
+    public static final Actions REQUIRED_ACTIONS = SimplePermission.SEE_REVISION_INFO.ACTIONS;
+    
+    @Override
+    protected Actions 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);
+    }
+
+    @Override
+    protected String getTitle(String siteName, VitroRequest vreq) {
+    	return "Revision Information for " + siteName;
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
index 99dcdd1c2..5a529f721 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/SiteAdminController.java
@@ -1,13 +1,13 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-public class SiteAdminController extends BaseSiteAdminController {
-	
-    private static final long serialVersionUID = 1L;
-    private static final Log log = LogFactory.getLog(SiteAdminController.class);
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+public class SiteAdminController extends BaseSiteAdminController {
+	
+    private static final long serialVersionUID = 1L;
+    private static final Log log = LogFactory.getLog(SiteAdminController.class);
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java
index 571dd0da5..fecd79ce0 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TermsOfUseController.java
@@ -1,7 +1,7 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
-
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -12,10 +12,10 @@ import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-
+
 public class TermsOfUseController extends FreemarkerHttpServlet {
-    
-    private static final long serialVersionUID = 1L;
+    
+    private static final long serialVersionUID = 1L;
     private static final Log log = LogFactory.getLog(TermsOfUseController.class);
     private static final String TEMPLATE_DEFAULT = "termsOfUse.ftl";
 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginProcessBean.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginProcessBean.java
index 9a2e6c456..9fb8ae953 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginProcessBean.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginProcessBean.java
@@ -1,253 +1,253 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.login;
-
-import java.util.Arrays;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-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 {
-	private static final Log log = LogFactory.getLog(LoginProcessBean.class);
-
-	private static Object[] NO_ARGUMENTS = new Object[0];
-
-	private static final String SESSION_ATTRIBUTE = LoginProcessBean.class
-			.getName();
-
-	// ----------------------------------------------------------------------
-	// static methods
-	// ----------------------------------------------------------------------
-
-	/**
-	 * Is there currently a login process bean in the session?
-	 */
-	public static boolean isBean(HttpServletRequest request) {
-		return (null != getBeanFromSession(request));
-	}
-
-	/**
-	 * Get the login process bean from the session. If there is no bean, create
-	 * one.
-	 */
-	public static LoginProcessBean getBean(HttpServletRequest request) {
-		if (isBean(request)) {
-			return getBeanFromSession(request);
-		} else {
-			setBean(request, new LoginProcessBean());
-			return getBeanFromSession(request);
-		}
-	}
-
-	/**
-	 * Store this login process bean in the session.
-	 */
-	public static void setBean(HttpServletRequest request, LoginProcessBean bean) {
-		HttpSession session = request.getSession();
-		session.setAttribute(SESSION_ATTRIBUTE, bean);
-	}
-
-	/**
-	 * Remove the login process bean from the session. If there is no bean, do
-	 * nothing.
-	 */
-	public static void removeBean(HttpServletRequest request) {
-		if (isBean(request)) {
-			request.getSession().removeAttribute(SESSION_ATTRIBUTE);
-		}
-	}
-
-	/**
-	 * Get the bean from the session, or null if there is no bean.
-	 */
-	private static LoginProcessBean getBeanFromSession(
-			HttpServletRequest request) {
-		HttpSession session = request.getSession(false);
-		if (session == null) {
-			return null;
-		}
-
-		Object bean = session.getAttribute(SESSION_ATTRIBUTE);
-		if (bean == null) {
-			return null;
-		}
-
-		if (!(bean instanceof LoginProcessBean)) {
-			log.warn("Tried to get login process bean, but found an instance of "
-					+ bean.getClass().getName() + ": " + bean);
-			return null;
-		}
-
-		return (LoginProcessBean) bean;
-	}
-
-	// ----------------------------------------------------------------------
-	// helper classes
-	// ----------------------------------------------------------------------
-
-	public enum State {
-		NOWHERE, LOGGING_IN, FORCED_PASSWORD_CHANGE, LOGGED_IN
-	}
-
-	public enum MLevel {
-		NONE, INFO, ERROR
-	}
-
-	public static class Message {
-		public static final Message NO_MESSAGE = new Message();
-
-		private final String text;
-		private final MLevel messageLevel;
-
-		public Message() {
-			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;
-		}
-
-		public String getText() {
-			return text;
-		}
-
-		@Override
-		public String toString() {
-			return "Message[" + messageLevel + ", '" + text + "']";
-		}
-	}
-
-	// ----------------------------------------------------------------------
-	// the bean
-	// ----------------------------------------------------------------------
-
-	/** Where are we in the process? */
-	private State currentState = State.NOWHERE;
-
-	/** Where is the interaction taking place? */
-	private volatile String loginPageUrl;
-
-	/** Where do we go when finished? */
-	private volatile String afterLoginUrl;
-
-	/** message and messageArguments must be kept consistent. */
-	private final Object messageSynchronizer = new Object();
-
-	/** What message should we display on the screen? */
-	private Message message = Message.NO_MESSAGE;
-
-	/** What arguments are needed to format the message? */
-	private Object[] messageArguments = NO_ARGUMENTS;
-
-	/**
-	 * What username was submitted to the form? This isn't just for display --
-	 * if they are changing passwords, we need to remember who it is.
-	 */
-	private String username = "";
-
-	public void setState(State newState) {
-		this.currentState = newState;
-	}
-
-	public State getState() {
-		return currentState;
-	}
-
-	public void clearMessage() {
-		synchronized (messageSynchronizer) {
-			this.message = Message.NO_MESSAGE;
-			this.messageArguments = NO_ARGUMENTS;
-		}
-	}
-
-	public void setMessage(Message message) {
-		synchronized (messageSynchronizer) {
-			this.message = message;
-		}
-	}
-	
-	public void setMessage(HttpServletRequest req, MLevel level, String textKey, Object... parameters) {
-		synchronized (messageSynchronizer) {
-			this.message = new Message(req, level, textKey, parameters);
-		}
-	}
-
-	public String getInfoMessageAndClear() {
-		synchronized (messageSynchronizer) {
-			String text = "";
-			if (message.getMessageLevel() == MLevel.INFO) {
-				text = message.getText();
-				clearMessage();
-			}
-			return text;
-		}
-	}
-
-	public String getErrorMessageAndClear() {
-		synchronized (messageSynchronizer) {
-			String text = "";
-			if (message.getMessageLevel() == MLevel.ERROR) {
-				text = message.getText();
-				clearMessage();
-			}
-			return text;
-		}
-	}
-
-	public String getUsername() {
-		return username;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	public String getLoginPageUrl() {
-		return loginPageUrl;
-	}
-
-	public void setLoginPageUrl(String loginPageUrl) {
-		this.loginPageUrl = loginPageUrl;
-	}
-
-	public String getAfterLoginUrl() {
-		return afterLoginUrl;
-	}
-
-	public void setAfterLoginUrl(String afterLoginUrl) {
-		this.afterLoginUrl = afterLoginUrl;
-	}
-
-	@Override
-	public String toString() {
-		return "LoginProcessBean(" + hashCode() + ")[state=" + currentState
-				+ ", message=" + message + ", messageArguments="
-				+ Arrays.deepToString(messageArguments) + ", username="
-				+ username + ", loginPageUrl=" + loginPageUrl
-				+ ", afterLoginUrl=" + afterLoginUrl + "]";
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.login;
+
+import java.util.Arrays;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+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 {
+	private static final Log log = LogFactory.getLog(LoginProcessBean.class);
+
+	private static Object[] NO_ARGUMENTS = new Object[0];
+
+	private static final String SESSION_ATTRIBUTE = LoginProcessBean.class
+			.getName();
+
+	// ----------------------------------------------------------------------
+	// static methods
+	// ----------------------------------------------------------------------
+
+	/**
+	 * Is there currently a login process bean in the session?
+	 */
+	public static boolean isBean(HttpServletRequest request) {
+		return (null != getBeanFromSession(request));
+	}
+
+	/**
+	 * Get the login process bean from the session. If there is no bean, create
+	 * one.
+	 */
+	public static LoginProcessBean getBean(HttpServletRequest request) {
+		if (isBean(request)) {
+			return getBeanFromSession(request);
+		} else {
+			setBean(request, new LoginProcessBean());
+			return getBeanFromSession(request);
+		}
+	}
+
+	/**
+	 * Store this login process bean in the session.
+	 */
+	public static void setBean(HttpServletRequest request, LoginProcessBean bean) {
+		HttpSession session = request.getSession();
+		session.setAttribute(SESSION_ATTRIBUTE, bean);
+	}
+
+	/**
+	 * Remove the login process bean from the session. If there is no bean, do
+	 * nothing.
+	 */
+	public static void removeBean(HttpServletRequest request) {
+		if (isBean(request)) {
+			request.getSession().removeAttribute(SESSION_ATTRIBUTE);
+		}
+	}
+
+	/**
+	 * Get the bean from the session, or null if there is no bean.
+	 */
+	private static LoginProcessBean getBeanFromSession(
+			HttpServletRequest request) {
+		HttpSession session = request.getSession(false);
+		if (session == null) {
+			return null;
+		}
+
+		Object bean = session.getAttribute(SESSION_ATTRIBUTE);
+		if (bean == null) {
+			return null;
+		}
+
+		if (!(bean instanceof LoginProcessBean)) {
+			log.warn("Tried to get login process bean, but found an instance of "
+					+ bean.getClass().getName() + ": " + bean);
+			return null;
+		}
+
+		return (LoginProcessBean) bean;
+	}
+
+	// ----------------------------------------------------------------------
+	// helper classes
+	// ----------------------------------------------------------------------
+
+	public enum State {
+		NOWHERE, LOGGING_IN, FORCED_PASSWORD_CHANGE, LOGGED_IN
+	}
+
+	public enum MLevel {
+		NONE, INFO, ERROR
+	}
+
+	public static class Message {
+		public static final Message NO_MESSAGE = new Message();
+
+		private final String text;
+		private final MLevel messageLevel;
+
+		public Message() {
+			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;
+		}
+
+		public String getText() {
+			return text;
+		}
+
+		@Override
+		public String toString() {
+			return "Message[" + messageLevel + ", '" + text + "']";
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// the bean
+	// ----------------------------------------------------------------------
+
+	/** Where are we in the process? */
+	private State currentState = State.NOWHERE;
+
+	/** Where is the interaction taking place? */
+	private volatile String loginPageUrl;
+
+	/** Where do we go when finished? */
+	private volatile String afterLoginUrl;
+
+	/** message and messageArguments must be kept consistent. */
+	private final Object messageSynchronizer = new Object();
+
+	/** What message should we display on the screen? */
+	private Message message = Message.NO_MESSAGE;
+
+	/** What arguments are needed to format the message? */
+	private Object[] messageArguments = NO_ARGUMENTS;
+
+	/**
+	 * What username was submitted to the form? This isn't just for display --
+	 * if they are changing passwords, we need to remember who it is.
+	 */
+	private String username = "";
+
+	public void setState(State newState) {
+		this.currentState = newState;
+	}
+
+	public State getState() {
+		return currentState;
+	}
+
+	public void clearMessage() {
+		synchronized (messageSynchronizer) {
+			this.message = Message.NO_MESSAGE;
+			this.messageArguments = NO_ARGUMENTS;
+		}
+	}
+
+	public void setMessage(Message message) {
+		synchronized (messageSynchronizer) {
+			this.message = message;
+		}
+	}
+	
+	public void setMessage(HttpServletRequest req, MLevel level, String textKey, Object... parameters) {
+		synchronized (messageSynchronizer) {
+			this.message = new Message(req, level, textKey, parameters);
+		}
+	}
+
+	public String getInfoMessageAndClear() {
+		synchronized (messageSynchronizer) {
+			String text = "";
+			if (message.getMessageLevel() == MLevel.INFO) {
+				text = message.getText();
+				clearMessage();
+			}
+			return text;
+		}
+	}
+
+	public String getErrorMessageAndClear() {
+		synchronized (messageSynchronizer) {
+			String text = "";
+			if (message.getMessageLevel() == MLevel.ERROR) {
+				text = message.getText();
+				clearMessage();
+			}
+			return text;
+		}
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getLoginPageUrl() {
+		return loginPageUrl;
+	}
+
+	public void setLoginPageUrl(String loginPageUrl) {
+		this.loginPageUrl = loginPageUrl;
+	}
+
+	public String getAfterLoginUrl() {
+		return afterLoginUrl;
+	}
+
+	public void setAfterLoginUrl(String afterLoginUrl) {
+		this.afterLoginUrl = afterLoginUrl;
+	}
+
+	@Override
+	public String toString() {
+		return "LoginProcessBean(" + hashCode() + ")[state=" + currentState
+				+ ", message=" + message + ", messageArguments="
+				+ Arrays.deepToString(messageArguments) + ", username="
+				+ username + ", loginPageUrl=" + loginPageUrl
+				+ ", afterLoginUrl=" + afterLoginUrl + "]";
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDao.java
index ae1bef568..d9c5f87e0 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDao.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDao.java
@@ -1,44 +1,44 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.dao;
-
-import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-
-import java.util.List;
-import java.util.Collection;
-
-public interface DataPropertyDao extends PropertyDao {
-
-    public abstract List<DataProperty> getAllDataProperties();
-
-    public abstract List<DataProperty> getAllExternalIdDataProperties();
-
-    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;
-
-    void updateDataProperty(DataProperty dataProperty);
-
-    void deleteDataProperty(DataProperty dataProperty);
-
-    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);
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao;
+
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+
+import java.util.List;
+import java.util.Collection;
+
+public interface DataPropertyDao extends PropertyDao {
+
+    public abstract List<DataProperty> getAllDataProperties();
+
+    public abstract List<DataProperty> getAllExternalIdDataProperties();
+
+    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;
+
+    void updateDataProperty(DataProperty dataProperty);
+
+    void deleteDataProperty(DataProperty dataProperty);
+
+    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/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DatatypeDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DatatypeDao.java
index fcb37792a..76e0133e2 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DatatypeDao.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/DatatypeDao.java
@@ -1,27 +1,27 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.dao;
-
-import edu.cornell.mannlib.vitro.webapp.beans.Datatype;
-
-import java.util.List;
-
-public interface DatatypeDao {
-
-    public abstract void updateDatatype(Datatype dtp);
-
-    /** deletes a datatype row by getting the id from a Datatype bean **/
-    public abstract void deleteDatatype(Datatype dtp);
-
-    /** deletes a datatype row **/
-    public abstract void deleteDatatype(int id);
-
-    public abstract Datatype getDatatypeById(int id);
-
-    public abstract Datatype getDatatypeByURI(String uri);
-
-    public abstract int getDatatypeIdByURI(String uri);
-
-    public abstract List<Datatype> getAllDatatypes();
-
+package edu.cornell.mannlib.vitro.webapp.dao;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Datatype;
+
+import java.util.List;
+
+public interface DatatypeDao {
+
+    public abstract void updateDatatype(Datatype dtp);
+
+    /** deletes a datatype row by getting the id from a Datatype bean **/
+    public abstract void deleteDatatype(Datatype dtp);
+
+    /** deletes a datatype row **/
+    public abstract void deleteDatatype(int id);
+
+    public abstract Datatype getDatatypeById(int id);
+
+    public abstract Datatype getDatatypeByURI(String uri);
+
+    public abstract int getDatatypeIdByURI(String uri);
+
+    public abstract List<Datatype> getAllDatatypes();
+
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/IndividualDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/IndividualDao.java
index e6b678526..3d364c7e4 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/IndividualDao.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/IndividualDao.java
@@ -1,7 +1,7 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.dao;
-
+package edu.cornell.mannlib.vitro.webapp.dao;
+
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
@@ -11,99 +11,99 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.edit.EditLiteral;
 import edu.cornell.mannlib.vitro.webapp.search.beans.ObjectSourceIface;
-
-public interface IndividualDao extends ObjectSourceIface {
-
-	/**
-	 * Returns a collection of DataPropertyStatements involving all the external ID literals for a given Individual.
-	 */
-    public abstract Collection<DataPropertyStatement> getExternalIds(String individualURI);
-
-    public abstract Collection<DataPropertyStatement> getExternalIds(String individualURI, String dataPropertyURI);
-
-    /**
-     * Adds the specified Individual to the specified VClass (i.e. adds rdf:type).
-     * @param individualURI
-     * @param vclassURI
-     */
-    public abstract void addVClass(String individualURI, String vclassURI);
-    
-    /**
-     * Removes the specified Individual from the specificed VClass (i.e. retracts rdf:type)
-     * @param individualURI
-     * @param vclassURI
-     */
-    public abstract void removeVClass(String individualURI, String vclassURI);
-    
-    /**
-     * Returns a list of all the Individuals in the specified VClass.
-     * @param vclass
-     * @return
-     */
-    public abstract List <Individual> getIndividualsByVClass(VClass vclass);
-
-    /**
-     * 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.
-     */
-    public abstract List <Individual> getIndividualsByVClassURI(String vclassURI, int offset,
-            int quantity);
-
-    /**
-     * @returns new individual URI  if success.
-     */
-    public abstract String insertNewIndividual(Individual individual) throws InsertException;
-
-    /**
-     * updates a single individual in the knowledge base.
-     * @return 0 on failed
-     */
-    public abstract int updateIndividual(Individual individual);
-
-    /**
-     * deletes a single individual from the knowledge base.
-     * @param id
-     * @return 0 on failed
-     */
-    public abstract int deleteIndividual(String individualURI);
-
-    public abstract int deleteIndividual(Individual individual);
-
-    public abstract void markModified(Individual individual);
-
-    /**
-     * Get a row from the entities table and make an Entity.
-     * PropertiesList will not be filled out.
-     * VClass will be filled out.
-     * @param entityId
-     * @return an Entity object or null if not found.
-     */
-    public abstract Individual getIndividualByURI(String individualURI);
-
-    /**
-     * Returns an Iterator over all Individuals in the model that are user-viewable.
-     */
-    public abstract Iterator<String> getAllOfThisTypeIterator();
-
-    /**
-     * Returns an Iterator over all Individuals in the model that are user-viewable and have been updated since the specified time.
-     */
-    public abstract Iterator<String> getUpdatedSinceIterator(long updatedSince);
-
+
+public interface IndividualDao extends ObjectSourceIface {
+
+	/**
+	 * Returns a collection of DataPropertyStatements involving all the external ID literals for a given Individual.
+	 */
+    public abstract Collection<DataPropertyStatement> getExternalIds(String individualURI);
+
+    public abstract Collection<DataPropertyStatement> getExternalIds(String individualURI, String dataPropertyURI);
+
+    /**
+     * Adds the specified Individual to the specified VClass (i.e. adds rdf:type).
+     * @param individualURI
+     * @param vclassURI
+     */
+    public abstract void addVClass(String individualURI, String vclassURI);
+    
+    /**
+     * Removes the specified Individual from the specificed VClass (i.e. retracts rdf:type)
+     * @param individualURI
+     * @param vclassURI
+     */
+    public abstract void removeVClass(String individualURI, String vclassURI);
+    
+    /**
+     * Returns a list of all the Individuals in the specified VClass.
+     * @param vclass
+     * @return
+     */
+    public abstract List <Individual> getIndividualsByVClass(VClass vclass);
+
+    /**
+     * 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.
+     */
+    public abstract List <Individual> getIndividualsByVClassURI(String vclassURI, int offset,
+            int quantity);
+
+    /**
+     * @returns new individual URI  if success.
+     */
+    public abstract String insertNewIndividual(Individual individual) throws InsertException;
+
+    /**
+     * updates a single individual in the knowledge base.
+     * @return 0 on failed
+     */
+    public abstract int updateIndividual(Individual individual);
+
+    /**
+     * deletes a single individual from the knowledge base.
+     * @param id
+     * @return 0 on failed
+     */
+    public abstract int deleteIndividual(String individualURI);
+
+    public abstract int deleteIndividual(Individual individual);
+
+    public abstract void markModified(Individual individual);
+
+    /**
+     * Get a row from the entities table and make an Entity.
+     * PropertiesList will not be filled out.
+     * VClass will be filled out.
+     * @param entityId
+     * @return an Entity object or null if not found.
+     */
+    public abstract Individual getIndividualByURI(String individualURI);
+
+    /**
+     * Returns an Iterator over all Individuals in the model that are user-viewable.
+     */
+    public abstract Iterator<String> getAllOfThisTypeIterator();
+
+    /**
+     * Returns an Iterator over all Individuals in the model that are user-viewable and have been updated since the specified time.
+     */
+    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.
-     */
-    public List<Individual> getIndividualsByDataProperty(String dataPropertyUri, String value);
-
-    public List<Individual> getIndividualsByDataProperty(String dataPropertyUri, String value, String datatypeUri, String lang);
-    
+    
+    /**
+     * 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.
+     */
+    public List<Individual> getIndividualsByDataProperty(String dataPropertyUri, String value);
+
+    public List<Individual> getIndividualsByDataProperty(String dataPropertyUri, String value, String datatypeUri, String lang);
+    
 	void fillVClassForIndividual(Individual individual);
 
 	/**
@@ -115,5 +115,5 @@ public interface IndividualDao extends ObjectSourceIface {
 	String getUnusedURI(Individual individual) throws InsertException;
 	
 	EditLiteral getLabelEditLiteral(String individualUri);
-	
+	
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java
index 5327d3df2..7d70cfc52 100755
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDao.java
@@ -1,62 +1,62 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.dao;
-
-import java.util.List;
-
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-
-public interface ObjectPropertyDao extends PropertyDao {
-
-    public abstract List<ObjectProperty> getAllObjectProperties();
-
+package edu.cornell.mannlib.vitro.webapp.dao;
+
+import java.util.List;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+
+public interface ObjectPropertyDao extends PropertyDao {
+
+    public abstract List<ObjectProperty> getAllObjectProperties();
+
     public ObjectProperty getObjectPropertyByURI(String objectPropertyURI);
     
-    public ObjectProperty getObjectPropertyByURIAndRangeURI(String objectPropertyURI, String rangeURI);
-
-    public List <ObjectProperty> getObjectPropertiesForObjectPropertyStatements(List /*of ObjectPropertyStatement */ objectPropertyStatements);
-
-    public List<String> getSuperPropertyURIs(String objectPropertyURI, boolean direct);
-
-    public List<String> getSubPropertyURIs(String objectPropertyURI);
-
-    public List<ObjectPropertyStatement> getStatementsUsingObjectProperty(ObjectProperty op);
-
-    public void fillObjectPropertiesForIndividual(Individual individual);
-
-    public int insertObjectProperty(ObjectProperty objectProperty ) throws InsertException;
-
-    public void updateObjectProperty(ObjectProperty objectProperty );
-
-    public void deleteObjectProperty(String objectPropertyURI);
-
-    public void deleteObjectProperty(ObjectProperty objectProperty);
-    
+    public ObjectProperty getObjectPropertyByURIAndRangeURI(String objectPropertyURI, String rangeURI);
+
+    public List <ObjectProperty> getObjectPropertiesForObjectPropertyStatements(List /*of ObjectPropertyStatement */ objectPropertyStatements);
+
+    public List<String> getSuperPropertyURIs(String objectPropertyURI, boolean direct);
+
+    public List<String> getSubPropertyURIs(String objectPropertyURI);
+
+    public List<ObjectPropertyStatement> getStatementsUsingObjectProperty(ObjectProperty op);
+
+    public void fillObjectPropertiesForIndividual(Individual individual);
+
+    public int insertObjectProperty(ObjectProperty objectProperty ) throws InsertException;
+
+    public void updateObjectProperty(ObjectProperty objectProperty );
+
+    public void deleteObjectProperty(String objectPropertyURI);
+
+    public void deleteObjectProperty(ObjectProperty objectProperty);
+    
     public boolean skipEditForm(String predicateURI);
-    
-
-//    List /*of ObjectProperty */ getObjectPropertiesForObjectPropertyStatements(List /*of ObjectPropertyStatement */ objectPropertyStatements);
-//
-//    void fillObjectPropertiesForIndividual(IndividualWebapp individual);
-//
-//    int insertObjectProperty(ObjectProperty objectPropertyWebapp);
-//
-//    void updateObjectProperty(ObjectProperty objectPropertyWebapp);
-//
-//    void deleteObjectProperty(ObjectProperty objectPropertyWebapp);
-
-//    ObjectProperty getObjectPropertyByURI(String objectPropertyURI);
-
-//    List /* of ObjectProperty */ getAllObjectProperties();
-
+    
+
+//    List /*of ObjectProperty */ getObjectPropertiesForObjectPropertyStatements(List /*of ObjectPropertyStatement */ objectPropertyStatements);
+//
+//    void fillObjectPropertiesForIndividual(IndividualWebapp individual);
+//
+//    int insertObjectProperty(ObjectProperty objectPropertyWebapp);
+//
+//    void updateObjectProperty(ObjectProperty objectPropertyWebapp);
+//
+//    void deleteObjectProperty(ObjectProperty objectPropertyWebapp);
+
+//    ObjectProperty getObjectPropertyByURI(String objectPropertyURI);
+
+//    List /* of ObjectProperty */ getAllObjectProperties();
+
     List <ObjectProperty> getRootObjectProperties();
     
     public List<ObjectProperty> getObjectPropertyList(Individual subject);
     
     public List<ObjectProperty> getObjectPropertyList(String subjectUri); 
     
-    public String getCustomListViewConfigFileName(ObjectProperty objectProperty);
-}
+    public String getCustomListViewConfigFileName(ObjectProperty objectProperty);
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/OntologyDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/OntologyDao.java
index dcc387af5..e147c0908 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/OntologyDao.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/OntologyDao.java
@@ -1,21 +1,21 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.dao;
-
-import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
-
-import java.util.List;
-
-public interface OntologyDao {
-
-    public abstract List<Ontology> getAllOntologies();
-
-    public abstract Ontology getOntologyByURI(String ontologyURI);
-
-    String insertNewOntology(Ontology ontology);
-
-    void updateOntology(Ontology ontology);
-
-    void deleteOntology(Ontology ontology);
-
+package edu.cornell.mannlib.vitro.webapp.dao;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Ontology;
+
+import java.util.List;
+
+public interface OntologyDao {
+
+    public abstract List<Ontology> getAllOntologies();
+
+    public abstract Ontology getOntologyByURI(String ontologyURI);
+
+    String insertNewOntology(Ontology ontology);
+
+    void updateOntology(Ontology ontology);
+
+    void deleteOntology(Ontology ontology);
+
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/PropertyInstanceDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/PropertyInstanceDao.java
index afa907a49..78dd5c475 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/PropertyInstanceDao.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/PropertyInstanceDao.java
@@ -1,30 +1,30 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.dao;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance;
-import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstanceIface;
-
-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);
-
-    PropertyInstance getProperty(String subjectURI, String predicateURI, String objectURI);
-
-    int insertProp(PropertyInstanceIface prop);
-
-    void insertPropertyInstance(PropertyInstance prop);
-
-    void deletePropertyInstance(PropertyInstance prop);
-
+package edu.cornell.mannlib.vitro.webapp.dao;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance;
+import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstanceIface;
+
+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);
+
+    PropertyInstance getProperty(String subjectURI, String predicateURI, String objectURI);
+
+    int insertProp(PropertyInstanceIface prop);
+
+    void insertPropertyInstance(PropertyInstance prop);
+
+    void deletePropertyInstance(PropertyInstance prop);
+
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/UserAccountsDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/UserAccountsDao.java
index 77d828d85..ec75ad137 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/UserAccountsDao.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/UserAccountsDao.java
@@ -1,107 +1,107 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.dao;
-
-import java.util.Collection;
-
-import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-
-/**
- * Methods for dealing with UserAccount and PermissionSet objects in the User
- * Accounts model.
- */
-public interface UserAccountsDao {
-
-	/**
-	 * Get all of the UserAccounts in the model.
-	 */
-	Collection<UserAccount> getAllUserAccounts();
-
-	/**
-	 * 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
-	 */
-	UserAccount getUserAccountByEmail(String emailAddress);
-
-	/**
-	 * 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.
-	 */
-	Collection<UserAccount> getUserAccountsWhoProxyForPage(String profilePageUri);
-
-	/**
-	 * 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
-	 *             if the URI of the UserAccount is not empty.
-	 */
-	String insertUserAccount(UserAccount userAccount);
-
-	/**
-	 * 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
-	 *             if a UserAccount with this URI does not already exist in the
-	 *             model.
-	 */
-	void updateUserAccount(UserAccount userAccount);
-
-	/**
-	 * 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.
-	 */
-	void deleteUserAccount(String userAccountUri);
-
-	/**
-	 * Set so that these UserAccounts, and only these, are authorized as proxies on this
-	 * 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();
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao;
+
+import java.util.Collection;
+
+import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+
+/**
+ * Methods for dealing with UserAccount and PermissionSet objects in the User
+ * Accounts model.
+ */
+public interface UserAccountsDao {
+
+	/**
+	 * Get all of the UserAccounts in the model.
+	 */
+	Collection<UserAccount> getAllUserAccounts();
+
+	/**
+	 * 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
+	 */
+	UserAccount getUserAccountByEmail(String emailAddress);
+
+	/**
+	 * 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.
+	 */
+	Collection<UserAccount> getUserAccountsWhoProxyForPage(String profilePageUri);
+
+	/**
+	 * 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
+	 *             if the URI of the UserAccount is not empty.
+	 */
+	String insertUserAccount(UserAccount userAccount);
+
+	/**
+	 * 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
+	 *             if a UserAccount with this URI does not already exist in the
+	 *             model.
+	 */
+	void updateUserAccount(UserAccount userAccount);
+
+	/**
+	 * 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.
+	 */
+	void deleteUserAccount(String userAccountUri);
+
+	/**
+	 * Set so that these UserAccounts, and only these, are authorized as proxies on this
+	 * 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/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/VClassDao.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/VClassDao.java
index 6d6e269ab..533b6e6d3 100755
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/VClassDao.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/VClassDao.java
@@ -1,115 +1,115 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.dao;
-
+package edu.cornell.mannlib.vitro.webapp.dao;
+
 import java.util.List;
 
 import edu.cornell.mannlib.vitro.webapp.beans.Classes2Classes;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
-
-public interface VClassDao {
-
-    List<VClass> getRootClasses();
-
-    List<VClass> getOntologyRootClasses(String ontologyURI);
-
-    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);
-
-    List <String> getSuperClassURIs(String classURI, boolean direct);
-
-    List <String> getAllSuperClassURIs(String classURI);
-
-    VClass getVClassByURI(String URI);
-
-    void insertNewVClass(VClass cls ) throws InsertException;
-
-    void updateVClass(VClass cls);
-
-    void deleteVClass(String URI);
-
-    void deleteVClass(VClass cls);
-
-    List <VClass> getVClassesForProperty(String propertyURI, boolean domainSide);
-    
-    List <VClass> getVClassesForProperty(String vclassURI, String propertyURI);
-
+
+public interface VClassDao {
+
+    List<VClass> getRootClasses();
+
+    List<VClass> getOntologyRootClasses(String ontologyURI);
+
+    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);
+
+    List <String> getSuperClassURIs(String classURI, boolean direct);
+
+    List <String> getAllSuperClassURIs(String classURI);
+
+    VClass getVClassByURI(String URI);
+
+    void insertNewVClass(VClass cls ) throws InsertException;
+
+    void updateVClass(VClass cls);
+
+    void deleteVClass(String URI);
+
+    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")
-    void addVClassesToGroup(VClassGroup group, boolean includeUninstantiatedClasses);/* (non-Javadoc)
-    * @see edu.cornell.mannlib.vitro.webapp.dao.db.VClassDao#addVClassesToGroups(java.util.List)
-    */
-
-    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
-     * @param vc2
-     * @return true if subClassOf(vc1, vc2)
-     */
-    boolean isSubClassOf(VClass vc1, VClass vc2);
-    
-    /**
-     * @param vc1
-     * @param vc2
-     * @return true if subClassOf(vc1, 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();
+    void deleteClasses2Classes(Classes2Classes c2c);
+
+    @SuppressWarnings("unchecked")
+    void addVClassesToGroup(VClassGroup group, boolean includeUninstantiatedClasses);/* (non-Javadoc)
+    * @see edu.cornell.mannlib.vitro.webapp.dao.db.VClassDao#addVClassesToGroups(java.util.List)
+    */
+
+    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
+     * @param vc2
+     * @return true if subClassOf(vc1, vc2)
+     */
+    boolean isSubClassOf(VClass vc1, VClass vc2);
+    
+    /**
+     * @param vc1
+     * @param vc2
+     * @return true if subClassOf(vc1, 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/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/HideFromDisplayByPolicyFilter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/HideFromDisplayByPolicyFilter.java
index 164a00061..765928fe0 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/HideFromDisplayByPolicyFilter.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/filtering/filters/HideFromDisplayByPolicyFilter.java
@@ -1,94 +1,94 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.dao.filtering.filters;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import net.sf.jga.fn.UnaryFunctor;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayDataProperty;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayDataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
-
-/**
- * Ask the current policies whether we can show these things to the user.
- */
-public class HideFromDisplayByPolicyFilter extends VitroFiltersImpl {
-	private static final Log log = LogFactory
-			.getLog(HideFromDisplayByPolicyFilter.class);
-	
-	private final IdentifierBundle idBundle;
-	private final PolicyIface policy;
-
-	public HideFromDisplayByPolicyFilter(IdentifierBundle idBundle,
-			PolicyIface policy) {
-		if (idBundle == null) {
-			throw new NullPointerException("idBundle may not be null.");
-		}
-		if (policy == null) {
-			throw new NullPointerException("policy may not be null.");
-		}
-
-		this.idBundle = idBundle;
-		this.policy = policy;
-
-		setDataPropertyFilter(new DataPropertyFilterByPolicy());
-		setObjectPropertyFilter(new ObjectPropertyFilterByPolicy());
-		setDataPropertyStatementFilter(new DataPropertyStatementFilterByPolicy());
-		setObjectPropertyStatementFilter(new ObjectPropertyStatementFilterByPolicy());
-	}
-
-	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;
-			}
-		}
-		return false;
-	}
-
-	private class DataPropertyFilterByPolicy extends
-			UnaryFunctor<DataProperty, Boolean> {
-		@Override
-		public Boolean fn(DataProperty dp) {
-			return checkAuthorization(new DisplayDataProperty(dp));
-		}
-	}
-
-	private class ObjectPropertyFilterByPolicy extends
-			UnaryFunctor<ObjectProperty, Boolean> {
-		@Override
-		public Boolean fn(ObjectProperty op) {
-			return checkAuthorization(new DisplayObjectProperty(op));
-		}
-	}
-
-	private class DataPropertyStatementFilterByPolicy extends
-			UnaryFunctor<DataPropertyStatement, Boolean> {
-		@Override
-		public Boolean fn(DataPropertyStatement dps) {
-			return checkAuthorization(new DisplayDataPropertyStatement(dps));
-		}
-	}
-
-	private class ObjectPropertyStatementFilterByPolicy extends
-			UnaryFunctor<ObjectPropertyStatement, Boolean> {
-		@Override
-		public Boolean fn(ObjectPropertyStatement ops) {
-			return checkAuthorization(new DisplayObjectPropertyStatement(ops));
-		}
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao.filtering.filters;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import net.sf.jga.fn.UnaryFunctor;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayDataProperty;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayDataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.display.DisplayObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
+
+/**
+ * Ask the current policies whether we can show these things to the user.
+ */
+public class HideFromDisplayByPolicyFilter extends VitroFiltersImpl {
+	private static final Log log = LogFactory
+			.getLog(HideFromDisplayByPolicyFilter.class);
+	
+	private final IdentifierBundle idBundle;
+	private final PolicyIface policy;
+
+	public HideFromDisplayByPolicyFilter(IdentifierBundle idBundle,
+			PolicyIface policy) {
+		if (idBundle == null) {
+			throw new NullPointerException("idBundle may not be null.");
+		}
+		if (policy == null) {
+			throw new NullPointerException("policy may not be null.");
+		}
+
+		this.idBundle = idBundle;
+		this.policy = policy;
+
+		setDataPropertyFilter(new DataPropertyFilterByPolicy());
+		setObjectPropertyFilter(new ObjectPropertyFilterByPolicy());
+		setDataPropertyStatementFilter(new DataPropertyStatementFilterByPolicy());
+		setObjectPropertyStatementFilter(new ObjectPropertyStatementFilterByPolicy());
+	}
+
+	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;
+			}
+		}
+		return false;
+	}
+
+	private class DataPropertyFilterByPolicy extends
+			UnaryFunctor<DataProperty, Boolean> {
+		@Override
+		public Boolean fn(DataProperty dp) {
+			return checkAuthorization(new DisplayDataProperty(dp));
+		}
+	}
+
+	private class ObjectPropertyFilterByPolicy extends
+			UnaryFunctor<ObjectProperty, Boolean> {
+		@Override
+		public Boolean fn(ObjectProperty op) {
+			return checkAuthorization(new DisplayObjectProperty(op));
+		}
+	}
+
+	private class DataPropertyStatementFilterByPolicy extends
+			UnaryFunctor<DataPropertyStatement, Boolean> {
+		@Override
+		public Boolean fn(DataPropertyStatement dps) {
+			return checkAuthorization(new DisplayDataPropertyStatement(dps));
+		}
+	}
+
+	private class ObjectPropertyStatementFilterByPolicy extends
+			UnaryFunctor<ObjectPropertyStatement, Boolean> {
+		@Override
+		public Boolean fn(ObjectPropertyStatement ops) {
+			return checkAuthorization(new DisplayObjectPropertyStatement(ops));
+		}
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJena.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJena.java
index 5bdb5f0fe..409b65842 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJena.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJena.java
@@ -1,513 +1,513 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.dao.jena;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Random;
-
-import com.hp.hpl.jena.ontology.OntClass;
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntResource;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.shared.Lock;
-import com.hp.hpl.jena.util.iterator.ClosableIterator;
-import com.hp.hpl.jena.vocabulary.RDF;
-import com.hp.hpl.jena.vocabulary.RDFS;
-
-import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
-import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-
-/**
- * Implement UserAccountsDao for Jena models.
- */
-public class UserAccountsDaoJena extends JenaBaseDao implements UserAccountsDao {
-	public UserAccountsDaoJena(WebappDaoFactoryJena wadf) {
-		super(wadf);
-	}
-
-	@Override
-	protected OntModel getOntModel() {
-		return getOntModelSelector().getUserAccountsModel();
-	}
-
-	@Override
-	public Collection<UserAccount> getAllUserAccounts() {
-		List<String> userUris = new ArrayList<String>();
-
-		getOntModel().enterCriticalSection(Lock.READ);
-		try {
-			StmtIterator stmts = getOntModel().listStatements((Resource) null,
-					RDF.type, USERACCOUNT);
-			while (stmts.hasNext()) {
-				Resource subject = stmts.next().getSubject();
-				if (subject != null) {
-					userUris.add(subject.getURI());
-				}
-			}
-			stmts.close();
-		} finally {
-			getOntModel().leaveCriticalSection();
-		}
-
-		List<UserAccount> userAccounts = new ArrayList<UserAccount>();
-		for (String userUri : userUris) {
-			UserAccount ua = getUserAccountByUri(userUri);
-			if (ua != null) {
-				userAccounts.add(ua);
-			}
-		}
-
-		return userAccounts;
-	}
-
-	@Override
-	public UserAccount getUserAccountByUri(String uri) {
-		if (uri == null) {
-			return null;
-		}
-
-		getOntModel().enterCriticalSection(Lock.READ);
-		try {
-			OntResource r = getOntModel().getOntResource(uri);
-			if (r == null) {
-				return null;
-			}
-
-			if (!isResourceOfType(r, USERACCOUNT)) {
-				return null;
-			}
-
-			UserAccount u = new UserAccount();
-			u.setUri(r.getURI());
-			u.setEmailAddress(getPropertyStringValue(r,
-					USERACCOUNT_EMAIL_ADDRESS));
-			u.setFirstName(getPropertyStringValue(r, USERACCOUNT_FIRST_NAME));
-			u.setLastName(getPropertyStringValue(r, USERACCOUNT_LAST_NAME));
-			u.setMd5Password(getPropertyStringValue(r, USERACCOUNT_MD5_PASSWORD));
-			u.setOldPassword(getPropertyStringValue(r, USERACCOUNT_OLD_PASSWORD));
-			u.setPasswordLinkExpires(getPropertyLongValue(r,
-					USERACCOUNT_PASSWORD_LINK_EXPIRES));
-			u.setPasswordChangeRequired(getPropertyBooleanValue(r,
-					USERACCOUNT_PASSWORD_CHANGE_REQUIRED));
-			u.setExternalAuthOnly(getPropertyBooleanValue(r,
-					USERACCOUNT_EXTERNAL_AUTH_ONLY));
-			u.setLoginCount(getPropertyIntValue(r, USERACCOUNT_LOGIN_COUNT));
-			u.setLastLoginTime(getPropertyLongValue(r,
-					USERACCOUNT_LAST_LOGIN_TIME));
-			u.setStatusFromString(getPropertyStringValue(r, USERACCOUNT_STATUS));
-			u.setExternalAuthId(getPropertyStringValue(r,
-					USERACCOUNT_EXTERNAL_AUTH_ID));
-			u.setPermissionSetUris(getPropertyResourceURIValues(r,
-					USERACCOUNT_HAS_PERMISSION_SET));
-			u.setRootUser(isResourceOfType(r, USERACCOUNT_ROOT_USER));
-			u.setProxiedIndividualUris(getPropertyResourceURIValues(r,
-					USERACCOUNT_PROXY_EDITOR_FOR));
-			return u;
-		} finally {
-			getOntModel().leaveCriticalSection();
-		}
-	}
-
-	@Override
-	public UserAccount getUserAccountByEmail(String emailAddress) {
-		if (emailAddress == null) {
-			return null;
-		}
-
-		String userUri = null;
-
-		getOntModel().enterCriticalSection(Lock.READ);
-		try {
-			StmtIterator stmts = getOntModel().listStatements(null,
-					USERACCOUNT_EMAIL_ADDRESS,
-					getOntModel().createLiteral(emailAddress));
-			if (stmts.hasNext()) {
-				userUri = stmts.next().getSubject().getURI();
-			}
-			stmts.close();
-		} finally {
-			getOntModel().leaveCriticalSection();
-		}
-
-		return getUserAccountByUri(userUri);
-	}
-
-	@Override
-	public UserAccount getUserAccountByExternalAuthId(String externalAuthId) {
-		if (externalAuthId == null) {
-			return null;
-		}
-
-		String userUri = null;
-
-		getOntModel().enterCriticalSection(Lock.READ);
-		try {
-			StmtIterator stmts = getOntModel().listStatements(null,
-					USERACCOUNT_EXTERNAL_AUTH_ID,
-					getOntModel().createLiteral(externalAuthId));
-			if (stmts.hasNext()) {
-				userUri = stmts.next().getSubject().getURI();
-			}
-			stmts.close();
-		} finally {
-			getOntModel().leaveCriticalSection();
-		}
-
-		return getUserAccountByUri(userUri);
-	}
-
-	@Override
-	public Collection<UserAccount> getUserAccountsWhoProxyForPage(
-			String profilePageUri) {
-		List<String> userUris = new ArrayList<String>();
-
-		Resource s = null;
-		Property p = getOntModel().getProperty(
-				VitroVocabulary.USERACCOUNT_PROXY_EDITOR_FOR);
-		Resource o = getOntModel().createResource(profilePageUri);
-
-		getOntModel().enterCriticalSection(Lock.READ);
-		try {
-			StmtIterator stmts = getOntModel().listStatements(s, p, o);
-			while (stmts.hasNext()) {
-				Resource subject = stmts.next().getSubject();
-				if (subject != null) {
-					userUris.add(subject.getURI());
-				}
-			}
-			stmts.close();
-		} finally {
-			getOntModel().leaveCriticalSection();
-		}
-
-		List<UserAccount> userAccounts = new ArrayList<UserAccount>();
-		for (String userUri : userUris) {
-			UserAccount ua = getUserAccountByUri(userUri);
-			if (ua != null) {
-				userAccounts.add(ua);
-			}
-		}
-
-		return userAccounts;
-	}
-
-	@Override
-	public String insertUserAccount(UserAccount userAccount) {
-		if (userAccount == null) {
-			throw new NullPointerException("userAccount may not be null.");
-		}
-		if (!userAccount.getUri().isEmpty()) {
-			throw new IllegalArgumentException(
-					"URI of new userAccount must be empty.");
-		}
-
-		OntModel model = getOntModel();
-
-		model.enterCriticalSection(Lock.WRITE);
-		try {
-			String userUri = getUnusedURI();
-			Resource res = model.createIndividual(userUri, USERACCOUNT);
-			addPropertyStringValue(res, USERACCOUNT_EMAIL_ADDRESS,
-					userAccount.getEmailAddress(), model);
-			addPropertyStringValue(res, USERACCOUNT_FIRST_NAME,
-					userAccount.getFirstName(), model);
-			addPropertyStringValue(res, USERACCOUNT_LAST_NAME,
-					userAccount.getLastName(), model);
-			addPropertyStringValue(res, USERACCOUNT_MD5_PASSWORD,
-					userAccount.getMd5Password(), model);
-			addPropertyStringValue(res, USERACCOUNT_OLD_PASSWORD,
-					userAccount.getOldPassword(), model);
-			addPropertyLongValue(res, USERACCOUNT_PASSWORD_LINK_EXPIRES,
-					userAccount.getPasswordLinkExpires(), model);
-			addPropertyBooleanValue(res, USERACCOUNT_PASSWORD_CHANGE_REQUIRED,
-					userAccount.isPasswordChangeRequired(), model);
-			addPropertyBooleanValue(res, USERACCOUNT_EXTERNAL_AUTH_ONLY,
-					userAccount.isExternalAuthOnly(), model);
-			addPropertyIntValue(res, USERACCOUNT_LOGIN_COUNT,
-					userAccount.getLoginCount(), model);
-			addPropertyLongValue(res, USERACCOUNT_LAST_LOGIN_TIME,
-					userAccount.getLastLoginTime(), model);
-			if (userAccount.getStatus() != null) {
-				addPropertyStringValue(res, USERACCOUNT_STATUS, userAccount
-						.getStatus().toString(), model);
-			}
-			addPropertyStringValue(res, USERACCOUNT_EXTERNAL_AUTH_ID,
-					userAccount.getExternalAuthId(), model);
-			updatePropertyResourceURIValues(res,
-					USERACCOUNT_HAS_PERMISSION_SET,
-					userAccount.getPermissionSetUris(), model);
-
-			if (userAccount.isRootUser()) {
-				model.add(res, RDF.type, USERACCOUNT_ROOT_USER);
-			}
-
-			updatePropertyResourceURIValues(res, USERACCOUNT_PROXY_EDITOR_FOR,
-					userAccount.getProxiedIndividualUris(), model);
-
-			userAccount.setUri(userUri);
-			return userUri;
-		} catch (InsertException e) {
-			log.error(e, e);
-			return null;
-		} finally {
-			model.leaveCriticalSection();
-		}
-	}
-
-	@Override
-	public void updateUserAccount(UserAccount userAccount) {
-		if (userAccount == null) {
-			throw new NullPointerException("userAccount may not be null.");
-		}
-
-		OntModel model = getOntModel();
-
-		model.enterCriticalSection(Lock.WRITE);
-		try {
-			OntResource res = model.getOntResource(userAccount.getUri());
-			if (res == null) {
-				throw new IllegalArgumentException("userAccount '"
-						+ userAccount.getUri() + "' does not exist.");
-			}
-
-			updatePropertyStringValue(res, USERACCOUNT_EMAIL_ADDRESS,
-					userAccount.getEmailAddress(), model);
-			updatePropertyStringValue(res, USERACCOUNT_FIRST_NAME,
-					userAccount.getFirstName(), model);
-			updatePropertyStringValue(res, USERACCOUNT_LAST_NAME,
-					userAccount.getLastName(), model);
-			updatePropertyStringValue(res, USERACCOUNT_MD5_PASSWORD,
-					userAccount.getMd5Password(), model);
-			updatePropertyStringValue(res, USERACCOUNT_OLD_PASSWORD,
-					userAccount.getOldPassword(), model);
-			updatePropertyLongValue(res, USERACCOUNT_PASSWORD_LINK_EXPIRES,
-					userAccount.getPasswordLinkExpires(), model);
-			updatePropertyBooleanValue(res,
-					USERACCOUNT_PASSWORD_CHANGE_REQUIRED,
-					userAccount.isPasswordChangeRequired(), model, true);
-			updatePropertyBooleanValue(res, USERACCOUNT_EXTERNAL_AUTH_ONLY,
-					userAccount.isExternalAuthOnly(), model, true);
-			updatePropertyIntValue(res, USERACCOUNT_LOGIN_COUNT,
-					userAccount.getLoginCount(), model);
-			updatePropertyLongValue(res, USERACCOUNT_LAST_LOGIN_TIME,
-					userAccount.getLastLoginTime(), model);
-			if (userAccount.getStatus() == null) {
-				updatePropertyStringValue(res, USERACCOUNT_STATUS, null, model);
-			} else {
-				updatePropertyStringValue(res, USERACCOUNT_STATUS, userAccount
-						.getStatus().toString(), model);
-			}
-			updatePropertyStringValue(res, USERACCOUNT_EXTERNAL_AUTH_ID,
-					userAccount.getExternalAuthId(), model);
-			updatePropertyResourceURIValues(res,
-					USERACCOUNT_HAS_PERMISSION_SET,
-					userAccount.getPermissionSetUris(), model);
-
-			if (userAccount.isRootUser()) {
-				model.add(res, RDF.type, USERACCOUNT_ROOT_USER);
-			} else {
-				model.remove(res, RDF.type, USERACCOUNT_ROOT_USER);
-			}
-
-			updatePropertyResourceURIValues(res, USERACCOUNT_PROXY_EDITOR_FOR,
-					userAccount.getProxiedIndividualUris(), model);
-
-		} finally {
-			model.leaveCriticalSection();
-		}
-	}
-
-	@Override
-	public void deleteUserAccount(String userAccountUri) {
-		if (userAccountUri == null) {
-			return;
-		}
-
-		OntModel model = getOntModel();
-
-		model.enterCriticalSection(Lock.WRITE);
-		try {
-			Resource res = model.createResource(userAccountUri);
-			model.removeAll(res, null, null);
-		} finally {
-			model.leaveCriticalSection();
-		}
-	}
-
-	@Override
-	public void setProxyAccountsOnProfile(String profilePageUri,
-			Collection<String> userAccountUris) {
-		Property p = getOntModel().getProperty(
-				VitroVocabulary.USERACCOUNT_PROXY_EDITOR_FOR);
-		Resource o = getOntModel().createResource(profilePageUri);
-
-		// figure out what needs to be added and what needs to be removed.
-		List<String> removeThese = new ArrayList<String>();
-		List<String> addThese = new ArrayList<String>(userAccountUris);
-		getOntModel().enterCriticalSection(Lock.READ);
-		try {
-			Resource s = null;
-			StmtIterator stmts = getOntModel().listStatements(s, p, o);
-			while (stmts.hasNext()) {
-				Resource subject = stmts.next().getSubject();
-				if (subject != null) {
-					String uri = subject.getURI();
-					if (addThese.contains(uri)) {
-						addThese.remove(uri);
-					} else {
-						removeThese.add(uri);
-					}
-				}
-			}
-			stmts.close();
-		} finally {
-			getOntModel().leaveCriticalSection();
-		}
-
-		// now do it.
-		getOntModel().enterCriticalSection(Lock.WRITE);
-		try {
-			for (String uri : removeThese) {
-				Resource s = getOntModel().createResource(uri);
-				getOntModel().remove(s, p, o);
-			}
-			for (String uri : addThese) {
-				Resource s = getOntModel().createResource(uri);
-				getOntModel().add(s, p, o);
-			}
-		} finally {
-			getOntModel().leaveCriticalSection();
-		}
-	}
-
-	@Override
-	public PermissionSet getPermissionSetByUri(String uri) {
-		if (uri == null) {
-			return null;
-		}
-
-		getOntModel().enterCriticalSection(Lock.READ);
-		try {
-			OntResource r = getOntModel().getOntResource(uri);
-			if (r == null) {
-				return null;
-			}
-			if (!isResourceOfType(r, PERMISSIONSET)) {
-				return null;
-			}
-
-			PermissionSet ps = new PermissionSet();
-			ps.setUri(uri);
-			ps.setLabel(getPropertyStringValue(r, RDFS.label));
-			ps.setForNewUsers(isResourceOfType(r, PERMISSION_SET_FOR_NEW_USERS));
-			ps.setForPublic(isResourceOfType(r, PERMISSION_SET_FOR_PUBLIC));
-			ps.setPermissionUris(getPropertyResourceURIValues(r,
-					PERMISSIONSET_HAS_PERMISSION));
-			return ps;
-		} finally {
-			getOntModel().leaveCriticalSection();
-		}
-	}
-
-	@Override
-	public Collection<PermissionSet> getAllPermissionSets() {
-		List<PermissionSet> list = new ArrayList<PermissionSet>();
-
-		getOntModel().enterCriticalSection(Lock.READ);
-		try {
-			ClosableIterator<Statement> stmtIt = getOntModel().listStatements(
-					null, RDF.type, PERMISSIONSET);
-			try {
-				while (stmtIt.hasNext()) {
-					Statement stmt = stmtIt.next();
-					OntResource r = stmt.getSubject().as(OntResource.class);
-
-					PermissionSet ps = new PermissionSet();
-					ps.setUri(r.getURI());
-					ps.setLabel(getPropertyStringValue(r, RDFS.label));
-					ps.setForNewUsers(isResourceOfType(r,
-							PERMISSION_SET_FOR_NEW_USERS));
-					ps.setForPublic(isResourceOfType(r,
-							PERMISSION_SET_FOR_PUBLIC));
-					ps.setPermissionUris(getPropertyResourceURIValues(r,
-							PERMISSIONSET_HAS_PERMISSION));
-					list.add(ps);
-				}
-			} finally {
-				stmtIt.close();
-			}
-		} finally {
-			getOntModel().leaveCriticalSection();
-		}
-
-		Collections.sort(list, new PermissionSetsByUri());
-
-		return list;
-	}
-
-	private String getUnusedURI() throws InsertException {
-		String errMsg = null;
-
-		String namespace = DEFAULT_NAMESPACE;
-		String uri = null;
-
-		Random random = new Random(System.currentTimeMillis());
-		for (int attempts = 0; attempts < 30; attempts++) {
-			int upperBound = (int) Math.pow(2, attempts + 13);
-			uri = namespace + ("u" + random.nextInt(upperBound));
-			if (!isUriUsed(uri)) {
-				return uri;
-			}
-		}
-
-		throw new InsertException("Could not create URI for individual: "
-				+ errMsg);
-	}
-
-	private boolean isUriUsed(String uri) {
-		return (getOntModel().getOntResource(uri) != null);
-	}
-
-	/**
-	 * 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) {
-		if (r == null) {
-			return false;
-		}
-		if (type == null) {
-			return false;
-		}
-
-		StmtIterator stmts = getOntModel().listStatements(r, RDF.type, type);
-		if (stmts.hasNext()) {
-			stmts.close();
-			return true;
-		} else {
-			stmts.close();
-			return false;
-		}
-	}
-
-	private static class PermissionSetsByUri implements
-			Comparator<PermissionSet> {
-		@Override
-		public int compare(PermissionSet ps1, PermissionSet ps2) {
-			return ps1.getUri().compareTo(ps2.getUri());
-		}
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao.jena;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Random;
+
+import com.hp.hpl.jena.ontology.OntClass;
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntResource;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.rdf.model.StmtIterator;
+import com.hp.hpl.jena.shared.Lock;
+import com.hp.hpl.jena.util.iterator.ClosableIterator;
+import com.hp.hpl.jena.vocabulary.RDF;
+import com.hp.hpl.jena.vocabulary.RDFS;
+
+import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
+import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+
+/**
+ * Implement UserAccountsDao for Jena models.
+ */
+public class UserAccountsDaoJena extends JenaBaseDao implements UserAccountsDao {
+	public UserAccountsDaoJena(WebappDaoFactoryJena wadf) {
+		super(wadf);
+	}
+
+	@Override
+	protected OntModel getOntModel() {
+		return getOntModelSelector().getUserAccountsModel();
+	}
+
+	@Override
+	public Collection<UserAccount> getAllUserAccounts() {
+		List<String> userUris = new ArrayList<String>();
+
+		getOntModel().enterCriticalSection(Lock.READ);
+		try {
+			StmtIterator stmts = getOntModel().listStatements((Resource) null,
+					RDF.type, USERACCOUNT);
+			while (stmts.hasNext()) {
+				Resource subject = stmts.next().getSubject();
+				if (subject != null) {
+					userUris.add(subject.getURI());
+				}
+			}
+			stmts.close();
+		} finally {
+			getOntModel().leaveCriticalSection();
+		}
+
+		List<UserAccount> userAccounts = new ArrayList<UserAccount>();
+		for (String userUri : userUris) {
+			UserAccount ua = getUserAccountByUri(userUri);
+			if (ua != null) {
+				userAccounts.add(ua);
+			}
+		}
+
+		return userAccounts;
+	}
+
+	@Override
+	public UserAccount getUserAccountByUri(String uri) {
+		if (uri == null) {
+			return null;
+		}
+
+		getOntModel().enterCriticalSection(Lock.READ);
+		try {
+			OntResource r = getOntModel().getOntResource(uri);
+			if (r == null) {
+				return null;
+			}
+
+			if (!isResourceOfType(r, USERACCOUNT)) {
+				return null;
+			}
+
+			UserAccount u = new UserAccount();
+			u.setUri(r.getURI());
+			u.setEmailAddress(getPropertyStringValue(r,
+					USERACCOUNT_EMAIL_ADDRESS));
+			u.setFirstName(getPropertyStringValue(r, USERACCOUNT_FIRST_NAME));
+			u.setLastName(getPropertyStringValue(r, USERACCOUNT_LAST_NAME));
+			u.setMd5Password(getPropertyStringValue(r, USERACCOUNT_MD5_PASSWORD));
+			u.setOldPassword(getPropertyStringValue(r, USERACCOUNT_OLD_PASSWORD));
+			u.setPasswordLinkExpires(getPropertyLongValue(r,
+					USERACCOUNT_PASSWORD_LINK_EXPIRES));
+			u.setPasswordChangeRequired(getPropertyBooleanValue(r,
+					USERACCOUNT_PASSWORD_CHANGE_REQUIRED));
+			u.setExternalAuthOnly(getPropertyBooleanValue(r,
+					USERACCOUNT_EXTERNAL_AUTH_ONLY));
+			u.setLoginCount(getPropertyIntValue(r, USERACCOUNT_LOGIN_COUNT));
+			u.setLastLoginTime(getPropertyLongValue(r,
+					USERACCOUNT_LAST_LOGIN_TIME));
+			u.setStatusFromString(getPropertyStringValue(r, USERACCOUNT_STATUS));
+			u.setExternalAuthId(getPropertyStringValue(r,
+					USERACCOUNT_EXTERNAL_AUTH_ID));
+			u.setPermissionSetUris(getPropertyResourceURIValues(r,
+					USERACCOUNT_HAS_PERMISSION_SET));
+			u.setRootUser(isResourceOfType(r, USERACCOUNT_ROOT_USER));
+			u.setProxiedIndividualUris(getPropertyResourceURIValues(r,
+					USERACCOUNT_PROXY_EDITOR_FOR));
+			return u;
+		} finally {
+			getOntModel().leaveCriticalSection();
+		}
+	}
+
+	@Override
+	public UserAccount getUserAccountByEmail(String emailAddress) {
+		if (emailAddress == null) {
+			return null;
+		}
+
+		String userUri = null;
+
+		getOntModel().enterCriticalSection(Lock.READ);
+		try {
+			StmtIterator stmts = getOntModel().listStatements(null,
+					USERACCOUNT_EMAIL_ADDRESS,
+					getOntModel().createLiteral(emailAddress));
+			if (stmts.hasNext()) {
+				userUri = stmts.next().getSubject().getURI();
+			}
+			stmts.close();
+		} finally {
+			getOntModel().leaveCriticalSection();
+		}
+
+		return getUserAccountByUri(userUri);
+	}
+
+	@Override
+	public UserAccount getUserAccountByExternalAuthId(String externalAuthId) {
+		if (externalAuthId == null) {
+			return null;
+		}
+
+		String userUri = null;
+
+		getOntModel().enterCriticalSection(Lock.READ);
+		try {
+			StmtIterator stmts = getOntModel().listStatements(null,
+					USERACCOUNT_EXTERNAL_AUTH_ID,
+					getOntModel().createLiteral(externalAuthId));
+			if (stmts.hasNext()) {
+				userUri = stmts.next().getSubject().getURI();
+			}
+			stmts.close();
+		} finally {
+			getOntModel().leaveCriticalSection();
+		}
+
+		return getUserAccountByUri(userUri);
+	}
+
+	@Override
+	public Collection<UserAccount> getUserAccountsWhoProxyForPage(
+			String profilePageUri) {
+		List<String> userUris = new ArrayList<String>();
+
+		Resource s = null;
+		Property p = getOntModel().getProperty(
+				VitroVocabulary.USERACCOUNT_PROXY_EDITOR_FOR);
+		Resource o = getOntModel().createResource(profilePageUri);
+
+		getOntModel().enterCriticalSection(Lock.READ);
+		try {
+			StmtIterator stmts = getOntModel().listStatements(s, p, o);
+			while (stmts.hasNext()) {
+				Resource subject = stmts.next().getSubject();
+				if (subject != null) {
+					userUris.add(subject.getURI());
+				}
+			}
+			stmts.close();
+		} finally {
+			getOntModel().leaveCriticalSection();
+		}
+
+		List<UserAccount> userAccounts = new ArrayList<UserAccount>();
+		for (String userUri : userUris) {
+			UserAccount ua = getUserAccountByUri(userUri);
+			if (ua != null) {
+				userAccounts.add(ua);
+			}
+		}
+
+		return userAccounts;
+	}
+
+	@Override
+	public String insertUserAccount(UserAccount userAccount) {
+		if (userAccount == null) {
+			throw new NullPointerException("userAccount may not be null.");
+		}
+		if (!userAccount.getUri().isEmpty()) {
+			throw new IllegalArgumentException(
+					"URI of new userAccount must be empty.");
+		}
+
+		OntModel model = getOntModel();
+
+		model.enterCriticalSection(Lock.WRITE);
+		try {
+			String userUri = getUnusedURI();
+			Resource res = model.createIndividual(userUri, USERACCOUNT);
+			addPropertyStringValue(res, USERACCOUNT_EMAIL_ADDRESS,
+					userAccount.getEmailAddress(), model);
+			addPropertyStringValue(res, USERACCOUNT_FIRST_NAME,
+					userAccount.getFirstName(), model);
+			addPropertyStringValue(res, USERACCOUNT_LAST_NAME,
+					userAccount.getLastName(), model);
+			addPropertyStringValue(res, USERACCOUNT_MD5_PASSWORD,
+					userAccount.getMd5Password(), model);
+			addPropertyStringValue(res, USERACCOUNT_OLD_PASSWORD,
+					userAccount.getOldPassword(), model);
+			addPropertyLongValue(res, USERACCOUNT_PASSWORD_LINK_EXPIRES,
+					userAccount.getPasswordLinkExpires(), model);
+			addPropertyBooleanValue(res, USERACCOUNT_PASSWORD_CHANGE_REQUIRED,
+					userAccount.isPasswordChangeRequired(), model);
+			addPropertyBooleanValue(res, USERACCOUNT_EXTERNAL_AUTH_ONLY,
+					userAccount.isExternalAuthOnly(), model);
+			addPropertyIntValue(res, USERACCOUNT_LOGIN_COUNT,
+					userAccount.getLoginCount(), model);
+			addPropertyLongValue(res, USERACCOUNT_LAST_LOGIN_TIME,
+					userAccount.getLastLoginTime(), model);
+			if (userAccount.getStatus() != null) {
+				addPropertyStringValue(res, USERACCOUNT_STATUS, userAccount
+						.getStatus().toString(), model);
+			}
+			addPropertyStringValue(res, USERACCOUNT_EXTERNAL_AUTH_ID,
+					userAccount.getExternalAuthId(), model);
+			updatePropertyResourceURIValues(res,
+					USERACCOUNT_HAS_PERMISSION_SET,
+					userAccount.getPermissionSetUris(), model);
+
+			if (userAccount.isRootUser()) {
+				model.add(res, RDF.type, USERACCOUNT_ROOT_USER);
+			}
+
+			updatePropertyResourceURIValues(res, USERACCOUNT_PROXY_EDITOR_FOR,
+					userAccount.getProxiedIndividualUris(), model);
+
+			userAccount.setUri(userUri);
+			return userUri;
+		} catch (InsertException e) {
+			log.error(e, e);
+			return null;
+		} finally {
+			model.leaveCriticalSection();
+		}
+	}
+
+	@Override
+	public void updateUserAccount(UserAccount userAccount) {
+		if (userAccount == null) {
+			throw new NullPointerException("userAccount may not be null.");
+		}
+
+		OntModel model = getOntModel();
+
+		model.enterCriticalSection(Lock.WRITE);
+		try {
+			OntResource res = model.getOntResource(userAccount.getUri());
+			if (res == null) {
+				throw new IllegalArgumentException("userAccount '"
+						+ userAccount.getUri() + "' does not exist.");
+			}
+
+			updatePropertyStringValue(res, USERACCOUNT_EMAIL_ADDRESS,
+					userAccount.getEmailAddress(), model);
+			updatePropertyStringValue(res, USERACCOUNT_FIRST_NAME,
+					userAccount.getFirstName(), model);
+			updatePropertyStringValue(res, USERACCOUNT_LAST_NAME,
+					userAccount.getLastName(), model);
+			updatePropertyStringValue(res, USERACCOUNT_MD5_PASSWORD,
+					userAccount.getMd5Password(), model);
+			updatePropertyStringValue(res, USERACCOUNT_OLD_PASSWORD,
+					userAccount.getOldPassword(), model);
+			updatePropertyLongValue(res, USERACCOUNT_PASSWORD_LINK_EXPIRES,
+					userAccount.getPasswordLinkExpires(), model);
+			updatePropertyBooleanValue(res,
+					USERACCOUNT_PASSWORD_CHANGE_REQUIRED,
+					userAccount.isPasswordChangeRequired(), model, true);
+			updatePropertyBooleanValue(res, USERACCOUNT_EXTERNAL_AUTH_ONLY,
+					userAccount.isExternalAuthOnly(), model, true);
+			updatePropertyIntValue(res, USERACCOUNT_LOGIN_COUNT,
+					userAccount.getLoginCount(), model);
+			updatePropertyLongValue(res, USERACCOUNT_LAST_LOGIN_TIME,
+					userAccount.getLastLoginTime(), model);
+			if (userAccount.getStatus() == null) {
+				updatePropertyStringValue(res, USERACCOUNT_STATUS, null, model);
+			} else {
+				updatePropertyStringValue(res, USERACCOUNT_STATUS, userAccount
+						.getStatus().toString(), model);
+			}
+			updatePropertyStringValue(res, USERACCOUNT_EXTERNAL_AUTH_ID,
+					userAccount.getExternalAuthId(), model);
+			updatePropertyResourceURIValues(res,
+					USERACCOUNT_HAS_PERMISSION_SET,
+					userAccount.getPermissionSetUris(), model);
+
+			if (userAccount.isRootUser()) {
+				model.add(res, RDF.type, USERACCOUNT_ROOT_USER);
+			} else {
+				model.remove(res, RDF.type, USERACCOUNT_ROOT_USER);
+			}
+
+			updatePropertyResourceURIValues(res, USERACCOUNT_PROXY_EDITOR_FOR,
+					userAccount.getProxiedIndividualUris(), model);
+
+		} finally {
+			model.leaveCriticalSection();
+		}
+	}
+
+	@Override
+	public void deleteUserAccount(String userAccountUri) {
+		if (userAccountUri == null) {
+			return;
+		}
+
+		OntModel model = getOntModel();
+
+		model.enterCriticalSection(Lock.WRITE);
+		try {
+			Resource res = model.createResource(userAccountUri);
+			model.removeAll(res, null, null);
+		} finally {
+			model.leaveCriticalSection();
+		}
+	}
+
+	@Override
+	public void setProxyAccountsOnProfile(String profilePageUri,
+			Collection<String> userAccountUris) {
+		Property p = getOntModel().getProperty(
+				VitroVocabulary.USERACCOUNT_PROXY_EDITOR_FOR);
+		Resource o = getOntModel().createResource(profilePageUri);
+
+		// figure out what needs to be added and what needs to be removed.
+		List<String> removeThese = new ArrayList<String>();
+		List<String> addThese = new ArrayList<String>(userAccountUris);
+		getOntModel().enterCriticalSection(Lock.READ);
+		try {
+			Resource s = null;
+			StmtIterator stmts = getOntModel().listStatements(s, p, o);
+			while (stmts.hasNext()) {
+				Resource subject = stmts.next().getSubject();
+				if (subject != null) {
+					String uri = subject.getURI();
+					if (addThese.contains(uri)) {
+						addThese.remove(uri);
+					} else {
+						removeThese.add(uri);
+					}
+				}
+			}
+			stmts.close();
+		} finally {
+			getOntModel().leaveCriticalSection();
+		}
+
+		// now do it.
+		getOntModel().enterCriticalSection(Lock.WRITE);
+		try {
+			for (String uri : removeThese) {
+				Resource s = getOntModel().createResource(uri);
+				getOntModel().remove(s, p, o);
+			}
+			for (String uri : addThese) {
+				Resource s = getOntModel().createResource(uri);
+				getOntModel().add(s, p, o);
+			}
+		} finally {
+			getOntModel().leaveCriticalSection();
+		}
+	}
+
+	@Override
+	public PermissionSet getPermissionSetByUri(String uri) {
+		if (uri == null) {
+			return null;
+		}
+
+		getOntModel().enterCriticalSection(Lock.READ);
+		try {
+			OntResource r = getOntModel().getOntResource(uri);
+			if (r == null) {
+				return null;
+			}
+			if (!isResourceOfType(r, PERMISSIONSET)) {
+				return null;
+			}
+
+			PermissionSet ps = new PermissionSet();
+			ps.setUri(uri);
+			ps.setLabel(getPropertyStringValue(r, RDFS.label));
+			ps.setForNewUsers(isResourceOfType(r, PERMISSION_SET_FOR_NEW_USERS));
+			ps.setForPublic(isResourceOfType(r, PERMISSION_SET_FOR_PUBLIC));
+			ps.setPermissionUris(getPropertyResourceURIValues(r,
+					PERMISSIONSET_HAS_PERMISSION));
+			return ps;
+		} finally {
+			getOntModel().leaveCriticalSection();
+		}
+	}
+
+	@Override
+	public Collection<PermissionSet> getAllPermissionSets() {
+		List<PermissionSet> list = new ArrayList<PermissionSet>();
+
+		getOntModel().enterCriticalSection(Lock.READ);
+		try {
+			ClosableIterator<Statement> stmtIt = getOntModel().listStatements(
+					null, RDF.type, PERMISSIONSET);
+			try {
+				while (stmtIt.hasNext()) {
+					Statement stmt = stmtIt.next();
+					OntResource r = stmt.getSubject().as(OntResource.class);
+
+					PermissionSet ps = new PermissionSet();
+					ps.setUri(r.getURI());
+					ps.setLabel(getPropertyStringValue(r, RDFS.label));
+					ps.setForNewUsers(isResourceOfType(r,
+							PERMISSION_SET_FOR_NEW_USERS));
+					ps.setForPublic(isResourceOfType(r,
+							PERMISSION_SET_FOR_PUBLIC));
+					ps.setPermissionUris(getPropertyResourceURIValues(r,
+							PERMISSIONSET_HAS_PERMISSION));
+					list.add(ps);
+				}
+			} finally {
+				stmtIt.close();
+			}
+		} finally {
+			getOntModel().leaveCriticalSection();
+		}
+
+		Collections.sort(list, new PermissionSetsByUri());
+
+		return list;
+	}
+
+	private String getUnusedURI() throws InsertException {
+		String errMsg = null;
+
+		String namespace = DEFAULT_NAMESPACE;
+		String uri = null;
+
+		Random random = new Random(System.currentTimeMillis());
+		for (int attempts = 0; attempts < 30; attempts++) {
+			int upperBound = (int) Math.pow(2, attempts + 13);
+			uri = namespace + ("u" + random.nextInt(upperBound));
+			if (!isUriUsed(uri)) {
+				return uri;
+			}
+		}
+
+		throw new InsertException("Could not create URI for individual: "
+				+ errMsg);
+	}
+
+	private boolean isUriUsed(String uri) {
+		return (getOntModel().getOntResource(uri) != null);
+	}
+
+	/**
+	 * 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) {
+		if (r == null) {
+			return false;
+		}
+		if (type == null) {
+			return false;
+		}
+
+		StmtIterator stmts = getOntModel().listStatements(r, RDF.type, type);
+		if (stmts.hasNext()) {
+			stmts.close();
+			return true;
+		} else {
+			stmts.close();
+			return false;
+		}
+	}
+
+	private static class PermissionSetsByUri implements
+			Comparator<PermissionSet> {
+		@Override
+		public int compare(PermissionSet ps1, PermissionSet ps2) {
+			return ps1.getUri().compareTo(ps2.getUri());
+		}
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/IndividualDataPropertyStatementProcessor.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/IndividualDataPropertyStatementProcessor.java
index 145320d76..81ef2a54d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/IndividualDataPropertyStatementProcessor.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/IndividualDataPropertyStatementProcessor.java
@@ -1,7 +1,7 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.edit.listener.impl;
-
+package edu.cornell.mannlib.vitro.webapp.edit.listener.impl;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -20,102 +20,102 @@ import edu.cornell.mannlib.vitro.webapp.beans.Individual;
 import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
 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) {
-        processDataprops(epo);
-    }
-
-    public void doUpdated(Object oldObj, Object newObj, EditProcessObject epo) {
-        processDataprops(epo);
-    }
-
-    public void doDeleted(Object oldObj, EditProcessObject epo) {
-        // do nothing
-    }
-
-    private void processDataprops (EditProcessObject epo) {
-        HashSet<String> deletedDataPropertyURIs = new HashSet<String>();
-        Map dpm = datapropParameterMap(epo.getRequestParameterMap());
-        DataPropertyStatementDao dataPropertyStatementDao = (DataPropertyStatementDao)epo.getAdditionalDaoMap().get("DataPropertyStatement");
-        Iterator dpmIt = dpm.keySet().iterator();
-        while (dpmIt.hasNext()) {
-            String key = (String) dpmIt.next();
-            String[] data = (String[])dpm.get(key);
-            for (int dataRow=0; dataRow<data.length; ++dataRow){
-                String[] keyArg = key.split("_");
-                String rowId = keyArg[2];
-                DataPropertyStatement dataPropertyStmt = new DataPropertyStatementImpl();
-                if (rowId != null) {
-                    // dataPropertyStmt = dataPropertyStatementDao.getDataPropertyStatementByURI(rowId);
-                } else
-                    dataPropertyStmt = new DataPropertyStatementImpl();
-                try {
-                    Map beanParamMap = FormUtils.beanParamMapFromString(keyArg[3]);
-                    String dataPropertyURI = (String)beanParamMap.get("DatatypePropertyURI");
-                    if (!deletedDataPropertyURIs.contains(dataPropertyURI)) {
-                        deletedDataPropertyURIs.add(dataPropertyURI);
-                        dataPropertyStatementDao.deleteDataPropertyStatementsForIndividualByDataProperty(((Individual)epo.getNewBean()).getURI(),dataPropertyURI);
-                    }
-                    dataPropertyStmt.setDatapropURI(dataPropertyURI);
-                } catch (Exception e) {
-                    log.error("Messed up beanParamMap?");
-                }
-                dataPropertyStmt.setData(data[dataRow]);
-                Individual individual = null;
-                // need to rethink this
-                if (((Individual)epo.getOriginalBean()).getURI() != null) {
-                	individual = (Individual) epo.getOriginalBean();
-                    dataPropertyStmt.setIndividualURI(individual.getURI());
-                } else {
-                	individual = (Individual) epo.getNewBean();
-                    dataPropertyStmt.setIndividualURI(individual.getURI());
-                }
-                if (dataPropertyStmt.getData().length()>0 && rowId != null) {
-                	
-            		DataPropertyDao dataPropertyDao = (DataPropertyDao)epo.getAdditionalDaoMap().get("DataProperty");
-            		DataProperty dp = dataPropertyDao.getDataPropertyByURI(dataPropertyStmt.getDatapropURI());
-            		if (dp != null) {
-	            		String rangeDatatypeURI = dataPropertyDao.getRequiredDatatypeURI(individual, dp);
-	            		if (rangeDatatypeURI != null) {
-	            			dataPropertyStmt.setDatatypeURI(rangeDatatypeURI);
-	            			String validationMsg = BasicValidationVTwo.validateAgainstDatatype(dataPropertyStmt.getData(), rangeDatatypeURI);
-	            			// Since this backend editing system is de facto deprecated,
-	            			// not worrying about implementing per-field validation
-	            			if (validationMsg != null) {
-	            				validationMsg = "'" + dataPropertyStmt.getData() + "'"  
-	            				    + " is invalid. "
-	            				    + validationMsg;
-	            				throw new RuntimeException(validationMsg);
-	            			}
-	            		}
-            		}
-                	
-                    dataPropertyStatementDao.insertNewDataPropertyStatement(dataPropertyStmt);
-                } //else if (dataPropertyStmt.getData().length()>0 && rowId != null) {
-                    // dataPropertyStatementDao.updateDataPropertyStatement(dataPropertyStmt);
-                //} else if (dataPropertyStmt.getData().length()==0 && rowId != null) {
-                    // dataPropertyStatementDao.deleteDataPropertyStatement(dataPropertyStmt);
-                //}
-            }
-        }
-    }
-
-    // might want to roll this into the other thing
-    private HashMap datapropParameterMap(Map requestParameterMap) {
-        HashMap dpm = new HashMap();
-        Iterator paramIt = requestParameterMap.keySet().iterator();
-        while (paramIt.hasNext()) {
-            String key = (String) paramIt.next();
-            if (key.startsWith("_DataPropertyStatement")) {
-                dpm.put(key,requestParameterMap.get(key));
-            }
-        }
-        return dpm;
-    }
-
-
-}
+
+public class IndividualDataPropertyStatementProcessor implements ChangeListener {
+	
+	private static final Log log = LogFactory.getLog(IndividualDataPropertyStatementProcessor.class.getName());
+
+    public void doInserted(Object newObj, EditProcessObject epo) {
+        processDataprops(epo);
+    }
+
+    public void doUpdated(Object oldObj, Object newObj, EditProcessObject epo) {
+        processDataprops(epo);
+    }
+
+    public void doDeleted(Object oldObj, EditProcessObject epo) {
+        // do nothing
+    }
+
+    private void processDataprops (EditProcessObject epo) {
+        HashSet<String> deletedDataPropertyURIs = new HashSet<String>();
+        Map dpm = datapropParameterMap(epo.getRequestParameterMap());
+        DataPropertyStatementDao dataPropertyStatementDao = (DataPropertyStatementDao)epo.getAdditionalDaoMap().get("DataPropertyStatement");
+        Iterator dpmIt = dpm.keySet().iterator();
+        while (dpmIt.hasNext()) {
+            String key = (String) dpmIt.next();
+            String[] data = (String[])dpm.get(key);
+            for (int dataRow=0; dataRow<data.length; ++dataRow){
+                String[] keyArg = key.split("_");
+                String rowId = keyArg[2];
+                DataPropertyStatement dataPropertyStmt = new DataPropertyStatementImpl();
+                if (rowId != null) {
+                    // dataPropertyStmt = dataPropertyStatementDao.getDataPropertyStatementByURI(rowId);
+                } else
+                    dataPropertyStmt = new DataPropertyStatementImpl();
+                try {
+                    Map beanParamMap = FormUtils.beanParamMapFromString(keyArg[3]);
+                    String dataPropertyURI = (String)beanParamMap.get("DatatypePropertyURI");
+                    if (!deletedDataPropertyURIs.contains(dataPropertyURI)) {
+                        deletedDataPropertyURIs.add(dataPropertyURI);
+                        dataPropertyStatementDao.deleteDataPropertyStatementsForIndividualByDataProperty(((Individual)epo.getNewBean()).getURI(),dataPropertyURI);
+                    }
+                    dataPropertyStmt.setDatapropURI(dataPropertyURI);
+                } catch (Exception e) {
+                    log.error("Messed up beanParamMap?");
+                }
+                dataPropertyStmt.setData(data[dataRow]);
+                Individual individual = null;
+                // need to rethink this
+                if (((Individual)epo.getOriginalBean()).getURI() != null) {
+                	individual = (Individual) epo.getOriginalBean();
+                    dataPropertyStmt.setIndividualURI(individual.getURI());
+                } else {
+                	individual = (Individual) epo.getNewBean();
+                    dataPropertyStmt.setIndividualURI(individual.getURI());
+                }
+                if (dataPropertyStmt.getData().length()>0 && rowId != null) {
+                	
+            		DataPropertyDao dataPropertyDao = (DataPropertyDao)epo.getAdditionalDaoMap().get("DataProperty");
+            		DataProperty dp = dataPropertyDao.getDataPropertyByURI(dataPropertyStmt.getDatapropURI());
+            		if (dp != null) {
+	            		String rangeDatatypeURI = dataPropertyDao.getRequiredDatatypeURI(individual, dp);
+	            		if (rangeDatatypeURI != null) {
+	            			dataPropertyStmt.setDatatypeURI(rangeDatatypeURI);
+	            			String validationMsg = BasicValidationVTwo.validateAgainstDatatype(dataPropertyStmt.getData(), rangeDatatypeURI);
+	            			// Since this backend editing system is de facto deprecated,
+	            			// not worrying about implementing per-field validation
+	            			if (validationMsg != null) {
+	            				validationMsg = "'" + dataPropertyStmt.getData() + "'"  
+	            				    + " is invalid. "
+	            				    + validationMsg;
+	            				throw new RuntimeException(validationMsg);
+	            			}
+	            		}
+            		}
+                	
+                    dataPropertyStatementDao.insertNewDataPropertyStatement(dataPropertyStmt);
+                } //else if (dataPropertyStmt.getData().length()>0 && rowId != null) {
+                    // dataPropertyStatementDao.updateDataPropertyStatement(dataPropertyStmt);
+                //} else if (dataPropertyStmt.getData().length()==0 && rowId != null) {
+                    // dataPropertyStatementDao.deleteDataPropertyStatement(dataPropertyStmt);
+                //}
+            }
+        }
+    }
+
+    // might want to roll this into the other thing
+    private HashMap datapropParameterMap(Map requestParameterMap) {
+        HashMap dpm = new HashMap();
+        Iterator paramIt = requestParameterMap.keySet().iterator();
+        while (paramIt.hasNext()) {
+            String key = (String) paramIt.next();
+            if (key.startsWith("_DataPropertyStatement")) {
+                dpm.put(key,requestParameterMap.get(key));
+            }
+        }
+        return dpm;
+    }
+
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/VclassOntologyLinker.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/VclassOntologyLinker.java
index 778cefb49..79e67ab01 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/VclassOntologyLinker.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/listener/impl/VclassOntologyLinker.java
@@ -1,22 +1,22 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.edit.listener.impl;
-
-import edu.cornell.mannlib.vedit.listener.ChangeListener;
-import edu.cornell.mannlib.vedit.beans.EditProcessObject;
-
-public class VclassOntologyLinker implements ChangeListener{
-
-    public void doInserted(Object newObj, EditProcessObject epo){
-
-    }
-
-    public void doUpdated(Object oldObj, Object newObj, EditProcessObject epo){
-
-    }
-
-    public void doDeleted(Object oldObj, EditProcessObject epo){
-
-    }
-
-}
+package edu.cornell.mannlib.vitro.webapp.edit.listener.impl;
+
+import edu.cornell.mannlib.vedit.listener.ChangeListener;
+import edu.cornell.mannlib.vedit.beans.EditProcessObject;
+
+public class VclassOntologyLinker implements ChangeListener{
+
+    public void doInserted(Object newObj, EditProcessObject epo){
+
+    }
+
+    public void doUpdated(Object oldObj, Object newObj, EditProcessObject epo){
+
+    }
+
+    public void doDeleted(Object oldObj, EditProcessObject epo){
+
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java
index bc0aa03bb..9d53321a8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditElementVTwo.java
@@ -1,80 +1,80 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-import freemarker.template.TemplateException;
-
-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.
-     */
-    protected String merge(Configuration fmConfig, String templateName, Map map){
-        Template template = null;
-        try {
-            template = fmConfig.getTemplate(templateName);
-        } catch (IOException e) {
-            log.error("Cannot get template " + templateName);
-        }  
-         
-        StringWriter writer = new StringWriter();
-        try {
-            template.process(map, writer);
-        } catch (TemplateException e) {
-            log.error(e,e);
-        } catch (IOException e) {
-            log.error(e,e);
-        }
-        return writer.toString();        
-    }
-
-    /**
-     * Utility method to check if a value from the query parameters is none or a single value.
-     * This returns true if the key is there and the value is null.
-     * This does not check if the value is the empty string.
-     */
-    protected boolean hasNoneOrSingle(String key, Map<String, String[]> queryParameters){
-        if( queryParameters != null ){
-            if( ! queryParameters.containsKey(key) )
-                return true; //none            
-            String[] vt = queryParameters.get(key);
-            return vt == null || vt.length == 0 || vt.length==1;
-        }else{
-            log.error("passed null queryParameters");
-            return false;
-        }
-    }
-    
-    protected boolean hasSingleNonNullNonEmptyValueForKey(String key, Map<String, String[]> queryParameters){
-        if( queryParameters != null ){
-            if( ! queryParameters.containsKey(key) )
-                return true; //none            
-            String[] vt = queryParameters.get(key);
-            return vt != null && vt.length == 1 && vt[0] != null && ! vt[0].isEmpty() ;
-        }else{
-            log.error("passed null queryParameters");
-            return false;
-        }
-    }
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import freemarker.template.TemplateException;
+
+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.
+     */
+    protected String merge(Configuration fmConfig, String templateName, Map map){
+        Template template = null;
+        try {
+            template = fmConfig.getTemplate(templateName);
+        } catch (IOException e) {
+            log.error("Cannot get template " + templateName);
+        }  
+         
+        StringWriter writer = new StringWriter();
+        try {
+            template.process(map, writer);
+        } catch (TemplateException e) {
+            log.error(e,e);
+        } catch (IOException e) {
+            log.error(e,e);
+        }
+        return writer.toString();        
+    }
+
+    /**
+     * Utility method to check if a value from the query parameters is none or a single value.
+     * This returns true if the key is there and the value is null.
+     * This does not check if the value is the empty string.
+     */
+    protected boolean hasNoneOrSingle(String key, Map<String, String[]> queryParameters){
+        if( queryParameters != null ){
+            if( ! queryParameters.containsKey(key) )
+                return true; //none            
+            String[] vt = queryParameters.get(key);
+            return vt == null || vt.length == 0 || vt.length==1;
+        }else{
+            log.error("passed null queryParameters");
+            return false;
+        }
+    }
+    
+    protected boolean hasSingleNonNullNonEmptyValueForKey(String key, Map<String, String[]> queryParameters){
+        if( queryParameters != null ){
+            if( ! queryParameters.containsKey(key) )
+                return true; //none            
+            String[] vt = queryParameters.get(key);
+            return vt != null && vt.length == 1 && vt[0] != null && ! vt[0].isEmpty() ;
+        }else{
+            log.error("passed null queryParameters");
+            return false;
+        }
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditSubmissionPreprocessorVTwo.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditSubmissionPreprocessorVTwo.java
index 8f08b6138..906da4894 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditSubmissionPreprocessorVTwo.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BaseEditSubmissionPreprocessorVTwo.java
@@ -1,15 +1,15 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
-
-public abstract class BaseEditSubmissionPreprocessorVTwo implements
-        EditSubmissionVTwoPreprocessor {
-
-    protected EditConfigurationVTwo editConfiguration;
-    
-    public BaseEditSubmissionPreprocessorVTwo(EditConfigurationVTwo editConfig) {
-        editConfiguration = editConfig;
-    }
-    
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
+
+public abstract class BaseEditSubmissionPreprocessorVTwo implements
+        EditSubmissionVTwoPreprocessor {
+
+    protected EditConfigurationVTwo editConfiguration;
+    
+    public BaseEditSubmissionPreprocessorVTwo(EditConfigurationVTwo editConfig) {
+        editConfiguration = editConfig;
+    }
+    
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java
index b5438610f..78b9e5e62 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/BasicValidationVTwo.java
@@ -1,300 +1,300 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.datatypes.RDFDatatype;
-import com.hp.hpl.jena.datatypes.TypeMapper;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-
-import edu.cornell.mannlib.vitro.webapp.beans.Datatype;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.DatatypeDaoJena;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-
-
-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>>();
-        for(String fieldName: editConfig.getFields().keySet()){
-            FieldVTwo field = editConfig.getField(fieldName);
-            validatorsForFields.put(fieldName,field.getValidators());
-        }
-        this.varsToValidations = validatorsForFields;
-        checkValidations();
-    }
-
-    public BasicValidationVTwo(Map<String, List<String>> varsToValidations){
-        this.varsToValidations = varsToValidations;
-        checkValidations();
-    }
-
-    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 
-                	String validateMsg = null;
-                	for(String value: values){
-                		String thisValidateMsg = validate(validationType,value);
-                		if(validateMsg != null && thisValidateMsg != null) {
-                			validateMsg += ", " + thisValidateMsg;
-                		} else {
-                			validateMsg = thisValidateMsg;
-
-                		}
-                	}
-                    if( validateMsg != null) {
-                        errors.put(name,validateMsg);
-                    }    
-                }
-            }
-        }               
-        return errors;
-    }
-
-
-    public Map<String,String> validateLiterals(Map<String, List<Literal>> varNamesToValues){
-        HashMap<String,String> errors = new HashMap<String,String>();
-
-        for( String name : editConfig.getLiteralsOnForm() ){
-            List<Literal> literals = varNamesToValues.get(name);
-            List<String>validations = varsToValidations.get(name);
-            if( validations != null ){
-                // NB this is case-sensitive
-                boolean isRequiredField = validations.contains("nonempty");
-                
-                for( String validationType : validations){
-                    String value = null;
-                    String 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);     
-                        break;
-                    }
-                    //Loop through literals if literals exist
-                    if(literals != null) {
-	                    for(Literal literal: literals) {
-		                    try{
-		                        if( literal != null ){
-		                            value = literal.getString();
-		                        }
-		                    }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 
-		                    // incorrectly generate errors.
-		                    if (isEmpty(value)) {
-		                        if (isRequiredField) {
-		                           errors.put(name, REQUIRED_FIELD_EMPTY_MSG);
-		                        }
-		                        break;
-		                    }
-		                    String thisValidateMsg = validate(validationType,value);
-	                		if(validateMsg != null && thisValidateMsg != null) {
-	                			validateMsg += ", " + thisValidateMsg;
-	                		} else {
-	                			validateMsg = thisValidateMsg;
-	
-	                		}
-	                    }
-                    }
-                    if( validateMsg != null) {
-                        errors.put(name,validateMsg);
-                    }
-                }
-            }
-        }
-        return errors;
-    }
-    
-    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 validationType : validators){
-                String validateMsg = validate(validationType, fileItemMap.get(name));
-                if( validateMsg != null ) {
-                    errors.put(name, validateMsg);
-                }    
-            }
-        }            
-        return errors;    
-    }
-    
-    private String validate(String validationType, List<FileItem> fileItems) {
-        if( "nonempty".equalsIgnoreCase(validationType)){
-            if( fileItems == null || fileItems.size() == 0 ){
-                return "a file must be entered for this field.";
-            }else{
-                FileItem fileItem = fileItems.get(0);
-                if( fileItem == null || fileItem.getName() == null || fileItem.getName().length() < 1 || fileItem.getSize() < 0){
-                    return "a file must be entered for this field.";
-                }
-            }
-        }
-        return null;
-    }
-
-    /* null indicates success. A returned string is the validation
-    error message.
-     */
-    public String validate(String validationType, String value){
-        // Required field validation.
-        // For literals, testing empty required values in validateLiterals.
-        // This case may be needed for validation of other field types.
-        if( "nonempty".equalsIgnoreCase(validationType)){
-            if( isEmpty(value) )
-                return REQUIRED_FIELD_EMPTY_MSG;
-        }
-        // Format validation
-        else if("isDate".equalsIgnoreCase(validationType)){
-            if( isDate( value))
-                return SUCCESS;
-            else
-                return "must be in valid date format mm/dd/yyyy.";
-        }
-        else if( validationType.indexOf("datatype:") == 0 ) {
-            String datatypeURI = validationType.substring(9);
-            String errorMsg = validateAgainstDatatype( value, datatypeURI ); 
-            if ( errorMsg == null ) { 
-                return SUCCESS;
-            } else {
-                return errorMsg;
-            }
-        } 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://"; 
-        	}else{
-        		return SUCCESS;        		
-        	}        	 
-        }
-        //Date not past validation
-        else if( "dateNotPast".equalsIgnoreCase(validationType)){
-        	//if( ! past (value) )
-        	// return "date must not be in the past";
-        	//Current date
-        	Calendar c = Calendar.getInstance();
-        	//Input
-        	Calendar inputC = Calendar.getInstance();
-        	String yearParamStr, monthParamStr, dayParamStr;
-        	int yearDash = value.indexOf("-");
-    		int monthDash = value.lastIndexOf("-");
-        	if(yearDash != -1 && yearDash != monthDash) {
-        		yearParamStr = value.substring(0, yearDash);
-        		monthParamStr = value.substring(yearDash + 1, monthDash);
-        		dayParamStr = value.substring(monthDash + 1, value.length());
-        		inputC.set(Integer.parseInt(yearParamStr), Integer.parseInt(monthParamStr) - 1, Integer.parseInt(dayParamStr));
-        		if(inputC.before(c)) {
-            		return this.DATE_NOT_PAST_MSG;
-            		//Returning null makes the error message "field is empty" display instead
-            		//return null;
-            	} else {
-            		return SUCCESS;
-            	}
-        	}	
-        }
-        return null; //
-    }
-
-    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);
-            if ( datatype == null ) {
-                throw new RuntimeException( datatypeURI + " is not a recognized datatype");
-            }
-            if ( datatype.isValid(value) ) {
-                return null;
-            } else {
-                // TODO: better way of getting more friendly names for common datatypes
-                if (ddao == null) {
-                    ddao = new DatatypeDaoJena(new WebappDaoFactoryJena(ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM)));
-                }
-                Datatype dtype = ddao.getDatatypeByURI(datatypeURI);
-                String dtypeMsg = (dtype != null) ? dtype.getName() : datatypeURI;
-                return " Please correct this value: must be a valid " + dtypeMsg + ".";
-            }
-        }
-        return null;
-    }
-
-    private void checkValidations(){
-        List<String> unknown = new ArrayList<String>();
-        for( String key : varsToValidations.keySet()){
-            if( varsToValidations.get(key) == null )
-                continue;            
-            for( String validator : varsToValidations.get(key)){
-                if( ! basicValidations.contains( validator)) {
-                    if ( ! ( ( validator != null) &&  
-                         ( validator.indexOf( "datatype:" ) == 0 ) ) ) {
-                        unknown.add(validator);
-                    }
-                }
-            }
-        }
-        if( unknown.isEmpty() )
-            return ;
-
-        throw new Error( "Unknown basic validators: " + unknown.toArray());
-    }
-    
-    private static boolean isEmpty(String value) {
-        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 */
-    public final static String SUCCESS = null;
-    public final static String REQUIRED_FIELD_EMPTY_MSG = "This field must not be empty.";
-    public final static String DATE_NOT_PAST_MSG = "Please enter a future target date for publication (past dates are invalid).";
-    //public final static String MIN_FIELDS_NOT_POPULATED = "Please enter values for at least ";
-    //public final static String FORM_ERROR_FIELD_ID = "formannotationerrors";
-    /** regex for strings like "12/31/2004" */
-    private final String dateRegex = "((1[012])|([1-9]))/((3[10])|([12][0-9])|([1-9]))/[\\d]{4}";
-    private final Pattern datePattern = Pattern.compile(dateRegex);
-
-    static final List<String> basicValidations;
-    static{
-        basicValidations = Arrays.asList(
-        "nonempty","isDate","dateNotPast","httpUrl" );
-    }
-
-    private Log log = LogFactory.getLog(BasicValidationVTwo.class);
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.datatypes.RDFDatatype;
+import com.hp.hpl.jena.datatypes.TypeMapper;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Datatype;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.DatatypeDaoJena;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+
+
+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>>();
+        for(String fieldName: editConfig.getFields().keySet()){
+            FieldVTwo field = editConfig.getField(fieldName);
+            validatorsForFields.put(fieldName,field.getValidators());
+        }
+        this.varsToValidations = validatorsForFields;
+        checkValidations();
+    }
+
+    public BasicValidationVTwo(Map<String, List<String>> varsToValidations){
+        this.varsToValidations = varsToValidations;
+        checkValidations();
+    }
+
+    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 
+                	String validateMsg = null;
+                	for(String value: values){
+                		String thisValidateMsg = validate(validationType,value);
+                		if(validateMsg != null && thisValidateMsg != null) {
+                			validateMsg += ", " + thisValidateMsg;
+                		} else {
+                			validateMsg = thisValidateMsg;
+
+                		}
+                	}
+                    if( validateMsg != null) {
+                        errors.put(name,validateMsg);
+                    }    
+                }
+            }
+        }               
+        return errors;
+    }
+
+
+    public Map<String,String> validateLiterals(Map<String, List<Literal>> varNamesToValues){
+        HashMap<String,String> errors = new HashMap<String,String>();
+
+        for( String name : editConfig.getLiteralsOnForm() ){
+            List<Literal> literals = varNamesToValues.get(name);
+            List<String>validations = varsToValidations.get(name);
+            if( validations != null ){
+                // NB this is case-sensitive
+                boolean isRequiredField = validations.contains("nonempty");
+                
+                for( String validationType : validations){
+                    String value = null;
+                    String 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);     
+                        break;
+                    }
+                    //Loop through literals if literals exist
+                    if(literals != null) {
+	                    for(Literal literal: literals) {
+		                    try{
+		                        if( literal != null ){
+		                            value = literal.getString();
+		                        }
+		                    }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 
+		                    // incorrectly generate errors.
+		                    if (isEmpty(value)) {
+		                        if (isRequiredField) {
+		                           errors.put(name, REQUIRED_FIELD_EMPTY_MSG);
+		                        }
+		                        break;
+		                    }
+		                    String thisValidateMsg = validate(validationType,value);
+	                		if(validateMsg != null && thisValidateMsg != null) {
+	                			validateMsg += ", " + thisValidateMsg;
+	                		} else {
+	                			validateMsg = thisValidateMsg;
+	
+	                		}
+	                    }
+                    }
+                    if( validateMsg != null) {
+                        errors.put(name,validateMsg);
+                    }
+                }
+            }
+        }
+        return errors;
+    }
+    
+    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 validationType : validators){
+                String validateMsg = validate(validationType, fileItemMap.get(name));
+                if( validateMsg != null ) {
+                    errors.put(name, validateMsg);
+                }    
+            }
+        }            
+        return errors;    
+    }
+    
+    private String validate(String validationType, List<FileItem> fileItems) {
+        if( "nonempty".equalsIgnoreCase(validationType)){
+            if( fileItems == null || fileItems.size() == 0 ){
+                return "a file must be entered for this field.";
+            }else{
+                FileItem fileItem = fileItems.get(0);
+                if( fileItem == null || fileItem.getName() == null || fileItem.getName().length() < 1 || fileItem.getSize() < 0){
+                    return "a file must be entered for this field.";
+                }
+            }
+        }
+        return null;
+    }
+
+    /* null indicates success. A returned string is the validation
+    error message.
+     */
+    public String validate(String validationType, String value){
+        // Required field validation.
+        // For literals, testing empty required values in validateLiterals.
+        // This case may be needed for validation of other field types.
+        if( "nonempty".equalsIgnoreCase(validationType)){
+            if( isEmpty(value) )
+                return REQUIRED_FIELD_EMPTY_MSG;
+        }
+        // Format validation
+        else if("isDate".equalsIgnoreCase(validationType)){
+            if( isDate( value))
+                return SUCCESS;
+            else
+                return "must be in valid date format mm/dd/yyyy.";
+        }
+        else if( validationType.indexOf("datatype:") == 0 ) {
+            String datatypeURI = validationType.substring(9);
+            String errorMsg = validateAgainstDatatype( value, datatypeURI ); 
+            if ( errorMsg == null ) { 
+                return SUCCESS;
+            } else {
+                return errorMsg;
+            }
+        } 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://"; 
+        	}else{
+        		return SUCCESS;        		
+        	}        	 
+        }
+        //Date not past validation
+        else if( "dateNotPast".equalsIgnoreCase(validationType)){
+        	//if( ! past (value) )
+        	// return "date must not be in the past";
+        	//Current date
+        	Calendar c = Calendar.getInstance();
+        	//Input
+        	Calendar inputC = Calendar.getInstance();
+        	String yearParamStr, monthParamStr, dayParamStr;
+        	int yearDash = value.indexOf("-");
+    		int monthDash = value.lastIndexOf("-");
+        	if(yearDash != -1 && yearDash != monthDash) {
+        		yearParamStr = value.substring(0, yearDash);
+        		monthParamStr = value.substring(yearDash + 1, monthDash);
+        		dayParamStr = value.substring(monthDash + 1, value.length());
+        		inputC.set(Integer.parseInt(yearParamStr), Integer.parseInt(monthParamStr) - 1, Integer.parseInt(dayParamStr));
+        		if(inputC.before(c)) {
+            		return this.DATE_NOT_PAST_MSG;
+            		//Returning null makes the error message "field is empty" display instead
+            		//return null;
+            	} else {
+            		return SUCCESS;
+            	}
+        	}	
+        }
+        return null; //
+    }
+
+    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);
+            if ( datatype == null ) {
+                throw new RuntimeException( datatypeURI + " is not a recognized datatype");
+            }
+            if ( datatype.isValid(value) ) {
+                return null;
+            } else {
+                // TODO: better way of getting more friendly names for common datatypes
+                if (ddao == null) {
+                    ddao = new DatatypeDaoJena(new WebappDaoFactoryJena(ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM)));
+                }
+                Datatype dtype = ddao.getDatatypeByURI(datatypeURI);
+                String dtypeMsg = (dtype != null) ? dtype.getName() : datatypeURI;
+                return " Please correct this value: must be a valid " + dtypeMsg + ".";
+            }
+        }
+        return null;
+    }
+
+    private void checkValidations(){
+        List<String> unknown = new ArrayList<String>();
+        for( String key : varsToValidations.keySet()){
+            if( varsToValidations.get(key) == null )
+                continue;            
+            for( String validator : varsToValidations.get(key)){
+                if( ! basicValidations.contains( validator)) {
+                    if ( ! ( ( validator != null) &&  
+                         ( validator.indexOf( "datatype:" ) == 0 ) ) ) {
+                        unknown.add(validator);
+                    }
+                }
+            }
+        }
+        if( unknown.isEmpty() )
+            return ;
+
+        throw new Error( "Unknown basic validators: " + unknown.toArray());
+    }
+    
+    private static boolean isEmpty(String value) {
+        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 */
+    public final static String SUCCESS = null;
+    public final static String REQUIRED_FIELD_EMPTY_MSG = "This field must not be empty.";
+    public final static String DATE_NOT_PAST_MSG = "Please enter a future target date for publication (past dates are invalid).";
+    //public final static String MIN_FIELDS_NOT_POPULATED = "Please enter values for at least ";
+    //public final static String FORM_ERROR_FIELD_ID = "formannotationerrors";
+    /** regex for strings like "12/31/2004" */
+    private final String dateRegex = "((1[012])|([1-9]))/((3[10])|([12][0-9])|([1-9]))/[\\d]{4}";
+    private final Pattern datePattern = Pattern.compile(dateRegex);
+
+    static final List<String> basicValidations;
+    static{
+        basicValidations = Arrays.asList(
+        "nonempty","isDate","dateNotPast","httpUrl" );
+    }
+
+    private Log log = LogFactory.getLog(BasicValidationVTwo.class);
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeWithPrecisionVTwo.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeWithPrecisionVTwo.java
index dea8a2f1d..2c3fa5587 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeWithPrecisionVTwo.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/DateTimeWithPrecisionVTwo.java
@@ -1,621 +1,621 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.joda.time.DateTime;
-import org.joda.time.format.ISODateTimeFormat;
-
-import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-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 
- * varname -> Literal and varname -> URI maps.
- * 
- * The variables that get passed to the template are defined in:
- * 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  
- * 
- */
-public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {        
-    
-    /**
-     * 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.  
-     */
-    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 
-     * specified in a ftl file.
-     * 
-     * 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);        
-        minimumPrecision = DEFAULT_MIN_PRECISION;
-        displayRequiredLevel = DEFAULT_DISPLAY_LEVEL;
-    }
-
-    public DateTimeWithPrecisionVTwo(FieldVTwo field, VitroVocabulary.Precision minimumPrecision){
-        this(field);
-        if( minimumPrecision != null )
-            this.minimumPrecision = minimumPrecision;
-        else
-            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 
-    //but this is to quickly get the JSP configuration working.
-    public DateTimeWithPrecisionVTwo(FieldVTwo field, String minimumPrecisionURI, String displayRequiredLevelUri){
-        this(field);
-        
-        this.minimumPrecision = toPrecision( minimumPrecisionURI);                
-        if( this.minimumPrecision == null )
-            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 
-                    +" 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 
-//                    + " is less precise than the required minimum precision of " + this.minimumPrecision);
-//        }
-    }
-    
-    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);    
-        return merge( fmConfig, TEMPLATE_NAME, map);
-    }    
-    
-    /**
-     * 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>();       
-
-        //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() 
-                        + " was '" + precisionUri + "' but date time was " + value);
-            
-            map.put("year", "");
-            map.put("month", "");
-            map.put("day", "");
-            map.put("hour", "");
-            map.put("minute", "");
-            map.put("second", "") ;
-        } 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("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 )
-                log.debug("Field " + getFieldName() + " has precision " + precisionUri 
-                        + " but the date time is " + value);                        
-            
-            /* 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()) );    
-            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()) );                    
-            else
-                map.put("day", "");
-            
-            if( existingPrec.ordinal() >= VitroVocabulary.Precision.MONTH.ordinal() )
-                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()));                  
-            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>();
-        for( VitroVocabulary.Precision pc: VitroVocabulary.Precision.values()){
-            constants.put(pc.name().toLowerCase(),pc.uri());
-        }
-        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 
-            		&& submittedPrecisionURI.size() > 0
-            		&& submittedPrecisionURI.get(0) != null){
-                return submittedPrecisionURI.get(0);
-            }
-        }
-        
-        List<String> existingPrecisionURI = editConfig.getUrisInScope().get( getPrecisionVariableName() );
-        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) {
-        if( editSub != null ){
-            List<Literal> submittedValue = editSub.getLiteralsFromForm().get( getValueVariableName() );
-            if( submittedValue != null ) {
-            	//TODO: Check what to do with multiple values, currently handling one value
-            	if(submittedValue.size() > 0 && submittedValue.get(0) != null) {
-            		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)
-        	{
-        		return new DateTime( dtValue.get(0).getLexicalForm() );
-        	}
-        }
-        
-        return null;
-    }
-
-    /**
-     * 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) {         
-        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 {
-            submittedPrec = getSubmittedPrecision( queryParameters);
-        } 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 ) 
-            return null;
-        
-        Integer month = parseToInt(getFieldName()+"-month", queryParameters);
-        if( month == null || month == 0 ) 
-            month = 1;        
-        Integer day = parseToInt(getFieldName()+"-day", queryParameters);
-        if( day == null || day == 0 )
-            day = 1;
-        Integer hour = parseToInt(getFieldName()+"-hour", queryParameters);
-        if( hour == null )
-            hour = 0;
-        Integer minute = parseToInt(getFieldName()+"-minute", queryParameters);
-        if( minute == null )
-            minute = 0;
-        Integer second = parseToInt(getFieldName()+"-second", queryParameters);
-        if( second == null )
-            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. 
-     * 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) {                                
-        String precisionUri;
-        try {
-            precisionUri = getSubmittedPrecision( queryParameters);
-        } catch (Exception e) {
-            log.error("getURIs() should only be called on input that passed getValidationErrors()");
-            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);  
-        }
-        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);
-        Integer hour  = parseToInt(getFieldName()+"-hour",queryParameters);
-        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;        
-        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. */         
-        boolean nonNullAfterFirstNull=false;
-        for(int i=0; i < values.length ; i++){
-            if( i > indexOfFirstNull && values[i] != null ){
-                nonNullAfterFirstNull = true;
-                break;
-            }
-        }
-        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(); 
-        }
-    }
-    
-    @Override
-    public Map<String, String> getValidationMessages(String fieldName,
-            EditConfigurationVTwo editConfig, Map<String, String[]> queryParameters) {
-        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){            
-            if ( !hasNoneOrSingle(fieldName+"-"+name, queryParameters))
-                errorMsgMap.put(fieldName+"-"+name, "must have only one value for " + name);            
-        }
-        
-        String precisionURI = null;
-        try{
-            precisionURI = getSubmittedPrecision( queryParameters);
-        }catch(Exception ex){            
-            errorMsgMap.put(fieldName,ex.getMessage());
-            return errorMsgMap;
-        }
-        
-        errorMsgMap.putAll(checkDate( precisionURI,  queryParameters) );
-        
-        return errorMsgMap; 
-    }
-
-    /**
-     * This checks for invalid date times.
-     */
-    final static String NON_INTEGER_YEAR = "must enter a valid year";
-    final static String NON_INTEGER_MONTH = "must enter a valid month";
-    final static String NON_INTEGER_DAY = "must enter a valid day";
-    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);            
-        }else if( precisionURI.equals( VitroVocabulary.Precision.MONTH.uri() )){
-            if( ! canParseToNumber(getFieldName()+"-year" ,qp))
-                errors.put(getFieldName()+"-year", NON_INTEGER_YEAR);
-            if( ! canParseToNumber(getFieldName()+"-month" ,qp))
-                errors.put(getFieldName()+"-month", NON_INTEGER_MONTH);
-        }else if( precisionURI.equals( VitroVocabulary.Precision.DAY.uri() )){
-            if( ! canParseToNumber(getFieldName()+"-year" ,qp))
-                errors.put(getFieldName()+"-year", NON_INTEGER_YEAR);
-            if( ! canParseToNumber(getFieldName()+"-month" ,qp))
-                errors.put(getFieldName()+"-month", NON_INTEGER_MONTH);
-            if( ! canParseToNumber(getFieldName()+"-day" ,qp))
-                errors.put(getFieldName()+"-day", NON_INTEGER_DAY);
-        }else if( precisionURI.equals( VitroVocabulary.Precision.HOUR.uri() )){
-            if( ! canParseToNumber(getFieldName()+"-year" ,qp))
-                errors.put(getFieldName()+"-year", NON_INTEGER_YEAR);
-            if( ! canParseToNumber(getFieldName()+"-month" ,qp))
-                errors.put(getFieldName()+"-month", NON_INTEGER_MONTH);
-            if( ! canParseToNumber(getFieldName()+"-day" ,qp))
-                errors.put(getFieldName()+"-day", NON_INTEGER_DAY);
-            if( ! canParseToNumber(getFieldName()+"-hour" ,qp))
-                errors.put(getFieldName()+"-hour", NON_INTEGER_HOUR);
-        }else if( precisionURI.equals( VitroVocabulary.Precision.MINUTE.uri() )){
-            if( ! canParseToNumber(getFieldName()+"-year" ,qp))
-                errors.put(getFieldName()+"-year", NON_INTEGER_YEAR);
-            if( ! canParseToNumber(getFieldName()+"-month" ,qp))
-                errors.put(getFieldName()+"-month", NON_INTEGER_MONTH);
-            if( ! canParseToNumber(getFieldName()+"-day" ,qp))
-                errors.put(getFieldName()+"-day", NON_INTEGER_DAY);
-            if( ! canParseToNumber(getFieldName()+"-hour" ,qp))
-                errors.put(getFieldName()+"-hour", NON_INTEGER_HOUR);
-            if( ! canParseToNumber(getFieldName()+"-minute" ,qp))
-                errors.put(getFieldName()+"-minute", NON_INTEGER_HOUR);
-        }else if( precisionURI.equals( VitroVocabulary.Precision.SECOND.uri() )){
-            if( ! canParseToNumber(getFieldName()+"-year" ,qp))
-                errors.put(getFieldName()+"-year", NON_INTEGER_YEAR);
-            if( ! canParseToNumber(getFieldName()+"-month" ,qp))
-                errors.put(getFieldName()+"-month", NON_INTEGER_MONTH);
-            if( ! canParseToNumber(getFieldName()+"-day" ,qp))
-                errors.put(getFieldName()+"-day", NON_INTEGER_DAY);
-            if( ! canParseToNumber(getFieldName()+"-hour" ,qp))
-                errors.put(getFieldName()+"-hour", NON_INTEGER_HOUR);
-            if( ! canParseToNumber(getFieldName()+"-minute" ,qp))
-                errors.put(getFieldName()+"-minute", NON_INTEGER_HOUR);
-            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 ) 
-            year = 1999;
-        month= parseToInt(getFieldName()+"-month", qp);
-        if(month == null )
-            month = 1;
-        day = parseToInt(getFieldName()+"-day", qp);
-        if( day == null )
-             day = 1;
-        hour = parseToInt(getFieldName()+"-hour", qp);
-        if( hour == null )
-            hour = 0;
-        minute = parseToInt(getFieldName()+"-minute",qp);
-        if( minute == null )
-            minute = 0;
-        second = parseToInt(getFieldName()+"-second", qp);
-        if( second == null )
-            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());   
-        }
-        try{
-            dateTime = dateTime.withMonthOfYear(month);
-        }catch(IllegalArgumentException iae){
-            errors.put(getFieldName()+"-month", iae.getLocalizedMessage());
-        }
-        try{
-            dateTime = dateTime.withDayOfMonth(day);
-        }catch(IllegalArgumentException iae){
-            errors.put(getFieldName()+"-day", iae.getLocalizedMessage());
-        }
-        try{
-            dateTime = dateTime.withHourOfDay(hour);
-        }catch(IllegalArgumentException iae){
-            errors.put(getFieldName()+"-hour", iae.getLocalizedMessage());
-        }
-        try{
-            dateTime = dateTime.withSecondOfMinute(second);
-        }catch(IllegalArgumentException iae){
-            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)
-            return false;
-        String value = varg[0];
-        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{
-            String[] vt = queryParameters.get(key);
-            if( vt == null || vt.length ==0 || vt[0] == null)
-                return false;
-            else{
-                out = Integer.parseInt(vt[0]);
-                return true;
-            }            
-        }catch(IndexOutOfBoundsException iex){
-            out =  null;
-        }catch(NumberFormatException nfe){
-            out =  null;
-        }catch(NullPointerException npe){
-            out = null;
-        }        
-        return false;
-    }
-    
-    
-  
-    private Integer parseToInt(String key,Map<String, String[]> queryParameters){        
-        Integer out = null;
-        try{
-            String[] vt = queryParameters.get(key);
-            if( vt == null || vt.length ==0 || vt[0] == null)
-                out = null;
-            else
-                out = Integer.parseInt(vt[0]);
-        }catch(IndexOutOfBoundsException iex){
-            out =  null;
-        }catch(NumberFormatException nfe){
-            out =  null;
-        }catch(NullPointerException npe){
-            out = null;
-        }        
-        return out;
-    }
-
-    public VitroVocabulary.Precision getRequiredMinimumPrecision() {
-        return minimumPrecision;
-    }
-
-    public void setRequiredMinimumPrecision(
-            VitroVocabulary.Precision requiredMinimumPrecision) {
-        this.minimumPrecision = requiredMinimumPrecision;
-    }
-    
-    /* returns null if it cannot convert */
-    public static VitroVocabulary.Precision toPrecision(String precisionUri){              
-        for( VitroVocabulary.Precision precision : VitroVocabulary.Precision.values()){
-            if( precision.uri().equals(precisionUri))
-                return precision;
-        }
-        return null;                
-    }
-    
-    public String getValueVariableName(){ return getFieldName() + "-value" ; }
-    public String getPrecisionVariableName(){ return getFieldName() + "-precision" ; }
-}
-
-
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.joda.time.DateTime;
+import org.joda.time.format.ISODateTimeFormat;
+
+import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+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 
+ * varname -> Literal and varname -> URI maps.
+ * 
+ * The variables that get passed to the template are defined in:
+ * 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  
+ * 
+ */
+public class DateTimeWithPrecisionVTwo extends BaseEditElementVTwo {        
+    
+    /**
+     * 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.  
+     */
+    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 
+     * specified in a ftl file.
+     * 
+     * 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);        
+        minimumPrecision = DEFAULT_MIN_PRECISION;
+        displayRequiredLevel = DEFAULT_DISPLAY_LEVEL;
+    }
+
+    public DateTimeWithPrecisionVTwo(FieldVTwo field, VitroVocabulary.Precision minimumPrecision){
+        this(field);
+        if( minimumPrecision != null )
+            this.minimumPrecision = minimumPrecision;
+        else
+            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 
+    //but this is to quickly get the JSP configuration working.
+    public DateTimeWithPrecisionVTwo(FieldVTwo field, String minimumPrecisionURI, String displayRequiredLevelUri){
+        this(field);
+        
+        this.minimumPrecision = toPrecision( minimumPrecisionURI);                
+        if( this.minimumPrecision == null )
+            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 
+                    +" 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 
+//                    + " is less precise than the required minimum precision of " + this.minimumPrecision);
+//        }
+    }
+    
+    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);    
+        return merge( fmConfig, TEMPLATE_NAME, map);
+    }    
+    
+    /**
+     * 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>();       
+
+        //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() 
+                        + " was '" + precisionUri + "' but date time was " + value);
+            
+            map.put("year", "");
+            map.put("month", "");
+            map.put("day", "");
+            map.put("hour", "");
+            map.put("minute", "");
+            map.put("second", "") ;
+        } 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("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 )
+                log.debug("Field " + getFieldName() + " has precision " + precisionUri 
+                        + " but the date time is " + value);                        
+            
+            /* 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()) );    
+            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()) );                    
+            else
+                map.put("day", "");
+            
+            if( existingPrec.ordinal() >= VitroVocabulary.Precision.MONTH.ordinal() )
+                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()));                  
+            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>();
+        for( VitroVocabulary.Precision pc: VitroVocabulary.Precision.values()){
+            constants.put(pc.name().toLowerCase(),pc.uri());
+        }
+        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 
+            		&& submittedPrecisionURI.size() > 0
+            		&& submittedPrecisionURI.get(0) != null){
+                return submittedPrecisionURI.get(0);
+            }
+        }
+        
+        List<String> existingPrecisionURI = editConfig.getUrisInScope().get( getPrecisionVariableName() );
+        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) {
+        if( editSub != null ){
+            List<Literal> submittedValue = editSub.getLiteralsFromForm().get( getValueVariableName() );
+            if( submittedValue != null ) {
+            	//TODO: Check what to do with multiple values, currently handling one value
+            	if(submittedValue.size() > 0 && submittedValue.get(0) != null) {
+            		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)
+        	{
+        		return new DateTime( dtValue.get(0).getLexicalForm() );
+        	}
+        }
+        
+        return null;
+    }
+
+    /**
+     * 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) {         
+        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 {
+            submittedPrec = getSubmittedPrecision( queryParameters);
+        } 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 ) 
+            return null;
+        
+        Integer month = parseToInt(getFieldName()+"-month", queryParameters);
+        if( month == null || month == 0 ) 
+            month = 1;        
+        Integer day = parseToInt(getFieldName()+"-day", queryParameters);
+        if( day == null || day == 0 )
+            day = 1;
+        Integer hour = parseToInt(getFieldName()+"-hour", queryParameters);
+        if( hour == null )
+            hour = 0;
+        Integer minute = parseToInt(getFieldName()+"-minute", queryParameters);
+        if( minute == null )
+            minute = 0;
+        Integer second = parseToInt(getFieldName()+"-second", queryParameters);
+        if( second == null )
+            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. 
+     * 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) {                                
+        String precisionUri;
+        try {
+            precisionUri = getSubmittedPrecision( queryParameters);
+        } catch (Exception e) {
+            log.error("getURIs() should only be called on input that passed getValidationErrors()");
+            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);  
+        }
+        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);
+        Integer hour  = parseToInt(getFieldName()+"-hour",queryParameters);
+        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;        
+        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. */         
+        boolean nonNullAfterFirstNull=false;
+        for(int i=0; i < values.length ; i++){
+            if( i > indexOfFirstNull && values[i] != null ){
+                nonNullAfterFirstNull = true;
+                break;
+            }
+        }
+        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(); 
+        }
+    }
+    
+    @Override
+    public Map<String, String> getValidationMessages(String fieldName,
+            EditConfigurationVTwo editConfig, Map<String, String[]> queryParameters) {
+        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){            
+            if ( !hasNoneOrSingle(fieldName+"-"+name, queryParameters))
+                errorMsgMap.put(fieldName+"-"+name, "must have only one value for " + name);            
+        }
+        
+        String precisionURI = null;
+        try{
+            precisionURI = getSubmittedPrecision( queryParameters);
+        }catch(Exception ex){            
+            errorMsgMap.put(fieldName,ex.getMessage());
+            return errorMsgMap;
+        }
+        
+        errorMsgMap.putAll(checkDate( precisionURI,  queryParameters) );
+        
+        return errorMsgMap; 
+    }
+
+    /**
+     * This checks for invalid date times.
+     */
+    final static String NON_INTEGER_YEAR = "must enter a valid year";
+    final static String NON_INTEGER_MONTH = "must enter a valid month";
+    final static String NON_INTEGER_DAY = "must enter a valid day";
+    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);            
+        }else if( precisionURI.equals( VitroVocabulary.Precision.MONTH.uri() )){
+            if( ! canParseToNumber(getFieldName()+"-year" ,qp))
+                errors.put(getFieldName()+"-year", NON_INTEGER_YEAR);
+            if( ! canParseToNumber(getFieldName()+"-month" ,qp))
+                errors.put(getFieldName()+"-month", NON_INTEGER_MONTH);
+        }else if( precisionURI.equals( VitroVocabulary.Precision.DAY.uri() )){
+            if( ! canParseToNumber(getFieldName()+"-year" ,qp))
+                errors.put(getFieldName()+"-year", NON_INTEGER_YEAR);
+            if( ! canParseToNumber(getFieldName()+"-month" ,qp))
+                errors.put(getFieldName()+"-month", NON_INTEGER_MONTH);
+            if( ! canParseToNumber(getFieldName()+"-day" ,qp))
+                errors.put(getFieldName()+"-day", NON_INTEGER_DAY);
+        }else if( precisionURI.equals( VitroVocabulary.Precision.HOUR.uri() )){
+            if( ! canParseToNumber(getFieldName()+"-year" ,qp))
+                errors.put(getFieldName()+"-year", NON_INTEGER_YEAR);
+            if( ! canParseToNumber(getFieldName()+"-month" ,qp))
+                errors.put(getFieldName()+"-month", NON_INTEGER_MONTH);
+            if( ! canParseToNumber(getFieldName()+"-day" ,qp))
+                errors.put(getFieldName()+"-day", NON_INTEGER_DAY);
+            if( ! canParseToNumber(getFieldName()+"-hour" ,qp))
+                errors.put(getFieldName()+"-hour", NON_INTEGER_HOUR);
+        }else if( precisionURI.equals( VitroVocabulary.Precision.MINUTE.uri() )){
+            if( ! canParseToNumber(getFieldName()+"-year" ,qp))
+                errors.put(getFieldName()+"-year", NON_INTEGER_YEAR);
+            if( ! canParseToNumber(getFieldName()+"-month" ,qp))
+                errors.put(getFieldName()+"-month", NON_INTEGER_MONTH);
+            if( ! canParseToNumber(getFieldName()+"-day" ,qp))
+                errors.put(getFieldName()+"-day", NON_INTEGER_DAY);
+            if( ! canParseToNumber(getFieldName()+"-hour" ,qp))
+                errors.put(getFieldName()+"-hour", NON_INTEGER_HOUR);
+            if( ! canParseToNumber(getFieldName()+"-minute" ,qp))
+                errors.put(getFieldName()+"-minute", NON_INTEGER_HOUR);
+        }else if( precisionURI.equals( VitroVocabulary.Precision.SECOND.uri() )){
+            if( ! canParseToNumber(getFieldName()+"-year" ,qp))
+                errors.put(getFieldName()+"-year", NON_INTEGER_YEAR);
+            if( ! canParseToNumber(getFieldName()+"-month" ,qp))
+                errors.put(getFieldName()+"-month", NON_INTEGER_MONTH);
+            if( ! canParseToNumber(getFieldName()+"-day" ,qp))
+                errors.put(getFieldName()+"-day", NON_INTEGER_DAY);
+            if( ! canParseToNumber(getFieldName()+"-hour" ,qp))
+                errors.put(getFieldName()+"-hour", NON_INTEGER_HOUR);
+            if( ! canParseToNumber(getFieldName()+"-minute" ,qp))
+                errors.put(getFieldName()+"-minute", NON_INTEGER_HOUR);
+            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 ) 
+            year = 1999;
+        month= parseToInt(getFieldName()+"-month", qp);
+        if(month == null )
+            month = 1;
+        day = parseToInt(getFieldName()+"-day", qp);
+        if( day == null )
+             day = 1;
+        hour = parseToInt(getFieldName()+"-hour", qp);
+        if( hour == null )
+            hour = 0;
+        minute = parseToInt(getFieldName()+"-minute",qp);
+        if( minute == null )
+            minute = 0;
+        second = parseToInt(getFieldName()+"-second", qp);
+        if( second == null )
+            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());   
+        }
+        try{
+            dateTime = dateTime.withMonthOfYear(month);
+        }catch(IllegalArgumentException iae){
+            errors.put(getFieldName()+"-month", iae.getLocalizedMessage());
+        }
+        try{
+            dateTime = dateTime.withDayOfMonth(day);
+        }catch(IllegalArgumentException iae){
+            errors.put(getFieldName()+"-day", iae.getLocalizedMessage());
+        }
+        try{
+            dateTime = dateTime.withHourOfDay(hour);
+        }catch(IllegalArgumentException iae){
+            errors.put(getFieldName()+"-hour", iae.getLocalizedMessage());
+        }
+        try{
+            dateTime = dateTime.withSecondOfMinute(second);
+        }catch(IllegalArgumentException iae){
+            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)
+            return false;
+        String value = varg[0];
+        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{
+            String[] vt = queryParameters.get(key);
+            if( vt == null || vt.length ==0 || vt[0] == null)
+                return false;
+            else{
+                out = Integer.parseInt(vt[0]);
+                return true;
+            }            
+        }catch(IndexOutOfBoundsException iex){
+            out =  null;
+        }catch(NumberFormatException nfe){
+            out =  null;
+        }catch(NullPointerException npe){
+            out = null;
+        }        
+        return false;
+    }
+    
+    
+  
+    private Integer parseToInt(String key,Map<String, String[]> queryParameters){        
+        Integer out = null;
+        try{
+            String[] vt = queryParameters.get(key);
+            if( vt == null || vt.length ==0 || vt[0] == null)
+                out = null;
+            else
+                out = Integer.parseInt(vt[0]);
+        }catch(IndexOutOfBoundsException iex){
+            out =  null;
+        }catch(NumberFormatException nfe){
+            out =  null;
+        }catch(NullPointerException npe){
+            out = null;
+        }        
+        return out;
+    }
+
+    public VitroVocabulary.Precision getRequiredMinimumPrecision() {
+        return minimumPrecision;
+    }
+
+    public void setRequiredMinimumPrecision(
+            VitroVocabulary.Precision requiredMinimumPrecision) {
+        this.minimumPrecision = requiredMinimumPrecision;
+    }
+    
+    /* returns null if it cannot convert */
+    public static VitroVocabulary.Precision toPrecision(String precisionUri){              
+        for( VitroVocabulary.Precision precision : VitroVocabulary.Precision.values()){
+            if( precision.uri().equals(precisionUri))
+                return precision;
+        }
+        return null;                
+    }
+    
+    public String getValueVariableName(){ return getFieldName() + "-value" ; }
+    public String getPrecisionVariableName(){ return getFieldName() + "-precision" ; }
+}
+
+
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java
index b2603cb42..5068e2b1b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationUtils.java
@@ -1,328 +1,328 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.rdf.model.Literal;
-
-import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerConfigurationLoader;
-import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import freemarker.template.Configuration;
-
-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 getRangeUri(VitroRequest vreq) {
-        return vreq.getParameter("rangeUri");
-    }
-    
-    public static VClass getRangeVClass(VitroRequest vreq) {
-        return vreq.getWebappDaoFactory().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);    
-	 	 }
-    	return subject;
-    }
-    
-    public static Individual getIndividual(VitroRequest vreq, String uri) {
-    	Individual individual = null; 
-    	WebappDaoFactory wdf = vreq.getWebappDaoFactory();
-
-    	 if( uri != null ){
-	        individual = wdf.getIndividualDao().getIndividualByURI(uri);
-    	 }
-    	return individual;
-    }
-    
-    public static Individual getObjectIndividual(VitroRequest vreq) {
-    	String objectUri = getObjectUri(vreq);
-    	Individual object = getIndividual(vreq, objectUri);
-        if( object != null ) {
-             vreq.setAttribute("subject", object);    
- 	    }
-    	return object;
-    }
-   
-    
-    public static ObjectProperty getObjectProperty(VitroRequest vreq) {
-    	//gets the predicate uri from the request
-    	String predicateUri = getPredicateUri(vreq);
-    	String rangeUri = getRangeUri(vreq);
-    	return getObjectPropertyForPredicate(vreq, predicateUri, rangeUri);
-    }
-    
-    public static DataProperty getDataProperty(VitroRequest vreq) {
-    	String predicateUri = getPredicateUri(vreq);
-    	return getDataPropertyForPredicate(vreq, predicateUri);
-    }
-    
-    public static ObjectProperty getObjectPropertyForPredicate(VitroRequest vreq, String predicateUri) {
-        return getObjectPropertyForPredicate(vreq, predicateUri, null);
-    }
-    
-    public static ObjectProperty getObjectPropertyForPredicate(VitroRequest vreq, String predicateUri, String rangeUri) {
-    	WebappDaoFactory wdf = vreq.getWebappDaoFactory();
-    	ObjectProperty objectProp = wdf.getObjectPropertyDao().getObjectPropertyByURI(predicateUri);
-    	if (rangeUri != null) {
-    	    objectProp.setRangeVClassURI(rangeUri);
-    	    // TODO implement this in the DAO?
-    	}
-    	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
-    	//would change the results
-    	//For some reason, note that edit data prop statement request dispatch utilizes unfiltered webapp dao facotry
-    	//DataProperty dataProp = wdf.getDataPropertyDao().getDataPropertyByURI(predicateUri);
-    	 WebappDaoFactory unfilteredWdf = vreq.getUnfilteredWebappDaoFactory();
-    	 DataProperty dataProp = unfilteredWdf.getDataPropertyDao().getDataPropertyByURI( predicateUri );
-    	 if( dataProp != null )
-    	     return dataProp;
-    	 else{
-    	     //when editing the display model, unfitlering wdf doesn't seem to have the needed properties.
-    	     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();
-    }
-    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) 
-                ? 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) {
-    		log.debug("Predicate URI is null so not data property");
-    		return false;
-    	}
-    	if(isVitroLabel(predicateUri)) {
-    		return true;
-    	}
-    	DataProperty dataProp = vreq.getWebappDaoFactory().getDataPropertyDao().getDataPropertyByURI(predicateUri);
-    	return (dataProp != null);
-    }
-    
-    protected static String getDataPropKey(VitroRequest vreq) {
-        return vreq.getParameter("datapropKey");        
-    }
-    
-    //is object property
-    public static boolean isObjectProperty(String predicateUri, VitroRequest vreq) {
-    	if(predicateUri == null) {
-    		log.debug("Predicate URI is null so not object property");
-    		return false;
-    	}
-    	WebappDaoFactory wdf = vreq.getWebappDaoFactory();
-    	ObjectProperty op = wdf.getObjectPropertyDao().getObjectPropertyByURI(predicateUri);
-    	DataProperty dp = wdf.getDataPropertyDao().getDataPropertyByURI(predicateUri);
-    	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. 
-	 */
-    public static DataPropertyStatement getDataPropertyStatement(VitroRequest vreq, HttpSession session, Integer dataHash, String predicateUri) {
-    	DataPropertyStatement dps = null;
-   	    if( dataHash != 0) {
-   			OntModel model = ModelAccess.on(session.getServletContext()).getJenaOntModel();
-   	        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;
-		String datapropKey = EditConfigurationUtils.getDataPropKey(vreq);
-		if (datapropKey!=null && datapropKey.trim().length()>0) {
-	        try {
-	            dataHash = Integer.parseInt(datapropKey);
-	        } catch (NumberFormatException ex) {
-	            log.error("Cannot decode incoming dataprop key str " + datapropKey + "as integer hash");
-	        	//throw new JspException("Cannot decode incoming datapropKey String value "+datapropKeyStr+" as an integer hash in datapropStmtDelete.jsp");
-	        }
-	    }
-		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
-    public static Map<String, List<String>> getExistingLiteralValues(VitroRequest vreq, EditConfigurationVTwo editConfig) {
-    	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) {
-	    	for(Literal l: literalValues) {
-	    		//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);
-	    		//}
-	    	}
-		}
-    	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);
-    	}
-    	return literalMapStringValues;
-    }
-
-	public static Map<String, List<String>> getExistingUriValues(EditConfigurationVTwo editConfig) {
-    	return editConfig.getUrisInScope();
-    }
-	
-	//Generate HTML for a specific field name given 
-	public static String generateHTMLForElement(VitroRequest vreq, String fieldName, EditConfigurationVTwo editConfig) {
-		String html = "";
-        Configuration fmConfig = FreemarkerConfigurationLoader.getConfig(vreq);
-
-        FieldVTwo field = editConfig == null ? null : editConfig.getField(fieldName);
-        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);  
-        if( field != null && field.getEditElement() != null ){
-    	  html = field.getEditElement().draw(fieldName, editConfig, editSub, fmConfig);
-        }
-		return html;
-	}
-
-	   /** Make a copy of list of Strings. */
-    public static List<String> copy(List<String> list) {
-        List<String> copyList = new ArrayList<String>();
-        for(String l: list) {
-            copyList.add( new String (l) );
-        }
-        return copyList;
-   }        
-    
-    /** Make a copy of a Map<String,String> */
-    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) {            
-            if( source.get(key) != null )
-                map.put(new String(key), new String( source.get(key)) );
-            else
-                map.put(new String(key),null);
-        }
-        return map;
-    }
-    
-    /** Make a copy of a Map<String,List<String>> */
-    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();
-        for(String key: keys) {
-            List<String> vals = map.get(key);
-            map.put(new String(key), copy(vals));
-        }
-        return map;
-    }    
-
-    
-    public static EditConfigurationVTwo getEditConfiguration(HttpServletRequest request) {
-        HttpSession session = request.getSession();
-        EditConfigurationVTwo editConfiguration = EditConfigurationVTwo.getConfigFromSession(session, request);     
-        return editConfiguration;
-    }
-    
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.rdf.model.Literal;
+
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerConfigurationLoader;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+import freemarker.template.Configuration;
+
+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 getRangeUri(VitroRequest vreq) {
+        return vreq.getParameter("rangeUri");
+    }
+    
+    public static VClass getRangeVClass(VitroRequest vreq) {
+        return vreq.getWebappDaoFactory().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);    
+	 	 }
+    	return subject;
+    }
+    
+    public static Individual getIndividual(VitroRequest vreq, String uri) {
+    	Individual individual = null; 
+    	WebappDaoFactory wdf = vreq.getWebappDaoFactory();
+
+    	 if( uri != null ){
+	        individual = wdf.getIndividualDao().getIndividualByURI(uri);
+    	 }
+    	return individual;
+    }
+    
+    public static Individual getObjectIndividual(VitroRequest vreq) {
+    	String objectUri = getObjectUri(vreq);
+    	Individual object = getIndividual(vreq, objectUri);
+        if( object != null ) {
+             vreq.setAttribute("subject", object);    
+ 	    }
+    	return object;
+    }
+   
+    
+    public static ObjectProperty getObjectProperty(VitroRequest vreq) {
+    	//gets the predicate uri from the request
+    	String predicateUri = getPredicateUri(vreq);
+    	String rangeUri = getRangeUri(vreq);
+    	return getObjectPropertyForPredicate(vreq, predicateUri, rangeUri);
+    }
+    
+    public static DataProperty getDataProperty(VitroRequest vreq) {
+    	String predicateUri = getPredicateUri(vreq);
+    	return getDataPropertyForPredicate(vreq, predicateUri);
+    }
+    
+    public static ObjectProperty getObjectPropertyForPredicate(VitroRequest vreq, String predicateUri) {
+        return getObjectPropertyForPredicate(vreq, predicateUri, null);
+    }
+    
+    public static ObjectProperty getObjectPropertyForPredicate(VitroRequest vreq, String predicateUri, String rangeUri) {
+    	WebappDaoFactory wdf = vreq.getWebappDaoFactory();
+    	ObjectProperty objectProp = wdf.getObjectPropertyDao().getObjectPropertyByURI(predicateUri);
+    	if (rangeUri != null) {
+    	    objectProp.setRangeVClassURI(rangeUri);
+    	    // TODO implement this in the DAO?
+    	}
+    	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
+    	//would change the results
+    	//For some reason, note that edit data prop statement request dispatch utilizes unfiltered webapp dao facotry
+    	//DataProperty dataProp = wdf.getDataPropertyDao().getDataPropertyByURI(predicateUri);
+    	 WebappDaoFactory unfilteredWdf = vreq.getUnfilteredWebappDaoFactory();
+    	 DataProperty dataProp = unfilteredWdf.getDataPropertyDao().getDataPropertyByURI( predicateUri );
+    	 if( dataProp != null )
+    	     return dataProp;
+    	 else{
+    	     //when editing the display model, unfitlering wdf doesn't seem to have the needed properties.
+    	     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();
+    }
+    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) 
+                ? 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) {
+    		log.debug("Predicate URI is null so not data property");
+    		return false;
+    	}
+    	if(isVitroLabel(predicateUri)) {
+    		return true;
+    	}
+    	DataProperty dataProp = vreq.getWebappDaoFactory().getDataPropertyDao().getDataPropertyByURI(predicateUri);
+    	return (dataProp != null);
+    }
+    
+    protected static String getDataPropKey(VitroRequest vreq) {
+        return vreq.getParameter("datapropKey");        
+    }
+    
+    //is object property
+    public static boolean isObjectProperty(String predicateUri, VitroRequest vreq) {
+    	if(predicateUri == null) {
+    		log.debug("Predicate URI is null so not object property");
+    		return false;
+    	}
+    	WebappDaoFactory wdf = vreq.getWebappDaoFactory();
+    	ObjectProperty op = wdf.getObjectPropertyDao().getObjectPropertyByURI(predicateUri);
+    	DataProperty dp = wdf.getDataPropertyDao().getDataPropertyByURI(predicateUri);
+    	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. 
+	 */
+    public static DataPropertyStatement getDataPropertyStatement(VitroRequest vreq, HttpSession session, Integer dataHash, String predicateUri) {
+    	DataPropertyStatement dps = null;
+   	    if( dataHash != 0) {
+   			OntModel model = ModelAccess.on(session.getServletContext()).getJenaOntModel();
+   	        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;
+		String datapropKey = EditConfigurationUtils.getDataPropKey(vreq);
+		if (datapropKey!=null && datapropKey.trim().length()>0) {
+	        try {
+	            dataHash = Integer.parseInt(datapropKey);
+	        } catch (NumberFormatException ex) {
+	            log.error("Cannot decode incoming dataprop key str " + datapropKey + "as integer hash");
+	        	//throw new JspException("Cannot decode incoming datapropKey String value "+datapropKeyStr+" as an integer hash in datapropStmtDelete.jsp");
+	        }
+	    }
+		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
+    public static Map<String, List<String>> getExistingLiteralValues(VitroRequest vreq, EditConfigurationVTwo editConfig) {
+    	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) {
+	    	for(Literal l: literalValues) {
+	    		//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);
+	    		//}
+	    	}
+		}
+    	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);
+    	}
+    	return literalMapStringValues;
+    }
+
+	public static Map<String, List<String>> getExistingUriValues(EditConfigurationVTwo editConfig) {
+    	return editConfig.getUrisInScope();
+    }
+	
+	//Generate HTML for a specific field name given 
+	public static String generateHTMLForElement(VitroRequest vreq, String fieldName, EditConfigurationVTwo editConfig) {
+		String html = "";
+        Configuration fmConfig = FreemarkerConfigurationLoader.getConfig(vreq);
+
+        FieldVTwo field = editConfig == null ? null : editConfig.getField(fieldName);
+        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);  
+        if( field != null && field.getEditElement() != null ){
+    	  html = field.getEditElement().draw(fieldName, editConfig, editSub, fmConfig);
+        }
+		return html;
+	}
+
+	   /** Make a copy of list of Strings. */
+    public static List<String> copy(List<String> list) {
+        List<String> copyList = new ArrayList<String>();
+        for(String l: list) {
+            copyList.add( new String (l) );
+        }
+        return copyList;
+   }        
+    
+    /** Make a copy of a Map<String,String> */
+    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) {            
+            if( source.get(key) != null )
+                map.put(new String(key), new String( source.get(key)) );
+            else
+                map.put(new String(key),null);
+        }
+        return map;
+    }
+    
+    /** Make a copy of a Map<String,List<String>> */
+    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();
+        for(String key: keys) {
+            List<String> vals = map.get(key);
+            map.put(new String(key), copy(vals));
+        }
+        return map;
+    }    
+
+    
+    public static EditConfigurationVTwo getEditConfiguration(HttpServletRequest request) {
+        HttpSession session = request.getSession();
+        EditConfigurationVTwo editConfiguration = EditConfigurationVTwo.getConfigFromSession(session, request);     
+        return editConfiguration;
+    }
+    
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java
index 87c319aed..3798fa660 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditConfigurationVTwo.java
@@ -1,1219 +1,1219 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.joda.time.DateTime;
-
-import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.ModelSelector;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.StandardModelSelector;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.StandardWDFSelector;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.WDFSelector;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DefaultDataPropertyFormGenerator;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.ModelChangePreprocessor;
-import edu.cornell.mannlib.vitro.webapp.search.beans.ProhibitedFromSearch;
-
-
-/**
- * Represents a set of fields on a form and how parameters from a from
- * submission should be manipulated to create N3.
- *
- * Uris in urisInScope and urisOnForm should not have any quoting or escaping.
- *
- * Literals in literalsOnForm and literalsInScope should be escaped and quoted
- * 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
-    List<String> n3Optional = new ArrayList<String>();
-    //Names of variables of 'objects' i.e. URIs on form
-    List<String> urisOnform = new ArrayList<String>();
-    //Names of variables corresponding to data values i.e. literals on form
-    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 
-    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
-    Map<String,String>sparqlForExistingUris = new HashMap<String,String>();
-
-    String subjectUri;
-    String varNameForSubject;
-
-    String predicateUri;
-    String varNameForPredicate;
-
-    /** When this is a DataPropertyStmt edit, the object is not used, the
-     * DataPropertyStatement is retrieved using the subject, predicate and the
-     * datapropKey.  When this edit is for a ObjectPropertyStmt,
-     * 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;   
-
-    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. */     
-    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. 
-     */
-    String urlToReturnTo = null;
-    
-    /**
-     * 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;   
-
-    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. 
-     *Setting to false for now as we should no longer be utilizing dependent resource deletion.
-     */
-    private boolean useDependentResourceDelete = false;   
-
-    /** Model id from write model. */
-    private String writeModelId;
-    
-    /** 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;
-
-    /** 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. 
-     * Usually this is set to null and the main model will be used. */
-    private WDFSelector wdfSelectorForOptons;
-    
-    private boolean hasBeenPreparedForUpdate;
-    
-    public EditConfigurationVTwo(){ 
-        writeModelSelector = StandardModelSelector.selector;
-        queryModelSelector = StandardModelSelector.selector;   
-        resourceModelSelector = StandardModelSelector.selector;
-        wdfSelectorForOptons = StandardWDFSelector.selector;        
-        n3generator = new EditN3GeneratorVTwo();
-    }
-
-    //Make copy of edit configuration object
-    public EditConfigurationVTwo copy() {
-    	EditConfigurationVTwo editConfig = new EditConfigurationVTwo();
-    	//Copy n3generator - make copy of n3generator or get something else?
-    	editConfig.setN3Generator( this.getN3Generator() );
-    	//For remaining ensure we make copies of all the objects and we don't use refererences
-    	//Set form url
-    	editConfig.setFormUrl(this.getFormUrl());
-    	//Set edit key
-    	editConfig.setEditKey(this.getEditKey());
-    	//subject, predicate
-    	editConfig.setUrlPatternToReturnTo(this.getUrlPatternToReturnTo());
-    	editConfig.setVarNameForSubject(this.getVarNameForSubject());
-    	editConfig.setSubjectUri(this.getSubjectUri());
-    	editConfig.setEntityToReturnTo(this.getEntityToReturnTo());
-    	editConfig.setVarNameForPredicate(this.getVarNameForPredicate());
-    	editConfig.setPredicateUri(this.getPredicateUri());
-    	//object or data parameters based on whether object or data property
-    	if(this.getObject() != null) {
-    		editConfig.setObject(this.getObject());
-    	}
-    	editConfig.setVarNameForObject(this.getVarNameForObject());
-
-    	editConfig.setDatapropKey(this.getDatapropKey());
-    	    	
-    	editConfig.setUrlPatternToReturnTo(this.getUrlPatternToReturnTo());
-   
-    	//n3 required
-    	editConfig.setN3Required(EditConfigurationUtils.copy(this.getN3Required()));
-    	//n3 optional
-    	editConfig.setN3Optional(EditConfigurationUtils.copy(this.getN3Optional()));
-    	//uris on form
-    	editConfig.setUrisOnform(EditConfigurationUtils.copy(this.getUrisOnform()));
-    	//literals on form
-    	editConfig.setLiteralsOnForm(EditConfigurationUtils.copy(this.getLiteralsOnForm()));
-    	//files on form
-    	editConfig.setFilesOnForm(EditConfigurationUtils.copy(this.getFilesOnForm()));
-    	//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(EditConfigurationUtils.copy(this.getLiteralsInScope()));
-    	
-    	//sparql for additional uris in scope
-    	editConfig.setSparqlForAdditionalUrisInScope(
-    			EditConfigurationUtils.copyMap(this.getSparqlForAdditionalUrisInScope()));     					
-    	//sparql for additional literals in scope
-    	editConfig.setSparqlForAdditionalLiteralsInScope(
-    			EditConfigurationUtils.copyMap(this.getSparqlForAdditionalLiteralsInScope()));     					
-    	//sparql for existing literals
-    	editConfig.setSparqlForExistingLiterals(
-    			EditConfigurationUtils.copyMap(this.getSparqlForExistingLiterals()));     					
-    	//sparql for existing uris
-    	editConfig.setSparqlForExistingUris(
-    			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 
-     * 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");        
-     
-        /* current time */
-        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 
-            //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 && 
-            getSparqlForAdditionalUrisInScope().containsKey("editingUser") &&
-            USE_SYSTEM_VALUE.equals(getSparqlForAdditionalUrisInScope().get("editingUser"))) {
-            
-            if( request.getSession() == null )
-                throw new Error("EditConfiguration.addSystemValues() needs a session");
-
-            /* ********** Get URI of a logged in user ************** */
-            String userUri = N3EditUtils.getEditorUri(request);
-           	log.debug("EditConfiguration.java - checking system value for User URI " + userUri);
-           	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() ){            
-            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() && 
-            varNameForObject != null && ! varNameForObject.trim().isEmpty() ){
-            urisInScope.put( varNameForObject, Arrays.asList(getObject()));
-            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. 
-     */
-    public void prepareForDataPropUpdate( Model model, DataPropertyDao dataPropertyDao ){
-        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 ");                           
-        }                     
-        
-        basicPrepare();
-        
-        DefaultDataPropertyFormGenerator.prepareForDataPropUpdate(model, this,dataPropertyDao );        
-
-        // run SPARQL, sub in values
-        SparqlEvaluateVTwo sparqlEval = new SparqlEvaluateVTwo(model);
-        runSparqlForAdditional( sparqlEval );
-        runSparqlForExisting( sparqlEval );
-       
-        hasBeenPreparedForUpdate = true;
-    }
-
-    /**
-     * Prepare for a ObjectProperty update. Run SPARQL for existing values.
-     *  This can be used for an object property or a direct form.
-     */
-    public void prepareForObjPropUpdate( Model model ){
-        if( model == null ) {
-        	log.debug("Model is null and will be throwing an error");
-        	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();        
-        
-        // run SPARQL, sub in values
-        SparqlEvaluateVTwo sparqlEval = new SparqlEvaluateVTwo( model );
-        runSparqlForAdditional( sparqlEval );
-        try {
-        	runSparqlForExisting( sparqlEval );
-        } catch (Exception e) {
-        	e.printStackTrace();
-        }
-
-        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
-     *  data or object property form.
-     */
-    public void prepareForParamUpdate( Model model ){
-        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();        
-        
-        // run SPARQL, sub in values
-        SparqlEvaluateVTwo sparqlEval = new SparqlEvaluateVTwo( model );
-        runSparqlForAdditional( sparqlEval );
-        try {
-        	runSparqlForExisting( sparqlEval );
-        } catch (Exception e) {
-        	e.printStackTrace();
-        }
-
-        hasBeenPreparedForUpdate = true;
-    }
-
-    /**
-     * Run SPARQL for Additional values.  This can be used for
-     * a data property, an object property or a direct form.
-     */
-    public void prepareForNonUpdate( Model model ){
-        if( model == null ) throw new Error("prepareForNonUpdate() needs a non-null Model");
-
-        basicPrepare();
-        
-        SparqlEvaluateVTwo sparqlEval = new SparqlEvaluateVTwo( model );
-        runSparqlForAdditional( sparqlEval );
-        //runSparqlForExisting( sparqlEval );                
-    }
-    
-    public void setFields(Map<String,FieldVTwo> fields) {
-    	this.fields = fields;
-    }
-
-    public void prepareForResubmit(MultiValueEditSubmission editSub){
-        //get any values from editSub and add to scope
-    }
-
-
-    /**
-     * Runs the queries for additional uris and literals then add those back into
-     * the urisInScope and literalsInScope.
-     */
-    public void runSparqlForAdditional(SparqlEvaluateVTwo sparqlEval){
-        sparqlEval.evaluateForAdditionalUris( this );
-        sparqlEval.evalulateForAdditionalLiterals( this );
-    }
-
-    public void runSparqlForExisting(SparqlEvaluateVTwo sparqlEval){
-        sparqlEval.evaluateForExistingUris( this );
-        sparqlEval.evaluateForExistingLiterals( this );
-    }
-
-    public FieldVTwo getField(String key){
-        if( fields == null) {
-            throw new Error("hashmap of field objects must be set before you can get a value from the EditConfiguration");
-        }
-        return fields.get(key);
-    }
-
-    /** Return a copy of the value so that the configuration is not modified by external code.
-     * @return
-     */
-    public List<String> getN3Required() {
-        return EditConfigurationUtils.copy(n3Required);
-    }
-
-    public void setN3Required(List<String> n3Required) {
-        this.n3Required = n3Required;
-    }
-
-    public void setN3Required(String ... n3RequiredStrs){
-        this.n3Required =  new ArrayList<String>(Arrays.asList( n3RequiredStrs )); //using ArrayList to allow list to be resized
-    }
-    //these methods allow strings to be added to the n3 required list and not just for the list to be set
-    public void addN3Required(List<String> n3RequiredInput) {
-    	this.n3Required.addAll(n3RequiredInput);
-    }
-    
-    public void addN3Required(String ... n3RequiredStrsInput) {
-    	 this.n3Required.addAll(Arrays.asList( n3RequiredStrsInput ));  
-    }
-     /** return a copy of the value so that the configuration is not modified by external code.
-     * @return
-     */
-    public List<String> getN3Optional() {
-         return EditConfigurationUtils.copy( n3Optional );
-    }
-
-    public void setN3Optional(List<String> n3Optional) {
-        this.n3Optional = n3Optional;
-    }
-
-    public void setN3Optional(String ... n3Strs){
-        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 ));        
-    }
-
-    
-    public Map<String,String> getNewResources() {
-        return newResources;
-    }
-
-    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]);            
-        }
-        
-        this.newResources = map;
-    }
-
-    
-    public List<String> getUrisOnform() {
-        return urisOnform;
-    }
-
-    public void setUrisOnform(List<String> urisOnform) {
-        this.urisOnform = urisOnform;
-    }
-
-    public void setUrisOnForm(String ... strs){
-        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) {
-        this.urisOnform.addAll(urisOnform);
-    }
-
-    public void addUrisOnForm(String ... strs){
-        this.urisOnform.addAll(Arrays.asList( strs ));        
-    }
-    
-    
-    public void setFilesOnForm(List<String> filesOnForm){
-        this.filesOnForm = filesOnForm;
-    }
-
-    public List<String> getFilesOnForm(){
-        return filesOnForm;
-    }
-
-    public List<String> getLiteralsOnForm() {
-        return literalsOnForm;
-    }
-
-    public void setLiteralsOnForm(List<String> literalsOnForm) {
-        this.literalsOnForm = literalsOnForm;
-    }
-
-    public void setLiteralsOnForm(String ... strs){
-        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 ));        
-    }
-    
-    public Map<String, List<String>> getUrisInScope() {
-        return urisInScope;
-    }
-
-    public void setUrisInScope(Map<String, List<String>> urisInScope) {
-        this.urisInScope = urisInScope;
-    }
-
-    public EditConfigurationVTwo addUrisInScope(String key, List<String> list) {
-        if( urisInScope  == null ){
-            urisInScope = new HashMap<String, List<String>>();
-        }
-        urisInScope.put(key, list);
-        return this;        
-    }
-    
-    public EditConfigurationVTwo addUrisInScope(Map<String, List<String>> uriValues) {
-        if( urisInScope  == null ){
-            urisInScope = new HashMap<String, List<String>>();
-        }
-        urisInScope.putAll(uriValues);
-        return this;        
-    }
-    
-   
-    
-    public Map<String, List<Literal>> getLiteralsInScope() {
-        return literalsInScope;
-    }
-
-    public void setLiteralsInScope(Map<String, List<Literal>> literalsInScope) {
-        this.literalsInScope = literalsInScope;
-    }
-
-    /** Return a copy of the value so that the configuration is not modified by external code.
-     * @return
-     */
-    public Map<String, String> getSparqlForAdditionalUrisInScope() {        
-        return copyMap(sparqlForAdditionalUrisInScope);        
-    }
-
-    public void setSparqlForAdditionalUrisInScope(Map<String, String> sparqlForAdditionalUrisInScope) {
-        this.sparqlForAdditionalUrisInScope = sparqlForAdditionalUrisInScope;
-    }
-
-     /** Return a copy of the value so that the configuration is not modified by external code.
-     * @return
-     */
-    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>();        
-        for( String key : source.keySet()){
-            if( source.get(key) != null )
-                dest.put(new String(key), source.get(key));
-            else 
-                dest.put(new String(key), null);
-        }
-        return dest;
-    }
-
-    public void setSparqlForAdditionalLiteralsInScope(Map<String, String> sparqlForAdditionalLiteralsInScope) {
-        this.sparqlForAdditionalLiteralsInScope = sparqlForAdditionalLiteralsInScope;
-    }
-
-    public String getEntityToReturnTo() {
-        return entityToReturnTo;
-    }
-
-    public void setEntityToReturnTo(String entityToReturnTo) {
-        this.entityToReturnTo = entityToReturnTo;
-    }
-
-    public String getUrlPatternToReturnTo() {
-        return urlPatternToReturnTo;
-    }
-
-    public void setUrlPatternToReturnTo(String s) {
-        urlPatternToReturnTo = s;
-    }
-
-     /** return a copy of the value so that the configuration is not modified by external code.
-     * @return
-     */
-    public Map<String, String> getSparqlForExistingLiterals() {
-        return copyMap(sparqlForExistingLiterals);        
-    }
-
-    public void setSparqlForExistingLiterals(Map<String, String> sparqlForExistingLiterals) {
-        this.sparqlForExistingLiterals = sparqlForExistingLiterals;
-    }
-
-     /** return a copy of the value so that the configuration is not modified by external code.
-     * @return
-     */
-    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 ******************************** */
-
-     public static void clearAllConfigsInSession( HttpSession sess ){
-        if(sess == null ) return;
-        sess.removeAttribute("editConfiguration");
-    }
-
-
-    public static void clearEditConfigurationInSession(HttpSession session, EditConfigurationVTwo editConfig) {
-        if( session == null || editConfig == null )
-            return;
-        Map<String,EditConfigurationVTwo> configs = (Map<String,EditConfigurationVTwo>)session.getAttribute("EditConfigurations");
-        if( configs == null )
-            return ;
-        if( configs.containsKey( editConfig.editKey ) )
-            configs.remove( editConfig.editKey );
-    }
-
-    public static void putConfigInSession(EditConfigurationVTwo ec, HttpSession sess){
-        if( sess == null )
-            throw new Error("EditConfig: could not put config in session because session was null");
-        if( ec.editKey == null )
-            throw new Error("EditConfig: could not put into session because editKey was null.");
-
-        Map<String,EditConfigurationVTwo> configs = (Map<String,EditConfigurationVTwo>)sess.getAttribute("EditConfigurations");
-        if( configs == null ){
-            configs = new HashMap<String,EditConfigurationVTwo>();
-            sess.setAttribute("EditConfigurations",configs);
-        }
-        configs.put(ec.editKey , ec);
-    }
-
-    public static EditConfigurationVTwo getConfigFromSession(HttpSession sess, String editKey){
-        Map<String,EditConfigurationVTwo> configs = (Map<String,EditConfigurationVTwo>)sess.getAttribute("EditConfigurations");
-        if( configs == null )
-          return null;
-
-        EditConfigurationVTwo config = configs.get( editKey );
-        if( config == null )
-            return null;
-        else
-            return config;
-    }
-
-    /**
-     * This may return null, which indicates that there is no editKey or EditConfiguration in the
-     * request or session.  If the queryParams are supplied, look for the editKey
-     * there first since multipart parsing might have cleared them from the request.
-     */
-    public static EditConfigurationVTwo getConfigFromSession( HttpSession sess, HttpServletRequest request ){
-        String key = getEditKeyFromRequest(request);
-        
-        if( key == null )
-            return null;
-        return getConfigFromSession(sess, key);
-    }
-
-    /**
-     * The editKey can be a HTTP query parameter or it can be a request attribute.
-     */
-    public static String getEditKeyFromRequest( ServletRequest request){
-        String key = null;
-        if( request instanceof VitroRequest ){
-            return request.getParameter("editKey");
-        }else if( request instanceof HttpServletRequest ){
-            HttpServletRequest hsreq = (HttpServletRequest)request;
-            boolean isMultipart = ServletFileUpload.isMultipartContent(hsreq);
-            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");    
-                if( key == null ) {
-                    // handle the cancel button where nothing is really uploaded
-                    key = request.getParameter("editKey");
-                }                               
-            }else{            	
-            	key = (String)request.getAttribute("editKey");                
-                if( key  != null  ){
-                    return key;
-                } else {
-                	key = request.getParameter("editKey");
-                }
-            }
-        }
-
-        if( key != null && key.trim().length() > 0 ){
-            return key;
-        }else{
-            log.debug("cannnot find editKey in request query parameters or from request");
-            return null;
-        }
-    }
-
-    @SuppressWarnings("unchecked")
-    public static String newEditKey(HttpSession sess){
-        int mills = new DateTime().getMillisOfDay();
-
-        Map<String,EditConfigurationVTwo> configs = (Map<String,EditConfigurationVTwo>)sess.getAttribute("EditConfigurations");
-        if( configs == null ){
-            return Integer.toString(mills);
-        }else{
-            while( configs.containsKey( Integer.toString(mills) )){
-                mills ++;
-            }
-            return Integer.toString(mills);
-        }
-    }
-    
-    /*
-     * getters and setters
-     */
-
-    public String getObject() {
-        return object;
-    }
-
-    public void setObject(String object) {
-        this.object = object;
-    }
-
-    public boolean isObjectResource() {
-        boolean objectFound = false;
-        boolean dataKeyFound = false;
-		if( object != null && ! object.trim().isEmpty() )
-		    objectFound = true;
-		if( getDatapropKey() != null )
-		    dataKeyFound = true;
-		if( dataKeyFound && objectFound )
-		    throw new Error("Bad configuration: both datapropKey and object are defined.");
-		return objectFound;
-	}	
-
-	public Integer getDatapropKey() {
-        return datapropKey;
-    }
-
-    public void setDatapropKey(Integer datapropKey) {
-        this.datapropKey = datapropKey;
-    }
-    
-    public String getSubjectUri() {
-        return subjectUri;
-    }
-
-    public void setSubjectUri(String subjectUri) {
-        this.subjectUri = subjectUri;
-    }
-
-    public String getPredicateUri() {
-        return predicateUri;
-    }
-
-    public void setPredicateUri(String predicateUri) {
-        this.predicateUri = predicateUri;
-    }
-
-    public Map<String,FieldVTwo> getFields() {
-        return fields;
-    }
-
-    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;
-    }
-
-    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;
-    }
-
-    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.
-     */
-    public boolean isUseDependentResourceDelete() {
-		return useDependentResourceDelete;
-	}
-
-    /**If this is set to true, then dependent resources should be deleted on edits that
-     * remove the parent resource.
-     */
-	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);
-            log.debug("literalsInScope:");
-            for( String key: literalsInScope.keySet() ){
-                String val = literalsInScope.get(key).toString();
-                log.debug( key + " " + val );
-            }
-            log.debug("uris in scope: " );
-            for( String key: urisInScope.keySet() ){
-                String val = urisInScope.get(key).toString();
-                log.debug( key + " " + val );
-            }
-        }
-    }
-    
-    public final static String USE_SYSTEM_VALUE = "USE_SYSTEM_VALUE";
-    
-    private static final Log log = LogFactory.getLog(EditConfigurationVTwo.class.getName());
-
-    public ModelSelector getWriteModelSelector() {
-        return writeModelSelector;
-    }
-
-    public void setWriteModelSelector(ModelSelector writeModel) {
-        if( writeModel != null )
-            this.writeModelSelector = writeModel;        
-    }
-
-    public ModelSelector getQueryModelSelector() {
-        return queryModelSelector;
-    }
-
-    public void setQueryModelSelector(ModelSelector queryModel) {
-        if( queryModel != null )
-            this.queryModelSelector = queryModel;
-    }
-
-    public WDFSelector getWdfSelectorForOptons() {
-        return wdfSelectorForOptons;
-    }
-
-    public void setWdfSelectorForOptons(WDFSelector wdfForOptons) {
-        this.wdfSelectorForOptons = wdfForOptons;
-    }
-
-    public ModelSelector getResourceModelSelector() {
-        return resourceModelSelector;
-    }
-
-    public void setResourceModelSelector(ModelSelector resourceModelSelector) {
-        if( resourceModelSelector != null )
-            this.resourceModelSelector = resourceModelSelector;
-    }
-        
-    public List<N3ValidatorVTwo> getValidators() {
-		return validators;
-	}
-
-    public void addValidator( N3ValidatorVTwo validator){
-    	if( this.validators == null )
-    		this.validators = new ArrayList<N3ValidatorVTwo>();
-    	this.validators.add(validator);    		
-    }    
-
-    public void addEditSubmissionPreprocessor( EditSubmissionVTwoPreprocessor preprocessor){
-        if( editSubmissionPreprocessors == null )
-            editSubmissionPreprocessors = new ArrayList<EditSubmissionVTwoPreprocessor>();
-        editSubmissionPreprocessors.add(preprocessor);         
-    }  
-    
-    public List<EditSubmissionVTwoPreprocessor> getEditSubmissionPreprocessors() {
-        return editSubmissionPreprocessors;
-    }
-
-    public void setTemplate(String template){
-        this.template = template;
-    }
-    
-    public String getTemplate() {
-        return this.template;
-    }
-
-    public String getSubmitToUrl() {
-        return submitToUrl;
-    }
-
-    public void setSubmitToUrl(String submitToUrl) {
-        this.submitToUrl = submitToUrl;
-    }
-    
-    public boolean isUpdate(){
-        //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;  
-    }
-    
-    public boolean isDataPropertyUpdate() {
-    	return this.getDatapropKey() != null ;
-    }
-    
-    //*****TEST Method***Remove if doesn't work******//
-    public boolean isParamUpdate = false;
-    public void setParamUpdate (boolean inputParamUpdate) {
-    	this.isParamUpdate = inputParamUpdate;
-    }
-    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. */    
-	public  void setFormSpecificData(HashMap<String, Object> formSpecificData) {
-		this.formSpecificData = formSpecificData;
-	}
-
-    //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 void addFormSpecificData( String key, Object value){
-	    if( this.formSpecificData == null){
-	        this.formSpecificData = new HashMap<String,Object>();
-	    }
-	    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() {	
-		return this.formSpecificData;
-	}
-
-	public boolean hasBeenPreparedForUpdate() {
-	    return hasBeenPreparedForUpdate;
-	}
-	
-    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);            
-        }else{
-            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() ) 
-            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);            
-        }        
-    }
-    
-    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() ) 
-            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);            
-        }        
-    }
-
-    public void addField( FieldVTwo field){
-        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( 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);                
-    }
-
-    public void addFields(List<FieldVTwo> fields) {
-    	if( fields != null ) 
-	    {    	
-    		for(FieldVTwo f: fields) {
-	    		this.addField(f);
-	    	}
-    	}
-    	
-    }
-    
-    @Override
-    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;                
-    }
-    
-    public EditConfigurationVTwo addLiteralsInScope(Map<String, List<Literal>> scopeLiterals) {
-        if( literalsInScope  == null ){
-            literalsInScope = new HashMap<String, List<Literal>>();
-        }        
-        literalsInScope.putAll(scopeLiterals);
-        return this;                
-    }
-
-    public void setUrlToReturnTo(String url){
-        this.urlToReturnTo = url;
-    }
-
-    public String getUrlToReturnTo() {
-        return this.urlToReturnTo;
-    }
-
-    public void setSkipToUrl(String url){
-        skipToUrl=url;
-    }
-    
-    public String getSkipToUrl() {
-        return skipToUrl;
-    }
-
-    public void setWriteModelId(String writeModelId) {
-        this.writeModelId = writeModelId;
-    }
-
-    public String getWriteModelId() {
-        return writeModelId;
-    }
-
-    public void setAboxModelId(String aboxModelId) {
-        this.aboxModelId = aboxModelId;
-    }
-
-    public String getAboxModelId() {
-        return aboxModelId;
-    }
-
-    public void setTboxModelId(String tboxModelId) {
-        this.tboxModelId = tboxModelId;
-    }
-
-    public String getTboxModelId() {
-        return tboxModelId;
-    }    
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.joda.time.DateTime;
+
+import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.ModelSelector;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.StandardModelSelector;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.StandardWDFSelector;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.WDFSelector;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.DefaultDataPropertyFormGenerator;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.ModelChangePreprocessor;
+import edu.cornell.mannlib.vitro.webapp.search.beans.ProhibitedFromSearch;
+
+
+/**
+ * Represents a set of fields on a form and how parameters from a from
+ * submission should be manipulated to create N3.
+ *
+ * Uris in urisInScope and urisOnForm should not have any quoting or escaping.
+ *
+ * Literals in literalsOnForm and literalsInScope should be escaped and quoted
+ * 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
+    List<String> n3Optional = new ArrayList<String>();
+    //Names of variables of 'objects' i.e. URIs on form
+    List<String> urisOnform = new ArrayList<String>();
+    //Names of variables corresponding to data values i.e. literals on form
+    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 
+    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
+    Map<String,String>sparqlForExistingUris = new HashMap<String,String>();
+
+    String subjectUri;
+    String varNameForSubject;
+
+    String predicateUri;
+    String varNameForPredicate;
+
+    /** When this is a DataPropertyStmt edit, the object is not used, the
+     * DataPropertyStatement is retrieved using the subject, predicate and the
+     * datapropKey.  When this edit is for a ObjectPropertyStmt,
+     * 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;   
+
+    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. */     
+    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. 
+     */
+    String urlToReturnTo = null;
+    
+    /**
+     * 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;   
+
+    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. 
+     *Setting to false for now as we should no longer be utilizing dependent resource deletion.
+     */
+    private boolean useDependentResourceDelete = false;   
+
+    /** Model id from write model. */
+    private String writeModelId;
+    
+    /** 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;
+
+    /** 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. 
+     * Usually this is set to null and the main model will be used. */
+    private WDFSelector wdfSelectorForOptons;
+    
+    private boolean hasBeenPreparedForUpdate;
+    
+    public EditConfigurationVTwo(){ 
+        writeModelSelector = StandardModelSelector.selector;
+        queryModelSelector = StandardModelSelector.selector;   
+        resourceModelSelector = StandardModelSelector.selector;
+        wdfSelectorForOptons = StandardWDFSelector.selector;        
+        n3generator = new EditN3GeneratorVTwo();
+    }
+
+    //Make copy of edit configuration object
+    public EditConfigurationVTwo copy() {
+    	EditConfigurationVTwo editConfig = new EditConfigurationVTwo();
+    	//Copy n3generator - make copy of n3generator or get something else?
+    	editConfig.setN3Generator( this.getN3Generator() );
+    	//For remaining ensure we make copies of all the objects and we don't use refererences
+    	//Set form url
+    	editConfig.setFormUrl(this.getFormUrl());
+    	//Set edit key
+    	editConfig.setEditKey(this.getEditKey());
+    	//subject, predicate
+    	editConfig.setUrlPatternToReturnTo(this.getUrlPatternToReturnTo());
+    	editConfig.setVarNameForSubject(this.getVarNameForSubject());
+    	editConfig.setSubjectUri(this.getSubjectUri());
+    	editConfig.setEntityToReturnTo(this.getEntityToReturnTo());
+    	editConfig.setVarNameForPredicate(this.getVarNameForPredicate());
+    	editConfig.setPredicateUri(this.getPredicateUri());
+    	//object or data parameters based on whether object or data property
+    	if(this.getObject() != null) {
+    		editConfig.setObject(this.getObject());
+    	}
+    	editConfig.setVarNameForObject(this.getVarNameForObject());
+
+    	editConfig.setDatapropKey(this.getDatapropKey());
+    	    	
+    	editConfig.setUrlPatternToReturnTo(this.getUrlPatternToReturnTo());
+   
+    	//n3 required
+    	editConfig.setN3Required(EditConfigurationUtils.copy(this.getN3Required()));
+    	//n3 optional
+    	editConfig.setN3Optional(EditConfigurationUtils.copy(this.getN3Optional()));
+    	//uris on form
+    	editConfig.setUrisOnform(EditConfigurationUtils.copy(this.getUrisOnform()));
+    	//literals on form
+    	editConfig.setLiteralsOnForm(EditConfigurationUtils.copy(this.getLiteralsOnForm()));
+    	//files on form
+    	editConfig.setFilesOnForm(EditConfigurationUtils.copy(this.getFilesOnForm()));
+    	//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(EditConfigurationUtils.copy(this.getLiteralsInScope()));
+    	
+    	//sparql for additional uris in scope
+    	editConfig.setSparqlForAdditionalUrisInScope(
+    			EditConfigurationUtils.copyMap(this.getSparqlForAdditionalUrisInScope()));     					
+    	//sparql for additional literals in scope
+    	editConfig.setSparqlForAdditionalLiteralsInScope(
+    			EditConfigurationUtils.copyMap(this.getSparqlForAdditionalLiteralsInScope()));     					
+    	//sparql for existing literals
+    	editConfig.setSparqlForExistingLiterals(
+    			EditConfigurationUtils.copyMap(this.getSparqlForExistingLiterals()));     					
+    	//sparql for existing uris
+    	editConfig.setSparqlForExistingUris(
+    			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 
+     * 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");        
+     
+        /* current time */
+        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 
+            //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 && 
+            getSparqlForAdditionalUrisInScope().containsKey("editingUser") &&
+            USE_SYSTEM_VALUE.equals(getSparqlForAdditionalUrisInScope().get("editingUser"))) {
+            
+            if( request.getSession() == null )
+                throw new Error("EditConfiguration.addSystemValues() needs a session");
+
+            /* ********** Get URI of a logged in user ************** */
+            String userUri = N3EditUtils.getEditorUri(request);
+           	log.debug("EditConfiguration.java - checking system value for User URI " + userUri);
+           	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() ){            
+            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() && 
+            varNameForObject != null && ! varNameForObject.trim().isEmpty() ){
+            urisInScope.put( varNameForObject, Arrays.asList(getObject()));
+            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. 
+     */
+    public void prepareForDataPropUpdate( Model model, DataPropertyDao dataPropertyDao ){
+        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 ");                           
+        }                     
+        
+        basicPrepare();
+        
+        DefaultDataPropertyFormGenerator.prepareForDataPropUpdate(model, this,dataPropertyDao );        
+
+        // run SPARQL, sub in values
+        SparqlEvaluateVTwo sparqlEval = new SparqlEvaluateVTwo(model);
+        runSparqlForAdditional( sparqlEval );
+        runSparqlForExisting( sparqlEval );
+       
+        hasBeenPreparedForUpdate = true;
+    }
+
+    /**
+     * Prepare for a ObjectProperty update. Run SPARQL for existing values.
+     *  This can be used for an object property or a direct form.
+     */
+    public void prepareForObjPropUpdate( Model model ){
+        if( model == null ) {
+        	log.debug("Model is null and will be throwing an error");
+        	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();        
+        
+        // run SPARQL, sub in values
+        SparqlEvaluateVTwo sparqlEval = new SparqlEvaluateVTwo( model );
+        runSparqlForAdditional( sparqlEval );
+        try {
+        	runSparqlForExisting( sparqlEval );
+        } catch (Exception e) {
+        	e.printStackTrace();
+        }
+
+        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
+     *  data or object property form.
+     */
+    public void prepareForParamUpdate( Model model ){
+        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();        
+        
+        // run SPARQL, sub in values
+        SparqlEvaluateVTwo sparqlEval = new SparqlEvaluateVTwo( model );
+        runSparqlForAdditional( sparqlEval );
+        try {
+        	runSparqlForExisting( sparqlEval );
+        } catch (Exception e) {
+        	e.printStackTrace();
+        }
+
+        hasBeenPreparedForUpdate = true;
+    }
+
+    /**
+     * Run SPARQL for Additional values.  This can be used for
+     * a data property, an object property or a direct form.
+     */
+    public void prepareForNonUpdate( Model model ){
+        if( model == null ) throw new Error("prepareForNonUpdate() needs a non-null Model");
+
+        basicPrepare();
+        
+        SparqlEvaluateVTwo sparqlEval = new SparqlEvaluateVTwo( model );
+        runSparqlForAdditional( sparqlEval );
+        //runSparqlForExisting( sparqlEval );                
+    }
+    
+    public void setFields(Map<String,FieldVTwo> fields) {
+    	this.fields = fields;
+    }
+
+    public void prepareForResubmit(MultiValueEditSubmission editSub){
+        //get any values from editSub and add to scope
+    }
+
+
+    /**
+     * Runs the queries for additional uris and literals then add those back into
+     * the urisInScope and literalsInScope.
+     */
+    public void runSparqlForAdditional(SparqlEvaluateVTwo sparqlEval){
+        sparqlEval.evaluateForAdditionalUris( this );
+        sparqlEval.evalulateForAdditionalLiterals( this );
+    }
+
+    public void runSparqlForExisting(SparqlEvaluateVTwo sparqlEval){
+        sparqlEval.evaluateForExistingUris( this );
+        sparqlEval.evaluateForExistingLiterals( this );
+    }
+
+    public FieldVTwo getField(String key){
+        if( fields == null) {
+            throw new Error("hashmap of field objects must be set before you can get a value from the EditConfiguration");
+        }
+        return fields.get(key);
+    }
+
+    /** Return a copy of the value so that the configuration is not modified by external code.
+     * @return
+     */
+    public List<String> getN3Required() {
+        return EditConfigurationUtils.copy(n3Required);
+    }
+
+    public void setN3Required(List<String> n3Required) {
+        this.n3Required = n3Required;
+    }
+
+    public void setN3Required(String ... n3RequiredStrs){
+        this.n3Required =  new ArrayList<String>(Arrays.asList( n3RequiredStrs )); //using ArrayList to allow list to be resized
+    }
+    //these methods allow strings to be added to the n3 required list and not just for the list to be set
+    public void addN3Required(List<String> n3RequiredInput) {
+    	this.n3Required.addAll(n3RequiredInput);
+    }
+    
+    public void addN3Required(String ... n3RequiredStrsInput) {
+    	 this.n3Required.addAll(Arrays.asList( n3RequiredStrsInput ));  
+    }
+     /** return a copy of the value so that the configuration is not modified by external code.
+     * @return
+     */
+    public List<String> getN3Optional() {
+         return EditConfigurationUtils.copy( n3Optional );
+    }
+
+    public void setN3Optional(List<String> n3Optional) {
+        this.n3Optional = n3Optional;
+    }
+
+    public void setN3Optional(String ... n3Strs){
+        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 ));        
+    }
+
+    
+    public Map<String,String> getNewResources() {
+        return newResources;
+    }
+
+    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]);            
+        }
+        
+        this.newResources = map;
+    }
+
+    
+    public List<String> getUrisOnform() {
+        return urisOnform;
+    }
+
+    public void setUrisOnform(List<String> urisOnform) {
+        this.urisOnform = urisOnform;
+    }
+
+    public void setUrisOnForm(String ... strs){
+        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) {
+        this.urisOnform.addAll(urisOnform);
+    }
+
+    public void addUrisOnForm(String ... strs){
+        this.urisOnform.addAll(Arrays.asList( strs ));        
+    }
+    
+    
+    public void setFilesOnForm(List<String> filesOnForm){
+        this.filesOnForm = filesOnForm;
+    }
+
+    public List<String> getFilesOnForm(){
+        return filesOnForm;
+    }
+
+    public List<String> getLiteralsOnForm() {
+        return literalsOnForm;
+    }
+
+    public void setLiteralsOnForm(List<String> literalsOnForm) {
+        this.literalsOnForm = literalsOnForm;
+    }
+
+    public void setLiteralsOnForm(String ... strs){
+        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 ));        
+    }
+    
+    public Map<String, List<String>> getUrisInScope() {
+        return urisInScope;
+    }
+
+    public void setUrisInScope(Map<String, List<String>> urisInScope) {
+        this.urisInScope = urisInScope;
+    }
+
+    public EditConfigurationVTwo addUrisInScope(String key, List<String> list) {
+        if( urisInScope  == null ){
+            urisInScope = new HashMap<String, List<String>>();
+        }
+        urisInScope.put(key, list);
+        return this;        
+    }
+    
+    public EditConfigurationVTwo addUrisInScope(Map<String, List<String>> uriValues) {
+        if( urisInScope  == null ){
+            urisInScope = new HashMap<String, List<String>>();
+        }
+        urisInScope.putAll(uriValues);
+        return this;        
+    }
+    
+   
+    
+    public Map<String, List<Literal>> getLiteralsInScope() {
+        return literalsInScope;
+    }
+
+    public void setLiteralsInScope(Map<String, List<Literal>> literalsInScope) {
+        this.literalsInScope = literalsInScope;
+    }
+
+    /** Return a copy of the value so that the configuration is not modified by external code.
+     * @return
+     */
+    public Map<String, String> getSparqlForAdditionalUrisInScope() {        
+        return copyMap(sparqlForAdditionalUrisInScope);        
+    }
+
+    public void setSparqlForAdditionalUrisInScope(Map<String, String> sparqlForAdditionalUrisInScope) {
+        this.sparqlForAdditionalUrisInScope = sparqlForAdditionalUrisInScope;
+    }
+
+     /** Return a copy of the value so that the configuration is not modified by external code.
+     * @return
+     */
+    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>();        
+        for( String key : source.keySet()){
+            if( source.get(key) != null )
+                dest.put(new String(key), source.get(key));
+            else 
+                dest.put(new String(key), null);
+        }
+        return dest;
+    }
+
+    public void setSparqlForAdditionalLiteralsInScope(Map<String, String> sparqlForAdditionalLiteralsInScope) {
+        this.sparqlForAdditionalLiteralsInScope = sparqlForAdditionalLiteralsInScope;
+    }
+
+    public String getEntityToReturnTo() {
+        return entityToReturnTo;
+    }
+
+    public void setEntityToReturnTo(String entityToReturnTo) {
+        this.entityToReturnTo = entityToReturnTo;
+    }
+
+    public String getUrlPatternToReturnTo() {
+        return urlPatternToReturnTo;
+    }
+
+    public void setUrlPatternToReturnTo(String s) {
+        urlPatternToReturnTo = s;
+    }
+
+     /** return a copy of the value so that the configuration is not modified by external code.
+     * @return
+     */
+    public Map<String, String> getSparqlForExistingLiterals() {
+        return copyMap(sparqlForExistingLiterals);        
+    }
+
+    public void setSparqlForExistingLiterals(Map<String, String> sparqlForExistingLiterals) {
+        this.sparqlForExistingLiterals = sparqlForExistingLiterals;
+    }
+
+     /** return a copy of the value so that the configuration is not modified by external code.
+     * @return
+     */
+    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 ******************************** */
+
+     public static void clearAllConfigsInSession( HttpSession sess ){
+        if(sess == null ) return;
+        sess.removeAttribute("editConfiguration");
+    }
+
+
+    public static void clearEditConfigurationInSession(HttpSession session, EditConfigurationVTwo editConfig) {
+        if( session == null || editConfig == null )
+            return;
+        Map<String,EditConfigurationVTwo> configs = (Map<String,EditConfigurationVTwo>)session.getAttribute("EditConfigurations");
+        if( configs == null )
+            return ;
+        if( configs.containsKey( editConfig.editKey ) )
+            configs.remove( editConfig.editKey );
+    }
+
+    public static void putConfigInSession(EditConfigurationVTwo ec, HttpSession sess){
+        if( sess == null )
+            throw new Error("EditConfig: could not put config in session because session was null");
+        if( ec.editKey == null )
+            throw new Error("EditConfig: could not put into session because editKey was null.");
+
+        Map<String,EditConfigurationVTwo> configs = (Map<String,EditConfigurationVTwo>)sess.getAttribute("EditConfigurations");
+        if( configs == null ){
+            configs = new HashMap<String,EditConfigurationVTwo>();
+            sess.setAttribute("EditConfigurations",configs);
+        }
+        configs.put(ec.editKey , ec);
+    }
+
+    public static EditConfigurationVTwo getConfigFromSession(HttpSession sess, String editKey){
+        Map<String,EditConfigurationVTwo> configs = (Map<String,EditConfigurationVTwo>)sess.getAttribute("EditConfigurations");
+        if( configs == null )
+          return null;
+
+        EditConfigurationVTwo config = configs.get( editKey );
+        if( config == null )
+            return null;
+        else
+            return config;
+    }
+
+    /**
+     * This may return null, which indicates that there is no editKey or EditConfiguration in the
+     * request or session.  If the queryParams are supplied, look for the editKey
+     * there first since multipart parsing might have cleared them from the request.
+     */
+    public static EditConfigurationVTwo getConfigFromSession( HttpSession sess, HttpServletRequest request ){
+        String key = getEditKeyFromRequest(request);
+        
+        if( key == null )
+            return null;
+        return getConfigFromSession(sess, key);
+    }
+
+    /**
+     * The editKey can be a HTTP query parameter or it can be a request attribute.
+     */
+    public static String getEditKeyFromRequest( ServletRequest request){
+        String key = null;
+        if( request instanceof VitroRequest ){
+            return request.getParameter("editKey");
+        }else if( request instanceof HttpServletRequest ){
+            HttpServletRequest hsreq = (HttpServletRequest)request;
+            boolean isMultipart = ServletFileUpload.isMultipartContent(hsreq);
+            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");    
+                if( key == null ) {
+                    // handle the cancel button where nothing is really uploaded
+                    key = request.getParameter("editKey");
+                }                               
+            }else{            	
+            	key = (String)request.getAttribute("editKey");                
+                if( key  != null  ){
+                    return key;
+                } else {
+                	key = request.getParameter("editKey");
+                }
+            }
+        }
+
+        if( key != null && key.trim().length() > 0 ){
+            return key;
+        }else{
+            log.debug("cannnot find editKey in request query parameters or from request");
+            return null;
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public static String newEditKey(HttpSession sess){
+        int mills = new DateTime().getMillisOfDay();
+
+        Map<String,EditConfigurationVTwo> configs = (Map<String,EditConfigurationVTwo>)sess.getAttribute("EditConfigurations");
+        if( configs == null ){
+            return Integer.toString(mills);
+        }else{
+            while( configs.containsKey( Integer.toString(mills) )){
+                mills ++;
+            }
+            return Integer.toString(mills);
+        }
+    }
+    
+    /*
+     * getters and setters
+     */
+
+    public String getObject() {
+        return object;
+    }
+
+    public void setObject(String object) {
+        this.object = object;
+    }
+
+    public boolean isObjectResource() {
+        boolean objectFound = false;
+        boolean dataKeyFound = false;
+		if( object != null && ! object.trim().isEmpty() )
+		    objectFound = true;
+		if( getDatapropKey() != null )
+		    dataKeyFound = true;
+		if( dataKeyFound && objectFound )
+		    throw new Error("Bad configuration: both datapropKey and object are defined.");
+		return objectFound;
+	}	
+
+	public Integer getDatapropKey() {
+        return datapropKey;
+    }
+
+    public void setDatapropKey(Integer datapropKey) {
+        this.datapropKey = datapropKey;
+    }
+    
+    public String getSubjectUri() {
+        return subjectUri;
+    }
+
+    public void setSubjectUri(String subjectUri) {
+        this.subjectUri = subjectUri;
+    }
+
+    public String getPredicateUri() {
+        return predicateUri;
+    }
+
+    public void setPredicateUri(String predicateUri) {
+        this.predicateUri = predicateUri;
+    }
+
+    public Map<String,FieldVTwo> getFields() {
+        return fields;
+    }
+
+    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;
+    }
+
+    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;
+    }
+
+    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.
+     */
+    public boolean isUseDependentResourceDelete() {
+		return useDependentResourceDelete;
+	}
+
+    /**If this is set to true, then dependent resources should be deleted on edits that
+     * remove the parent resource.
+     */
+	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);
+            log.debug("literalsInScope:");
+            for( String key: literalsInScope.keySet() ){
+                String val = literalsInScope.get(key).toString();
+                log.debug( key + " " + val );
+            }
+            log.debug("uris in scope: " );
+            for( String key: urisInScope.keySet() ){
+                String val = urisInScope.get(key).toString();
+                log.debug( key + " " + val );
+            }
+        }
+    }
+    
+    public final static String USE_SYSTEM_VALUE = "USE_SYSTEM_VALUE";
+    
+    private static final Log log = LogFactory.getLog(EditConfigurationVTwo.class.getName());
+
+    public ModelSelector getWriteModelSelector() {
+        return writeModelSelector;
+    }
+
+    public void setWriteModelSelector(ModelSelector writeModel) {
+        if( writeModel != null )
+            this.writeModelSelector = writeModel;        
+    }
+
+    public ModelSelector getQueryModelSelector() {
+        return queryModelSelector;
+    }
+
+    public void setQueryModelSelector(ModelSelector queryModel) {
+        if( queryModel != null )
+            this.queryModelSelector = queryModel;
+    }
+
+    public WDFSelector getWdfSelectorForOptons() {
+        return wdfSelectorForOptons;
+    }
+
+    public void setWdfSelectorForOptons(WDFSelector wdfForOptons) {
+        this.wdfSelectorForOptons = wdfForOptons;
+    }
+
+    public ModelSelector getResourceModelSelector() {
+        return resourceModelSelector;
+    }
+
+    public void setResourceModelSelector(ModelSelector resourceModelSelector) {
+        if( resourceModelSelector != null )
+            this.resourceModelSelector = resourceModelSelector;
+    }
+        
+    public List<N3ValidatorVTwo> getValidators() {
+		return validators;
+	}
+
+    public void addValidator( N3ValidatorVTwo validator){
+    	if( this.validators == null )
+    		this.validators = new ArrayList<N3ValidatorVTwo>();
+    	this.validators.add(validator);    		
+    }    
+
+    public void addEditSubmissionPreprocessor( EditSubmissionVTwoPreprocessor preprocessor){
+        if( editSubmissionPreprocessors == null )
+            editSubmissionPreprocessors = new ArrayList<EditSubmissionVTwoPreprocessor>();
+        editSubmissionPreprocessors.add(preprocessor);         
+    }  
+    
+    public List<EditSubmissionVTwoPreprocessor> getEditSubmissionPreprocessors() {
+        return editSubmissionPreprocessors;
+    }
+
+    public void setTemplate(String template){
+        this.template = template;
+    }
+    
+    public String getTemplate() {
+        return this.template;
+    }
+
+    public String getSubmitToUrl() {
+        return submitToUrl;
+    }
+
+    public void setSubmitToUrl(String submitToUrl) {
+        this.submitToUrl = submitToUrl;
+    }
+    
+    public boolean isUpdate(){
+        //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;  
+    }
+    
+    public boolean isDataPropertyUpdate() {
+    	return this.getDatapropKey() != null ;
+    }
+    
+    //*****TEST Method***Remove if doesn't work******//
+    public boolean isParamUpdate = false;
+    public void setParamUpdate (boolean inputParamUpdate) {
+    	this.isParamUpdate = inputParamUpdate;
+    }
+    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. */    
+	public  void setFormSpecificData(HashMap<String, Object> formSpecificData) {
+		this.formSpecificData = formSpecificData;
+	}
+
+    //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 void addFormSpecificData( String key, Object value){
+	    if( this.formSpecificData == null){
+	        this.formSpecificData = new HashMap<String,Object>();
+	    }
+	    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() {	
+		return this.formSpecificData;
+	}
+
+	public boolean hasBeenPreparedForUpdate() {
+	    return hasBeenPreparedForUpdate;
+	}
+	
+    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);            
+        }else{
+            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() ) 
+            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);            
+        }        
+    }
+    
+    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() ) 
+            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);            
+        }        
+    }
+
+    public void addField( FieldVTwo field){
+        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( 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);                
+    }
+
+    public void addFields(List<FieldVTwo> fields) {
+    	if( fields != null ) 
+	    {    	
+    		for(FieldVTwo f: fields) {
+	    		this.addField(f);
+	    	}
+    	}
+    	
+    }
+    
+    @Override
+    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;                
+    }
+    
+    public EditConfigurationVTwo addLiteralsInScope(Map<String, List<Literal>> scopeLiterals) {
+        if( literalsInScope  == null ){
+            literalsInScope = new HashMap<String, List<Literal>>();
+        }        
+        literalsInScope.putAll(scopeLiterals);
+        return this;                
+    }
+
+    public void setUrlToReturnTo(String url){
+        this.urlToReturnTo = url;
+    }
+
+    public String getUrlToReturnTo() {
+        return this.urlToReturnTo;
+    }
+
+    public void setSkipToUrl(String url){
+        skipToUrl=url;
+    }
+    
+    public String getSkipToUrl() {
+        return skipToUrl;
+    }
+
+    public void setWriteModelId(String writeModelId) {
+        this.writeModelId = writeModelId;
+    }
+
+    public String getWriteModelId() {
+        return writeModelId;
+    }
+
+    public void setAboxModelId(String aboxModelId) {
+        this.aboxModelId = aboxModelId;
+    }
+
+    public String getAboxModelId() {
+        return aboxModelId;
+    }
+
+    public void setTboxModelId(String tboxModelId) {
+        this.tboxModelId = tboxModelId;
+    }
+
+    public String getTboxModelId() {
+        return tboxModelId;
+    }    
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditElementVTwo.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditElementVTwo.java
index 6c035ad9a..c3ced4abb 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditElementVTwo.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditElementVTwo.java
@@ -1,52 +1,52 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
-
-import java.util.Map;
-import java.util.List;
-import com.hp.hpl.jena.rdf.model.Literal;
-
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-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 
- * called with using reflection.
- */
-public interface EditElementVTwo {  
-    /**
-     * This is a method to get a map of variable name to Literal value from the submitted form. 
-     */
-    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. 
-     */
-    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.  
-     */
-    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);            
-    
-    /* in the future, we may need to get existing values */
-    /*
-    public Map<String,Literal> getExistingLiterals(???)
-    public Map<String,String> getExistingURIs(???);
-    */
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
+
+import java.util.Map;
+import java.util.List;
+import com.hp.hpl.jena.rdf.model.Literal;
+
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+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 
+ * called with using reflection.
+ */
+public interface EditElementVTwo {  
+    /**
+     * This is a method to get a map of variable name to Literal value from the submitted form. 
+     */
+    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. 
+     */
+    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.  
+     */
+    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);            
+    
+    /* in the future, we may need to get existing values */
+    /*
+    public Map<String,Literal> getExistingLiterals(???)
+    public Map<String,String> getExistingURIs(???);
+    */
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java
index 47887cc05..39ea3f3b0 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwo.java
@@ -1,430 +1,430 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.regex.Matcher;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.vocabulary.XSD;
-
-/**
- * Builds the N3 strings for the given EditConfiguration, model
- * 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 );  
-
-    /**
-     * 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<String> 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){       
-    	
-    	if( varsToVals == null || varsToVals.isEmpty() || n3targets == null)
-    	    return;
-
-        //for (String target : n3targets) {
-    	for( int i = 0; i < n3targets.size() ; i++ ){
-    	    String result = n3targets.get(i);
-    	    if( result == null )
-    	        continue;
-            Set<String> keySet = varsToVals.keySet();
-            for (String key : keySet) {
-                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.  
-                    //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());                
-                
-                String valueString = org.apache.commons.lang.StringUtils.join(values,
-                        ">, <");                                
-                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) {        
-        return values != null && ( values.contains(null) || values.contains("") );       
-    }
-
-    /**
-     * The List targets will be modified.
-     */
-    public void subInUris(Map<String,String> varsToVals, List<String> targets){
-        if( varsToVals == null || varsToVals.isEmpty() || targets == null )
-            return;
-
-        for( int i = 0; i < targets.size() ; 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 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) 
-            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 );                
-            }         
-            n3targets.set(i, newN3);
-        }
-    }
-    
-    public void subInLiterals(Map<String, Literal> varsToVals, List<String> n3targets){
-        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 = subInLiterals( key, varsToVals.get(key), newN3 );                
-            }         
-            n3targets.set(i, newN3);
-        }        
-    }
-
-
-    /**
-     * When we sub in literals we have to take in to account the Lang or Datatype of
-     * the literal.  N3 needs to have its literals escaped in Python style.  Java regex
-     * Matcher is used to do the substitution and it need escaping to avoid group
-     * references, Matcher.quoteReplacement() serves the purpose.
-     *
-     */
-    protected String subInLiterals(String var, Literal literal, String target){
-        String varRegex = "\\?" + var + "(?=\\p{Punct}||\\p{Space}|&)";
-        if (target==null ) {
-            log.error("subInLiterals was passed a null target");
-            return "blankBecauseTargetOrValueWasNull";
-        }else if( var == null ){
-            log.warn("subInLiterals was passed a null var name");
-            return target;
-        }else if( literal == null ){
-            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");        
-        }catch(com.hp.hpl.jena.datatypes.DatatypeFormatException ex){           
-            log.debug("value for " + var + " " + ex.getMessage());
-        }        
-        
-        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 ) 
-            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){        
-	  if (n3==null ) {
-          log.error("subInMultiLiterals was passed a null n3 String");
-          return "blankBecauseTargetOrValueWasNull";
-      }else if( var == null ){
-          log.warn("subInMultiLiterals was passed a null var name");
-          return n3;
-      }else if( values == null ){
-          log.debug("subInMultiLiterals was passed a null value for var '"+var+"'; returning target: '"+n3+"'");
-          return n3;
-      }
-    	String tmp = n3;
-        
-        //make the multivalue literal string
-        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");        
-        	}
-        }
-        String valueString = org.apache.commons.lang.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) {       
-        /* 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;
-        if("".equals(value))
-            return target.replaceAll(varRegex,">::" + var + " was BLANK::< ");
-        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   
-     * Found in file Jena-2.5.5/src/com/hp/hpl/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.
-     *
-     * Redistribution and use in source and binary forms, with or without
-     * modification, are permitted provided that the following conditions
-     * are met:
-     * 1. Redistributions of source code must retain the above copyright
-     *    notice, this list of conditions and the following disclaimer.
-     * 2. Redistributions in binary form must reproduce the above copyright
-     *    notice, this list of conditions and the following disclaimer in the
-     *    documentation and/or other materials provided with the distribution.
-     * 3. The name of the author may not be used to endorse or promote products
-     *    derived from this software without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
-     */
-    
-    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?
-            // Assume valid text
-            if ( datatype.equals(XSD.integer.getURI()) )
-            {
-                try {
-                    new java.math.BigInteger(s) ;
-                    return s ;
-                } catch (NumberFormatException nfe) {}
-                // No luck.  Continue.
-                // Continuing is always safe.
-            }
-                
-            if ( datatype.equals(XSD.decimal.getURI()) )
-            {
-                // Must have ., can't have e or E
-                if ( s.indexOf('.') >= 0 &&
-                     s.indexOf('e') == -1 && s.indexOf('E') == -1 )
-                {
-                    // See if parsable.
-                    try {
-                        BigDecimal d = new BigDecimal(s) ;
-                        return s ;
-                    } catch (NumberFormatException nfe) {}
-                }
-            }
-            
-            if ( datatype.equals(XSD.xdouble.getURI()) )
-            {
-                // Must have 'e' or 'E' (N3 and Turtle now read 2.3 as a decimal).
-                if ( s.indexOf('e') >= 0 ||
-                     s.indexOf('E') >= 0 )
-                {
-                    try {
-                        // Validate it.
-                        Double.parseDouble(s) ;
-                        return s ;
-                    } catch (NumberFormatException nfe) {}
-                    // No luck.  Continue.
-                }
-            }
-        }
-        // Format the text - with escaping.
-        StringBuffer sbuff = new StringBuffer() ;
-        
-        String quoteMarks = "\"" ;
-        
-        sbuff.append(quoteMarks);
-        pyString(sbuff, s ) ;
-        sbuff.append(quoteMarks);
-    
-        // Format the language tag 
-        if ( lang != null && lang.length()>0)
-        {
-            sbuff.append("@") ;
-            sbuff.append(lang) ;
-        }
-        
-        // Format the datatype
-        if ( datatype != null )
-        {
-            sbuff.append("^^") ;
-            sbuff.append(formatURI(datatype)) ;
-        }
-        return sbuff.toString() ;
-    }
-
-    
-    /*
-     * 
-     * see http://www.python.org/doc/2.5.2/ref/strings.html
-     * or see jena's n3 grammar jena/src/com/hp/hpl/jena/n3/n3.g
-     */ 
-    protected static void pyString(StringBuffer sbuff, String s)
-    {
-        for (int i = 0; i < s.length(); i++) {
-            char c = s.charAt(i);
-
-            // Escape escapes and quotes
-            if (c == '\\' || c == '"' )
-            {
-                sbuff.append('\\') ;
-                sbuff.append(c) ;
-                continue ;
-            }            
-
-            // 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 == '\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();
-//            int pad = 4 - hexstr.length();
-//            sbuff.append("\\u");
-//            for (; pad > 0; pad--)
-//                sbuff.append("0");
-//            sbuff.append(hexstr);
-        }
-    }
-
-    protected static String formatURI(String uriStr)
-    {
-        // Not as a qname - write as a quoted URIref
-        // Should we unicode escape here?
-        // It should be right - the writer should be UTF-8 on output.
-        return "<"+uriStr+">" ;
-    }
-    
-    /*************************************************************************
-     * End code taken from the Jena project and Hewlett-Packard 
-     *************************************************************************/
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.vocabulary.XSD;
+
+/**
+ * Builds the N3 strings for the given EditConfiguration, model
+ * 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 );  
+
+    /**
+     * 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<String> 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){       
+    	
+    	if( varsToVals == null || varsToVals.isEmpty() || n3targets == null)
+    	    return;
+
+        //for (String target : n3targets) {
+    	for( int i = 0; i < n3targets.size() ; i++ ){
+    	    String result = n3targets.get(i);
+    	    if( result == null )
+    	        continue;
+            Set<String> keySet = varsToVals.keySet();
+            for (String key : keySet) {
+                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.  
+                    //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());                
+                
+                String valueString = org.apache.commons.lang.StringUtils.join(values,
+                        ">, <");                                
+                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) {        
+        return values != null && ( values.contains(null) || values.contains("") );       
+    }
+
+    /**
+     * The List targets will be modified.
+     */
+    public void subInUris(Map<String,String> varsToVals, List<String> targets){
+        if( varsToVals == null || varsToVals.isEmpty() || targets == null )
+            return;
+
+        for( int i = 0; i < targets.size() ; 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 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) 
+            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 );                
+            }         
+            n3targets.set(i, newN3);
+        }
+    }
+    
+    public void subInLiterals(Map<String, Literal> varsToVals, List<String> n3targets){
+        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 = subInLiterals( key, varsToVals.get(key), newN3 );                
+            }         
+            n3targets.set(i, newN3);
+        }        
+    }
+
+
+    /**
+     * When we sub in literals we have to take in to account the Lang or Datatype of
+     * the literal.  N3 needs to have its literals escaped in Python style.  Java regex
+     * Matcher is used to do the substitution and it need escaping to avoid group
+     * references, Matcher.quoteReplacement() serves the purpose.
+     *
+     */
+    protected String subInLiterals(String var, Literal literal, String target){
+        String varRegex = "\\?" + var + "(?=\\p{Punct}||\\p{Space}|&)";
+        if (target==null ) {
+            log.error("subInLiterals was passed a null target");
+            return "blankBecauseTargetOrValueWasNull";
+        }else if( var == null ){
+            log.warn("subInLiterals was passed a null var name");
+            return target;
+        }else if( literal == null ){
+            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");        
+        }catch(com.hp.hpl.jena.datatypes.DatatypeFormatException ex){           
+            log.debug("value for " + var + " " + ex.getMessage());
+        }        
+        
+        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 ) 
+            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){        
+	  if (n3==null ) {
+          log.error("subInMultiLiterals was passed a null n3 String");
+          return "blankBecauseTargetOrValueWasNull";
+      }else if( var == null ){
+          log.warn("subInMultiLiterals was passed a null var name");
+          return n3;
+      }else if( values == null ){
+          log.debug("subInMultiLiterals was passed a null value for var '"+var+"'; returning target: '"+n3+"'");
+          return n3;
+      }
+    	String tmp = n3;
+        
+        //make the multivalue literal string
+        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");        
+        	}
+        }
+        String valueString = org.apache.commons.lang.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) {       
+        /* 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;
+        if("".equals(value))
+            return target.replaceAll(varRegex,">::" + var + " was BLANK::< ");
+        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   
+     * Found in file Jena-2.5.5/src/com/hp/hpl/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.
+     *
+     * Redistribution and use in source and binary forms, with or without
+     * modification, are permitted provided that the following conditions
+     * are met:
+     * 1. Redistributions of source code must retain the above copyright
+     *    notice, this list of conditions and the following disclaimer.
+     * 2. Redistributions in binary form must reproduce the above copyright
+     *    notice, this list of conditions and the following disclaimer in the
+     *    documentation and/or other materials provided with the distribution.
+     * 3. The name of the author may not be used to endorse or promote products
+     *    derived from this software without specific prior written permission.
+     *
+     * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+     */
+    
+    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?
+            // Assume valid text
+            if ( datatype.equals(XSD.integer.getURI()) )
+            {
+                try {
+                    new java.math.BigInteger(s) ;
+                    return s ;
+                } catch (NumberFormatException nfe) {}
+                // No luck.  Continue.
+                // Continuing is always safe.
+            }
+                
+            if ( datatype.equals(XSD.decimal.getURI()) )
+            {
+                // Must have ., can't have e or E
+                if ( s.indexOf('.') >= 0 &&
+                     s.indexOf('e') == -1 && s.indexOf('E') == -1 )
+                {
+                    // See if parsable.
+                    try {
+                        BigDecimal d = new BigDecimal(s) ;
+                        return s ;
+                    } catch (NumberFormatException nfe) {}
+                }
+            }
+            
+            if ( datatype.equals(XSD.xdouble.getURI()) )
+            {
+                // Must have 'e' or 'E' (N3 and Turtle now read 2.3 as a decimal).
+                if ( s.indexOf('e') >= 0 ||
+                     s.indexOf('E') >= 0 )
+                {
+                    try {
+                        // Validate it.
+                        Double.parseDouble(s) ;
+                        return s ;
+                    } catch (NumberFormatException nfe) {}
+                    // No luck.  Continue.
+                }
+            }
+        }
+        // Format the text - with escaping.
+        StringBuffer sbuff = new StringBuffer() ;
+        
+        String quoteMarks = "\"" ;
+        
+        sbuff.append(quoteMarks);
+        pyString(sbuff, s ) ;
+        sbuff.append(quoteMarks);
+    
+        // Format the language tag 
+        if ( lang != null && lang.length()>0)
+        {
+            sbuff.append("@") ;
+            sbuff.append(lang) ;
+        }
+        
+        // Format the datatype
+        if ( datatype != null )
+        {
+            sbuff.append("^^") ;
+            sbuff.append(formatURI(datatype)) ;
+        }
+        return sbuff.toString() ;
+    }
+
+    
+    /*
+     * 
+     * see http://www.python.org/doc/2.5.2/ref/strings.html
+     * or see jena's n3 grammar jena/src/com/hp/hpl/jena/n3/n3.g
+     */ 
+    protected static void pyString(StringBuffer sbuff, String s)
+    {
+        for (int i = 0; i < s.length(); i++) {
+            char c = s.charAt(i);
+
+            // Escape escapes and quotes
+            if (c == '\\' || c == '"' )
+            {
+                sbuff.append('\\') ;
+                sbuff.append(c) ;
+                continue ;
+            }            
+
+            // 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 == '\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();
+//            int pad = 4 - hexstr.length();
+//            sbuff.append("\\u");
+//            for (; pad > 0; pad--)
+//                sbuff.append("0");
+//            sbuff.append(hexstr);
+        }
+    }
+
+    protected static String formatURI(String uriStr)
+    {
+        // Not as a qname - write as a quoted URIref
+        // Should we unicode escape here?
+        // It should be right - the writer should be UTF-8 on output.
+        return "<"+uriStr+">" ;
+    }
+    
+    /*************************************************************************
+     * End code taken from the Jena project and Hewlett-Packard 
+     *************************************************************************/
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditSubmissionVTwoPreprocessor.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditSubmissionVTwoPreprocessor.java
index c92cb11f7..05e8df8f4 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditSubmissionVTwoPreprocessor.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditSubmissionVTwoPreprocessor.java
@@ -1,9 +1,9 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
-
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
-
-public interface EditSubmissionVTwoPreprocessor {
-    public void preprocess(MultiValueEditSubmission editSubmission);
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
+
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
+
+public interface EditSubmissionVTwoPreprocessor {
+    public void preprocess(MultiValueEditSubmission editSubmission);
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/SparqlEvaluateVTwo.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/SparqlEvaluateVTwo.java
index 0f4dfa7e1..9525a8c4d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/SparqlEvaluateVTwo.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/SparqlEvaluateVTwo.java
@@ -1,252 +1,252 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
-import com.hp.hpl.jena.query.*;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.Resource;
-
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-public class SparqlEvaluateVTwo {
-    private static Log log = LogFactory.getLog( SparqlEvaluateVTwo.class );
-
-    Model model;
-    public SparqlEvaluateVTwo(Model model){
-        if( model == null ) throw new Error("SparqlEvaluate must be passed a Model");
-         this.model = model;
-    }
-
-    public void evaluateForAdditionalUris( EditConfigurationVTwo editConfig ){
-    	log.debug("Evaluating for Additional URIS");
-        Map<String,List<String>> varsToUris = sparqlEvaluateForUris(editConfig, editConfig.getSparqlForAdditionalUrisInScope());
-        editConfig.getUrisInScope().putAll(varsToUris);
-    }
-
-    public void evalulateForAdditionalLiterals( EditConfigurationVTwo editConfig ){
-    	log.debug("Evaluating for Additional Literals");
-        Map<String,List<Literal>> varsToLiterals = sparqlEvaluateForLiterals(editConfig, editConfig.getSparqlForAdditionalLiteralsInScope());
-        editConfig.getLiteralsInScope().putAll(varsToLiterals);
-    }
-
-    public void evaluateForExistingUris( EditConfigurationVTwo editConfig){
-    	log.debug("Evaluating for existing URIS");
-        Map<String,List<String>> varsToUris = sparqlEvaluateForUris(editConfig, editConfig.getSparqlForExistingUris());
-        editConfig.getUrisInScope().putAll(varsToUris);
-    }
-
-    public void evaluateForExistingLiterals( EditConfigurationVTwo editConfig){
-    	log.debug("Evaluating for existing literals");
-        Map<String,List<Literal>> varsToLiterals = sparqlEvaluateForLiterals(editConfig, editConfig.getSparqlForExistingLiterals());
-        editConfig.getLiteralsInScope().putAll(varsToLiterals);
-    }
-
-//    public  Map<String,String> sparqlEvaluateForExistingToUris(Map<String,String> varToSpqrql){
-//        Map<String,String> varToUris = new HashMap<String,String>();
-//        for(String var : varToSpqrql.keySet()){
-//            varToUris.put(var, queryToUri( varToSpqrql.get(var) ));
-//        }
-//        return varToUris;
-//    }
-//
-//    public  Map<String,String> sparqlEvaluateForAdditionalLiterals(Map<String,String> varToSpqrql){
-//        Map<String,String> varToLiterals = new HashMap<String,String>();
-//        for(String var : varToSpqrql.keySet()){
-//            varToLiterals.put(var, queryToLiteral( varToSpqrql.get(var) ));
-//        }
-//        return varToLiterals;
-//    }
-
-//    private  Map<String,String> sparqlEvaluateForExistingToUris( EditConfiguration editConfig ) {
-//        Map<String,String> varToSpqrql = editConfig.getSparqlForExistingUris();
-//        Map<String,String> uriScope = editConfig.getUrisInScope();
-//        Map<String,Literal> literalScope = editConfig.getLiteralsInScope();
-//
-//        Map<String,String> varToUris = new HashMap<String,String>();
-//
-//        for(String var : varToSpqrql.keySet()){
-//            String query = varToSpqrql.get(var);
-//            List<String> queryStrings = new ArrayList <String>();
-//            queryStrings.add(query);
-//            queryStrings= editConfig.getN3Generator().subInUris(uriScope, queryStrings);
-//            queryStrings = editConfig.getN3Generator().subInLiterals(literalScope,queryStrings);
-//            varToUris.put(var, queryToUri(  queryStrings.get(0) ));           //might result in (key -> null)
-//        }
-//
-//        return varToUris;
-//    }
-
-    public  Map<String,List<Literal>> sparqlEvaluateForLiterals( EditConfigurationVTwo editConfig, Map<String,String> varToSparql)  {
-        Map<String,List<String>> uriScope = editConfig.getUrisInScope();
-        Map<String,List<Literal>> literalScope = editConfig.getLiteralsInScope();
-
-        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);           
-            /* 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");
-                continue;
-            }
-            List<String> queryStrings = new ArrayList <String>();
-            queryStrings.add( query );
-            editConfig.getN3Generator().subInMultiUris(uriScope, queryStrings);
-            log.debug("Query after substituting uris in scope: " + queryStrings.toString());
-            editConfig.getN3Generator().subInMultiLiterals(literalScope,queryStrings);
-            log.debug("Query after substituting literals in scope: " + queryStrings.toString());
-            varToLiterals.put(var, queryToLiteral(  queryStrings.get(0) ));   //might result in (key -> null)
-        }
-
-        return varToLiterals;
-    }
-
-    public Map<String,List<String>> sparqlEvaluateForUris( EditConfigurationVTwo editConfig, Map<String,String>varToSparql) {
-        Map<String,List<String>> uriScope = editConfig.getUrisInScope();
-        Map<String,List<Literal>> literalScope = editConfig.getLiteralsInScope();
-
-        Map<String,List<String>> varToUris = new HashMap<String,List<String>>();
-
-        for(String var : varToSparql.keySet()){
-            String query = varToSparql.get(var);
-            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");
-                continue;
-            }
-            List<String> queryStrings = new ArrayList <String>();
-            queryStrings.add(query);
-            editConfig.getN3Generator().subInMultiUris(uriScope, queryStrings);
-            log.debug("Query after substituting uris in scope: " + queryStrings.toString());
-            editConfig.getN3Generator().subInMultiLiterals(literalScope,queryStrings);
-            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");                            
-        }
-
-        return varToUris;
-    }
-
-//    public Map<String,Literal> sparqlEvaluateForAdditionalLiterals( EditConfiguration editConfig)  {
-//        Map<String,String> varToSpqrql = editConfig.getSparqlForAdditionalLiteralsInScope();
-//        Map<String,String> uriScope = editConfig.getUrisInScope();
-//        Map<String,Literal> literalScope = editConfig.getLiteralsInScope();
-//
-//        Map<String,Literal> varToLiterals = new HashMap<String,Literal>();
-//        for(String var : varToSpqrql.keySet()){
-//            String query = varToSpqrql.get(var);
-//            List<String> queryStrings = new ArrayList <String>();
-//            queryStrings.add( query );
-//            queryStrings= editConfig.getN3Generator().subInUris(uriScope, queryStrings);
-//            queryStrings = editConfig.getN3Generator().subInLiterals(literalScope,queryStrings);
-//            Literal literalFromQuery = queryToLiteral(  queryStrings.get(0) );
-//            if( literalFromQuery != null )
-//                varToLiterals.put(var, literalFromQuery );
-//            else
-//                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);
-        String value = null;
-        List<String> values = new ArrayList<String>();
-        QueryExecution qe = null;
-        try{
-            Query query = QueryFactory.create(querystr);
-            qe = QueryExecutionFactory.create(query, model);
-            if( query.isSelectType() ){
-                ResultSet results = null;
-                results = qe.execSelect();
-                if( results.hasNext()){
-                    List<String> vars = results.getResultVars();
-                    if( vars == null )
-                      throw new Error("sparql had no result variables");
-                    for(String var: vars) {
-                    	QuerySolution qs = results.nextSolution();
-                        Resource resource = qs.getResource(var);
-                        value =  resource.getURI();
-                        values.add(value);
-                    }
-                    
-                    
-                   
-                }else{
-                	log.debug("Query had no results");
-                    return null;
-                }
-            } else {
-                throw new Error("only SELECT type SPARQL queries are supported");
-            }
-        }catch(Exception ex){
-            throw new Error("could not parse SPARQL in queryToUri: \n" + querystr + '\n' + ex.getMessage());
-        }finally{
-            if( qe != null)
-                qe.close();
-        }
-        if( log.isDebugEnabled() ) log.debug("queryToUri() query: '"+ querystr +"'\nvalue: '" + values.toString() +"'");
-        return values;
-    }
-
-
-    public  List<Literal> queryToLiteral(String querystr){
-    	log.debug("Executing query " + querystr);
-        Literal value = null;
-        List<Literal> values = new ArrayList<Literal>();
-        QueryExecution qe = null;
-        try{
-            Query query = QueryFactory.create(querystr);
-            qe = QueryExecutionFactory.create(query, model);
-            if( query.isSelectType() ){
-                ResultSet results = null;
-                results = qe.execSelect();
-                if( results.hasNext()){
-                    List<String> vars = results.getResultVars();
-                    if( vars == null )
-                        throw new Error("sparql had no result variables");
-                    for(String var: vars){
-                    	QuerySolution qs = results.nextSolution();
-                    	value = qs.getLiteral(var);
-                    	values.add(value);
-                    }
-                }else{
-                	log.debug("Query had no results");
-                    return null;
-                }
-            } else {
-                throw new Error("only SELECT type SPARQL queries are supported");
-            }
-        }catch(Exception ex){
-            throw new Error("could not parse SPARQL in queryToLiteral: \n" + querystr + '\n' + ex.getMessage());
-        }finally{
-            if( qe != null)
-                qe.close();
-        }
-
-        if( log.isDebugEnabled() ) log.debug("queryToLiteral() query: '"+ querystr +"'\nvalue: '" + values.toString() +"'");
-        return values;
-    }
-
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
+import com.hp.hpl.jena.query.*;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.Resource;
+
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+public class SparqlEvaluateVTwo {
+    private static Log log = LogFactory.getLog( SparqlEvaluateVTwo.class );
+
+    Model model;
+    public SparqlEvaluateVTwo(Model model){
+        if( model == null ) throw new Error("SparqlEvaluate must be passed a Model");
+         this.model = model;
+    }
+
+    public void evaluateForAdditionalUris( EditConfigurationVTwo editConfig ){
+    	log.debug("Evaluating for Additional URIS");
+        Map<String,List<String>> varsToUris = sparqlEvaluateForUris(editConfig, editConfig.getSparqlForAdditionalUrisInScope());
+        editConfig.getUrisInScope().putAll(varsToUris);
+    }
+
+    public void evalulateForAdditionalLiterals( EditConfigurationVTwo editConfig ){
+    	log.debug("Evaluating for Additional Literals");
+        Map<String,List<Literal>> varsToLiterals = sparqlEvaluateForLiterals(editConfig, editConfig.getSparqlForAdditionalLiteralsInScope());
+        editConfig.getLiteralsInScope().putAll(varsToLiterals);
+    }
+
+    public void evaluateForExistingUris( EditConfigurationVTwo editConfig){
+    	log.debug("Evaluating for existing URIS");
+        Map<String,List<String>> varsToUris = sparqlEvaluateForUris(editConfig, editConfig.getSparqlForExistingUris());
+        editConfig.getUrisInScope().putAll(varsToUris);
+    }
+
+    public void evaluateForExistingLiterals( EditConfigurationVTwo editConfig){
+    	log.debug("Evaluating for existing literals");
+        Map<String,List<Literal>> varsToLiterals = sparqlEvaluateForLiterals(editConfig, editConfig.getSparqlForExistingLiterals());
+        editConfig.getLiteralsInScope().putAll(varsToLiterals);
+    }
+
+//    public  Map<String,String> sparqlEvaluateForExistingToUris(Map<String,String> varToSpqrql){
+//        Map<String,String> varToUris = new HashMap<String,String>();
+//        for(String var : varToSpqrql.keySet()){
+//            varToUris.put(var, queryToUri( varToSpqrql.get(var) ));
+//        }
+//        return varToUris;
+//    }
+//
+//    public  Map<String,String> sparqlEvaluateForAdditionalLiterals(Map<String,String> varToSpqrql){
+//        Map<String,String> varToLiterals = new HashMap<String,String>();
+//        for(String var : varToSpqrql.keySet()){
+//            varToLiterals.put(var, queryToLiteral( varToSpqrql.get(var) ));
+//        }
+//        return varToLiterals;
+//    }
+
+//    private  Map<String,String> sparqlEvaluateForExistingToUris( EditConfiguration editConfig ) {
+//        Map<String,String> varToSpqrql = editConfig.getSparqlForExistingUris();
+//        Map<String,String> uriScope = editConfig.getUrisInScope();
+//        Map<String,Literal> literalScope = editConfig.getLiteralsInScope();
+//
+//        Map<String,String> varToUris = new HashMap<String,String>();
+//
+//        for(String var : varToSpqrql.keySet()){
+//            String query = varToSpqrql.get(var);
+//            List<String> queryStrings = new ArrayList <String>();
+//            queryStrings.add(query);
+//            queryStrings= editConfig.getN3Generator().subInUris(uriScope, queryStrings);
+//            queryStrings = editConfig.getN3Generator().subInLiterals(literalScope,queryStrings);
+//            varToUris.put(var, queryToUri(  queryStrings.get(0) ));           //might result in (key -> null)
+//        }
+//
+//        return varToUris;
+//    }
+
+    public  Map<String,List<Literal>> sparqlEvaluateForLiterals( EditConfigurationVTwo editConfig, Map<String,String> varToSparql)  {
+        Map<String,List<String>> uriScope = editConfig.getUrisInScope();
+        Map<String,List<Literal>> literalScope = editConfig.getLiteralsInScope();
+
+        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);           
+            /* 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");
+                continue;
+            }
+            List<String> queryStrings = new ArrayList <String>();
+            queryStrings.add( query );
+            editConfig.getN3Generator().subInMultiUris(uriScope, queryStrings);
+            log.debug("Query after substituting uris in scope: " + queryStrings.toString());
+            editConfig.getN3Generator().subInMultiLiterals(literalScope,queryStrings);
+            log.debug("Query after substituting literals in scope: " + queryStrings.toString());
+            varToLiterals.put(var, queryToLiteral(  queryStrings.get(0) ));   //might result in (key -> null)
+        }
+
+        return varToLiterals;
+    }
+
+    public Map<String,List<String>> sparqlEvaluateForUris( EditConfigurationVTwo editConfig, Map<String,String>varToSparql) {
+        Map<String,List<String>> uriScope = editConfig.getUrisInScope();
+        Map<String,List<Literal>> literalScope = editConfig.getLiteralsInScope();
+
+        Map<String,List<String>> varToUris = new HashMap<String,List<String>>();
+
+        for(String var : varToSparql.keySet()){
+            String query = varToSparql.get(var);
+            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");
+                continue;
+            }
+            List<String> queryStrings = new ArrayList <String>();
+            queryStrings.add(query);
+            editConfig.getN3Generator().subInMultiUris(uriScope, queryStrings);
+            log.debug("Query after substituting uris in scope: " + queryStrings.toString());
+            editConfig.getN3Generator().subInMultiLiterals(literalScope,queryStrings);
+            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");                            
+        }
+
+        return varToUris;
+    }
+
+//    public Map<String,Literal> sparqlEvaluateForAdditionalLiterals( EditConfiguration editConfig)  {
+//        Map<String,String> varToSpqrql = editConfig.getSparqlForAdditionalLiteralsInScope();
+//        Map<String,String> uriScope = editConfig.getUrisInScope();
+//        Map<String,Literal> literalScope = editConfig.getLiteralsInScope();
+//
+//        Map<String,Literal> varToLiterals = new HashMap<String,Literal>();
+//        for(String var : varToSpqrql.keySet()){
+//            String query = varToSpqrql.get(var);
+//            List<String> queryStrings = new ArrayList <String>();
+//            queryStrings.add( query );
+//            queryStrings= editConfig.getN3Generator().subInUris(uriScope, queryStrings);
+//            queryStrings = editConfig.getN3Generator().subInLiterals(literalScope,queryStrings);
+//            Literal literalFromQuery = queryToLiteral(  queryStrings.get(0) );
+//            if( literalFromQuery != null )
+//                varToLiterals.put(var, literalFromQuery );
+//            else
+//                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);
+        String value = null;
+        List<String> values = new ArrayList<String>();
+        QueryExecution qe = null;
+        try{
+            Query query = QueryFactory.create(querystr);
+            qe = QueryExecutionFactory.create(query, model);
+            if( query.isSelectType() ){
+                ResultSet results = null;
+                results = qe.execSelect();
+                if( results.hasNext()){
+                    List<String> vars = results.getResultVars();
+                    if( vars == null )
+                      throw new Error("sparql had no result variables");
+                    for(String var: vars) {
+                    	QuerySolution qs = results.nextSolution();
+                        Resource resource = qs.getResource(var);
+                        value =  resource.getURI();
+                        values.add(value);
+                    }
+                    
+                    
+                   
+                }else{
+                	log.debug("Query had no results");
+                    return null;
+                }
+            } else {
+                throw new Error("only SELECT type SPARQL queries are supported");
+            }
+        }catch(Exception ex){
+            throw new Error("could not parse SPARQL in queryToUri: \n" + querystr + '\n' + ex.getMessage());
+        }finally{
+            if( qe != null)
+                qe.close();
+        }
+        if( log.isDebugEnabled() ) log.debug("queryToUri() query: '"+ querystr +"'\nvalue: '" + values.toString() +"'");
+        return values;
+    }
+
+
+    public  List<Literal> queryToLiteral(String querystr){
+    	log.debug("Executing query " + querystr);
+        Literal value = null;
+        List<Literal> values = new ArrayList<Literal>();
+        QueryExecution qe = null;
+        try{
+            Query query = QueryFactory.create(querystr);
+            qe = QueryExecutionFactory.create(query, model);
+            if( query.isSelectType() ){
+                ResultSet results = null;
+                results = qe.execSelect();
+                if( results.hasNext()){
+                    List<String> vars = results.getResultVars();
+                    if( vars == null )
+                        throw new Error("sparql had no result variables");
+                    for(String var: vars){
+                    	QuerySolution qs = results.nextSolution();
+                    	value = qs.getLiteral(var);
+                    	values.add(value);
+                    }
+                }else{
+                	log.debug("Query had no results");
+                    return null;
+                }
+            } else {
+                throw new Error("only SELECT type SPARQL queries are supported");
+            }
+        }catch(Exception ex){
+            throw new Error("could not parse SPARQL in queryToLiteral: \n" + querystr + '\n' + ex.getMessage());
+        }finally{
+            if( qe != null)
+                qe.close();
+        }
+
+        if( log.isDebugEnabled() ) log.debug("queryToLiteral() query: '"+ querystr +"'\nvalue: '" + values.toString() +"'");
+        return values;
+    }
+
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/FieldVTwo.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/FieldVTwo.java
index fd538d53d..d12551420 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/FieldVTwo.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/FieldVTwo.java
@@ -1,163 +1,163 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.BaseEditElementVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditElementVTwo;
-public class FieldVTwo {
-
-//    public enum OptionsType {
-//        LITERALS, 
-//        HARDCODED_LITERALS,
-//        STRINGS_VIA_DATATYPE_PROPERTY, 
-//        INDIVIDUALS_VIA_OBJECT_PROPERTY, 
-//        INDIVIDUALS_VIA_VCLASS, 
-//        CHILD_VCLASSES, 
-//        CHILD_VCLASSES_WITH_PARENT,
-//        VCLASSGROUP,
-//        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>();  
-    
-    /** 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.
-     * example:
-     *  "this is the literal"^^<http://someuri.com/v1.2#type23>
-     *  or
-     *  "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]+)*
-     */
-    private String rangeLang;
-
-    /**
-     * 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); }
-
-    /* ****************** Getters and Setters ******************************* */
-
-    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;
-    }
-    public FieldVTwo setValidators(List <String> v) {
-        validators = v;
-        return this;
-    }
-
-    public FieldVTwo setOptions( FieldOptions fopts){
-        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;
-    }
-
-    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;
-    }
-
-    public EditElementVTwo getEditElement(){
-        return editElement;
-    }
-        
-    public FieldVTwo setName(String 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 
-    public boolean isEqualTo(FieldVTwo inputField) {
-    	//Name required
-    	boolean nameEqual = this.name.equals(inputField.getName());
-    	//Validators initialized so can check
-    	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.equals(inputField.getRangeDatatypeUri())));
-    	boolean rangeLangEqual = ((this.rangeLang == null && inputField.getRangeLang() == null) ||
-				(this.rangeLang != null && inputField.getRangeLang() != null 
-				&& this.rangeLang.equals(inputField.getRangeLang())));
-    	
-    	return (nameEqual &&
-    			validatorsEqual &&
-    			rangeDatatypeEqual &&
-    			rangeLangEqual);
-    	
-    }
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang.builder.ToStringBuilder;
+import org.apache.commons.lang.builder.ToStringStyle;
+
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.BaseEditElementVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditElementVTwo;
+public class FieldVTwo {
+
+//    public enum OptionsType {
+//        LITERALS, 
+//        HARDCODED_LITERALS,
+//        STRINGS_VIA_DATATYPE_PROPERTY, 
+//        INDIVIDUALS_VIA_OBJECT_PROPERTY, 
+//        INDIVIDUALS_VIA_VCLASS, 
+//        CHILD_VCLASSES, 
+//        CHILD_VCLASSES_WITH_PARENT,
+//        VCLASSGROUP,
+//        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>();  
+    
+    /** 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.
+     * example:
+     *  "this is the literal"^^<http://someuri.com/v1.2#type23>
+     *  or
+     *  "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]+)*
+     */
+    private String rangeLang;
+
+    /**
+     * 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); }
+
+    /* ****************** Getters and Setters ******************************* */
+
+    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;
+    }
+    public FieldVTwo setValidators(List <String> v) {
+        validators = v;
+        return this;
+    }
+
+    public FieldVTwo setOptions( FieldOptions fopts){
+        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;
+    }
+
+    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;
+    }
+
+    public EditElementVTwo getEditElement(){
+        return editElement;
+    }
+        
+    public FieldVTwo setName(String 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 
+    public boolean isEqualTo(FieldVTwo inputField) {
+    	//Name required
+    	boolean nameEqual = this.name.equals(inputField.getName());
+    	//Validators initialized so can check
+    	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.equals(inputField.getRangeDatatypeUri())));
+    	boolean rangeLangEqual = ((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/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropertyByRankOptions.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropertyByRankOptions.java
index e3d0a123d..97ecc2e71 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropertyByRankOptions.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/IndividualsViaObjectPropertyByRankOptions.java
@@ -1,125 +1,125 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields;
-
-import java.text.Collator;
-import java.util.Comparator;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.QuerySolutionMap;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.jena.shared.Lock;
-
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-
-public class IndividualsViaObjectPropertyByRankOptions extends IndividualsViaObjectPropetyOptions {
-    final static Log log = LogFactory.getLog(IndividualsViaObjectPropertyByRankOptions.class);
-
-    private WebappDaoFactory wdf = null;
-    private Model queryModel = null;
-    public IndividualsViaObjectPropertyByRankOptions(String subjectUri,
-            String predicateUri, String objectUri, WebappDaoFactory wdf, Model model)  throws Exception {
-       super(subjectUri, predicateUri, objectUri);
-       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;
-
-    	public DisplayRankComparator(WebappDaoFactory wdf, Model model) {
-    		this.wdf = wdf;
-    		this.queryModel = model;
-    	}
-        public int compare (String[] s1, String[] s2) {
-            if (s2 == null) {
-                return 1;
-            } else if (s1 == null) {
-                return -1;
-            } else {
-            	if ("".equals(s1[0])) {
-            		return -1;
-            	} else if ("".equals(s2[0])) {
-            		return 1;
-            	}
-                if (s2[1]==null) {
-                    return 1;
-                } else if (s1[1] == null){
-                    return -1;
-                } else {
-                    return compareRanks(s1, s2); 
-                }
-            }
-        }
-        
-        private  int compareRanks(String[] s1, String[] s2) {
-        	String uri1 = s1[0];
-        	String uri2 = s2[0];
-        	Individual ind1 = this.wdf.getIndividualDao().getIndividualByURI(uri1);
-        	Individual ind2 = this.wdf.getIndividualDao().getIndividualByURI(uri2);
-        	int displayRank1 = getDisplayRank(ind1);
-        	int displayRank2 = getDisplayRank(ind2);
-        	//Get display ranks 
-        	return (displayRank1 > displayRank2 ? 1: (displayRank1 == displayRank2? 0: -1));
-        	//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);
-        	String query = getRankQuery();
-        	//Set up bindings: individualURI in query should be individual
-        	QuerySolutionMap initBindings = new QuerySolutionMap();
-            initBindings.add("individualURI", ResourceFactory.createResource(ind.getURI()));
-        	//Create query
-            Query rankQuery = QueryFactory.create(query);
-            this.queryModel.enterCriticalSection(Lock.READ);
-            try {
-            	QueryExecution qe = QueryExecutionFactory.create(rankQuery, this.queryModel, initBindings);
-                ResultSet res = qe.execSelect();
-                try {
-                	while(res.hasNext()) {
-                		QuerySolution qs = res.nextSolution();
-                		//Check for rank
-                		if(qs.get("rank") != null && qs.get("rank").isLiteral()) {
-                			Literal rankLiteral = qs.getLiteral("rank");
-                			rankResult = new Integer(rankLiteral.getInt());
-                		} else {
-                			log.debug("Rank was not returned in query or was not literal");
-                		}
-                		
-                	}
-                }finally{ qe.close(); }
-
-            } catch(Exception ex) {
-            	log.error("Error occurred in executing query " + query, ex);
-            } finally {
-            	this.queryModel.leaveCriticalSection();
-            }
-        	
-        	return rankResult;
-        }
-        
-        private String getRankQuery() {
-        	return "PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> " + 
-        			"SELECT ?rank WHERE {?individualURI vitro:displayRankAnnot ?rank .} ";
-        }
-    }    
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields;
+
+import java.text.Collator;
+import java.util.Comparator;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.QuerySolutionMap;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+import com.hp.hpl.jena.shared.Lock;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+
+public class IndividualsViaObjectPropertyByRankOptions extends IndividualsViaObjectPropetyOptions {
+    final static Log log = LogFactory.getLog(IndividualsViaObjectPropertyByRankOptions.class);
+
+    private WebappDaoFactory wdf = null;
+    private Model queryModel = null;
+    public IndividualsViaObjectPropertyByRankOptions(String subjectUri,
+            String predicateUri, String objectUri, WebappDaoFactory wdf, Model model)  throws Exception {
+       super(subjectUri, predicateUri, objectUri);
+       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;
+
+    	public DisplayRankComparator(WebappDaoFactory wdf, Model model) {
+    		this.wdf = wdf;
+    		this.queryModel = model;
+    	}
+        public int compare (String[] s1, String[] s2) {
+            if (s2 == null) {
+                return 1;
+            } else if (s1 == null) {
+                return -1;
+            } else {
+            	if ("".equals(s1[0])) {
+            		return -1;
+            	} else if ("".equals(s2[0])) {
+            		return 1;
+            	}
+                if (s2[1]==null) {
+                    return 1;
+                } else if (s1[1] == null){
+                    return -1;
+                } else {
+                    return compareRanks(s1, s2); 
+                }
+            }
+        }
+        
+        private  int compareRanks(String[] s1, String[] s2) {
+        	String uri1 = s1[0];
+        	String uri2 = s2[0];
+        	Individual ind1 = this.wdf.getIndividualDao().getIndividualByURI(uri1);
+        	Individual ind2 = this.wdf.getIndividualDao().getIndividualByURI(uri2);
+        	int displayRank1 = getDisplayRank(ind1);
+        	int displayRank2 = getDisplayRank(ind2);
+        	//Get display ranks 
+        	return (displayRank1 > displayRank2 ? 1: (displayRank1 == displayRank2? 0: -1));
+        	//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);
+        	String query = getRankQuery();
+        	//Set up bindings: individualURI in query should be individual
+        	QuerySolutionMap initBindings = new QuerySolutionMap();
+            initBindings.add("individualURI", ResourceFactory.createResource(ind.getURI()));
+        	//Create query
+            Query rankQuery = QueryFactory.create(query);
+            this.queryModel.enterCriticalSection(Lock.READ);
+            try {
+            	QueryExecution qe = QueryExecutionFactory.create(rankQuery, this.queryModel, initBindings);
+                ResultSet res = qe.execSelect();
+                try {
+                	while(res.hasNext()) {
+                		QuerySolution qs = res.nextSolution();
+                		//Check for rank
+                		if(qs.get("rank") != null && qs.get("rank").isLiteral()) {
+                			Literal rankLiteral = qs.getLiteral("rank");
+                			rankResult = new Integer(rankLiteral.getInt());
+                		} else {
+                			log.debug("Rank was not returned in query or was not literal");
+                		}
+                		
+                	}
+                }finally{ qe.close(); }
+
+            } catch(Exception ex) {
+            	log.error("Error occurred in executing query " + query, ex);
+            } finally {
+            	this.queryModel.leaveCriticalSection();
+            }
+        	
+        	return rankResult;
+        }
+        
+        private String getRankQuery() {
+        	return "PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> " + 
+        			"SELECT ?rank WHERE {?individualURI vitro:displayRankAnnot ?rank .} ";
+        }
+    }    
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java
index 98b5ad46b..4308c76d0 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/fields/SelectListGeneratorVTwo.java
@@ -1,109 +1,109 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields;
-
-import java.text.Collator;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-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, 
-            WebappDaoFactory wDaoFact){
-
-        
-        if( editConfig == null ){
-            log.error( "fieldToSelectItemList() must be called with a non-null EditConfigurationVTwo ");
-            return Collections.emptyMap();
-        }
-        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) {
-            log.error("Error runing getFieldOptionis()",e);
-            return Collections.emptyMap();
-        }
-    }
-   
-      
-    //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, Comparator<String[]> comparator){
-        // 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());
-        for (String key:hmap.keySet()) {
-            String[] x = new String[2];
-            x[0] = key;
-            x[1] = hmap.get(key);
-            objectsToSort.add(x);
-        }
-        
-        //if no comparator is passed in, utilize MapPairsComparator
-        if(comparator == null) {
-        	comparator = new MapPairsComparator();
-        }
-        
-        Collections.sort(objectsToSort, comparator);
-
-        HashMap<String,String> map = new LinkedHashMap<String,String>(objectsToSort.size());
-        for (String[] pair:objectsToSort) {
-            map.put(pair[0],pair[1]);
-        }
-        return map;
-    }
-
-    //Sorts by the value of the 2nd element in each of the arrays 
-    private static class MapPairsComparator implements Comparator<String[]> {
-        public int compare (String[] s1, String[] s2) {
-            Collator collator = Collator.getInstance();
-            if (s2 == null) {
-                return 1;
-            } else if (s1 == null) {
-                return -1;
-            } else {
-            	if ("".equals(s1[0])) {
-            		return -1;
-            	} else if ("".equals(s2[0])) {
-            		return 1;
-            	}
-                if (s2[1]==null) {
-                    return 1;
-                } else if (s1[1] == null){
-                    return -1;
-                } else {
-                    return collator.compare(s1[1],s2[1]);
-                }
-            }
-        }
-    }    
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields;
+
+import java.text.Collator;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+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, 
+            WebappDaoFactory wDaoFact){
+
+        
+        if( editConfig == null ){
+            log.error( "fieldToSelectItemList() must be called with a non-null EditConfigurationVTwo ");
+            return Collections.emptyMap();
+        }
+        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) {
+            log.error("Error runing getFieldOptionis()",e);
+            return Collections.emptyMap();
+        }
+    }
+   
+      
+    //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, Comparator<String[]> comparator){
+        // 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());
+        for (String key:hmap.keySet()) {
+            String[] x = new String[2];
+            x[0] = key;
+            x[1] = hmap.get(key);
+            objectsToSort.add(x);
+        }
+        
+        //if no comparator is passed in, utilize MapPairsComparator
+        if(comparator == null) {
+        	comparator = new MapPairsComparator();
+        }
+        
+        Collections.sort(objectsToSort, comparator);
+
+        HashMap<String,String> map = new LinkedHashMap<String,String>(objectsToSort.size());
+        for (String[] pair:objectsToSort) {
+            map.put(pair[0],pair[1]);
+        }
+        return map;
+    }
+
+    //Sorts by the value of the 2nd element in each of the arrays 
+    private static class MapPairsComparator implements Comparator<String[]> {
+        public int compare (String[] s1, String[] s2) {
+            Collator collator = Collator.getInstance();
+            if (s2 == null) {
+                return 1;
+            } else if (s1 == null) {
+                return -1;
+            } else {
+            	if ("".equals(s1[0])) {
+            		return -1;
+            	} else if ("".equals(s2[0])) {
+            		return 1;
+            	}
+                if (s2[1]==null) {
+                    return 1;
+                } else if (s1[1] == null){
+                    return -1;
+                } else {
+                    return collator.compare(s1[1],s2[1]);
+                }
+            }
+        }
+    }    
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/EditConfigurationConstants.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/EditConfigurationConstants.java
index 7990bd220..8257e8086 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/EditConfigurationConstants.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/EditConfigurationConstants.java
@@ -1,38 +1,38 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration;
-
-import java.lang.reflect.Modifier;
-import java.util.HashMap;
-import java.util.Map;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.ProcessRdfForm;
-
-
-public class EditConfigurationConstants {
-    /** Constants used by edit configuration */
-	//forces creation of new uri if present
-    public static final String NEW_URI_SENTINEL = ">NEW URI REQUIRED<";
-    public static final String BLANK_SENTINEL = ">SUBMITTED VALUE WAS BLANK<";
-
-    //For freemarker configuration
-    public static Map<String, String> exportConstants() {
-    	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()) && 
-    			Modifier.isPublic(f.getModifiers())) {
-    			try {
-    				constants.put(f.getName(), f.get(null).toString());
-    			} catch(Exception ex) {
-    				log.error("An exception occurred in trying to retrieve this field ", ex);
-    			}
-    		}
-    	}
-    	return constants;
-    }
-    private static Log log = LogFactory.getLog(EditConfigurationConstants.class);
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration;
+
+import java.lang.reflect.Modifier;
+import java.util.HashMap;
+import java.util.Map;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.ProcessRdfForm;
+
+
+public class EditConfigurationConstants {
+    /** Constants used by edit configuration */
+	//forces creation of new uri if present
+    public static final String NEW_URI_SENTINEL = ">NEW URI REQUIRED<";
+    public static final String BLANK_SENTINEL = ">SUBMITTED VALUE WAS BLANK<";
+
+    //For freemarker configuration
+    public static Map<String, String> exportConstants() {
+    	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()) && 
+    			Modifier.isPublic(f.getModifiers())) {
+    			try {
+    				constants.put(f.getName(), f.get(null).toString());
+    			} catch(Exception ex) {
+    				log.error("An exception occurred in trying to retrieve this field ", ex);
+    			}
+    		}
+    	}
+    	return constants;
+    }
+    private static Log log = LogFactory.getLog(EditConfigurationConstants.class);
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteObjectPropertyFormGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteObjectPropertyFormGenerator.java
index 1db0e99de..e59c91078 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteObjectPropertyFormGenerator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AutocompleteObjectPropertyFormGenerator.java
@@ -1,28 +1,28 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
-
-import javax.servlet.http.HttpSession;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-
-
-/**
- * Auto complete object property form generator folded into DefualtObjectPropertyFormGenerator.java
- *
- */
-public class AutocompleteObjectPropertyFormGenerator extends DefaultObjectPropertyFormGenerator {
-
-	@Override
-	public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
-			HttpSession session) throws Exception {
-		//force auto complete 
-		doAutoComplete = true;
-		
-		return super.getEditConfiguration(vreq, session);
-	}
-
-
-	
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
+
+import javax.servlet.http.HttpSession;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+
+
+/**
+ * Auto complete object property form generator folded into DefualtObjectPropertyFormGenerator.java
+ *
+ */
+public class AutocompleteObjectPropertyFormGenerator extends DefaultObjectPropertyFormGenerator {
+
+	@Override
+	public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
+			HttpSession session) throws Exception {
+		//force auto complete 
+		doAutoComplete = true;
+		
+		return super.getEditConfiguration(vreq, session);
+	}
+
+
+	
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java
index 6b24a1825..2f53d3619 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultAddMissingIndividualFormGenerator.java
@@ -1,460 +1,460 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.DefaultAddMissingIndividualFormModelPreprocessor;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
-
-/**
- * Generates the edit configuration for a default property form.
- *
- */
-public class DefaultAddMissingIndividualFormGenerator implements EditConfigurationGenerator {
-	
-	private Log log = LogFactory.getLog(DefaultAddMissingIndividualFormGenerator.class);
-	private boolean isObjectPropForm = false;
-	private String subjectUri = null;
-	private String predicateUri = null;
-	private String objectUri = null;
-
-	private String template = "defaultAddMissingIndividualForm.ftl";
-	private static String createCommand = "create";
-	private static String objectVarName = "newIndividual";
-	private static HashMap<String,String> defaultsForXSDtypes ;
-	  static {
-		defaultsForXSDtypes = new HashMap<String,String>();
-		//defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","2001-01-01T12:00:00");
-		defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","#Unparseable datetime defaults to now");
-	  }
-	  
-	//Method which checks whether this particular generator should be employed  
-	public static boolean isCreateNewIndividual(VitroRequest vreq, HttpSession session) {
-		String command = vreq.getParameter("cmd");
-		String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-		ObjectProperty objProp = vreq.getWebappDaoFactory().getObjectPropertyDao().getObjectPropertyByURI(predicateUri);
-		if(objProp != null) {
-			return(objProp.getOfferCreateNewOption() && 
-					(
-							(command != null && command.equals(createCommand)) || 
-							objProp.getSelectFromExisting() == false
-					)
-				);
-		}
-		return false;
-	}
-    @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));
-    	
-    	//add preprocesoors
-    	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;
-    }
-    
-    private Map<String, String> generateNewResources(VitroRequest vreq) {
-		HashMap<String, String> newResources = new HashMap<String, String>();
-		//Null triggers default namespace
-		newResources.put(objectVarName, null);
-		return newResources;
-	}
-	//Need to replace edit key
-    //TODO:Check if we need to recheck forward to create new or assume that is the case since
-    //we're using this generator
-    //In this case we always set a new edit key as the original jsp checked 'isForwardToCreateNew'
-    //which condition would require that an entirely new edit key be created
-    private void setEditKey(HttpSession session, EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-    	String editKey = EditConfigurationVTwo.newEditKey(session);
-    	editConfiguration.setEditKey(editKey);
-    }
-    
-	private void setTemplate(EditConfigurationVTwo editConfiguration,
-			VitroRequest vreq) {
-    	editConfiguration.setTemplate(template);
-		
-	}
-
-	//Initialize setup: process parameters
-	//Doesn't look like we need to set up separate processing for data property form
-    private void initProcessParameters(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
-    	String formUrl = EditConfigurationUtils.getFormUrlWithoutContext(vreq);
-
-    	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"],
-    	if(EditConfigurationUtils.isObjectProperty(predicateUri, vreq)) {
-    		//not concerned about remainder, can move into default obj prop form if required
-    		this.isObjectPropForm = true;
-    		this.initObjectParameters(vreq);
-    		this.processObjectPropForm(vreq, editConfiguration);
-    	} else {
-    		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);
-		if(thisObjectUri != null && !thisObjectUri.isEmpty()) {
-			objectUri = EditConfigurationUtils.getObjectUri(vreq);
-		}
-		//otherwise object uri will stay null - since don't want to set it to empty string
-	}
-
-	//this particular form uses a different var name for object "newIndividual"
-	private void processObjectPropForm(VitroRequest vreq, EditConfigurationVTwo editConfiguration) {
-    	editConfiguration.setVarNameForObject(objectVarName);    	
-    	//If is replace with new, set Object resource to null
-    	if(isReplaceWithNew(vreq)) {
-    		editConfiguration.setObject(null);
-    	} else {
-    		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    
-    private List<String> generateN3Required(VitroRequest vreq) {
-    	List<String> n3ForEdit = new ArrayList<String>();
-    	n3ForEdit.add(getN3PrefixesAsString() + "\n" + getN3ForName());
-    	n3ForEdit.add("?subject ?predicate ?" + objectVarName + " .");
-    	n3ForEdit.add(getN3PrefixesAsString() + "\n" + "?" + objectVarName + " rdf:type <" + getRangeClassUri(vreq) + "> . ");
-    	return n3ForEdit;
-    }
-    
-    private 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;
-    }
-    
-    private String getN3PrefixesAsString() {
-    	String prefixes = StringUtils.join(getN3Prefixes(), "\n");
-    	return prefixes;
-    }
-    
-    private String getN3ForName() {
-    	return "?" + objectVarName + " rdfs:label ?name .";
-    }
-    
-    private List<String> generateN3Optional(VitroRequest vreq) {
-    	//flag uri and asserted types need to be added here
-    	List<String> n3Optional = new ArrayList<String>();
-    	n3Optional.add("?" + objectVarName + " ?inverseProp ?subject .");
-    	//asserted types string buffer is empty in the original jsp
-    	//TODO: Review original comments in jsp to see what could go here
-    	//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(); 
-    	return flagURI;
-	}
-	private String getN3AssertedTypes(VitroRequest vreq) {
-		return null;
-	}
-	//Set queries
-    private String retrieveQueryForInverse () {
-    	String queryForInverse =  "PREFIX owl:  <http://www.w3.org/2002/07/owl#>"
-			+ " SELECT ?inverse_property "
-			+ "    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(), 
-    			Arrays.asList(new String[]{editConfiguration.getSubjectUri()}));
-    	urisInScope.put(editConfiguration.getVarNameForPredicate(), 
-    			Arrays.asList(new String[]{editConfiguration.getPredicateUri()}));
-    	editConfiguration.setUrisInScope(urisInScope);    	
-    	editConfiguration.setLiteralsInScope(new HashMap<String, List<Literal>>());
-    }
-    
-    //n3 should look as follows
-    //?subject ?predicate ?objectVar 
-    
-    private void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-    	List<String> urisOnForm = new ArrayList<String>();
-    	List<String> literalsOnForm = new ArrayList<String>();
-    	literalsOnForm.add("name");
-    	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#> ";
-    	query += "SELECT ?existingName WHERE { ?" + objectVarName + " rdfs:label ?existingName . }";
-    	map.put("name", query);
-    	return map;
-    }
-
-    
-    private 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");      	        
-	        
-	        List<String> validators = new ArrayList<String>();
-	        validators.add("nonempty");
-	        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.
-	        // Typically an allValuesFrom restriction will come into play later.
-	        VClass top = wdf.getVClassDao().getTopConcept();
-	        prop.setRangeVClassURI(top.getURI());
-	    }
-
-	    VClass rangeClass = null;
-	    String typeOfNew = getTypeOfNew(vreq);
-	    if(typeOfNew != null )
-	    	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() );    
-	    }
-		return rangeClass.getURI();
-	}
-
-	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
-    	//Here, retrieve model from 
-		OntModel model = ModelAccess.on(session.getServletContext()).getJenaOntModel();
-    	//if object property
-    	if(EditConfigurationUtils.isObjectProperty(EditConfigurationUtils.getPredicateUri(vreq), vreq)){
-	    	Individual objectIndividual = EditConfigurationUtils.getObjectIndividual(vreq);
-	    	if(!isReplaceWithNew(vreq) && 
-	    			(isForwardToCreateButEdit(vreq) || 
-	    			objectIndividual != null)
-	    		) {
-	    		editConfiguration.prepareForObjPropUpdate(model);
-	    	}  else {
-	    		//new object to be created
-	            editConfiguration.prepareForNonUpdate( model );
-	        }
-    	} 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);
-			//String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-			//String objectUri = EditConfigurationUtils.getObjectUri(vreq);
-			editConfiguration.addModelChangePreprocessor(
-					new DefaultAddMissingIndividualFormModelPreprocessor(
-							subjectUri, predicateUri, objectUri));
-			
-		}
-	}
-	
-    //Command processing
-    private boolean isTypeOfNew(VitroRequest vreq) {
-    	String typeOfNew = getTypeOfNew(vreq);
-    	return (typeOfNew != null && !typeOfNew.isEmpty());
-    }
-    
-    private String getTypeOfNew(VitroRequest vreq) {
-    	return  vreq.getParameter("typeOfNew");
-    }
-    // The default object proepty form offers the option to create a new item
-    // instead of selecting from existing individuals in the system.
-    // This is where the request to create a new indivdiual is handled.
-    //We don't really need this again b/c we wouldn't be using this generator unless we want
-    //to create a new individual so commenting out for now
-    /*
-    private boolean isForwardToCreateNew(VitroRequest vreq) {
-    	String command = vreq.getParameter("cmd");
-    	ObjectProperty objectProp = EditConfigurationUtils.getObjectProperty(vreq);
-    	if(hasCustomForm(objectProp)) {
-    		return false;
-    	}
-    	
-       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 && 
-    			!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)) 
-    	       && (objectProp != null)
-    	       && (objectProp.getOfferCreateNewOption() == true);                
-    }
-    
-    private boolean isForwardToCreateButEdit(VitroRequest vreq) {
-    	boolean isEditOfExistingStmt = isEditOfExistingStatement(vreq);
-    	ObjectProperty objectProp = EditConfigurationUtils.getObjectProperty(vreq);
-    	String command = vreq.getParameter("cmd");
-    	return (isEditOfExistingStmt 
-    			&& (! "create".equals(command))
-    			&& (objectProp != null) 
-    	       && (objectProp.getOfferCreateNewOption() == true) 
-    	       && (objectProp.getSelectFromExisting() == false)
-    	     );
-    }
-    
-    //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
-    	if(EditConfigurationUtils.isDataProperty(EditConfigurationUtils.getPredicateUri(vreq), vreq)) {
-    		return false;
-    	}
-    	Individual object = EditConfigurationUtils.getObjectIndividual(vreq);
-    	return (object != null);
-
-    }
-
-    
-
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.DefaultAddMissingIndividualFormModelPreprocessor;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
+
+/**
+ * Generates the edit configuration for a default property form.
+ *
+ */
+public class DefaultAddMissingIndividualFormGenerator implements EditConfigurationGenerator {
+	
+	private Log log = LogFactory.getLog(DefaultAddMissingIndividualFormGenerator.class);
+	private boolean isObjectPropForm = false;
+	private String subjectUri = null;
+	private String predicateUri = null;
+	private String objectUri = null;
+
+	private String template = "defaultAddMissingIndividualForm.ftl";
+	private static String createCommand = "create";
+	private static String objectVarName = "newIndividual";
+	private static HashMap<String,String> defaultsForXSDtypes ;
+	  static {
+		defaultsForXSDtypes = new HashMap<String,String>();
+		//defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","2001-01-01T12:00:00");
+		defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","#Unparseable datetime defaults to now");
+	  }
+	  
+	//Method which checks whether this particular generator should be employed  
+	public static boolean isCreateNewIndividual(VitroRequest vreq, HttpSession session) {
+		String command = vreq.getParameter("cmd");
+		String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
+		ObjectProperty objProp = vreq.getWebappDaoFactory().getObjectPropertyDao().getObjectPropertyByURI(predicateUri);
+		if(objProp != null) {
+			return(objProp.getOfferCreateNewOption() && 
+					(
+							(command != null && command.equals(createCommand)) || 
+							objProp.getSelectFromExisting() == false
+					)
+				);
+		}
+		return false;
+	}
+    @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));
+    	
+    	//add preprocesoors
+    	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;
+    }
+    
+    private Map<String, String> generateNewResources(VitroRequest vreq) {
+		HashMap<String, String> newResources = new HashMap<String, String>();
+		//Null triggers default namespace
+		newResources.put(objectVarName, null);
+		return newResources;
+	}
+	//Need to replace edit key
+    //TODO:Check if we need to recheck forward to create new or assume that is the case since
+    //we're using this generator
+    //In this case we always set a new edit key as the original jsp checked 'isForwardToCreateNew'
+    //which condition would require that an entirely new edit key be created
+    private void setEditKey(HttpSession session, EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
+    	String editKey = EditConfigurationVTwo.newEditKey(session);
+    	editConfiguration.setEditKey(editKey);
+    }
+    
+	private void setTemplate(EditConfigurationVTwo editConfiguration,
+			VitroRequest vreq) {
+    	editConfiguration.setTemplate(template);
+		
+	}
+
+	//Initialize setup: process parameters
+	//Doesn't look like we need to set up separate processing for data property form
+    private void initProcessParameters(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
+    	String formUrl = EditConfigurationUtils.getFormUrlWithoutContext(vreq);
+
+    	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"],
+    	if(EditConfigurationUtils.isObjectProperty(predicateUri, vreq)) {
+    		//not concerned about remainder, can move into default obj prop form if required
+    		this.isObjectPropForm = true;
+    		this.initObjectParameters(vreq);
+    		this.processObjectPropForm(vreq, editConfiguration);
+    	} else {
+    		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);
+		if(thisObjectUri != null && !thisObjectUri.isEmpty()) {
+			objectUri = EditConfigurationUtils.getObjectUri(vreq);
+		}
+		//otherwise object uri will stay null - since don't want to set it to empty string
+	}
+
+	//this particular form uses a different var name for object "newIndividual"
+	private void processObjectPropForm(VitroRequest vreq, EditConfigurationVTwo editConfiguration) {
+    	editConfiguration.setVarNameForObject(objectVarName);    	
+    	//If is replace with new, set Object resource to null
+    	if(isReplaceWithNew(vreq)) {
+    		editConfiguration.setObject(null);
+    	} else {
+    		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    
+    private List<String> generateN3Required(VitroRequest vreq) {
+    	List<String> n3ForEdit = new ArrayList<String>();
+    	n3ForEdit.add(getN3PrefixesAsString() + "\n" + getN3ForName());
+    	n3ForEdit.add("?subject ?predicate ?" + objectVarName + " .");
+    	n3ForEdit.add(getN3PrefixesAsString() + "\n" + "?" + objectVarName + " rdf:type <" + getRangeClassUri(vreq) + "> . ");
+    	return n3ForEdit;
+    }
+    
+    private 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;
+    }
+    
+    private String getN3PrefixesAsString() {
+    	String prefixes = StringUtils.join(getN3Prefixes(), "\n");
+    	return prefixes;
+    }
+    
+    private String getN3ForName() {
+    	return "?" + objectVarName + " rdfs:label ?name .";
+    }
+    
+    private List<String> generateN3Optional(VitroRequest vreq) {
+    	//flag uri and asserted types need to be added here
+    	List<String> n3Optional = new ArrayList<String>();
+    	n3Optional.add("?" + objectVarName + " ?inverseProp ?subject .");
+    	//asserted types string buffer is empty in the original jsp
+    	//TODO: Review original comments in jsp to see what could go here
+    	//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(); 
+    	return flagURI;
+	}
+	private String getN3AssertedTypes(VitroRequest vreq) {
+		return null;
+	}
+	//Set queries
+    private String retrieveQueryForInverse () {
+    	String queryForInverse =  "PREFIX owl:  <http://www.w3.org/2002/07/owl#>"
+			+ " SELECT ?inverse_property "
+			+ "    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(), 
+    			Arrays.asList(new String[]{editConfiguration.getSubjectUri()}));
+    	urisInScope.put(editConfiguration.getVarNameForPredicate(), 
+    			Arrays.asList(new String[]{editConfiguration.getPredicateUri()}));
+    	editConfiguration.setUrisInScope(urisInScope);    	
+    	editConfiguration.setLiteralsInScope(new HashMap<String, List<Literal>>());
+    }
+    
+    //n3 should look as follows
+    //?subject ?predicate ?objectVar 
+    
+    private void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
+    	List<String> urisOnForm = new ArrayList<String>();
+    	List<String> literalsOnForm = new ArrayList<String>();
+    	literalsOnForm.add("name");
+    	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#> ";
+    	query += "SELECT ?existingName WHERE { ?" + objectVarName + " rdfs:label ?existingName . }";
+    	map.put("name", query);
+    	return map;
+    }
+
+    
+    private 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");      	        
+	        
+	        List<String> validators = new ArrayList<String>();
+	        validators.add("nonempty");
+	        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.
+	        // Typically an allValuesFrom restriction will come into play later.
+	        VClass top = wdf.getVClassDao().getTopConcept();
+	        prop.setRangeVClassURI(top.getURI());
+	    }
+
+	    VClass rangeClass = null;
+	    String typeOfNew = getTypeOfNew(vreq);
+	    if(typeOfNew != null )
+	    	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() );    
+	    }
+		return rangeClass.getURI();
+	}
+
+	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
+    	//Here, retrieve model from 
+		OntModel model = ModelAccess.on(session.getServletContext()).getJenaOntModel();
+    	//if object property
+    	if(EditConfigurationUtils.isObjectProperty(EditConfigurationUtils.getPredicateUri(vreq), vreq)){
+	    	Individual objectIndividual = EditConfigurationUtils.getObjectIndividual(vreq);
+	    	if(!isReplaceWithNew(vreq) && 
+	    			(isForwardToCreateButEdit(vreq) || 
+	    			objectIndividual != null)
+	    		) {
+	    		editConfiguration.prepareForObjPropUpdate(model);
+	    	}  else {
+	    		//new object to be created
+	            editConfiguration.prepareForNonUpdate( model );
+	        }
+    	} 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);
+			//String predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
+			//String objectUri = EditConfigurationUtils.getObjectUri(vreq);
+			editConfiguration.addModelChangePreprocessor(
+					new DefaultAddMissingIndividualFormModelPreprocessor(
+							subjectUri, predicateUri, objectUri));
+			
+		}
+	}
+	
+    //Command processing
+    private boolean isTypeOfNew(VitroRequest vreq) {
+    	String typeOfNew = getTypeOfNew(vreq);
+    	return (typeOfNew != null && !typeOfNew.isEmpty());
+    }
+    
+    private String getTypeOfNew(VitroRequest vreq) {
+    	return  vreq.getParameter("typeOfNew");
+    }
+    // The default object proepty form offers the option to create a new item
+    // instead of selecting from existing individuals in the system.
+    // This is where the request to create a new indivdiual is handled.
+    //We don't really need this again b/c we wouldn't be using this generator unless we want
+    //to create a new individual so commenting out for now
+    /*
+    private boolean isForwardToCreateNew(VitroRequest vreq) {
+    	String command = vreq.getParameter("cmd");
+    	ObjectProperty objectProp = EditConfigurationUtils.getObjectProperty(vreq);
+    	if(hasCustomForm(objectProp)) {
+    		return false;
+    	}
+    	
+       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 && 
+    			!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)) 
+    	       && (objectProp != null)
+    	       && (objectProp.getOfferCreateNewOption() == true);                
+    }
+    
+    private boolean isForwardToCreateButEdit(VitroRequest vreq) {
+    	boolean isEditOfExistingStmt = isEditOfExistingStatement(vreq);
+    	ObjectProperty objectProp = EditConfigurationUtils.getObjectProperty(vreq);
+    	String command = vreq.getParameter("cmd");
+    	return (isEditOfExistingStmt 
+    			&& (! "create".equals(command))
+    			&& (objectProp != null) 
+    	       && (objectProp.getOfferCreateNewOption() == true) 
+    	       && (objectProp.getSelectFromExisting() == false)
+    	     );
+    }
+    
+    //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
+    	if(EditConfigurationUtils.isDataProperty(EditConfigurationUtils.getPredicateUri(vreq), vreq)) {
+    		return false;
+    	}
+    	Individual object = EditConfigurationUtils.getObjectIndividual(vreq);
+    	return (object != null);
+
+    }
+
+    
+
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java
index e93754aa5..bcf6b547f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/DefaultDeleteGenerator.java
@@ -1,119 +1,119 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
-
-import java.util.HashMap;
-
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-
-/**
- * Generates 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. 
- *
- */
-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 Integer dataHash = 0;
-	private DataPropertyStatement dps = null;
-	private String dataLiteral = null;
-	private String template = "confirmDeletePropertyForm.ftl";
-	private static HashMap<String,String> defaultsForXSDtypes ;
-	  static {
-		defaultsForXSDtypes = new HashMap<String,String>();
-		//defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","2001-01-01T12:00:00");
-		defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","#Unparseable datetime defaults to now");
-	  }
-	  
-	//In this case, simply return the edit configuration currently saved in session
-	//Since this is forwarding from another form, an edit configuration should already exist in session
-    @Override
-    public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
-            HttpSession session) {
-    	EditConfigurationVTwo editConfiguration = EditConfigurationVTwo.getConfigFromSession(session, vreq);
-    	//Two paths for deletion: (i) from front page and (ii) from edit page of individual
-    	//If (ii), edit configuration already exists but if (i) no edit configuration exists or is required for deletion
-    	//so stub will be created that contains a minimal set of information
-    	//Set template to be confirm delete
-    	if(editConfiguration == null) {
-    		editConfiguration = setupEditConfiguration(vreq, session);
-    	}
-    	editConfiguration.setTemplate(template);
-    	//prepare update?
-    	prepare(vreq, editConfiguration);
-    	return editConfiguration;
-    }
-
-	private EditConfigurationVTwo  setupEditConfiguration(VitroRequest vreq, HttpSession session) {
-		EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();
-		initProcessParameters(vreq, session, editConfiguration);
-		//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);
-    	predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-    	editConfiguration.setSubjectUri(subjectUri);
-    	editConfiguration.setPredicateUri(predicateUri);
-    	editConfiguration.setEntityToReturnTo(subjectUri);
-    	editConfiguration.setUrlPatternToReturnTo("/individual");
-
-    	if(EditConfigurationUtils.isObjectProperty(predicateUri, vreq)) {
-    		//not concerned about remainder, can move into default obj prop form if required
-    		this.initObjectParameters(vreq);
-    		this.processObjectPropForm(vreq, editConfiguration);
-    	} else {    		
-    	   this.processDataPropForm(vreq, session, editConfiguration);
-    	}
-    }
-
-
-    
-	private void initObjectParameters(VitroRequest vreq) {
-		//in case of object property
-    	objectUri = EditConfigurationUtils.getObjectUri(vreq);
-	}
-
-	private void processObjectPropForm(VitroRequest vreq, EditConfigurationVTwo editConfiguration) {
-    	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
-    }
-    
-	
-    private void processDataPropForm(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
-        dataHash = EditConfigurationUtils.getDataHash(vreq);
-        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);
-            if( dps != null ){
-                editConfiguration.addFormSpecificData("dataPropertyLexicalValue", dps.getData());
-            }else{
-                editConfiguration.addFormSpecificData("dataPropertyLexicalValue", "unknown value");
-            }
-        }else{
-            log.debug("Did NOT find a datapropKey for hte data hash.");
-            editConfiguration.addFormSpecificData("dataPropertyLexicalValue", "unknown value");
-        }                
-    }
-    
-
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
+
+import java.util.HashMap;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+
+/**
+ * Generates 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. 
+ *
+ */
+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 Integer dataHash = 0;
+	private DataPropertyStatement dps = null;
+	private String dataLiteral = null;
+	private String template = "confirmDeletePropertyForm.ftl";
+	private static HashMap<String,String> defaultsForXSDtypes ;
+	  static {
+		defaultsForXSDtypes = new HashMap<String,String>();
+		//defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","2001-01-01T12:00:00");
+		defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","#Unparseable datetime defaults to now");
+	  }
+	  
+	//In this case, simply return the edit configuration currently saved in session
+	//Since this is forwarding from another form, an edit configuration should already exist in session
+    @Override
+    public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq,
+            HttpSession session) {
+    	EditConfigurationVTwo editConfiguration = EditConfigurationVTwo.getConfigFromSession(session, vreq);
+    	//Two paths for deletion: (i) from front page and (ii) from edit page of individual
+    	//If (ii), edit configuration already exists but if (i) no edit configuration exists or is required for deletion
+    	//so stub will be created that contains a minimal set of information
+    	//Set template to be confirm delete
+    	if(editConfiguration == null) {
+    		editConfiguration = setupEditConfiguration(vreq, session);
+    	}
+    	editConfiguration.setTemplate(template);
+    	//prepare update?
+    	prepare(vreq, editConfiguration);
+    	return editConfiguration;
+    }
+
+	private EditConfigurationVTwo  setupEditConfiguration(VitroRequest vreq, HttpSession session) {
+		EditConfigurationVTwo editConfiguration = new EditConfigurationVTwo();
+		initProcessParameters(vreq, session, editConfiguration);
+		//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);
+    	predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
+    	editConfiguration.setSubjectUri(subjectUri);
+    	editConfiguration.setPredicateUri(predicateUri);
+    	editConfiguration.setEntityToReturnTo(subjectUri);
+    	editConfiguration.setUrlPatternToReturnTo("/individual");
+
+    	if(EditConfigurationUtils.isObjectProperty(predicateUri, vreq)) {
+    		//not concerned about remainder, can move into default obj prop form if required
+    		this.initObjectParameters(vreq);
+    		this.processObjectPropForm(vreq, editConfiguration);
+    	} else {    		
+    	   this.processDataPropForm(vreq, session, editConfiguration);
+    	}
+    }
+
+
+    
+	private void initObjectParameters(VitroRequest vreq) {
+		//in case of object property
+    	objectUri = EditConfigurationUtils.getObjectUri(vreq);
+	}
+
+	private void processObjectPropForm(VitroRequest vreq, EditConfigurationVTwo editConfiguration) {
+    	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
+    }
+    
+	
+    private void processDataPropForm(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
+        dataHash = EditConfigurationUtils.getDataHash(vreq);
+        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);
+            if( dps != null ){
+                editConfiguration.addFormSpecificData("dataPropertyLexicalValue", dps.getData());
+            }else{
+                editConfiguration.addFormSpecificData("dataPropertyLexicalValue", "unknown value");
+            }
+        }else{
+            log.debug("Did NOT find a datapropKey for hte data hash.");
+            editConfiguration.addFormSpecificData("dataPropertyLexicalValue", "unknown value");
+        }                
+    }
+    
+
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/IndividualsByRankFormGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/IndividualsByRankFormGenerator.java
index 2e1b522a7..c6fa8c0a0 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/IndividualsByRankFormGenerator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/IndividualsByRankFormGenerator.java
@@ -1,90 +1,90 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
-
-import static edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary.*;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.solr.client.solrj.SolrQuery;
-import org.apache.solr.client.solrj.SolrServer;
-import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.common.SolrDocumentList;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaObjectPropertyByRankOptions;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaObjectPropetyOptions;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
-import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames;
-import edu.cornell.mannlib.vitro.webapp.search.beans.ProhibitedFromSearch;
-import edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup;
-import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils;
-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 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);	
-	
-	/*
-	 *   (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 {    	
-		FieldVTwo field = new FieldVTwo();
-    	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.getObjectUri(),
-    	        vreq.getWebappDaoFactory(), 
-    	        vreq.getJenaOntModel()));
-    	}else{
-    		field.setOptions(null);
-    	}
-    	
-    	Map<String, FieldVTwo> fields = new HashMap<String, FieldVTwo>();
-    	fields.put(field.getName(), field);    	
-    	    	    	
-    	editConfiguration.setFields(fields);
-    }       
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
+
+import static edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrDocumentList;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaObjectPropertyByRankOptions;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.IndividualsViaObjectPropetyOptions;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
+import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames;
+import edu.cornell.mannlib.vitro.webapp.search.beans.ProhibitedFromSearch;
+import edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup;
+import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils;
+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 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);	
+	
+	/*
+	 *   (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 {    	
+		FieldVTwo field = new FieldVTwo();
+    	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.getObjectUri(),
+    	        vreq.getWebappDaoFactory(), 
+    	        vreq.getJenaOntModel()));
+    	}else{
+    		field.setOptions(null);
+    	}
+    	
+    	Map<String, FieldVTwo> fields = new HashMap<String, FieldVTwo>();
+    	fields.put(field.getName(), field);    	
+    	    	    	
+    	editConfiguration.setFields(fields);
+    }       
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java
index 43c820fb5..b5f27a09d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/ManagePageGenerator.java
@@ -1,625 +1,625 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.QuerySolutionMap;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.jena.vocabulary.XSD;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.ManagePagePreprocessor;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessDataGetterN3;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessDataGetterN3Utils;
-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. 
- *
- */
-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) { 
-        EditConfigurationVTwo conf = new EditConfigurationVTwo();
-        conf.setTemplate(template);
-
-        //get editkey and url of form
-        initBasics(conf, vreq);        
-        initPropertyParameters(vreq, session, conf);
-        //if object uri exists, sets object URI
-        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
-     	setUrisAndLiteralsInScope(conf, vreq);
-
-     // on Form
-     	setUrisAndLiteralsOnForm(conf, vreq);
-        //Set the fields
-        setFields(conf);
-        //Adding additional data, specifically edit mode
-        addFormSpecificData(conf, vreq);
-        //Add preprocessor
-        conf.addEditSubmissionPreprocessor(new ManagePagePreprocessor(conf));
-        //Prepare: add literals/uris in scope based on sparql queries
-        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"}); //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(), 
-							Arrays.asList(new String[]{conf.getSubjectUri()}));
-		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, 
-	    		  							prefixes + menuItemN3 + menuN3,
-	    		  							prefixes + isSelfContainedTemplateN3)));
-	}
-
-	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"));
-		conf.addField(titleField);
-
-		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);
-		
-		//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
-	}
-
-
-
-	private void setVarNames(EditConfigurationVTwo conf) {
-		if(conf.getSubjectUri() != null) {
-        	conf.setVarNameForSubject("page");
-        	conf.setVarNameForPredicate("predicate");
-        } else {
-        	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);                           
-        	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
-		        editConfiguration.setEntityToReturnTo(subjectUri);
-		        //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);         
-			OntModel queryModel = ModelAccess.on(vreq).getJenaOntModel();
-	        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()) { 
-        	 //setup the model selectors for query, write and display models on editConfig
-	        setupModelSelectorsFromVitroRequest(vreq, editConfig);         
-			OntModel queryModel = ModelAccess.on(vreq).getJenaOntModel();
-        	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, 
-    		OntModel queryModel) {
-		String pageUri = editConfig.getSubjectUri();
-		executeExistingDataGettersInfo(context, editConfig, pageUri, queryModel);
-		 
-		
-	}
-    
-    private void executeExistingDataGettersInfo(ServletContext servletContext,
-    		EditConfigurationVTwo editConfig, 
-    		String pageUri, 
-    		OntModel queryModel) {
-    	//Create json array to be set within form specific data
-    	JSONArray jsonArray = new JSONArray();
-    	String querystr = getExistingDataGettersQuery();
-    	//Bind pageUri to query
-    	QuerySolutionMap initialBindings = new QuerySolutionMap();
-        initialBindings.add("page", ResourceFactory.createResource(pageUri));
-    	QueryExecution qe = null;
-        try{
-            Query query = QueryFactory.create(querystr);
-            qe = QueryExecutionFactory.create(query, queryModel, initialBindings);
-            ResultSet results = qe.execSelect();
-            int counter = 0;
-            while( results.hasNext()){
-            	QuerySolution qs = results.nextSolution();
-            	Resource dg = qs.getResource("dataGetter");
-            	Resource dgType = qs.getResource("dataGetterType");
-            	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(), 
-            			dgClassName, editConfig, queryModel, jsonArray, servletContext);
-            
-            	counter++;
-            }
-            //add json array to form specific data to be returned
-        	addJSONArrayToFormSpecificData(jsonArray, editConfig);
-
-
-        } catch(Exception ex) {
-        	log.error("Error occurred in executing query " + querystr, ex);
-        }
-    }
-    
-    private void addJSONArrayToFormSpecificData(JSONArray jsonArray, EditConfigurationVTwo editConfig) {
-    	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, JSONArray 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
-		addExistingLiteralsAndUrisOnForm(editConfig, pn, counter);
-		// Add fields
-		addExistingFields(editConfig, pn, counter);
-		//Add new resources - data getters need to be new resources
-		addExistingDataGetterNewResources(editConfig, pn, counter);
-		//Add values in scope
-    	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, JSONArray jsonArray, ServletContext context) {
-		JSONObject jo = pn.getExistingValuesJSON(dataGetterURI, queryModel, context);
-		//Add dataGetterURI to jsonObject
-		jo.element("URI", dataGetterURI);
-		jsonArray.add(jo);
-	}
-
-	//We're adding everything as optional - even what is considered "required" for a specific data getter
-	private void addExistingN3Optional(EditConfigurationVTwo editConfig, ProcessDataGetterN3 pn, int counter) {
-		List<String> n3 = pn.retrieveN3Required(counter);
-		if(pn.retrieveN3Optional(counter) != null) {
-			n3.addAll(pn.retrieveN3Optional(counter));
-		}
-		//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
-		return getDataGetterN3(dataGetterVar);
-	}
-
-	private void addExistingLiteralsAndUrisOnForm(EditConfigurationVTwo editConfig, ProcessDataGetterN3 pn,
-			int counter) {
-		List<String> literalsOnForm = pn.retrieveLiteralsOnForm(counter);
-		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,
-			int counter) {
-		//Should we even add new resources?
-		List<String> newResources = pn.getNewResources(counter);
-		for(String r: newResources) {
-			//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);
-		 	Map<String, List<Literal>> existingLiteralValues = pn.retrieveExistingLiteralValues();
-		 	Map<String, List<String>> existingUriValues = pn.retrieveExistingUriValues();
-		 	editConfig.addLiteralsInScope(existingLiteralValues);
-		 	editConfig.addUrisInScope(existingUriValues);
-		}
-
-	private String getClassName(String dataGetterURI) {
-    	if(dataGetterURI.contains("java:")) {
-    		return dataGetterURI.substring("java:".length());
-    	}
-    	return dataGetterURI;
-    }
-    
-    //Get the data getter uri and the type of the data getter
-    private String getExistingDataGettersQuery() {
-    	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 
-    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());
-    	return map;
-    }
-    
-    private String getExistingMenuItemQuery() {
-		String query = getSparqlPrefix() + "SELECT ?menuItem WHERE {?menuItem display:toPage ?page .}";
-		return query;
-	}
-
-	//Page level literals:
-    //"pageName", "prettyUrl", "menuPosition", "menuLinkText", "customTemplate"
-
-    private HashMap<String, String> generateSparqlForExistingLiterals() {
-    	HashMap<String, String> map = new HashMap<String, String>();
-    	map.put("pageName", getExistingPageNameQuery());
-    	map.put("prettyUrl", getExistingPrettyUrlQuery());
-    	map.put("menuPosition", getExistingMenuPositionQuery());
-    	map.put("menuLinkText", getExistingMenuLinkTextQuery());
-    	map.put("customTemplate", getExistingCustomTemplateQuery());
-    	map.put("isSelfContainedTemplate", getExistingIsSelfContainedTemplateQuery());
-    	return map;
-    }
-    
-  private String getSparqlPrefix() {
-	  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 {" +
-		"?page display:title ?pageName .}";
-	  return query;
-	}
-
-private String getExistingPrettyUrlQuery() {
-		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 {" + 
-		"?menuItem display:toPage ?page . ?menuItem display:menuPosition ?menuPosition. }";
-		return menuPositionQuery;
-	}
-
-private String getExistingMenuLinkTextQuery() {
-	String menuPositionQuery = getSparqlPrefix() + "SELECT ?menuLinkText WHERE {" + 
-			"?menuItem display:toPage ?page . ?menuItem display:linkText ?menuLinkText. }";
-			return menuPositionQuery;
-	}
-
-private String getExistingCustomTemplateQuery() {
-	String query = getSparqlPrefix() + "SELECT ?customTemplate WHERE {?page display:requiresBodyTemplate ?customTemplate .}";
-	return query;
-}
-
-private String getExistingIsSelfContainedTemplateQuery() {
-	String query = getSparqlPrefix() + "SELECT ?isSelfContainedTemplate WHERE {?page display:isSelfContainedTemplate ?isSelfContainedTemplate .}";
-
-	return query;
-}
-
-//Form specific data
-    //In this case, need to get all the different data getter TYPES and labels
-    //Also need to pass back the map for the options presented to the user
-    //which is different from the above
-    //Maybe mapping where it does exist? I.e. sparql query from drop-down IS sparql query data getter
-    //Class group is hard-coded to class group but otherwise it can be changed
-    //Based on circumstances - specifically internal class data getter
-    //Need to get the hash for data getter to label TO the form so
-    //that can then be read by javascript?
-    //Also pass back current menu position?
-	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
-		//Get options for user: label to data getter type
-		//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 
-		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>());
-    	data.put("classGroups", DataGetterUtils.getClassGroups(vreq));
-	}
-	
-	private void addExistingPageData(VitroRequest vreq, Map<String, Object> data) {
-		addNewPageData(vreq, data);
-		data.put("menuAction", "Edit");
-		data.put("title", "Edit Menu Item");
-		//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("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);
-    	} 
-	}
-	
-	//N3 strings
-	
-	//For new or existing page
-	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 .";  
-
-	//"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" + 
-    	"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 .";
-	
-	//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
-		//menu position
-		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 
-	public int getAvailableMenuPosition(EditConfigurationVTwo editConfig, VitroRequest vreq) {
-		//Execute sparql query to get highest menu position
-		int maxMenuPosition = getMaxMenuPosition(editConfig, vreq);
-		return maxMenuPosition + 1;
-	}
-
-
-
-	private int getMaxMenuPosition(EditConfigurationVTwo editConfig, VitroRequest vreq) {
-		int maxMenuPosition = 0;
-		Literal menuPosition = null;
-		setupModelSelectorsFromVitroRequest(vreq, editConfig);         
-		OntModel queryModel = ModelAccess.on(vreq).getJenaOntModel();
-
-		String maxMenuPositionQuery = getMaxMenuPositionQueryString();
-    	QueryExecution qe = null;
-        try{
-            Query query = QueryFactory.create(maxMenuPositionQuery);
-            qe = QueryExecutionFactory.create(query, queryModel);
-            ResultSet results = qe.execSelect();
-            while( results.hasNext()){
-            	QuerySolution qs = results.nextSolution();
-            	menuPosition = qs.getLiteral("menuPosition");
-            }
-
-        } catch(Exception ex) {
-        	log.error("Error occurred in executing query " + maxMenuPositionQuery, ex);
-        }
-        
-        if(menuPosition != null) {
-        	maxMenuPosition = menuPosition.getInt();
-        }
-		return maxMenuPosition;
-	}
-
-
-
-	private String getMaxMenuPositionQueryString() {
-		String query = getSparqlPrefix() + 
-				"SELECT ?menuPosition WHERE {?pageUri display:menuPosition ?menuPosition . } " + 
-				"ORDER BY DESC(?menuPosition) LIMIT 1";
-		return query;
-	}
-	
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpSession;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.QuerySolutionMap;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+import com.hp.hpl.jena.vocabulary.XSD;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.ManagePagePreprocessor;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessDataGetterN3;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessDataGetterN3Utils;
+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. 
+ *
+ */
+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) { 
+        EditConfigurationVTwo conf = new EditConfigurationVTwo();
+        conf.setTemplate(template);
+
+        //get editkey and url of form
+        initBasics(conf, vreq);        
+        initPropertyParameters(vreq, session, conf);
+        //if object uri exists, sets object URI
+        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
+     	setUrisAndLiteralsInScope(conf, vreq);
+
+     // on Form
+     	setUrisAndLiteralsOnForm(conf, vreq);
+        //Set the fields
+        setFields(conf);
+        //Adding additional data, specifically edit mode
+        addFormSpecificData(conf, vreq);
+        //Add preprocessor
+        conf.addEditSubmissionPreprocessor(new ManagePagePreprocessor(conf));
+        //Prepare: add literals/uris in scope based on sparql queries
+        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"}); //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(), 
+							Arrays.asList(new String[]{conf.getSubjectUri()}));
+		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, 
+	    		  							prefixes + menuItemN3 + menuN3,
+	    		  							prefixes + isSelfContainedTemplateN3)));
+	}
+
+	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"));
+		conf.addField(titleField);
+
+		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);
+		
+		//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
+	}
+
+
+
+	private void setVarNames(EditConfigurationVTwo conf) {
+		if(conf.getSubjectUri() != null) {
+        	conf.setVarNameForSubject("page");
+        	conf.setVarNameForPredicate("predicate");
+        } else {
+        	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);                           
+        	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
+		        editConfiguration.setEntityToReturnTo(subjectUri);
+		        //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);         
+			OntModel queryModel = ModelAccess.on(vreq).getJenaOntModel();
+	        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()) { 
+        	 //setup the model selectors for query, write and display models on editConfig
+	        setupModelSelectorsFromVitroRequest(vreq, editConfig);         
+			OntModel queryModel = ModelAccess.on(vreq).getJenaOntModel();
+        	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, 
+    		OntModel queryModel) {
+		String pageUri = editConfig.getSubjectUri();
+		executeExistingDataGettersInfo(context, editConfig, pageUri, queryModel);
+		 
+		
+	}
+    
+    private void executeExistingDataGettersInfo(ServletContext servletContext,
+    		EditConfigurationVTwo editConfig, 
+    		String pageUri, 
+    		OntModel queryModel) {
+    	//Create json array to be set within form specific data
+    	JSONArray jsonArray = new JSONArray();
+    	String querystr = getExistingDataGettersQuery();
+    	//Bind pageUri to query
+    	QuerySolutionMap initialBindings = new QuerySolutionMap();
+        initialBindings.add("page", ResourceFactory.createResource(pageUri));
+    	QueryExecution qe = null;
+        try{
+            Query query = QueryFactory.create(querystr);
+            qe = QueryExecutionFactory.create(query, queryModel, initialBindings);
+            ResultSet results = qe.execSelect();
+            int counter = 0;
+            while( results.hasNext()){
+            	QuerySolution qs = results.nextSolution();
+            	Resource dg = qs.getResource("dataGetter");
+            	Resource dgType = qs.getResource("dataGetterType");
+            	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(), 
+            			dgClassName, editConfig, queryModel, jsonArray, servletContext);
+            
+            	counter++;
+            }
+            //add json array to form specific data to be returned
+        	addJSONArrayToFormSpecificData(jsonArray, editConfig);
+
+
+        } catch(Exception ex) {
+        	log.error("Error occurred in executing query " + querystr, ex);
+        }
+    }
+    
+    private void addJSONArrayToFormSpecificData(JSONArray jsonArray, EditConfigurationVTwo editConfig) {
+    	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, JSONArray 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
+		addExistingLiteralsAndUrisOnForm(editConfig, pn, counter);
+		// Add fields
+		addExistingFields(editConfig, pn, counter);
+		//Add new resources - data getters need to be new resources
+		addExistingDataGetterNewResources(editConfig, pn, counter);
+		//Add values in scope
+    	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, JSONArray jsonArray, ServletContext context) {
+		JSONObject jo = pn.getExistingValuesJSON(dataGetterURI, queryModel, context);
+		//Add dataGetterURI to jsonObject
+		jo.element("URI", dataGetterURI);
+		jsonArray.add(jo);
+	}
+
+	//We're adding everything as optional - even what is considered "required" for a specific data getter
+	private void addExistingN3Optional(EditConfigurationVTwo editConfig, ProcessDataGetterN3 pn, int counter) {
+		List<String> n3 = pn.retrieveN3Required(counter);
+		if(pn.retrieveN3Optional(counter) != null) {
+			n3.addAll(pn.retrieveN3Optional(counter));
+		}
+		//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
+		return getDataGetterN3(dataGetterVar);
+	}
+
+	private void addExistingLiteralsAndUrisOnForm(EditConfigurationVTwo editConfig, ProcessDataGetterN3 pn,
+			int counter) {
+		List<String> literalsOnForm = pn.retrieveLiteralsOnForm(counter);
+		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,
+			int counter) {
+		//Should we even add new resources?
+		List<String> newResources = pn.getNewResources(counter);
+		for(String r: newResources) {
+			//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);
+		 	Map<String, List<Literal>> existingLiteralValues = pn.retrieveExistingLiteralValues();
+		 	Map<String, List<String>> existingUriValues = pn.retrieveExistingUriValues();
+		 	editConfig.addLiteralsInScope(existingLiteralValues);
+		 	editConfig.addUrisInScope(existingUriValues);
+		}
+
+	private String getClassName(String dataGetterURI) {
+    	if(dataGetterURI.contains("java:")) {
+    		return dataGetterURI.substring("java:".length());
+    	}
+    	return dataGetterURI;
+    }
+    
+    //Get the data getter uri and the type of the data getter
+    private String getExistingDataGettersQuery() {
+    	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 
+    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());
+    	return map;
+    }
+    
+    private String getExistingMenuItemQuery() {
+		String query = getSparqlPrefix() + "SELECT ?menuItem WHERE {?menuItem display:toPage ?page .}";
+		return query;
+	}
+
+	//Page level literals:
+    //"pageName", "prettyUrl", "menuPosition", "menuLinkText", "customTemplate"
+
+    private HashMap<String, String> generateSparqlForExistingLiterals() {
+    	HashMap<String, String> map = new HashMap<String, String>();
+    	map.put("pageName", getExistingPageNameQuery());
+    	map.put("prettyUrl", getExistingPrettyUrlQuery());
+    	map.put("menuPosition", getExistingMenuPositionQuery());
+    	map.put("menuLinkText", getExistingMenuLinkTextQuery());
+    	map.put("customTemplate", getExistingCustomTemplateQuery());
+    	map.put("isSelfContainedTemplate", getExistingIsSelfContainedTemplateQuery());
+    	return map;
+    }
+    
+  private String getSparqlPrefix() {
+	  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 {" +
+		"?page display:title ?pageName .}";
+	  return query;
+	}
+
+private String getExistingPrettyUrlQuery() {
+		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 {" + 
+		"?menuItem display:toPage ?page . ?menuItem display:menuPosition ?menuPosition. }";
+		return menuPositionQuery;
+	}
+
+private String getExistingMenuLinkTextQuery() {
+	String menuPositionQuery = getSparqlPrefix() + "SELECT ?menuLinkText WHERE {" + 
+			"?menuItem display:toPage ?page . ?menuItem display:linkText ?menuLinkText. }";
+			return menuPositionQuery;
+	}
+
+private String getExistingCustomTemplateQuery() {
+	String query = getSparqlPrefix() + "SELECT ?customTemplate WHERE {?page display:requiresBodyTemplate ?customTemplate .}";
+	return query;
+}
+
+private String getExistingIsSelfContainedTemplateQuery() {
+	String query = getSparqlPrefix() + "SELECT ?isSelfContainedTemplate WHERE {?page display:isSelfContainedTemplate ?isSelfContainedTemplate .}";
+
+	return query;
+}
+
+//Form specific data
+    //In this case, need to get all the different data getter TYPES and labels
+    //Also need to pass back the map for the options presented to the user
+    //which is different from the above
+    //Maybe mapping where it does exist? I.e. sparql query from drop-down IS sparql query data getter
+    //Class group is hard-coded to class group but otherwise it can be changed
+    //Based on circumstances - specifically internal class data getter
+    //Need to get the hash for data getter to label TO the form so
+    //that can then be read by javascript?
+    //Also pass back current menu position?
+	public void addFormSpecificData(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
+		HashMap<String, Object> formSpecificData = new HashMap<String, Object>();
+		//Get options for user: label to data getter type
+		//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 
+		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>());
+    	data.put("classGroups", DataGetterUtils.getClassGroups(vreq));
+	}
+	
+	private void addExistingPageData(VitroRequest vreq, Map<String, Object> data) {
+		addNewPageData(vreq, data);
+		data.put("menuAction", "Edit");
+		data.put("title", "Edit Menu Item");
+		//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("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);
+    	} 
+	}
+	
+	//N3 strings
+	
+	//For new or existing page
+	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 .";  
+
+	//"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" + 
+    	"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 .";
+	
+	//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
+		//menu position
+		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 
+	public int getAvailableMenuPosition(EditConfigurationVTwo editConfig, VitroRequest vreq) {
+		//Execute sparql query to get highest menu position
+		int maxMenuPosition = getMaxMenuPosition(editConfig, vreq);
+		return maxMenuPosition + 1;
+	}
+
+
+
+	private int getMaxMenuPosition(EditConfigurationVTwo editConfig, VitroRequest vreq) {
+		int maxMenuPosition = 0;
+		Literal menuPosition = null;
+		setupModelSelectorsFromVitroRequest(vreq, editConfig);         
+		OntModel queryModel = ModelAccess.on(vreq).getJenaOntModel();
+
+		String maxMenuPositionQuery = getMaxMenuPositionQueryString();
+    	QueryExecution qe = null;
+        try{
+            Query query = QueryFactory.create(maxMenuPositionQuery);
+            qe = QueryExecutionFactory.create(query, queryModel);
+            ResultSet results = qe.execSelect();
+            while( results.hasNext()){
+            	QuerySolution qs = results.nextSolution();
+            	menuPosition = qs.getLiteral("menuPosition");
+            }
+
+        } catch(Exception ex) {
+        	log.error("Error occurred in executing query " + maxMenuPositionQuery, ex);
+        }
+        
+        if(menuPosition != null) {
+        	maxMenuPosition = menuPosition.getInt();
+        }
+		return maxMenuPosition;
+	}
+
+
+
+	private String getMaxMenuPositionQueryString() {
+		String query = getSparqlPrefix() + 
+				"SELECT ?menuPosition WHERE {?pageUri display:menuPosition ?menuPosition . } " + 
+				"ORDER BY DESC(?menuPosition) LIMIT 1";
+		return query;
+	}
+	
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
index ba5b640ab..54c189705 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/NewIndividualFormGenerator.java
@@ -1,270 +1,270 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpSession;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.vocabulary.RDFS;
-import com.hp.hpl.jena.vocabulary.XSD;
-
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
-
-/**
- * Generates the edit configuration for a default property form.
- *
- */
-public class NewIndividualFormGenerator implements EditConfigurationGenerator {
-	
-	private String subjectUri = null;
-	private String predicateUri = null;
-	private String objectUri = null;
-		
-	private String template = "newIndividualForm.ftl";
-	
-	private static HashMap<String,String> defaultsForXSDtypes ;
-	  static {
-		defaultsForXSDtypes = new HashMap<String,String>();
-		//defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","2001-01-01T12:00:00");
-		defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","#Unparseable datetime defaults to now");
-	  }
-	  
-    @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
-    	//default obj property form.populateTemplate or some such method
-    	//Select from existing also set within template itself
-    	setTemplate(editConfiguration, vreq);
-    	//Set edit key
-    	setEditKey(editConfiguration, vreq);
-        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
-		newResources.put("newInd", null);
-		return newResources;
-	}
-
-	private void setEditKey(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-    	String editKey = EditConfigurationUtils.getEditKey(vreq);	
-    	editConfiguration.setEditKey(editKey);
-    }
-    
-	private void setTemplate(EditConfigurationVTwo editConfiguration,
-			VitroRequest vreq) {
-    	editConfiguration.setTemplate(template);
-		
-	}
-
-	//Initialize setup: process parameters
-    private void initProcessParameters(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
-    	String formUrl = EditConfigurationUtils.getFormUrlWithoutContext(vreq);
-
-    	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.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    
-    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(), 
-    			Arrays.asList(new String[]{editConfiguration.getSubjectUri()}));
-    	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 
-    
-    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() );        
-    	
-    	List<String> validators = new ArrayList<String>();
-    	validators.add("nonempty");
-    	field.setValidators(validators);    	
-    	
-    	fields.put(field.getName(), field);		
-    	editConfiguration.setFields(fields);
-	}
-
-	
-
-	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
-    	//Here, retrieve model from 
-		OntModel model = ModelAccess.on(session.getServletContext()).getJenaOntModel();
-    	//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>();
-		formSpecificData.put("typeName", getTypeName(vreq));
-		//Put in the fact that we require field
-		editConfiguration.setFormSpecificData(formSpecificData);
-	}
-
-	private String getTypeName(VitroRequest vreq) {
-		String typeOfNew = getTypeOfNew(vreq);
-		VClass type = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(typeOfNew);
-		return type.getName();
-	}
-    
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.vocabulary.RDFS;
+import com.hp.hpl.jena.vocabulary.XSD;
+
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
+
+/**
+ * Generates the edit configuration for a default property form.
+ *
+ */
+public class NewIndividualFormGenerator implements EditConfigurationGenerator {
+	
+	private String subjectUri = null;
+	private String predicateUri = null;
+	private String objectUri = null;
+		
+	private String template = "newIndividualForm.ftl";
+	
+	private static HashMap<String,String> defaultsForXSDtypes ;
+	  static {
+		defaultsForXSDtypes = new HashMap<String,String>();
+		//defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","2001-01-01T12:00:00");
+		defaultsForXSDtypes.put("http://www.w3.org/2001/XMLSchema#dateTime","#Unparseable datetime defaults to now");
+	  }
+	  
+    @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
+    	//default obj property form.populateTemplate or some such method
+    	//Select from existing also set within template itself
+    	setTemplate(editConfiguration, vreq);
+    	//Set edit key
+    	setEditKey(editConfiguration, vreq);
+        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
+		newResources.put("newInd", null);
+		return newResources;
+	}
+
+	private void setEditKey(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
+    	String editKey = EditConfigurationUtils.getEditKey(vreq);	
+    	editConfiguration.setEditKey(editKey);
+    }
+    
+	private void setTemplate(EditConfigurationVTwo editConfiguration,
+			VitroRequest vreq) {
+    	editConfiguration.setTemplate(template);
+		
+	}
+
+	//Initialize setup: process parameters
+    private void initProcessParameters(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
+    	String formUrl = EditConfigurationUtils.getFormUrlWithoutContext(vreq);
+
+    	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.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    
+    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(), 
+    			Arrays.asList(new String[]{editConfiguration.getSubjectUri()}));
+    	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 
+    
+    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() );        
+    	
+    	List<String> validators = new ArrayList<String>();
+    	validators.add("nonempty");
+    	field.setValidators(validators);    	
+    	
+    	fields.put(field.getName(), field);		
+    	editConfiguration.setFields(fields);
+	}
+
+	
+
+	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
+    	//Here, retrieve model from 
+		OntModel model = ModelAccess.on(session.getServletContext()).getJenaOntModel();
+    	//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>();
+		formSpecificData.put("typeName", getTypeName(vreq));
+		//Put in the fact that we require field
+		editConfiguration.setFormSpecificData(formSpecificData);
+	}
+
+	private String getTypeName(VitroRequest vreq) {
+		String typeOfNew = getTypeOfNew(vreq);
+		VClass type = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(typeOfNew);
+		return type.getName();
+	}
+    
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RDFSLabelGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RDFSLabelGenerator.java
index 7dc24a5be..648e1d768 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RDFSLabelGenerator.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/RDFSLabelGenerator.java
@@ -1,308 +1,308 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.vocabulary.XSD;
-
-import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
-/**
- * Generates the edit configuration for RDFS Label form.  
- *
- */
-public class RDFSLabelGenerator implements EditConfigurationGenerator {
-	
-	private Log log = LogFactory.getLog(RDFSLabelGenerator.class);
-	
-	private String subjectUri = null;
-	private String predicateUri = null;	
-	private Integer dataHash = null;
-
-	private String literalName = "label";
-
-	private String template = "rdfsLabelForm.ftl";
-
-    @Override
-    public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
-    	//Check if an edit configuration exists and return that, otherwise create a new one
-    	EditConfigurationVTwo editConfiguration = EditConfigurationVTwo.getConfigFromSession(session, vreq);
-    	if(editConfiguration == null) {
-    		log.debug("No editConfig in session. Making new editConfig.");
-    		editConfiguration = setupEditConfiguration(vreq, session);
-    	} else {
-    		log.debug("Edit Configuration object already exists and will be returned");
-    	}
-    	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
-    	setEditKey(editConfiguration, vreq);
-    	return editConfiguration;
-    }
-    private void setEditKey(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-    	String editKey = EditConfigurationUtils.getEditKey(vreq);	
-    	editConfiguration.setEditKey(editKey);
-    }
-    
-	private void setTemplate(EditConfigurationVTwo editConfiguration,
-			VitroRequest vreq) {
-    	editConfiguration.setTemplate(template);
-	}
-
-	//Initialize setup: process parameters
-	//As this is a data property, don't require any additional processing for object properties
-    private void initProcessParameters(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
-    	String formUrl = EditConfigurationUtils.getFormUrlWithoutContext(vreq);
-
-    	subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
-    	predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
-    
-    	editConfiguration.setFormUrl(formUrl);
-        	
-    	editConfiguration.setVarNameForSubject("subject");
-    	editConfiguration.setSubjectUri(subjectUri);
-    	editConfiguration.setEntityToReturnTo(subjectUri);
-    	editConfiguration.setVarNameForPredicate("predicate");
-    	editConfiguration.setPredicateUri(predicateUri);
-
-    	this.initDataParameters(vreq, session);
-    	this.processDataPropForm(vreq, editConfiguration);
-    }
-    
-   
-    
-    private void initDataParameters(VitroRequest vreq, HttpSession session) {
-    	dataHash = EditConfigurationUtils.getDataHash(vreq);	    	    
-	}
-    
-    private void processDataPropForm(VitroRequest vreq, EditConfigurationVTwo editConfiguration) {
-    	//set data prop value, data prop key str, 
-    	editConfiguration.setDatapropKey( EditConfigurationUtils.getDataHash(vreq) );
-    	editConfiguration.setVarNameForObject(literalName);    	    
-    }
-    
-    //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);
-    	String editString = "?subject <" + predicateUri + "> ?label .";
-    	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(), 
-    			Arrays.asList(new String[]{editConfiguration.getSubjectUri()}));
-    	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 
-    
-    private void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-    	List<String> urisOnForm = new ArrayList<String>();
-    	List<String> literalsOnForm = new ArrayList<String>();
-    	literalsOnForm.add(literalName);
-    	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>();
-		FieldVTwo field = new FieldVTwo();
-    	field.setName(literalName);
-    	//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);    	
-
-    	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;
-	}
-
-
-	private String getRangeLang(EditConfigurationVTwo editConfiguration,
-			VitroRequest vreq) {
-		String rangeLang = null;
-		
-	   DataPropertyStatement dps =EditConfigurationUtils.getDataPropertyStatement(vreq, vreq.getSession(), dataHash, predicateUri);
-	   if (dps != null) { 
-	        rangeLang = dps.getLanguage();
-	        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;
-	}
-
-	private String getRangeDatatypeUri(EditConfigurationVTwo editConfiguration,
-			VitroRequest vreq) {
-		Individual subject = EditConfigurationUtils.getSubjectIndividual(vreq);
-		DataProperty prop = EditConfigurationUtils.getDataProperty(vreq);
-		String rangeDatatypeUri = null;
-		//rangeDefaultJson goes into literalk options
-		//validations include dataype:rangedatatypeurijson
-		//rangeDatatypeUri is rangeDAttypeUriJson
-		//rangeLang = rangeLanJson
-	   DataPropertyStatement dps =EditConfigurationUtils.getDataPropertyStatement(vreq, vreq.getSession(), dataHash, predicateUri);
-	   if (dps != null) {
-	        
-	        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");  
-	        rangeDatatypeUri = XSD.xstring.getURI();
-	    }
-	   
-	    if( rangeDatatypeUri != null && rangeDatatypeUri.trim().length() == 0)
-            rangeDatatypeUri = null;
-	    
-	    return rangeDatatypeUri;
-	}
-
-	private List<String> getFieldValidators(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
-		List<String> validatorList = new ArrayList<String>();
-		String predicateUri =EditConfigurationUtils.getPredicateUri(vreq);
-	    if (predicateUri.equals(VitroVocabulary.LABEL) || predicateUri.equals(VitroVocabulary.RDF_TYPE)) {
-	        validatorList.add("nonempty");       
-	    }
-	    String rangeDatatypeUri = getRangeDatatypeUri(editConfiguration, vreq);
-	    if (rangeDatatypeUri != null && !rangeDatatypeUri.isEmpty()) {
-	        validatorList.add("datatype:" +  rangeDatatypeUri);
-	    }
-		return validatorList;    
-	}
-
-	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
-    	//Here, retrieve model from 
-		OntModel model = ModelAccess.on(session.getServletContext()).getJenaOntModel();
-		if( editConfiguration.isDataPropertyUpdate() ){
-    		editConfiguration.prepareForDataPropUpdate(model, vreq.getWebappDaoFactory().getDataPropertyDao());	
-		}
-    }
-    
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.vocabulary.XSD;
+
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.AntiXssValidation;
+/**
+ * Generates the edit configuration for RDFS Label form.  
+ *
+ */
+public class RDFSLabelGenerator implements EditConfigurationGenerator {
+	
+	private Log log = LogFactory.getLog(RDFSLabelGenerator.class);
+	
+	private String subjectUri = null;
+	private String predicateUri = null;	
+	private Integer dataHash = null;
+
+	private String literalName = "label";
+
+	private String template = "rdfsLabelForm.ftl";
+
+    @Override
+    public EditConfigurationVTwo getEditConfiguration(VitroRequest vreq, HttpSession session) {
+    	//Check if an edit configuration exists and return that, otherwise create a new one
+    	EditConfigurationVTwo editConfiguration = EditConfigurationVTwo.getConfigFromSession(session, vreq);
+    	if(editConfiguration == null) {
+    		log.debug("No editConfig in session. Making new editConfig.");
+    		editConfiguration = setupEditConfiguration(vreq, session);
+    	} else {
+    		log.debug("Edit Configuration object already exists and will be returned");
+    	}
+    	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
+    	setEditKey(editConfiguration, vreq);
+    	return editConfiguration;
+    }
+    private void setEditKey(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
+    	String editKey = EditConfigurationUtils.getEditKey(vreq);	
+    	editConfiguration.setEditKey(editKey);
+    }
+    
+	private void setTemplate(EditConfigurationVTwo editConfiguration,
+			VitroRequest vreq) {
+    	editConfiguration.setTemplate(template);
+	}
+
+	//Initialize setup: process parameters
+	//As this is a data property, don't require any additional processing for object properties
+    private void initProcessParameters(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
+    	String formUrl = EditConfigurationUtils.getFormUrlWithoutContext(vreq);
+
+    	subjectUri = EditConfigurationUtils.getSubjectUri(vreq);
+    	predicateUri = EditConfigurationUtils.getPredicateUri(vreq);
+    
+    	editConfiguration.setFormUrl(formUrl);
+        	
+    	editConfiguration.setVarNameForSubject("subject");
+    	editConfiguration.setSubjectUri(subjectUri);
+    	editConfiguration.setEntityToReturnTo(subjectUri);
+    	editConfiguration.setVarNameForPredicate("predicate");
+    	editConfiguration.setPredicateUri(predicateUri);
+
+    	this.initDataParameters(vreq, session);
+    	this.processDataPropForm(vreq, editConfiguration);
+    }
+    
+   
+    
+    private void initDataParameters(VitroRequest vreq, HttpSession session) {
+    	dataHash = EditConfigurationUtils.getDataHash(vreq);	    	    
+	}
+    
+    private void processDataPropForm(VitroRequest vreq, EditConfigurationVTwo editConfiguration) {
+    	//set data prop value, data prop key str, 
+    	editConfiguration.setDatapropKey( EditConfigurationUtils.getDataHash(vreq) );
+    	editConfiguration.setVarNameForObject(literalName);    	    
+    }
+    
+    //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);
+    	String editString = "?subject <" + predicateUri + "> ?label .";
+    	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(), 
+    			Arrays.asList(new String[]{editConfiguration.getSubjectUri()}));
+    	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 
+    
+    private void setUrisAndLiteralsOnForm(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
+    	List<String> urisOnForm = new ArrayList<String>();
+    	List<String> literalsOnForm = new ArrayList<String>();
+    	literalsOnForm.add(literalName);
+    	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>();
+		FieldVTwo field = new FieldVTwo();
+    	field.setName(literalName);
+    	//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);    	
+
+    	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;
+	}
+
+
+	private String getRangeLang(EditConfigurationVTwo editConfiguration,
+			VitroRequest vreq) {
+		String rangeLang = null;
+		
+	   DataPropertyStatement dps =EditConfigurationUtils.getDataPropertyStatement(vreq, vreq.getSession(), dataHash, predicateUri);
+	   if (dps != null) { 
+	        rangeLang = dps.getLanguage();
+	        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;
+	}
+
+	private String getRangeDatatypeUri(EditConfigurationVTwo editConfiguration,
+			VitroRequest vreq) {
+		Individual subject = EditConfigurationUtils.getSubjectIndividual(vreq);
+		DataProperty prop = EditConfigurationUtils.getDataProperty(vreq);
+		String rangeDatatypeUri = null;
+		//rangeDefaultJson goes into literalk options
+		//validations include dataype:rangedatatypeurijson
+		//rangeDatatypeUri is rangeDAttypeUriJson
+		//rangeLang = rangeLanJson
+	   DataPropertyStatement dps =EditConfigurationUtils.getDataPropertyStatement(vreq, vreq.getSession(), dataHash, predicateUri);
+	   if (dps != null) {
+	        
+	        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");  
+	        rangeDatatypeUri = XSD.xstring.getURI();
+	    }
+	   
+	    if( rangeDatatypeUri != null && rangeDatatypeUri.trim().length() == 0)
+            rangeDatatypeUri = null;
+	    
+	    return rangeDatatypeUri;
+	}
+
+	private List<String> getFieldValidators(EditConfigurationVTwo editConfiguration, VitroRequest vreq) {
+		List<String> validatorList = new ArrayList<String>();
+		String predicateUri =EditConfigurationUtils.getPredicateUri(vreq);
+	    if (predicateUri.equals(VitroVocabulary.LABEL) || predicateUri.equals(VitroVocabulary.RDF_TYPE)) {
+	        validatorList.add("nonempty");       
+	    }
+	    String rangeDatatypeUri = getRangeDatatypeUri(editConfiguration, vreq);
+	    if (rangeDatatypeUri != null && !rangeDatatypeUri.isEmpty()) {
+	        validatorList.add("datatype:" +  rangeDatatypeUri);
+	    }
+		return validatorList;    
+	}
+
+	private void prepareForUpdate(VitroRequest vreq, HttpSession session, EditConfigurationVTwo editConfiguration) {
+    	//Here, retrieve model from 
+		OntModel model = ModelAccess.on(session.getServletContext()).getJenaOntModel();
+		if( editConfiguration.isDataPropertyUpdate() ){
+    		editConfiguration.prepareForDataPropUpdate(model, vreq.getWebappDaoFactory().getDataPropertyDao());	
+		}
+    }
+    
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManagePagePreprocessor.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManagePagePreprocessor.java
index 85fb8629d..24244ca8c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManagePagePreprocessor.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/ManagePagePreprocessor.java
@@ -1,386 +1,386 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-import net.sf.json.JSONSerializer;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.rdf.model.Literal;
-
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.BaseEditSubmissionPreprocessorVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfigurationConstants;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessDataGetterN3;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessDataGetterN3Utils;
-public class ManagePagePreprocessor extends
-		BaseEditSubmissionPreprocessorVTwo {
-
-	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;
-	private static Map<String, List<String>> urisFromForm = null;
-	private static List<String> pageContentUnits = null;//String submission from form
-	private static List<JSONObject> pageContentUnitsJSON = null;//converted to JSON objects that can be read
-	// String datatype
-
-	// Will be editing the edit configuration as well as edit submission here
-
-	public ManagePagePreprocessor(EditConfigurationVTwo editConfig) {
-		super(editConfig);
-		editConfiguration = editConfig;
-	}
-
-	public void preprocess(MultiValueEditSubmission inputSubmission) {
-		submission = inputSubmission;
-		// Get the input elements for concept node and concept label as well
-		// as vocab uri (which is based on thge
-		// For query parameters, check whether CUI
-		copySubmissionValues();
-		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 
-		//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
-	private void copySubmissionValues() {
-		Map<String, List<Literal>> literalsFromForm = submission.getLiteralsFromForm();
-		transformedLiteralsFromForm = copyMap(EditConfigurationUtils.transformLiteralMap(literalsFromForm));
-		urisFromForm = copyMap(submission.getUrisFromForm());
-		pageContentUnits = transformedLiteralsFromForm.get("pageContentUnit");
-	}
-
-	private Map<String, List<String>> copyMap(
-			Map<String, List<String>> originalMap) {
-		Map<String, List<String>> copyMap = new HashMap<String, List<String>>();
-		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
-		//For those literals, those values will be replaced with form values where overwritten
-		//And will be deleted where not overwritten which is the behavior we desire
-		if(this.editConfiguration.isParamUpdate()) {
-			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, 
-							 (new String[] {null}));
-				}
-			}
-			
-			
-			for(String uriName: uriKeys) {
-				//these values should never be overwritten or deleted
-				//if(uriName != "page" && uriName != "menuItem" && !uriName.startsWith("dataGetter")) {
-				if(uriName != "page") {
-					boolean hasuv = submission.hasUriValue(uriName);
-					if(!submission.hasUriValue(uriName)) {
-						submission.addUriToForm(editConfiguration, 
-								 uriName, 
-								 (new String[] {EditConfigurationConstants.BLANK_SENTINEL}));
-					}	
-				}
-			}
-		}
-		
-	}
-	
-
-	private void processDataGetters() {
-		convertToJson();
-		int counter = 0;
-		for(JSONObject 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 
-			//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
-			//To not muddle up logic, we will just add ALL required and optional statements
-			//from data getters directly to N3 optional
-			//Add n3 required
-			//addN3Required(pn, counter);
-			//Add N3 Optional as well
-			addN3Optional(pn, counter);
-			// Add URIs on Form and Add Literals On Form
-			addLiteralsAndUrisOnForm(pn, counter);
-			// Add fields
-			addFields(pn, counter);
-			//Add new resources - data getters need to be new resources
-			addNewResources(pn, counter);
-			//Add input values to submission
-			addInputsToSubmission(pn, counter, jsonObject);
-			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() {
-		//Iterate through list of inputs
-		pageContentUnitsJSON = new ArrayList<JSONObject>();
-		//page content units might return null in case self-contained template is selected
-		//otherwise there should be page content units returned from the form
-		if(pageContentUnits != null) {
-			for(String pageContentUnit: pageContentUnits) {
-				JSONObject jsonObject = (JSONObject) JSONSerializer.toJSON( pageContentUnit );
-				pageContentUnitsJSON.add(jsonObject);
-			}
-		}
-	}
-
-	//This is where the actual values will be submitted as if they were separate input fields
-	//Each field name will correspond to the names of the fileds/uris on form/literals on form
-	//generated here
-
-	private void addInputsToSubmission(ProcessDataGetterN3 pn, int counter, JSONObject jsonObject) {
-		 List<String> literalLabels = pn.getLiteralVarNamesBase();
-		 List<String> uriLabels = pn.getUriVarNamesBase();
-		 
-		 for(String literalLabel:literalLabels) {
-			 List<String> literalValues = new ArrayList<String>();
-			 Object jsonValue = jsonObject.get(literalLabel);
-			//Var names will depend on which data getter object this is on the page, so depends on counter
-			 String submissionLiteralName = pn.getVarName(literalLabel, counter);
-			 //Single value
-			 if(jsonValue instanceof String) {
-				 //TODO: Deal with multiple submission values
-				 //This retrieves the value for this particular json object
-				 String jsonString = jsonObject.getString(literalLabel);
-				 jsonString = pn.replaceEncodedQuotesWithEscapedQuotes(jsonString);
-				 literalValues.add(jsonString);
-			 } else if(jsonValue instanceof JSONArray) {
-				 JSONArray values = jsonObject.getJSONArray(literalLabel);
-				 literalValues = (List<String>) JSONSerializer.toJava(values);
-				 //Replacing encoded quotes here as well
-				 this.replaceEncodedQuotesInList(pn, literalValues);
-			 } else if(jsonValue instanceof Boolean) {
-				 Boolean booleanValue = jsonObject.getBoolean(literalLabel);
-				 //Adds string version
-				 literalValues.add(booleanValue.toString());
-			 }
-			 String[] literalValuesSubmission = new String[literalValues.size()];
-			 literalValuesSubmission = literalValues.toArray(literalValuesSubmission);
-			 //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>();
-			 Object jsonValue = jsonObject.get(uriLabel);
-			//Var names will depend on which data getter object this is on the page, so depends on counter
-			 String submissionUriName = pn.getVarName(uriLabel, counter);
-			 //if single value, then, add to values
-			 if(jsonValue instanceof String) {
-				 //Var names will depend on which data getter object this is on the page, so depends on counter
-				 //This retrieves the value for this particular json object and adds to list
-				 uriValues.add(jsonObject.getString(uriLabel));
-
-			 } else if(jsonValue instanceof JSONArray) {
-				 //multiple values
-				 JSONArray values = jsonObject.getJSONArray(uriLabel);
-				 uriValues = (List<String>) JSONSerializer.toJava(values);
-				
-			 } else {
-				 //This may include JSON Objects but no way to deal with these right now
-			 }
-			 String[] uriValuesSubmission = new String[uriValues.size()];
-
-			 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
-			 //existing data getter URIs, so important to check whether the key exists within the json object in the first place
-			 String dataGetterURISubmissionName = pn.getDataGetterVarName(counter);
-			 if(jsonObject.containsKey("URI")) {
-				 String URIValue = jsonObject.getString("URI");
-				 if(URIValue != null) {
-					 log.debug("Existing URI for data getter found: " + URIValue);
-					 submission.addUriToForm(editConfiguration, dataGetterURISubmissionName, new String[]{URIValue});
-				 }
-			 } else {
-				 //if the URI is not included in the json object, this is a NEW data getter
-				 //and as such as we must ensure the URI is created
-				 submission.addUriToForm(editConfiguration, dataGetterURISubmissionName, new String[]{EditConfigurationConstants.NEW_URI_SENTINEL});
-
-			 }
-		 }
-		
-	}
-
-	private void replaceEncodedQuotesInList(ProcessDataGetterN3 pn, List<String> values) {
-		int i;
-		int len = values.size();
-		for(i = 0; i < len; i++) {
-			String value = values.get(i);
-			if(value.contains("&quot;") || value.contains("&#39;")) {
-				value = pn.replaceEncodedQuotesWithEscapedQuotes(value);
-				values.set(i,value);
-			}
-		}
-	}
-
-
-	private void addFields(ProcessDataGetterN3 pn, int counter) {
-		List<FieldVTwo> fields = pn.retrieveFields(counter);
-		//Check if fields don't already exist in case of editing
-		Map<String, FieldVTwo> existingFields = editConfiguration.getFields();
-		for(FieldVTwo newField: fields) {
-			String newFieldName = newField.getName();
-			//if not already in list and about the same
-			if(existingFields.containsKey(newFieldName)) {
-				FieldVTwo existingField = existingFields.get(newFieldName);
-				if(existingField.isEqualTo(newField)) {
-					log.debug("This field already exists and so will not be added:" + newFieldName);
-				} else {
-					log.error("The field with the same name is different and will not be added as a different field exists which is different:" + newFieldName);
-				}
-			} else {
-				editConfiguration.addField(newField);
-			}
-		}
-	}
-	
-	
-
-	//original literals on form: label, uris on form: conceptNode and conceptSource
-	//This will overwrite the original values in the edit configuration
-	private void addLiteralsAndUrisOnForm(ProcessDataGetterN3 pn, int counter) {
-		List<String> literalsOnForm = pn.retrieveLiteralsOnForm(counter);
-		editConfiguration.addLiteralsOnForm(literalsOnForm);
-		List<String> urisOnForm = pn.retrieveUrisOnForm(counter);
-		editConfiguration.addUrisOnForm(urisOnForm);
-	}
-
-	// N3 being reproduced
-	/*
-	 * ?subject ?predicate ?conceptNode .
-	 */
-	//NOT Using this right now
-	//This will overwrite the original with the set of new n3 required
-	/*
-	private void addN3Required(ProcessDataGetterN3 pn, int counter) {
-		//Use the process utils to figure out what class required to retrieve the N3 required
-		List<String> requiredList = pn.retrieveN3Required(counter);
-		//Add connection between data getter and page
-		requiredList.addAll(getPageToDataGetterN3(pn, counter));
-		if(requiredList != null) {
-			editConfiguration.addN3Required(requiredList);
-		}
-	}*/
-	private List<String> getPageToDataGetterN3(
-			ProcessDataGetterN3 pn, int counter) {
-		String dataGetterVar = pn.getDataGetterVar(counter);
-		//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
-		List<String> requiredList = pn.retrieveN3Required(counter);
-		//Add connection between data getter and page
-		requiredList.addAll(getPageToDataGetterN3(pn, counter));
-		//get optional n3
-		List<String> optionalList = pn.retrieveN3Optional(counter);
-		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(JSONObject jsonObject) {
-		String javaURI = jsonObject.getString("dataGetterClass");
-		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);
-		}
-		return dataGetterTypeURI;
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import net.sf.json.JSONSerializer;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.rdf.model.Literal;
+
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.BaseEditSubmissionPreprocessorVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.EditConfigurationConstants;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessDataGetterN3;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessDataGetterN3Utils;
+public class ManagePagePreprocessor extends
+		BaseEditSubmissionPreprocessorVTwo {
+
+	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;
+	private static Map<String, List<String>> urisFromForm = null;
+	private static List<String> pageContentUnits = null;//String submission from form
+	private static List<JSONObject> pageContentUnitsJSON = null;//converted to JSON objects that can be read
+	// String datatype
+
+	// Will be editing the edit configuration as well as edit submission here
+
+	public ManagePagePreprocessor(EditConfigurationVTwo editConfig) {
+		super(editConfig);
+		editConfiguration = editConfig;
+	}
+
+	public void preprocess(MultiValueEditSubmission inputSubmission) {
+		submission = inputSubmission;
+		// Get the input elements for concept node and concept label as well
+		// as vocab uri (which is based on thge
+		// For query parameters, check whether CUI
+		copySubmissionValues();
+		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 
+		//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
+	private void copySubmissionValues() {
+		Map<String, List<Literal>> literalsFromForm = submission.getLiteralsFromForm();
+		transformedLiteralsFromForm = copyMap(EditConfigurationUtils.transformLiteralMap(literalsFromForm));
+		urisFromForm = copyMap(submission.getUrisFromForm());
+		pageContentUnits = transformedLiteralsFromForm.get("pageContentUnit");
+	}
+
+	private Map<String, List<String>> copyMap(
+			Map<String, List<String>> originalMap) {
+		Map<String, List<String>> copyMap = new HashMap<String, List<String>>();
+		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
+		//For those literals, those values will be replaced with form values where overwritten
+		//And will be deleted where not overwritten which is the behavior we desire
+		if(this.editConfiguration.isParamUpdate()) {
+			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, 
+							 (new String[] {null}));
+				}
+			}
+			
+			
+			for(String uriName: uriKeys) {
+				//these values should never be overwritten or deleted
+				//if(uriName != "page" && uriName != "menuItem" && !uriName.startsWith("dataGetter")) {
+				if(uriName != "page") {
+					boolean hasuv = submission.hasUriValue(uriName);
+					if(!submission.hasUriValue(uriName)) {
+						submission.addUriToForm(editConfiguration, 
+								 uriName, 
+								 (new String[] {EditConfigurationConstants.BLANK_SENTINEL}));
+					}	
+				}
+			}
+		}
+		
+	}
+	
+
+	private void processDataGetters() {
+		convertToJson();
+		int counter = 0;
+		for(JSONObject 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 
+			//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
+			//To not muddle up logic, we will just add ALL required and optional statements
+			//from data getters directly to N3 optional
+			//Add n3 required
+			//addN3Required(pn, counter);
+			//Add N3 Optional as well
+			addN3Optional(pn, counter);
+			// Add URIs on Form and Add Literals On Form
+			addLiteralsAndUrisOnForm(pn, counter);
+			// Add fields
+			addFields(pn, counter);
+			//Add new resources - data getters need to be new resources
+			addNewResources(pn, counter);
+			//Add input values to submission
+			addInputsToSubmission(pn, counter, jsonObject);
+			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() {
+		//Iterate through list of inputs
+		pageContentUnitsJSON = new ArrayList<JSONObject>();
+		//page content units might return null in case self-contained template is selected
+		//otherwise there should be page content units returned from the form
+		if(pageContentUnits != null) {
+			for(String pageContentUnit: pageContentUnits) {
+				JSONObject jsonObject = (JSONObject) JSONSerializer.toJSON( pageContentUnit );
+				pageContentUnitsJSON.add(jsonObject);
+			}
+		}
+	}
+
+	//This is where the actual values will be submitted as if they were separate input fields
+	//Each field name will correspond to the names of the fileds/uris on form/literals on form
+	//generated here
+
+	private void addInputsToSubmission(ProcessDataGetterN3 pn, int counter, JSONObject jsonObject) {
+		 List<String> literalLabels = pn.getLiteralVarNamesBase();
+		 List<String> uriLabels = pn.getUriVarNamesBase();
+		 
+		 for(String literalLabel:literalLabels) {
+			 List<String> literalValues = new ArrayList<String>();
+			 Object jsonValue = jsonObject.get(literalLabel);
+			//Var names will depend on which data getter object this is on the page, so depends on counter
+			 String submissionLiteralName = pn.getVarName(literalLabel, counter);
+			 //Single value
+			 if(jsonValue instanceof String) {
+				 //TODO: Deal with multiple submission values
+				 //This retrieves the value for this particular json object
+				 String jsonString = jsonObject.getString(literalLabel);
+				 jsonString = pn.replaceEncodedQuotesWithEscapedQuotes(jsonString);
+				 literalValues.add(jsonString);
+			 } else if(jsonValue instanceof JSONArray) {
+				 JSONArray values = jsonObject.getJSONArray(literalLabel);
+				 literalValues = (List<String>) JSONSerializer.toJava(values);
+				 //Replacing encoded quotes here as well
+				 this.replaceEncodedQuotesInList(pn, literalValues);
+			 } else if(jsonValue instanceof Boolean) {
+				 Boolean booleanValue = jsonObject.getBoolean(literalLabel);
+				 //Adds string version
+				 literalValues.add(booleanValue.toString());
+			 }
+			 String[] literalValuesSubmission = new String[literalValues.size()];
+			 literalValuesSubmission = literalValues.toArray(literalValuesSubmission);
+			 //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>();
+			 Object jsonValue = jsonObject.get(uriLabel);
+			//Var names will depend on which data getter object this is on the page, so depends on counter
+			 String submissionUriName = pn.getVarName(uriLabel, counter);
+			 //if single value, then, add to values
+			 if(jsonValue instanceof String) {
+				 //Var names will depend on which data getter object this is on the page, so depends on counter
+				 //This retrieves the value for this particular json object and adds to list
+				 uriValues.add(jsonObject.getString(uriLabel));
+
+			 } else if(jsonValue instanceof JSONArray) {
+				 //multiple values
+				 JSONArray values = jsonObject.getJSONArray(uriLabel);
+				 uriValues = (List<String>) JSONSerializer.toJava(values);
+				
+			 } else {
+				 //This may include JSON Objects but no way to deal with these right now
+			 }
+			 String[] uriValuesSubmission = new String[uriValues.size()];
+
+			 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
+			 //existing data getter URIs, so important to check whether the key exists within the json object in the first place
+			 String dataGetterURISubmissionName = pn.getDataGetterVarName(counter);
+			 if(jsonObject.containsKey("URI")) {
+				 String URIValue = jsonObject.getString("URI");
+				 if(URIValue != null) {
+					 log.debug("Existing URI for data getter found: " + URIValue);
+					 submission.addUriToForm(editConfiguration, dataGetterURISubmissionName, new String[]{URIValue});
+				 }
+			 } else {
+				 //if the URI is not included in the json object, this is a NEW data getter
+				 //and as such as we must ensure the URI is created
+				 submission.addUriToForm(editConfiguration, dataGetterURISubmissionName, new String[]{EditConfigurationConstants.NEW_URI_SENTINEL});
+
+			 }
+		 }
+		
+	}
+
+	private void replaceEncodedQuotesInList(ProcessDataGetterN3 pn, List<String> values) {
+		int i;
+		int len = values.size();
+		for(i = 0; i < len; i++) {
+			String value = values.get(i);
+			if(value.contains("&quot;") || value.contains("&#39;")) {
+				value = pn.replaceEncodedQuotesWithEscapedQuotes(value);
+				values.set(i,value);
+			}
+		}
+	}
+
+
+	private void addFields(ProcessDataGetterN3 pn, int counter) {
+		List<FieldVTwo> fields = pn.retrieveFields(counter);
+		//Check if fields don't already exist in case of editing
+		Map<String, FieldVTwo> existingFields = editConfiguration.getFields();
+		for(FieldVTwo newField: fields) {
+			String newFieldName = newField.getName();
+			//if not already in list and about the same
+			if(existingFields.containsKey(newFieldName)) {
+				FieldVTwo existingField = existingFields.get(newFieldName);
+				if(existingField.isEqualTo(newField)) {
+					log.debug("This field already exists and so will not be added:" + newFieldName);
+				} else {
+					log.error("The field with the same name is different and will not be added as a different field exists which is different:" + newFieldName);
+				}
+			} else {
+				editConfiguration.addField(newField);
+			}
+		}
+	}
+	
+	
+
+	//original literals on form: label, uris on form: conceptNode and conceptSource
+	//This will overwrite the original values in the edit configuration
+	private void addLiteralsAndUrisOnForm(ProcessDataGetterN3 pn, int counter) {
+		List<String> literalsOnForm = pn.retrieveLiteralsOnForm(counter);
+		editConfiguration.addLiteralsOnForm(literalsOnForm);
+		List<String> urisOnForm = pn.retrieveUrisOnForm(counter);
+		editConfiguration.addUrisOnForm(urisOnForm);
+	}
+
+	// N3 being reproduced
+	/*
+	 * ?subject ?predicate ?conceptNode .
+	 */
+	//NOT Using this right now
+	//This will overwrite the original with the set of new n3 required
+	/*
+	private void addN3Required(ProcessDataGetterN3 pn, int counter) {
+		//Use the process utils to figure out what class required to retrieve the N3 required
+		List<String> requiredList = pn.retrieveN3Required(counter);
+		//Add connection between data getter and page
+		requiredList.addAll(getPageToDataGetterN3(pn, counter));
+		if(requiredList != null) {
+			editConfiguration.addN3Required(requiredList);
+		}
+	}*/
+	private List<String> getPageToDataGetterN3(
+			ProcessDataGetterN3 pn, int counter) {
+		String dataGetterVar = pn.getDataGetterVar(counter);
+		//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
+		List<String> requiredList = pn.retrieveN3Required(counter);
+		//Add connection between data getter and page
+		requiredList.addAll(getPageToDataGetterN3(pn, counter));
+		//get optional n3
+		List<String> optionalList = pn.retrieveN3Optional(counter);
+		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(JSONObject jsonObject) {
+		String javaURI = jsonObject.getString("dataGetterClass");
+		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);
+		}
+		return dataGetterTypeURI;
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessClassGroupDataGetterN3.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessClassGroupDataGetterN3.java
index 503f7193a..58fac7806 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessClassGroupDataGetterN3.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessClassGroupDataGetterN3.java
@@ -1,221 +1,221 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.servlet.ServletContext;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Resource;
-
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-//Returns the appropriate n3 based on data getter
-public  class ProcessClassGroupDataGetterN3 extends ProcessDataGetterAbstract {
-	private static String classType = "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData";
-	public static  String classGroupVarBase = "classGroup";
-	private Log log = LogFactory.getLog(ProcessClassGroupDataGetterN3.class);
-
-	public ProcessClassGroupDataGetterN3(){
-		
-	}
-	//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" + 
-    		"<" + 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 
-    	String dataGetterVar = getDataGetterVar(counter);
-    	String classTypeVar = getN3VarName(classTypeVarBase, counter);
-    	//String n3 = dataGetterVar + " a <" + getClassType() + ">";
-    	String n3 = dataGetterVar + " a " + classTypeVar;
-
-    	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 
-    
-    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
-    	urisOnForm.add(getVarName("classGroup", counter));
-    	//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)));
-	   //UPDATE: adding class type to the uris on the form
-	   fields.add(new FieldVTwo().setName(getVarName(classTypeVarBase, counter)));
-
-	   return fields;
-   }
-   
-   //These var names  match the names of the elements within the json object returned with the info required for the data getter
-   
-   public List<String> getLiteralVarNamesBase() {
-	   return Arrays.asList();   
-   }
-
-   //these are for the fields ON the form
-   public List<String> getUriVarNamesBase() {
-	   //UPDATE: adding class type as uri
-	   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) {
-	   //First, put dataGetterURI within scope as well
-	   this.populateExistingDataGetterURI(dataGetterURI, counter);
-	   //Put in type
-	   this.populateExistingClassType(this.getClassType(), counter);
-	   //Sparql queries for values to be executed
-	   //And then placed in the correct place/literal or uri
-	   String querystr = getExistingValuesClassGroup(dataGetterURI);
-	   QueryExecution qe = null;
-       try{
-           Query query = QueryFactory.create(querystr);
-           qe = QueryExecutionFactory.create(query, queryModel);
-           ResultSet results = qe.execSelect();
-           while( results.hasNext()){
-        	   QuerySolution qs = results.nextSolution();
-        	   Resource classGroupResource = qs.getResource("classGroup");
-        	   //Put both literals in existing literals
-        	   existingUriValues.put(this.getVarName(classGroupVarBase, counter),
-        			   new ArrayList<String>(Arrays.asList(classGroupResource.getURI())));
-           }
-       } 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 {" + 
-			   "<" + dataGetterURI + "> <" + DisplayVocabulary.FOR_CLASSGROUP + "> ?classGroup  . \n" +
-			   "}";
-	   return query;
-   }
-   
-   public JSONObject getExistingValuesJSON(String dataGetterURI, OntModel queryModel, ServletContext context) {
-	   JSONObject jObject = new JSONObject();
-	   jObject.element("dataGetterClass", classType);
-	   jObject.element(classTypeVarBase, classType);
-	   //Get class group
-	   getExistingClassGroup(dataGetterURI, jObject, queryModel);
-	   //Get classes within class group
-	   getExistingClassesInClassGroup(context, dataGetterURI, jObject);
-	   return jObject;
-   }
-   
-   private void getExistingClassGroup(String dataGetterURI, JSONObject jObject, OntModel queryModel) {
-	   String querystr = getExistingValuesClassGroup(dataGetterURI);
-	   QueryExecution qe = null;
-       try{
-           Query query = QueryFactory.create(querystr);
-           qe = QueryExecutionFactory.create(query, queryModel);
-           ResultSet results = qe.execSelect();
-           while( results.hasNext()){
-        	   QuerySolution qs = results.nextSolution();
-        	   Resource classGroupResource = qs.getResource("classGroup");
-        	   //Put both literals in existing literals
-        	   jObject.element(classGroupVarBase, classGroupResource.getURI());
-           }
-       } 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, JSONObject jObject) {
-	   //Check for class group resource within json object
-	   if(jObject.containsKey(classGroupVarBase)) {
-		   String classGroupURI = jObject.getString(classGroupVarBase);
-		   //Get classes for classGroupURI and include in 
-		   VClassGroupCache vcgc = VClassGroupCache.getVClassGroupCache(context);
-		   VClassGroup group = vcgc.getGroup(classGroupURI);
-		   populateClassesInClassGroupJSON(jObject, group);
-	   } else {
-		   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(JSONObject jObject, VClassGroup group) {
-	   JSONArray classes = new JSONArray();
-       for( VClass vc : group){
-           JSONObject vcObj = new JSONObject();
-           vcObj.element("name", vc.getName());
-           vcObj.element("URI", vc.getURI());
-           classes.add(vcObj);
-       }
-       JSONObject results = new JSONObject();
-      
-       results.element("classes", classes);                
-       results.element("classGroupName", group.getPublicName());
-       results.element("classGroupUri", group.getURI());
-       jObject.element("results", results);
-   }
-}
-
-
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.rdf.model.Resource;
+
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
+import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+//Returns the appropriate n3 based on data getter
+public  class ProcessClassGroupDataGetterN3 extends ProcessDataGetterAbstract {
+	private static String classType = "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData";
+	public static  String classGroupVarBase = "classGroup";
+	private Log log = LogFactory.getLog(ProcessClassGroupDataGetterN3.class);
+
+	public ProcessClassGroupDataGetterN3(){
+		
+	}
+	//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" + 
+    		"<" + 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 
+    	String dataGetterVar = getDataGetterVar(counter);
+    	String classTypeVar = getN3VarName(classTypeVarBase, counter);
+    	//String n3 = dataGetterVar + " a <" + getClassType() + ">";
+    	String n3 = dataGetterVar + " a " + classTypeVar;
+
+    	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 
+    
+    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
+    	urisOnForm.add(getVarName("classGroup", counter));
+    	//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)));
+	   //UPDATE: adding class type to the uris on the form
+	   fields.add(new FieldVTwo().setName(getVarName(classTypeVarBase, counter)));
+
+	   return fields;
+   }
+   
+   //These var names  match the names of the elements within the json object returned with the info required for the data getter
+   
+   public List<String> getLiteralVarNamesBase() {
+	   return Arrays.asList();   
+   }
+
+   //these are for the fields ON the form
+   public List<String> getUriVarNamesBase() {
+	   //UPDATE: adding class type as uri
+	   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) {
+	   //First, put dataGetterURI within scope as well
+	   this.populateExistingDataGetterURI(dataGetterURI, counter);
+	   //Put in type
+	   this.populateExistingClassType(this.getClassType(), counter);
+	   //Sparql queries for values to be executed
+	   //And then placed in the correct place/literal or uri
+	   String querystr = getExistingValuesClassGroup(dataGetterURI);
+	   QueryExecution qe = null;
+       try{
+           Query query = QueryFactory.create(querystr);
+           qe = QueryExecutionFactory.create(query, queryModel);
+           ResultSet results = qe.execSelect();
+           while( results.hasNext()){
+        	   QuerySolution qs = results.nextSolution();
+        	   Resource classGroupResource = qs.getResource("classGroup");
+        	   //Put both literals in existing literals
+        	   existingUriValues.put(this.getVarName(classGroupVarBase, counter),
+        			   new ArrayList<String>(Arrays.asList(classGroupResource.getURI())));
+           }
+       } 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 {" + 
+			   "<" + dataGetterURI + "> <" + DisplayVocabulary.FOR_CLASSGROUP + "> ?classGroup  . \n" +
+			   "}";
+	   return query;
+   }
+   
+   public JSONObject getExistingValuesJSON(String dataGetterURI, OntModel queryModel, ServletContext context) {
+	   JSONObject jObject = new JSONObject();
+	   jObject.element("dataGetterClass", classType);
+	   jObject.element(classTypeVarBase, classType);
+	   //Get class group
+	   getExistingClassGroup(dataGetterURI, jObject, queryModel);
+	   //Get classes within class group
+	   getExistingClassesInClassGroup(context, dataGetterURI, jObject);
+	   return jObject;
+   }
+   
+   private void getExistingClassGroup(String dataGetterURI, JSONObject jObject, OntModel queryModel) {
+	   String querystr = getExistingValuesClassGroup(dataGetterURI);
+	   QueryExecution qe = null;
+       try{
+           Query query = QueryFactory.create(querystr);
+           qe = QueryExecutionFactory.create(query, queryModel);
+           ResultSet results = qe.execSelect();
+           while( results.hasNext()){
+        	   QuerySolution qs = results.nextSolution();
+        	   Resource classGroupResource = qs.getResource("classGroup");
+        	   //Put both literals in existing literals
+        	   jObject.element(classGroupVarBase, classGroupResource.getURI());
+           }
+       } 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, JSONObject jObject) {
+	   //Check for class group resource within json object
+	   if(jObject.containsKey(classGroupVarBase)) {
+		   String classGroupURI = jObject.getString(classGroupVarBase);
+		   //Get classes for classGroupURI and include in 
+		   VClassGroupCache vcgc = VClassGroupCache.getVClassGroupCache(context);
+		   VClassGroup group = vcgc.getGroup(classGroupURI);
+		   populateClassesInClassGroupJSON(jObject, group);
+	   } else {
+		   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(JSONObject jObject, VClassGroup group) {
+	   JSONArray classes = new JSONArray();
+       for( VClass vc : group){
+           JSONObject vcObj = new JSONObject();
+           vcObj.element("name", vc.getName());
+           vcObj.element("URI", vc.getURI());
+           classes.add(vcObj);
+       }
+       JSONObject results = new JSONObject();
+      
+       results.element("classes", classes);                
+       results.element("classGroupName", group.getPublicName());
+       results.element("classGroupUri", group.getURI());
+       jObject.element("results", results);
+   }
+}
+
+
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterAbstract.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterAbstract.java
index 3ad5c1309..cfb279efc 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterAbstract.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterAbstract.java
@@ -1,89 +1,89 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.hp.hpl.jena.rdf.model.Literal;
-
-//Returns the appropriate n3 based on data getter
-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" + 
-    			"@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
-	   List<String> newResources = new ArrayList<String>();
-	   newResources.add("dataGetter" + counter);
-	   return newResources;
-   }
-   
-   protected String getSparqlPrefix() {
-		  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>>();
-   public Map<String, List<Literal>> retrieveExistingLiteralValues() {
-	  return existingLiteralValues;
-   }
-   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)));
-
-   }
-   
- 
-}
-
-
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.hp.hpl.jena.rdf.model.Literal;
+
+//Returns the appropriate n3 based on data getter
+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" + 
+    			"@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
+	   List<String> newResources = new ArrayList<String>();
+	   newResources.add("dataGetter" + counter);
+	   return newResources;
+   }
+   
+   protected String getSparqlPrefix() {
+		  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>>();
+   public Map<String, List<Literal>> retrieveExistingLiteralValues() {
+	  return existingLiteralValues;
+   }
+   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/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3.java
index c4a89a4a9..70185d540 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3.java
@@ -1,42 +1,42 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import net.sf.json.JSONObject;
-import javax.servlet.ServletContext;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.rdf.model.Literal;
-
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-
-//Returns the appropriate n3 based on data getter
-
-public interface ProcessDataGetterN3 {
-	public String getClassType();
-	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();
-    public List<String> getUriVarNamesBase();
-    public String getVarName(String base, int counter);
-    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();
-    public void populateExistingValues(String dataGetterURI, int counter, OntModel queryModel);
-    public JSONObject getExistingValuesJSON(String dataGetterURI, OntModel queryModel, ServletContext context);
-    public String replaceEncodedQuotesWithEscapedQuotes(String inputStr);
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import net.sf.json.JSONObject;
+import javax.servlet.ServletContext;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.rdf.model.Literal;
+
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+
+//Returns the appropriate n3 based on data getter
+
+public interface ProcessDataGetterN3 {
+	public String getClassType();
+	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();
+    public List<String> getUriVarNamesBase();
+    public String getVarName(String base, int counter);
+    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();
+    public void populateExistingValues(String dataGetterURI, int counter, OntModel queryModel);
+    public JSONObject getExistingValuesJSON(String dataGetterURI, OntModel queryModel, ServletContext context);
+    public String replaceEncodedQuotesWithEscapedQuotes(String inputStr);
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java
index 4900cba6f..730774c70 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Map.java
@@ -1,24 +1,24 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils;
-
-import java.util.HashMap;
-
-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. 
- */
-public class ProcessDataGetterN3Map {
-    private static final Log log = LogFactory.getLog(ProcessDataGetterN3Map.class);
-    public  static HashMap<String, String> getDataGetterTypeToProcessorMap() {
-    	 HashMap<String, String> map = new HashMap<String, String>();
-    	 map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessSparqlDataGetterN3");
-    	 map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessClassGroupDataGetterN3");
-    	 map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessIndividualsForClassesDataGetterN3");
-    	 map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessFixedHTMLN3");
-
-    	 return map;
-    }
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils;
+
+import java.util.HashMap;
+
+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. 
+ */
+public class ProcessDataGetterN3Map {
+    private static final Log log = LogFactory.getLog(ProcessDataGetterN3Map.class);
+    public  static HashMap<String, String> getDataGetterTypeToProcessorMap() {
+    	 HashMap<String, String> map = new HashMap<String, String>();
+    	 map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessSparqlDataGetterN3");
+    	 map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessClassGroupDataGetterN3");
+    	 map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessIndividualsForClassesDataGetterN3");
+    	 map.put("edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter", "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils.ProcessFixedHTMLN3");
+
+    	 return map;
+    }
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Utils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Utils.java
index 64a64b36c..189383f39 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Utils.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessDataGetterN3Utils.java
@@ -1,56 +1,56 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils;
-
-import java.lang.reflect.Constructor;
-import java.util.HashMap;
-
-import net.sf.json.JSONObject;
-
-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. 
- */
-public class ProcessDataGetterN3Utils {
-    private static final Log log = LogFactory.getLog(ProcessDataGetterN3Utils.class);
-    
-    public static ProcessDataGetterN3 getDataGetterProcessorN3(String dataGetterClass, JSONObject jsonObject) {
-    	HashMap<String, String> map = ProcessDataGetterN3Map.getDataGetterTypeToProcessorMap();
-    	//
-    	if(map.containsKey(dataGetterClass)) {
-    		String processorClass = map.get(dataGetterClass);
-    		try {
-    			ProcessDataGetterN3 pn = instantiateClass(processorClass, jsonObject);
-    			return pn;
-    		} catch(Exception ex) {
-    			log.error("Exception occurred in trying to get processor class for n3 for " + dataGetterClass, ex);
-    			return null;
-    		}
-    	}
-    	return null;
-    }
-    
-    private static ProcessDataGetterN3 instantiateClass(String processorClass, JSONObject jsonObject) {
-    	ProcessDataGetterN3 pn = null;
-    	try {
-	    	Class<?> clz = Class.forName(processorClass);
-	    	Constructor<?>[] ctList = clz.getConstructors();
-	    	for (Constructor<?> ct: ctList) {
-		    	Class<?>[] parameterTypes =ct.getParameterTypes();
-				if(parameterTypes.length > 0 && parameterTypes[0].isAssignableFrom(jsonObject.getClass())) {
-						 pn = (ProcessDataGetterN3) ct.newInstance(jsonObject);
-				} 	else {
-						pn = (ProcessDataGetterN3) ct.newInstance();
-				} 
-	    	}
-		
-    	} catch(Exception ex) {
-			log.error("Error occurred instantiating " + processorClass, ex);
-		}
-    	return pn;
-        		
-    }
-    
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils;
+
+import java.lang.reflect.Constructor;
+import java.util.HashMap;
+
+import net.sf.json.JSONObject;
+
+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. 
+ */
+public class ProcessDataGetterN3Utils {
+    private static final Log log = LogFactory.getLog(ProcessDataGetterN3Utils.class);
+    
+    public static ProcessDataGetterN3 getDataGetterProcessorN3(String dataGetterClass, JSONObject jsonObject) {
+    	HashMap<String, String> map = ProcessDataGetterN3Map.getDataGetterTypeToProcessorMap();
+    	//
+    	if(map.containsKey(dataGetterClass)) {
+    		String processorClass = map.get(dataGetterClass);
+    		try {
+    			ProcessDataGetterN3 pn = instantiateClass(processorClass, jsonObject);
+    			return pn;
+    		} catch(Exception ex) {
+    			log.error("Exception occurred in trying to get processor class for n3 for " + dataGetterClass, ex);
+    			return null;
+    		}
+    	}
+    	return null;
+    }
+    
+    private static ProcessDataGetterN3 instantiateClass(String processorClass, JSONObject jsonObject) {
+    	ProcessDataGetterN3 pn = null;
+    	try {
+	    	Class<?> clz = Class.forName(processorClass);
+	    	Constructor<?>[] ctList = clz.getConstructors();
+	    	for (Constructor<?> ct: ctList) {
+		    	Class<?>[] parameterTypes =ct.getParameterTypes();
+				if(parameterTypes.length > 0 && parameterTypes[0].isAssignableFrom(jsonObject.getClass())) {
+						 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/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessFixedHTMLN3.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessFixedHTMLN3.java
index e7fe326b5..260942cf8 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessFixedHTMLN3.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessFixedHTMLN3.java
@@ -1,178 +1,178 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import javax.servlet.ServletContext;
-
-import net.sf.json.JSONObject;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Literal;
-
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-//Returns the appropriate n3 based on data getter
-public  class ProcessFixedHTMLN3 extends ProcessDataGetterAbstract {
-	private static String classType = "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter";
-	private Log log = LogFactory.getLog(ProcessFixedHTMLN3.class);
-
-	public ProcessFixedHTMLN3(){
-		
-	}
-	//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
-	//?dataGetter a FixedHTMLDataGetter ; display:saveToVar ?saveToVar; display:htmlValue ?htmlValue .
-    public List<String> retrieveN3Required(int counter) {
-    	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" + 
-    	"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)));
-	   //UPDATE: adding class type to the uris on the form
-	   fields.add(new FieldVTwo().setName(getVarName(classTypeVarBase, counter)));
-	   return fields;
-   }
-   
-   public List<String> getLiteralVarNamesBase() {
-	   return Arrays.asList("saveToVar", "htmlValue");   
-   }
-
-   //these are for the fields ON the form
-   public List<String> getUriVarNamesBase() {
-	   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
-	   this.populateExistingDataGetterURI(dataGetterURI, counter);
-	 //Put in type
-	   this.populateExistingClassType(this.getClassType(), counter);
-	//Sparql queries for values to be executed
-	   //And then placed in the correct place/literal or uri
-	   String querystr = getExistingValuesSparqlQuery(dataGetterURI);
-	   QueryExecution qe = null;
-       try{
-           Query query = QueryFactory.create(querystr);
-           qe = QueryExecutionFactory.create(query, queryModel);
-           ResultSet results = qe.execSelect();
-           while( results.hasNext()){
-        	   QuerySolution qs = results.nextSolution();
-        	   Literal saveToVarLiteral = qs.getLiteral("saveToVar");
-        	   Literal htmlValueLiteral = qs.getLiteral("htmlValue");
-        	   //Put both literals in existing literals
-        	   existingLiteralValues.put(this.getVarName("saveToVar", counter),
-        			   new ArrayList<Literal>(Arrays.asList(saveToVarLiteral)));
-        	   existingLiteralValues.put(this.getVarName("htmlValue", counter),
-        			   new ArrayList<Literal>(Arrays.asList(htmlValueLiteral)));
-           }
-       } 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" + 
-			   "}";
-	   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
-   public JSONObject getExistingValuesJSON(String dataGetterURI, OntModel queryModel, ServletContext context) {
-	   JSONObject jObject = new JSONObject();
-	   jObject.element("dataGetterClass", classType);
-	   jObject.element(classTypeVarBase, classType);
-	   String querystr = getExistingValuesSparqlQuery(dataGetterURI);
-	   QueryExecution qe = null;
-       try{
-           Query query = QueryFactory.create(querystr);
-           qe = QueryExecutionFactory.create(query, queryModel);
-           ResultSet results = qe.execSelect();
-           while( results.hasNext()){
-        	   QuerySolution qs = results.nextSolution();
-        	   Literal saveToVarLiteral = qs.getLiteral("saveToVar");
-        	   Literal htmlValueLiteral = qs.getLiteral("htmlValue");
-        	   String htmlValueString = htmlValueLiteral.getString();
-        	   htmlValueString = this.replaceQuotes(htmlValueString);
-        	   jObject.element("saveToVar", saveToVarLiteral.getString());
-        	   //TODO: Handle single and double quotes within string and escape properlyu
-        	   jObject.element("htmlValue", htmlValueString);
-           }
-       } 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;
-   }
-}
-
-
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import javax.servlet.ServletContext;
+
+import net.sf.json.JSONObject;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.rdf.model.Literal;
+
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+//Returns the appropriate n3 based on data getter
+public  class ProcessFixedHTMLN3 extends ProcessDataGetterAbstract {
+	private static String classType = "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter";
+	private Log log = LogFactory.getLog(ProcessFixedHTMLN3.class);
+
+	public ProcessFixedHTMLN3(){
+		
+	}
+	//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
+	//?dataGetter a FixedHTMLDataGetter ; display:saveToVar ?saveToVar; display:htmlValue ?htmlValue .
+    public List<String> retrieveN3Required(int counter) {
+    	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" + 
+    	"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)));
+	   //UPDATE: adding class type to the uris on the form
+	   fields.add(new FieldVTwo().setName(getVarName(classTypeVarBase, counter)));
+	   return fields;
+   }
+   
+   public List<String> getLiteralVarNamesBase() {
+	   return Arrays.asList("saveToVar", "htmlValue");   
+   }
+
+   //these are for the fields ON the form
+   public List<String> getUriVarNamesBase() {
+	   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
+	   this.populateExistingDataGetterURI(dataGetterURI, counter);
+	 //Put in type
+	   this.populateExistingClassType(this.getClassType(), counter);
+	//Sparql queries for values to be executed
+	   //And then placed in the correct place/literal or uri
+	   String querystr = getExistingValuesSparqlQuery(dataGetterURI);
+	   QueryExecution qe = null;
+       try{
+           Query query = QueryFactory.create(querystr);
+           qe = QueryExecutionFactory.create(query, queryModel);
+           ResultSet results = qe.execSelect();
+           while( results.hasNext()){
+        	   QuerySolution qs = results.nextSolution();
+        	   Literal saveToVarLiteral = qs.getLiteral("saveToVar");
+        	   Literal htmlValueLiteral = qs.getLiteral("htmlValue");
+        	   //Put both literals in existing literals
+        	   existingLiteralValues.put(this.getVarName("saveToVar", counter),
+        			   new ArrayList<Literal>(Arrays.asList(saveToVarLiteral)));
+        	   existingLiteralValues.put(this.getVarName("htmlValue", counter),
+        			   new ArrayList<Literal>(Arrays.asList(htmlValueLiteral)));
+           }
+       } 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" + 
+			   "}";
+	   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
+   public JSONObject getExistingValuesJSON(String dataGetterURI, OntModel queryModel, ServletContext context) {
+	   JSONObject jObject = new JSONObject();
+	   jObject.element("dataGetterClass", classType);
+	   jObject.element(classTypeVarBase, classType);
+	   String querystr = getExistingValuesSparqlQuery(dataGetterURI);
+	   QueryExecution qe = null;
+       try{
+           Query query = QueryFactory.create(querystr);
+           qe = QueryExecutionFactory.create(query, queryModel);
+           ResultSet results = qe.execSelect();
+           while( results.hasNext()){
+        	   QuerySolution qs = results.nextSolution();
+        	   Literal saveToVarLiteral = qs.getLiteral("saveToVar");
+        	   Literal htmlValueLiteral = qs.getLiteral("htmlValue");
+        	   String htmlValueString = htmlValueLiteral.getString();
+        	   htmlValueString = this.replaceQuotes(htmlValueString);
+        	   jObject.element("saveToVar", saveToVarLiteral.getString());
+        	   //TODO: Handle single and double quotes within string and escape properlyu
+        	   jObject.element("htmlValue", htmlValueString);
+           }
+       } 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/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessIndividualsForClassesDataGetterN3.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessIndividualsForClassesDataGetterN3.java
index 54421d6ca..dd24195ff 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessIndividualsForClassesDataGetterN3.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessIndividualsForClassesDataGetterN3.java
@@ -1,220 +1,220 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Resource;
-import javax.servlet.ServletContext;
-
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-import net.sf.json.JSONSerializer;
-//Returns the appropriate n3 for selection of classes from within class group
-public  class ProcessIndividualsForClassesDataGetterN3 extends ProcessClassGroupDataGetterN3 {
-	private static String classType = "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter";
-	protected static String individualClassVarNameBase = "classesSelectedInClassGroup";
-	private Log log = LogFactory.getLog(ProcessIndividualsForClassesDataGetterN3.class);
-
-	public ProcessIndividualsForClassesDataGetterN3(){
-		
-	}
-	//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 
-    
-    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);
-    	//now get individual classes selected uri
-    	//urisOnForm.addAll(getIndividualClassesVarNames(counter));
-    	//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)));
-	   //Add fields for each class selected
-	/*   List<String> classVarNames = getIndividualClassesVarNames(counter);
-	   for(String v:classVarNames) {
-		   fields.add(new FieldVTwo().setName(v));
-
-	   }*/
-	   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();   
-   }
-
-   //these are for the fields ON the form
-   public List<String> getUriVarNamesBase() {
-	   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);
-	   //UPDATE: Put in type
-	   this.populateExistingClassType(this.getClassType(), counter);
-	   //Sparql queries for values to be executed
-	   //And then placed in the correct place/literal or uri
-	   String querystr = getExistingValuesIndividualsForClasses(dataGetterURI);
-	   QueryExecution qe = null;
-       try{
-           Query query = QueryFactory.create(querystr);
-           qe = QueryExecutionFactory.create(query, queryModel);
-           ResultSet results = qe.execSelect();
-           List<String> individualsForClasses = new ArrayList<String>();
-           while( results.hasNext()){
-        	   QuerySolution qs = results.nextSolution();
-        	   Resource classGroupResource = qs.getResource("classGroup");
-        	   String classGroupVarName = this.getVarName(classGroupVarBase, counter);
-        	   if(!existingUriValues.containsKey(classGroupVarName)) {
-	        	   //Put both literals in existing literals
-	        	   existingUriValues.put(this.getVarName(classGroupVarBase, counter),
-	        			   new ArrayList<String>(Arrays.asList(classGroupResource.getURI())));
-        	   }
-        	   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 {" + 
-			   "<" + dataGetterURI + "> <" + DisplayVocabulary.FOR_CLASSGROUP + "> ?classGroup  . \n" +
-			   "<" + dataGetterURI + "> <" + DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS + "> ?individualForClass . \n" + 
-			   "}";
-	   return query;
-   }
-
-   
-   public JSONObject getExistingValuesJSON(String dataGetterURI, OntModel queryModel, ServletContext context) {
-	   JSONObject jObject = new JSONObject();
-	   jObject.element("dataGetterClass", classType);
-	   //Update to include class type as variable
-	   jObject.element(classTypeVarBase, classType);
-	   //Get selected class group and which classes were selected
-	   getExistingClassGroupAndIndividuals(dataGetterURI, jObject, queryModel);
-	   //Get all classes within the class group
-	   super.getExistingClassesInClassGroup(context, dataGetterURI, jObject);
-	   return jObject;
-   }
-   
-   private void getExistingClassGroupAndIndividuals(String dataGetterURI, JSONObject jObject, OntModel queryModel) {
-	   String querystr = getExistingValuesIndividualsForClasses(dataGetterURI);
-	   QueryExecution qe = null;
-       try{
-           Query query = QueryFactory.create(querystr);
-           qe = QueryExecutionFactory.create(query, queryModel);
-           ResultSet results = qe.execSelect();
-           JSONArray individualsForClasses = new JSONArray();
-           String classGroupURI = null;
-           while( results.hasNext()){
-        	   QuerySolution qs = results.nextSolution();
-        	   if(classGroupURI == null) {
-	        	   Resource classGroupResource = qs.getResource("classGroup");
-	        	   classGroupURI = classGroupResource.getURI();
-        	   }
-        	   Resource individualForClassResource = qs.getResource("individualForClass");
-        	   individualsForClasses.add(individualForClassResource.getURI());
-        	 //Put both literals in existing literals
-        	   
-           }
-           
-          jObject.element("classGroup", classGroupURI);
-          //this is a json array
-          jObject.element(individualClassVarNameBase, individualsForClasses);
-       } catch(Exception ex) {
-    	   log.error("Exception occurred in retrieving existing values with query " + querystr, ex);
-       }
-   }
-
-}
-
-
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Resource;
+import javax.servlet.ServletContext;
+
+import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import net.sf.json.JSONSerializer;
+//Returns the appropriate n3 for selection of classes from within class group
+public  class ProcessIndividualsForClassesDataGetterN3 extends ProcessClassGroupDataGetterN3 {
+	private static String classType = "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter";
+	protected static String individualClassVarNameBase = "classesSelectedInClassGroup";
+	private Log log = LogFactory.getLog(ProcessIndividualsForClassesDataGetterN3.class);
+
+	public ProcessIndividualsForClassesDataGetterN3(){
+		
+	}
+	//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 
+    
+    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);
+    	//now get individual classes selected uri
+    	//urisOnForm.addAll(getIndividualClassesVarNames(counter));
+    	//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)));
+	   //Add fields for each class selected
+	/*   List<String> classVarNames = getIndividualClassesVarNames(counter);
+	   for(String v:classVarNames) {
+		   fields.add(new FieldVTwo().setName(v));
+
+	   }*/
+	   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();   
+   }
+
+   //these are for the fields ON the form
+   public List<String> getUriVarNamesBase() {
+	   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);
+	   //UPDATE: Put in type
+	   this.populateExistingClassType(this.getClassType(), counter);
+	   //Sparql queries for values to be executed
+	   //And then placed in the correct place/literal or uri
+	   String querystr = getExistingValuesIndividualsForClasses(dataGetterURI);
+	   QueryExecution qe = null;
+       try{
+           Query query = QueryFactory.create(querystr);
+           qe = QueryExecutionFactory.create(query, queryModel);
+           ResultSet results = qe.execSelect();
+           List<String> individualsForClasses = new ArrayList<String>();
+           while( results.hasNext()){
+        	   QuerySolution qs = results.nextSolution();
+        	   Resource classGroupResource = qs.getResource("classGroup");
+        	   String classGroupVarName = this.getVarName(classGroupVarBase, counter);
+        	   if(!existingUriValues.containsKey(classGroupVarName)) {
+	        	   //Put both literals in existing literals
+	        	   existingUriValues.put(this.getVarName(classGroupVarBase, counter),
+	        			   new ArrayList<String>(Arrays.asList(classGroupResource.getURI())));
+        	   }
+        	   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 {" + 
+			   "<" + dataGetterURI + "> <" + DisplayVocabulary.FOR_CLASSGROUP + "> ?classGroup  . \n" +
+			   "<" + dataGetterURI + "> <" + DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS + "> ?individualForClass . \n" + 
+			   "}";
+	   return query;
+   }
+
+   
+   public JSONObject getExistingValuesJSON(String dataGetterURI, OntModel queryModel, ServletContext context) {
+	   JSONObject jObject = new JSONObject();
+	   jObject.element("dataGetterClass", classType);
+	   //Update to include class type as variable
+	   jObject.element(classTypeVarBase, classType);
+	   //Get selected class group and which classes were selected
+	   getExistingClassGroupAndIndividuals(dataGetterURI, jObject, queryModel);
+	   //Get all classes within the class group
+	   super.getExistingClassesInClassGroup(context, dataGetterURI, jObject);
+	   return jObject;
+   }
+   
+   private void getExistingClassGroupAndIndividuals(String dataGetterURI, JSONObject jObject, OntModel queryModel) {
+	   String querystr = getExistingValuesIndividualsForClasses(dataGetterURI);
+	   QueryExecution qe = null;
+       try{
+           Query query = QueryFactory.create(querystr);
+           qe = QueryExecutionFactory.create(query, queryModel);
+           ResultSet results = qe.execSelect();
+           JSONArray individualsForClasses = new JSONArray();
+           String classGroupURI = null;
+           while( results.hasNext()){
+        	   QuerySolution qs = results.nextSolution();
+        	   if(classGroupURI == null) {
+	        	   Resource classGroupResource = qs.getResource("classGroup");
+	        	   classGroupURI = classGroupResource.getURI();
+        	   }
+        	   Resource individualForClassResource = qs.getResource("individualForClass");
+        	   individualsForClasses.add(individualForClassResource.getURI());
+        	 //Put both literals in existing literals
+        	   
+           }
+           
+          jObject.element("classGroup", classGroupURI);
+          //this is a json array
+          jObject.element(individualClassVarNameBase, individualsForClasses);
+       } catch(Exception ex) {
+    	   log.error("Exception occurred in retrieving existing values with query " + querystr, ex);
+       }
+   }
+
+}
+
+
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSparqlDataGetterN3.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSparqlDataGetterN3.java
index a3409cd3d..d4feb86d6 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSparqlDataGetterN3.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/preprocessors/utils/ProcessSparqlDataGetterN3.java
@@ -1,211 +1,211 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Resource;
-import javax.servlet.ServletContext;
-
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
-
-import net.sf.json.JSONObject;
-import net.sf.json.JSONSerializer;
-//Returns the appropriate n3 based on data getter
-public  class ProcessSparqlDataGetterN3 extends ProcessDataGetterAbstract {
-	private static String classType = "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter";
-	private Log log = LogFactory.getLog(ProcessSparqlDataGetterN3.class);
-
-	public ProcessSparqlDataGetterN3(){
-		
-	}
-	//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) {
-    	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" + 
-    	"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) + ". "; 
-    	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
-    	urisOnForm.add(getVarName("queryModel", counter));
-    	//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)));
-	   fields.add(new FieldVTwo().setName(getVarName("saveToVar", counter)));
-	   fields.add(new FieldVTwo().setName(getVarName("query", counter)));
-	   //UPDATE: adding class type to the uris on the form
-	   fields.add(new FieldVTwo().setName(getVarName(classTypeVarBase, counter)));
-
-	   return fields;
-   }
-   
-   public List<String> getLiteralVarNamesBase() {
-	   return Arrays.asList("saveToVar", "query");   
-   }
-
-   //these are for the fields ON the form
-   public List<String> getUriVarNamesBase() {
-	   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);
-	   //Put in type
-	   this.populateExistingClassType(this.getClassType(), counter);
-	   //Sparql queries for values to be executed
-	   //And then placed in the correct place/literal or uri
-	   String querystr = getExistingValuesSparqlQuery(dataGetterURI);
-	   QueryExecution qe = null;
-       try{
-           Query query = QueryFactory.create(querystr);
-           qe = QueryExecutionFactory.create(query, queryModel);
-           ResultSet results = qe.execSelect();
-           while( results.hasNext()){
-        	   QuerySolution qs = results.nextSolution();
-        	   Literal saveToVarLiteral = qs.getLiteral("saveToVar");
-        	   Literal queryLiteral = qs.getLiteral("query");
-        	   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), 
-        			   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" + 
-			   "}";
-	   return query;
-   }
-
-
-   
-   public JSONObject getExistingValuesJSON(String dataGetterURI, OntModel queryModel, ServletContext context) {
-	   JSONObject jObject = new JSONObject();
-	   jObject.element("dataGetterClass", classType);
-	   jObject.element(classTypeVarBase, classType);
-	   String querystr = getExistingValuesSparqlQuery(dataGetterURI);
-	   QueryExecution qe = null;
-       try{
-           Query query = QueryFactory.create(querystr);
-           qe = QueryExecutionFactory.create(query, queryModel);
-           ResultSet results = qe.execSelect();
-           while( results.hasNext()){
-        	   QuerySolution qs = results.nextSolution();
-        	   Literal saveToVarLiteral = qs.getLiteral("saveToVar");
-        	   Literal queryLiteral = qs.getLiteral("query");
-        	   String queryString = queryLiteral.getString();
-        	   //we are saving the actual quotes in the n3 as escaped
-        	   //so for the json object we need to convert them into encoded
-        	   //quotes that will be reconverted on the client side for display
-        	   //Not converting them will either result in an incorrect json object
-        	   //or incorrect html
-        	   queryString = replaceQuotes(queryString);
-        	   Resource queryModelResource = qs.getResource("queryModel");
-        	   jObject.element("saveToVar", saveToVarLiteral.getString());
-        	   jObject.element("query",queryString);
-        	   if(queryModelResource != null) {
-        	   jObject.element("queryModel", queryModelResource.getURI());
-        	   } else {
-            	   jObject.element("queryModel", "");
-
-        	   }
-           }
-       } 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;
-   }
-
-}
-
-
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.preprocessors.utils;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Resource;
+import javax.servlet.ServletContext;
+
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldVTwo;
+
+import net.sf.json.JSONObject;
+import net.sf.json.JSONSerializer;
+//Returns the appropriate n3 based on data getter
+public  class ProcessSparqlDataGetterN3 extends ProcessDataGetterAbstract {
+	private static String classType = "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter";
+	private Log log = LogFactory.getLog(ProcessSparqlDataGetterN3.class);
+
+	public ProcessSparqlDataGetterN3(){
+		
+	}
+	//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) {
+    	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" + 
+    	"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) + ". "; 
+    	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
+    	urisOnForm.add(getVarName("queryModel", counter));
+    	//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)));
+	   fields.add(new FieldVTwo().setName(getVarName("saveToVar", counter)));
+	   fields.add(new FieldVTwo().setName(getVarName("query", counter)));
+	   //UPDATE: adding class type to the uris on the form
+	   fields.add(new FieldVTwo().setName(getVarName(classTypeVarBase, counter)));
+
+	   return fields;
+   }
+   
+   public List<String> getLiteralVarNamesBase() {
+	   return Arrays.asList("saveToVar", "query");   
+   }
+
+   //these are for the fields ON the form
+   public List<String> getUriVarNamesBase() {
+	   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);
+	   //Put in type
+	   this.populateExistingClassType(this.getClassType(), counter);
+	   //Sparql queries for values to be executed
+	   //And then placed in the correct place/literal or uri
+	   String querystr = getExistingValuesSparqlQuery(dataGetterURI);
+	   QueryExecution qe = null;
+       try{
+           Query query = QueryFactory.create(querystr);
+           qe = QueryExecutionFactory.create(query, queryModel);
+           ResultSet results = qe.execSelect();
+           while( results.hasNext()){
+        	   QuerySolution qs = results.nextSolution();
+        	   Literal saveToVarLiteral = qs.getLiteral("saveToVar");
+        	   Literal queryLiteral = qs.getLiteral("query");
+        	   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), 
+        			   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" + 
+			   "}";
+	   return query;
+   }
+
+
+   
+   public JSONObject getExistingValuesJSON(String dataGetterURI, OntModel queryModel, ServletContext context) {
+	   JSONObject jObject = new JSONObject();
+	   jObject.element("dataGetterClass", classType);
+	   jObject.element(classTypeVarBase, classType);
+	   String querystr = getExistingValuesSparqlQuery(dataGetterURI);
+	   QueryExecution qe = null;
+       try{
+           Query query = QueryFactory.create(querystr);
+           qe = QueryExecutionFactory.create(query, queryModel);
+           ResultSet results = qe.execSelect();
+           while( results.hasNext()){
+        	   QuerySolution qs = results.nextSolution();
+        	   Literal saveToVarLiteral = qs.getLiteral("saveToVar");
+        	   Literal queryLiteral = qs.getLiteral("query");
+        	   String queryString = queryLiteral.getString();
+        	   //we are saving the actual quotes in the n3 as escaped
+        	   //so for the json object we need to convert them into encoded
+        	   //quotes that will be reconverted on the client side for display
+        	   //Not converting them will either result in an incorrect json object
+        	   //or incorrect html
+        	   queryString = replaceQuotes(queryString);
+        	   Resource queryModelResource = qs.getResource("queryModel");
+        	   jObject.element("saveToVar", saveToVarLiteral.getString());
+        	   jObject.element("query",queryString);
+        	   if(queryModelResource != null) {
+        	   jObject.element("queryModel", queryModelResource.getURI());
+        	   } else {
+            	   jObject.element("queryModel", "");
+
+        	   }
+           }
+       } 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/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java
index 82f5c5a33..9c7d6b9a0 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/controller/PostEditCleanupController.java
@@ -1,162 +1,162 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.DirectRedirectResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroModelSource;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditSubmissionUtils;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3EditUtils;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller.ProcessRdfFormController.Utilities;
-
-
-public class PostEditCleanupController extends FreemarkerHttpServlet{
-	
-    private static Log log = LogFactory.getLog(PostEditCleanupController.class);    	    
-	
-    @Override
-	protected Actions requiredActions(VitroRequest vreq) {
-    	return SimplePermission.DO_FRONT_END_EDITING.ACTIONS;
-	}
-
-    @Override 
-	protected ResponseValues processRequest(VitroRequest vreq) {	
-		doPostEditCleanup( vreq );
-		return doPostEditRedirect( vreq, null);	
-	}
-
-	/**
-	 * Returns a redirect after an edit.
-	 * @param vreq - should have an edit configuration in attributes or session
-	 * @param entityToReturnTo - may be null
-	 * @return
-	 */
-    protected static ResponseValues doPostEditRedirect( VitroRequest vreq , String entityToReturnTo){
-        EditConfigurationVTwo editConfig = EditConfigurationVTwo.getConfigFromSession(vreq.getSession(), vreq);      
-        if(editConfig == null){
-            log.error("No edit configuration found in doPostEditRedirect()");        
-            return new RedirectResponseValues( UrlBuilder.getHomeUrl() );
-        }
-        
-        // 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, 
-            //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);                  
-        }
-      
-        //Get url pattern
-        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       
-            //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 );            
-            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 ){ 
-            
-            //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           
-            String path = UrlBuilder.getPath( UrlBuilder.Route.INDIVIDUAL, paramMap);
-            path += getSpecialModelParam( 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 && 
-            editConfig.getAboxModelId().equals(VitroModelSource.ModelName.DISPLAY.toString())){
-            return "&"+ DisplayVocabulary.SWITCH_TO_DISPLAY_MODEL + "=1";
-        }else{
-            return "";
-        }
-    }
-
-    public static void doPostEditCleanup( VitroRequest vreq ) {
-        EditConfigurationVTwo configuration = EditConfigurationVTwo.getConfigFromSession(vreq.getSession(), vreq);      
-        if(configuration == null)
-            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);            
-            //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);                               
-        }               
-    }    
-	
-    
-    /**
-     * 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. 
-     */
-    public static String getPredicateAnchor( HttpServletRequest req, EditConfigurationVTwo config){
-        if( req == null || config == null )
-            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);
-            return predicateAnchor;
-        }else{
-            return "";
-        }
-    }    
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.ParamMap;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Route;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.DirectRedirectResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.VitroModelSource;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationVTwo;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditSubmissionUtils;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.MultiValueEditSubmission;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.N3EditUtils;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.controller.ProcessRdfFormController.Utilities;
+
+
+public class PostEditCleanupController extends FreemarkerHttpServlet{
+	
+    private static Log log = LogFactory.getLog(PostEditCleanupController.class);    	    
+	
+    @Override
+	protected Actions requiredActions(VitroRequest vreq) {
+    	return SimplePermission.DO_FRONT_END_EDITING.ACTIONS;
+	}
+
+    @Override 
+	protected ResponseValues processRequest(VitroRequest vreq) {	
+		doPostEditCleanup( vreq );
+		return doPostEditRedirect( vreq, null);	
+	}
+
+	/**
+	 * Returns a redirect after an edit.
+	 * @param vreq - should have an edit configuration in attributes or session
+	 * @param entityToReturnTo - may be null
+	 * @return
+	 */
+    protected static ResponseValues doPostEditRedirect( VitroRequest vreq , String entityToReturnTo){
+        EditConfigurationVTwo editConfig = EditConfigurationVTwo.getConfigFromSession(vreq.getSession(), vreq);      
+        if(editConfig == null){
+            log.error("No edit configuration found in doPostEditRedirect()");        
+            return new RedirectResponseValues( UrlBuilder.getHomeUrl() );
+        }
+        
+        // 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, 
+            //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);                  
+        }
+      
+        //Get url pattern
+        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       
+            //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 );            
+            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 ){ 
+            
+            //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           
+            String path = UrlBuilder.getPath( UrlBuilder.Route.INDIVIDUAL, paramMap);
+            path += getSpecialModelParam( 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 && 
+            editConfig.getAboxModelId().equals(VitroModelSource.ModelName.DISPLAY.toString())){
+            return "&"+ DisplayVocabulary.SWITCH_TO_DISPLAY_MODEL + "=1";
+        }else{
+            return "";
+        }
+    }
+
+    public static void doPostEditCleanup( VitroRequest vreq ) {
+        EditConfigurationVTwo configuration = EditConfigurationVTwo.getConfigFromSession(vreq.getSession(), vreq);      
+        if(configuration == null)
+            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);            
+            //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);                               
+        }               
+    }    
+	
+    
+    /**
+     * 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. 
+     */
+    public static String getPredicateAnchor( HttpServletRequest req, EditConfigurationVTwo config){
+        if( req == null || config == null )
+            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);
+            return predicateAnchor;
+        }else{
+            return "";
+        }
+    }    
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailFactory.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailFactory.java
index 05e3c7a51..84f0c1fcd 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailFactory.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailFactory.java
@@ -1,278 +1,278 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.email;
-
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintStream;
-import java.net.ConnectException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.Properties;
-import java.util.Scanner;
-
-import javax.mail.Session;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerConfiguration;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerConfigurationLoader;
-import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
-
-/**
- * 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.
- */
-public class FreemarkerEmailFactory {
-	private static final Log log = LogFactory
-			.getLog(FreemarkerEmailFactory.class);
-
-	public static final String SMTP_HOST_PROPERTY = "email.smtpHost";
-	public static final String REPLY_TO_PROPERTY = "email.replyTo";
-
-	private static final String ATTRIBUTE_NAME = FreemarkerEmailFactory.class
-			.getName();
-
-	// ----------------------------------------------------------------------
-	// static methods
-	// ----------------------------------------------------------------------
-
-	public static FreemarkerEmailMessage createNewMessage(VitroRequest vreq) {
-		if (!isConfigured(vreq)) {
-			throw new IllegalStateException("Email factory is not configured.");
-		}
-
-		FreemarkerEmailFactory factory = getFactory(vreq);
-		FreemarkerConfiguration fConfig = FreemarkerConfigurationLoader
-				.getConfig(vreq);
-		return new FreemarkerEmailMessage(vreq, fConfig,
-				factory.getEmailSession(), factory.getReplyToAddress());
-	}
-
-	/**
-	 * Client code that does not use the FreemarkerEmailFactory can still use
-	 * it's Email Session.
-	 */
-	public static Session getEmailSession(HttpServletRequest req) {
-		if (!isConfigured(req)) {
-			throw new IllegalStateException("Email factory is not configured.");
-		}
-		return getFactory(req).getEmailSession();
-	}
-
-	public static boolean isConfigured(HttpServletRequest req) {
-		return (getFactory(req) != null);
-	}
-
-	private static FreemarkerEmailFactory getFactory(HttpServletRequest req) {
-		ServletContext ctx = req.getSession().getServletContext();
-		return (FreemarkerEmailFactory) ctx.getAttribute(ATTRIBUTE_NAME);
-	}
-
-	// ----------------------------------------------------------------------
-	// The factory
-	// ----------------------------------------------------------------------
-
-	private final String smtpHost;
-	private final InternetAddress replyToAddress;
-	private final Session emailSession;
-
-	public FreemarkerEmailFactory(ServletContext ctx) {
-		this.smtpHost = getSmtpHostFromConfig(ctx);
-		new SmtpHostTester().test(this.smtpHost);
-
-		this.replyToAddress = getReplyToAddressFromConfig(ctx);
-		this.emailSession = createEmailSession(smtpHost);
-	}
-
-	String getSmtpHost() {
-		return smtpHost;
-	}
-
-	InternetAddress getReplyToAddress() {
-		return replyToAddress;
-	}
-
-	Session getEmailSession() {
-		return emailSession;
-	}
-
-	private String getSmtpHostFromConfig(ServletContext ctx) {
-		ConfigurationProperties config = ConfigurationProperties.getBean(ctx);
-		String hostName = config.getProperty(SMTP_HOST_PROPERTY, "");
-		if (hostName.isEmpty()) {
-			throw new NotConfiguredException(SMTP_HOST_PROPERTY);
-		}
-		return hostName;
-	}
-
-	private InternetAddress getReplyToAddressFromConfig(ServletContext ctx) {
-		ConfigurationProperties config = ConfigurationProperties.getBean(ctx);
-		String rawAddress = config.getProperty(REPLY_TO_PROPERTY, "");
-		if (rawAddress.isEmpty()) {
-			throw new NotConfiguredException(REPLY_TO_PROPERTY);
-		}
-
-		try {
-			InternetAddress[] addresses = InternetAddress.parse(rawAddress,
-					false);
-			if (addresses.length == 0) {
-				throw new BadPropertyValueException("No Reply-To address",
-						REPLY_TO_PROPERTY);
-			} else if (addresses.length > 1) {
-				throw new BadPropertyValueException(
-						"More than one Reply-To address", REPLY_TO_PROPERTY);
-			} else {
-				return addresses[0];
-			}
-		} catch (AddressException e) {
-			throw new IllegalStateException(
-					"Error while parsing Reply-To address configured in '"
-							+ REPLY_TO_PROPERTY + "'", e);
-		}
-	}
-
-	private Session createEmailSession(String hostName) {
-		Properties props = new Properties(System.getProperties());
-		props.put("mail.smtp.host", hostName);
-		return Session.getDefaultInstance(props, null);
-	}
-
-	// ----------------------------------------------------------------------
-	// Helper classes
-	// ----------------------------------------------------------------------
-
-	public static class NotConfiguredException extends RuntimeException {
-		public NotConfiguredException(String property) {
-			super("Configuration property for '" + property
-					+ "' is empty - Email functions are disabled.");
-		}
-	}
-
-	public static class BadPropertyValueException extends RuntimeException {
-		public BadPropertyValueException(String problem, String property) {
-			super(problem + " configured in '" + property
-					+ "' - Email functions are disabled.");
-		}
-	}
-
-	public static class InvalidSmtpHost extends RuntimeException {
-		public InvalidSmtpHost(String smtpHost, String reason) {
-			super("Invalid SMTP host: '" + smtpHost + "': " + reason
-					+ " - Email functions are disabled.");
-		}
-	}
-
-	/**
-	 * Checks to see whether the SMTP host will talk to us.
-	 */
-	public static class SmtpHostTester {
-		private static final int SMTP_PORT = 25;
-		private static final int SMTP_SUCCESS_CODE = 220;
-
-		/**
-		 * Try to open a connection to the SMTP host and conduct an "empty"
-		 * conversation using SMTP.
-		 * 
-		 * @throws InvalidSmtpHost
-		 *             If anything goes wrong.
-		 */
-		public void test(String smtpHost) throws InvalidSmtpHost {
-			Socket socket = null;
-			PrintStream out = null;
-			Scanner in = null;
-			try {
-				InetAddress hostAddr = InetAddress.getByName(smtpHost);
-				socket = new Socket(hostAddr, SMTP_PORT);
-
-				out = new PrintStream(socket.getOutputStream());
-				in = new Scanner(new InputStreamReader(socket.getInputStream()));
-
-				int smtpCode = in.nextInt();
-				if (smtpCode != SMTP_SUCCESS_CODE) {
-					throw new InvalidSmtpHost(smtpHost,
-							"host will not converse: "
-									+ "SMTP initialization code is " + smtpCode);
-				}
-
-				out.println("QUIT");
-			} catch (UnknownHostException e) {
-				throw new InvalidSmtpHost(smtpHost,
-						"host name is not recognized");
-			} catch (ConnectException e) {
-				throw new InvalidSmtpHost(smtpHost,
-						"refused connection on port " + SMTP_PORT);
-			} catch (IOException e) {
-				throw new RuntimeException("unrecognized problem: ", e);
-			} finally {
-				if (in != null) {
-					in.close();
-				}
-				if (out != null) {
-					out.close();
-				}
-				if ((socket != null) && (!socket.isClosed())) {
-					try {
-						socket.close();
-					} catch (IOException e) {
-						log.error("failed to close socket", e);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Tries to create a FreemarkerEmailFactory bean and store it in the servlet
-	 * context.
-	 */
-	public static class Setup implements ServletContextListener {
-		@Override
-		public void contextInitialized(ServletContextEvent sce) {
-			ServletContext ctx = sce.getServletContext();
-			StartupStatus ss = StartupStatus.getBean(ctx);
-
-			try {
-				FreemarkerEmailFactory factory = new FreemarkerEmailFactory(ctx);
-				ctx.setAttribute(ATTRIBUTE_NAME, factory);
-				ss.info(this,
-						"The system will send email from '"
-								+ factory.getReplyToAddress() + "' through '"
-								+ factory.getSmtpHost() + "'.");
-			} catch (NotConfiguredException e) {
-				ss.info(this, e.getMessage());
-			} catch (BadPropertyValueException e) {
-				ss.warning(this, e.getMessage());
-			} catch (InvalidSmtpHost e) {
-				ss.warning(this, e.getMessage());
-			} catch (Exception e) {
-				ss.warning(this,
-						"Failed to initialize FreemarkerEmailFactory. "
-								+ "The system will not be able to send email "
-								+ "to users.", e);
-			}
-		}
-
-		@Override
-		public void contextDestroyed(ServletContextEvent sce) {
-			sce.getServletContext().removeAttribute(ATTRIBUTE_NAME);
-		}
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.email;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintStream;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.util.Properties;
+import java.util.Scanner;
+
+import javax.mail.Session;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerConfiguration;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerConfigurationLoader;
+import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
+
+/**
+ * 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.
+ */
+public class FreemarkerEmailFactory {
+	private static final Log log = LogFactory
+			.getLog(FreemarkerEmailFactory.class);
+
+	public static final String SMTP_HOST_PROPERTY = "email.smtpHost";
+	public static final String REPLY_TO_PROPERTY = "email.replyTo";
+
+	private static final String ATTRIBUTE_NAME = FreemarkerEmailFactory.class
+			.getName();
+
+	// ----------------------------------------------------------------------
+	// static methods
+	// ----------------------------------------------------------------------
+
+	public static FreemarkerEmailMessage createNewMessage(VitroRequest vreq) {
+		if (!isConfigured(vreq)) {
+			throw new IllegalStateException("Email factory is not configured.");
+		}
+
+		FreemarkerEmailFactory factory = getFactory(vreq);
+		FreemarkerConfiguration fConfig = FreemarkerConfigurationLoader
+				.getConfig(vreq);
+		return new FreemarkerEmailMessage(vreq, fConfig,
+				factory.getEmailSession(), factory.getReplyToAddress());
+	}
+
+	/**
+	 * Client code that does not use the FreemarkerEmailFactory can still use
+	 * it's Email Session.
+	 */
+	public static Session getEmailSession(HttpServletRequest req) {
+		if (!isConfigured(req)) {
+			throw new IllegalStateException("Email factory is not configured.");
+		}
+		return getFactory(req).getEmailSession();
+	}
+
+	public static boolean isConfigured(HttpServletRequest req) {
+		return (getFactory(req) != null);
+	}
+
+	private static FreemarkerEmailFactory getFactory(HttpServletRequest req) {
+		ServletContext ctx = req.getSession().getServletContext();
+		return (FreemarkerEmailFactory) ctx.getAttribute(ATTRIBUTE_NAME);
+	}
+
+	// ----------------------------------------------------------------------
+	// The factory
+	// ----------------------------------------------------------------------
+
+	private final String smtpHost;
+	private final InternetAddress replyToAddress;
+	private final Session emailSession;
+
+	public FreemarkerEmailFactory(ServletContext ctx) {
+		this.smtpHost = getSmtpHostFromConfig(ctx);
+		new SmtpHostTester().test(this.smtpHost);
+
+		this.replyToAddress = getReplyToAddressFromConfig(ctx);
+		this.emailSession = createEmailSession(smtpHost);
+	}
+
+	String getSmtpHost() {
+		return smtpHost;
+	}
+
+	InternetAddress getReplyToAddress() {
+		return replyToAddress;
+	}
+
+	Session getEmailSession() {
+		return emailSession;
+	}
+
+	private String getSmtpHostFromConfig(ServletContext ctx) {
+		ConfigurationProperties config = ConfigurationProperties.getBean(ctx);
+		String hostName = config.getProperty(SMTP_HOST_PROPERTY, "");
+		if (hostName.isEmpty()) {
+			throw new NotConfiguredException(SMTP_HOST_PROPERTY);
+		}
+		return hostName;
+	}
+
+	private InternetAddress getReplyToAddressFromConfig(ServletContext ctx) {
+		ConfigurationProperties config = ConfigurationProperties.getBean(ctx);
+		String rawAddress = config.getProperty(REPLY_TO_PROPERTY, "");
+		if (rawAddress.isEmpty()) {
+			throw new NotConfiguredException(REPLY_TO_PROPERTY);
+		}
+
+		try {
+			InternetAddress[] addresses = InternetAddress.parse(rawAddress,
+					false);
+			if (addresses.length == 0) {
+				throw new BadPropertyValueException("No Reply-To address",
+						REPLY_TO_PROPERTY);
+			} else if (addresses.length > 1) {
+				throw new BadPropertyValueException(
+						"More than one Reply-To address", REPLY_TO_PROPERTY);
+			} else {
+				return addresses[0];
+			}
+		} catch (AddressException e) {
+			throw new IllegalStateException(
+					"Error while parsing Reply-To address configured in '"
+							+ REPLY_TO_PROPERTY + "'", e);
+		}
+	}
+
+	private Session createEmailSession(String hostName) {
+		Properties props = new Properties(System.getProperties());
+		props.put("mail.smtp.host", hostName);
+		return Session.getDefaultInstance(props, null);
+	}
+
+	// ----------------------------------------------------------------------
+	// Helper classes
+	// ----------------------------------------------------------------------
+
+	public static class NotConfiguredException extends RuntimeException {
+		public NotConfiguredException(String property) {
+			super("Configuration property for '" + property
+					+ "' is empty - Email functions are disabled.");
+		}
+	}
+
+	public static class BadPropertyValueException extends RuntimeException {
+		public BadPropertyValueException(String problem, String property) {
+			super(problem + " configured in '" + property
+					+ "' - Email functions are disabled.");
+		}
+	}
+
+	public static class InvalidSmtpHost extends RuntimeException {
+		public InvalidSmtpHost(String smtpHost, String reason) {
+			super("Invalid SMTP host: '" + smtpHost + "': " + reason
+					+ " - Email functions are disabled.");
+		}
+	}
+
+	/**
+	 * Checks to see whether the SMTP host will talk to us.
+	 */
+	public static class SmtpHostTester {
+		private static final int SMTP_PORT = 25;
+		private static final int SMTP_SUCCESS_CODE = 220;
+
+		/**
+		 * Try to open a connection to the SMTP host and conduct an "empty"
+		 * conversation using SMTP.
+		 * 
+		 * @throws InvalidSmtpHost
+		 *             If anything goes wrong.
+		 */
+		public void test(String smtpHost) throws InvalidSmtpHost {
+			Socket socket = null;
+			PrintStream out = null;
+			Scanner in = null;
+			try {
+				InetAddress hostAddr = InetAddress.getByName(smtpHost);
+				socket = new Socket(hostAddr, SMTP_PORT);
+
+				out = new PrintStream(socket.getOutputStream());
+				in = new Scanner(new InputStreamReader(socket.getInputStream()));
+
+				int smtpCode = in.nextInt();
+				if (smtpCode != SMTP_SUCCESS_CODE) {
+					throw new InvalidSmtpHost(smtpHost,
+							"host will not converse: "
+									+ "SMTP initialization code is " + smtpCode);
+				}
+
+				out.println("QUIT");
+			} catch (UnknownHostException e) {
+				throw new InvalidSmtpHost(smtpHost,
+						"host name is not recognized");
+			} catch (ConnectException e) {
+				throw new InvalidSmtpHost(smtpHost,
+						"refused connection on port " + SMTP_PORT);
+			} catch (IOException e) {
+				throw new RuntimeException("unrecognized problem: ", e);
+			} finally {
+				if (in != null) {
+					in.close();
+				}
+				if (out != null) {
+					out.close();
+				}
+				if ((socket != null) && (!socket.isClosed())) {
+					try {
+						socket.close();
+					} catch (IOException e) {
+						log.error("failed to close socket", e);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Tries to create a FreemarkerEmailFactory bean and store it in the servlet
+	 * context.
+	 */
+	public static class Setup implements ServletContextListener {
+		@Override
+		public void contextInitialized(ServletContextEvent sce) {
+			ServletContext ctx = sce.getServletContext();
+			StartupStatus ss = StartupStatus.getBean(ctx);
+
+			try {
+				FreemarkerEmailFactory factory = new FreemarkerEmailFactory(ctx);
+				ctx.setAttribute(ATTRIBUTE_NAME, factory);
+				ss.info(this,
+						"The system will send email from '"
+								+ factory.getReplyToAddress() + "' through '"
+								+ factory.getSmtpHost() + "'.");
+			} catch (NotConfiguredException e) {
+				ss.info(this, e.getMessage());
+			} catch (BadPropertyValueException e) {
+				ss.warning(this, e.getMessage());
+			} catch (InvalidSmtpHost e) {
+				ss.warning(this, e.getMessage());
+			} catch (Exception e) {
+				ss.warning(this,
+						"Failed to initialize FreemarkerEmailFactory. "
+								+ "The system will not be able to send email "
+								+ "to users.", e);
+			}
+		}
+
+		@Override
+		public void contextDestroyed(ServletContextEvent sce) {
+			sce.getServletContext().removeAttribute(ATTRIBUTE_NAME);
+		}
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java
index 6fab17daa..0dd14a2f3 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java
@@ -1,238 +1,238 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.email;
-
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.mail.Address;
-import javax.mail.Message;
-import javax.mail.Message.RecipientType;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerConfiguration;
-import edu.cornell.mannlib.vitro.webapp.web.directives.EmailDirective;
-import freemarker.core.Environment;
-import freemarker.template.Template;
-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 {
-	private static final Log log = LogFactory
-			.getLog(FreemarkerEmailMessage.class);
-
-	private final VitroRequest vreq;
-	private final Session mailSession;
-	private final FreemarkerConfiguration config;
-
-	private final List<Recipient> recipients = new ArrayList<Recipient>();
-	private final InternetAddress replyToAddress;
-
-	private InternetAddress fromAddress = null;
-	private String subject = "";
-	private String templateName = "";
-	private String htmlContent = "";
-	private String textContent = "";
-	private Map<String, Object> bodyMap = Collections.emptyMap();
-
-	/**
-	 * Package access - should only be created by the factory.
-	 */
-	FreemarkerEmailMessage(VitroRequest vreq, FreemarkerConfiguration fConfig,
-			Session mailSession, InternetAddress replyToAddress) {
-		this.vreq = vreq;
-		this.mailSession = mailSession;
-		this.replyToAddress = replyToAddress;
-		this.config = fConfig;
-	}
-
-	public void addRecipient(RecipientType type, String emailAddress) {
-		if (type == null) {
-			throw new NullPointerException("type may not be null.");
-		}
-		if (emailAddress == null) {
-			log.warn("recipient type was '" + type
-					+ "', but email address was null.");
-			return;
-		}
-
-		try {
-			recipients.add(new Recipient(type, emailAddress));
-		} catch (AddressException e) {
-			log.warn("invalid recipient address: " + type + ", '"
-					+ emailAddress + "'");
-			return;
-		}
-	}
-
-	public void addRecipient(RecipientType type, String emailAddress,
-			String personalName) {
-		if (personalName == null) {
-			addRecipient(type, emailAddress);
-		}
-		if (type == null) {
-			throw new NullPointerException("type may not be null.");
-		}
-		if (emailAddress == null) {
-			log.warn("recipient type was '" + type
-					+ "', but email address was null.");
-			return;
-		}
-
-		try {
-			recipients.add(new Recipient(type, emailAddress, personalName));
-		} catch (UnsupportedEncodingException e) {
-			log.warn("invalid recipient address: " + type + ", '"
-					+ emailAddress + "', personal name '" + personalName + "'");
-			return;
-		}
-	}
-
-	public void setSubject(String subject) {
-		this.subject = nonNull(subject, "");
-	}
-
-	public void setHtmlContent(String htmlContent) {
-		this.htmlContent = nonNull(htmlContent, "");
-	}
-
-	public void setTextContent(String textContent) {
-		this.textContent = nonNull(textContent, "");
-	}
-
-	public void setTemplate(String templateName) {
-		this.templateName = nonNull(templateName, "");
-	}
-
-	public void setBodyMap(Map<String, Object> body) {
-		if (body == null) {
-			this.bodyMap = Collections.emptyMap();
-		} else {
-			this.bodyMap = new HashMap<String, Object>(body);
-		}
-	}
-
-	public void processTemplate() {
-		bodyMap.put("email", new EmailDirective(this));
-
-		try {
-			Template template = config.getTemplate(templateName);
-
-			Environment env = template.createProcessingEnvironment(bodyMap,
-					new StringWriter());
-			env.setCustomAttribute("request", vreq);
-			env.setCustomAttribute("context", vreq.getSession()
-					.getServletContext());
-			env.process();
-		} catch (TemplateException e) {
-			log.error(e, e);
-		} catch (IOException e) {
-			log.error(e, e);
-		}
-	}
-
-	public boolean send() {
-		try {
-			MimeMessage msg = new MimeMessage(mailSession);
-			msg.setReplyTo(new Address[] { replyToAddress });
-
-			if (fromAddress == null) {
-				msg.addFrom(new Address[] { replyToAddress });
-			} else {
-				msg.addFrom(new Address[] { fromAddress });
-			}
-
-			for (Recipient recipient : recipients) {
-				msg.addRecipient(recipient.type, recipient.address);
-			}
-
-			msg.setSubject(subject);
-
-			if (textContent.isEmpty()) {
-				if (htmlContent.isEmpty()) {
-					log.error("Message has neither text body nor HTML body");
-				} else {
-					msg.setContent(htmlContent, "text/html");
-				}
-			} else {
-				if (htmlContent.isEmpty()) {
-					msg.setContent(textContent, "text/plain");
-				} else {
-					MimeMultipart content = new MimeMultipart("alternative");
-					addBodyPart(content, textContent, "text/plain");
-					addBodyPart(content, htmlContent, "text/html");
-					msg.setContent(content);
-				}
-			}
-
-			msg.setSentDate(new Date());
-
-			Transport.send(msg);
-			return true;
-		} catch (MessagingException e) {
-			log.error("Failed to send message.", e);
-			return false;
-		}
-	}
-
-	private void addBodyPart(MimeMultipart content, String textBody, String type)
-			throws MessagingException {
-		MimeBodyPart bodyPart = new MimeBodyPart();
-		bodyPart.setContent(textBody, type);
-		content.addBodyPart(bodyPart);
-	}
-
-	public String getReplyToAddress() {
-		return replyToAddress.getAddress();
-	}
-
-	private <T> T nonNull(T value, T defaultValue) {
-		return (value == null) ? defaultValue : value;
-	}
-
-	private static class Recipient {
-		final Message.RecipientType type;
-		final InternetAddress address;
-
-		public Recipient(RecipientType type, String address)
-				throws AddressException {
-			this.type = type;
-			this.address = new InternetAddress(address);
-		}
-
-		public Recipient(RecipientType type, String address, String personalName)
-				throws UnsupportedEncodingException {
-			this.type = type;
-			this.address = new InternetAddress(address, personalName);
-		}
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.email;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.mail.Address;
+import javax.mail.Message;
+import javax.mail.Message.RecipientType;
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerConfiguration;
+import edu.cornell.mannlib.vitro.webapp.web.directives.EmailDirective;
+import freemarker.core.Environment;
+import freemarker.template.Template;
+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 {
+	private static final Log log = LogFactory
+			.getLog(FreemarkerEmailMessage.class);
+
+	private final VitroRequest vreq;
+	private final Session mailSession;
+	private final FreemarkerConfiguration config;
+
+	private final List<Recipient> recipients = new ArrayList<Recipient>();
+	private final InternetAddress replyToAddress;
+
+	private InternetAddress fromAddress = null;
+	private String subject = "";
+	private String templateName = "";
+	private String htmlContent = "";
+	private String textContent = "";
+	private Map<String, Object> bodyMap = Collections.emptyMap();
+
+	/**
+	 * Package access - should only be created by the factory.
+	 */
+	FreemarkerEmailMessage(VitroRequest vreq, FreemarkerConfiguration fConfig,
+			Session mailSession, InternetAddress replyToAddress) {
+		this.vreq = vreq;
+		this.mailSession = mailSession;
+		this.replyToAddress = replyToAddress;
+		this.config = fConfig;
+	}
+
+	public void addRecipient(RecipientType type, String emailAddress) {
+		if (type == null) {
+			throw new NullPointerException("type may not be null.");
+		}
+		if (emailAddress == null) {
+			log.warn("recipient type was '" + type
+					+ "', but email address was null.");
+			return;
+		}
+
+		try {
+			recipients.add(new Recipient(type, emailAddress));
+		} catch (AddressException e) {
+			log.warn("invalid recipient address: " + type + ", '"
+					+ emailAddress + "'");
+			return;
+		}
+	}
+
+	public void addRecipient(RecipientType type, String emailAddress,
+			String personalName) {
+		if (personalName == null) {
+			addRecipient(type, emailAddress);
+		}
+		if (type == null) {
+			throw new NullPointerException("type may not be null.");
+		}
+		if (emailAddress == null) {
+			log.warn("recipient type was '" + type
+					+ "', but email address was null.");
+			return;
+		}
+
+		try {
+			recipients.add(new Recipient(type, emailAddress, personalName));
+		} catch (UnsupportedEncodingException e) {
+			log.warn("invalid recipient address: " + type + ", '"
+					+ emailAddress + "', personal name '" + personalName + "'");
+			return;
+		}
+	}
+
+	public void setSubject(String subject) {
+		this.subject = nonNull(subject, "");
+	}
+
+	public void setHtmlContent(String htmlContent) {
+		this.htmlContent = nonNull(htmlContent, "");
+	}
+
+	public void setTextContent(String textContent) {
+		this.textContent = nonNull(textContent, "");
+	}
+
+	public void setTemplate(String templateName) {
+		this.templateName = nonNull(templateName, "");
+	}
+
+	public void setBodyMap(Map<String, Object> body) {
+		if (body == null) {
+			this.bodyMap = Collections.emptyMap();
+		} else {
+			this.bodyMap = new HashMap<String, Object>(body);
+		}
+	}
+
+	public void processTemplate() {
+		bodyMap.put("email", new EmailDirective(this));
+
+		try {
+			Template template = config.getTemplate(templateName);
+
+			Environment env = template.createProcessingEnvironment(bodyMap,
+					new StringWriter());
+			env.setCustomAttribute("request", vreq);
+			env.setCustomAttribute("context", vreq.getSession()
+					.getServletContext());
+			env.process();
+		} catch (TemplateException e) {
+			log.error(e, e);
+		} catch (IOException e) {
+			log.error(e, e);
+		}
+	}
+
+	public boolean send() {
+		try {
+			MimeMessage msg = new MimeMessage(mailSession);
+			msg.setReplyTo(new Address[] { replyToAddress });
+
+			if (fromAddress == null) {
+				msg.addFrom(new Address[] { replyToAddress });
+			} else {
+				msg.addFrom(new Address[] { fromAddress });
+			}
+
+			for (Recipient recipient : recipients) {
+				msg.addRecipient(recipient.type, recipient.address);
+			}
+
+			msg.setSubject(subject);
+
+			if (textContent.isEmpty()) {
+				if (htmlContent.isEmpty()) {
+					log.error("Message has neither text body nor HTML body");
+				} else {
+					msg.setContent(htmlContent, "text/html");
+				}
+			} else {
+				if (htmlContent.isEmpty()) {
+					msg.setContent(textContent, "text/plain");
+				} else {
+					MimeMultipart content = new MimeMultipart("alternative");
+					addBodyPart(content, textContent, "text/plain");
+					addBodyPart(content, htmlContent, "text/html");
+					msg.setContent(content);
+				}
+			}
+
+			msg.setSentDate(new Date());
+
+			Transport.send(msg);
+			return true;
+		} catch (MessagingException e) {
+			log.error("Failed to send message.", e);
+			return false;
+		}
+	}
+
+	private void addBodyPart(MimeMultipart content, String textBody, String type)
+			throws MessagingException {
+		MimeBodyPart bodyPart = new MimeBodyPart();
+		bodyPart.setContent(textBody, type);
+		content.addBodyPart(bodyPart);
+	}
+
+	public String getReplyToAddress() {
+		return replyToAddress.getAddress();
+	}
+
+	private <T> T nonNull(T value, T defaultValue) {
+		return (value == null) ? defaultValue : value;
+	}
+
+	private static class Recipient {
+		final Message.RecipientType type;
+		final InternetAddress address;
+
+		public Recipient(RecipientType type, String address)
+				throws AddressException {
+			this.type = type;
+			this.address = new InternetAddress(address);
+		}
+
+		public Recipient(RecipientType type, String address, String personalName)
+				throws UnsupportedEncodingException {
+			this.type = type;
+			this.address = new InternetAddress(address, personalName);
+		}
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/FileServingHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/FileServingHelper.java
index a171d2e5b..be7c8334e 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/FileServingHelper.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/FileServingHelper.java
@@ -1,129 +1,129 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
-import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageSetup;
-
-/**
- * Static methods to help when serving uploaded files.
- */
-public class FileServingHelper {
-	private static final Log log = LogFactory.getLog(FileServingHelper.class);
-
-	private static final String DEFAULT_PATH = "/individual/";
-	private static final String FILE_PATH = "/file/";
-	private static boolean warned; // Only issue the warning once.
-
-	/**
-	 * Get the default namespace from the configuration properties, and trim off
-	 * the suffix.
-	 */
-	private static String getDefaultNamespace(ServletContext ctx) {
-		String defaultNamespace = ConfigurationProperties.getBean(ctx)
-				.getProperty(FileStorageSetup.PROPERTY_DEFAULT_NAMESPACE);
-		if (defaultNamespace == null) {
-			throw new IllegalArgumentException(
-					"Configuration properties must contain a value for '"
-							+ FileStorageSetup.PROPERTY_DEFAULT_NAMESPACE + "'");
-		}
-
-		if (!defaultNamespace.endsWith(DEFAULT_PATH)) {
-			if (!warned) {
-				log.warn("Default namespace does not match the expected form: '"
-						+ defaultNamespace + "'");
-				warned = true;
-			}
-		}
-
-		return defaultNamespace;
-	}
-
-	/**
-	 * <p>
-	 * Combine the URI and the filename to produce a relative URL for the file
-	 * (relative to the context of the webapp). The filename will be URLEncoded
-	 * as needed.
-	 * </p>
-	 * <p>
-	 * This should involve stripping the default namespace from the front of the
-	 * 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>
-	 *         <li>null, if the original URI or the filename was null.</li>
-	 *         </ul>
-	 */
-	public static String getBytestreamAliasUrl(String uri, String filename,
-			ServletContext ctx) {
-		if ((uri == null) || (filename == null)) {
-			return null;
-		}
-
-		String defaultNamespace = getDefaultNamespace(ctx);
-
-		if (!uri.startsWith(defaultNamespace)) {
-			log.warn("uri does not start with the default namespace: '" + uri
-					+ "'");
-			return uri;
-		}
-		String remainder = uri.substring(defaultNamespace.length());
-
-		try {
-			filename = URLEncoder.encode(filename, "UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			log.error("No UTF-8 encoding?", e); // Can't happen.
-		}
-
-		String separator = remainder.endsWith("/") ? "" : "/";
-		return FILE_PATH + remainder + separator + filename;
-	}
-
-	/** No need for instances because all of the methods are static. */
-	private FileServingHelper() {
-		// nothing to instantiate.
-	}
-
-	/**
-	 * <p>
-	 * Take a relative URL (relative to the context of the webapp) and produce
-	 * the URI for the file bytestream.
-	 * </p>
-	 * <p>
-	 * 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</code> if the URL couldn't be translated.
-	 */
-	public static String getBytestreamUri(String path, ServletContext ctx) {
-		if (path == null) {
-			return null;
-		}
-		if (!path.startsWith(FILE_PATH)) {
-			log.warn("path does not start with a file prefix: '" + path + "'");
-			return null;
-		}
-		String remainder = path.substring(FILE_PATH.length());
-
-		int slashHere = remainder.lastIndexOf('/');
-		if (slashHere == -1) {
-			log.debug("path does not include a filename: '" + path + "'");
-			return null;
-		}
-		remainder = remainder.substring(0, slashHere);
-
-		return getDefaultNamespace(ctx) + remainder;
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageSetup;
+
+/**
+ * Static methods to help when serving uploaded files.
+ */
+public class FileServingHelper {
+	private static final Log log = LogFactory.getLog(FileServingHelper.class);
+
+	private static final String DEFAULT_PATH = "/individual/";
+	private static final String FILE_PATH = "/file/";
+	private static boolean warned; // Only issue the warning once.
+
+	/**
+	 * Get the default namespace from the configuration properties, and trim off
+	 * the suffix.
+	 */
+	private static String getDefaultNamespace(ServletContext ctx) {
+		String defaultNamespace = ConfigurationProperties.getBean(ctx)
+				.getProperty(FileStorageSetup.PROPERTY_DEFAULT_NAMESPACE);
+		if (defaultNamespace == null) {
+			throw new IllegalArgumentException(
+					"Configuration properties must contain a value for '"
+							+ FileStorageSetup.PROPERTY_DEFAULT_NAMESPACE + "'");
+		}
+
+		if (!defaultNamespace.endsWith(DEFAULT_PATH)) {
+			if (!warned) {
+				log.warn("Default namespace does not match the expected form: '"
+						+ defaultNamespace + "'");
+				warned = true;
+			}
+		}
+
+		return defaultNamespace;
+	}
+
+	/**
+	 * <p>
+	 * Combine the URI and the filename to produce a relative URL for the file
+	 * (relative to the context of the webapp). The filename will be URLEncoded
+	 * as needed.
+	 * </p>
+	 * <p>
+	 * This should involve stripping the default namespace from the front of the
+	 * 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>
+	 *         <li>null, if the original URI or the filename was null.</li>
+	 *         </ul>
+	 */
+	public static String getBytestreamAliasUrl(String uri, String filename,
+			ServletContext ctx) {
+		if ((uri == null) || (filename == null)) {
+			return null;
+		}
+
+		String defaultNamespace = getDefaultNamespace(ctx);
+
+		if (!uri.startsWith(defaultNamespace)) {
+			log.warn("uri does not start with the default namespace: '" + uri
+					+ "'");
+			return uri;
+		}
+		String remainder = uri.substring(defaultNamespace.length());
+
+		try {
+			filename = URLEncoder.encode(filename, "UTF-8");
+		} catch (UnsupportedEncodingException e) {
+			log.error("No UTF-8 encoding?", e); // Can't happen.
+		}
+
+		String separator = remainder.endsWith("/") ? "" : "/";
+		return FILE_PATH + remainder + separator + filename;
+	}
+
+	/** No need for instances because all of the methods are static. */
+	private FileServingHelper() {
+		// nothing to instantiate.
+	}
+
+	/**
+	 * <p>
+	 * Take a relative URL (relative to the context of the webapp) and produce
+	 * the URI for the file bytestream.
+	 * </p>
+	 * <p>
+	 * 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</code> if the URL couldn't be translated.
+	 */
+	public static String getBytestreamUri(String path, ServletContext ctx) {
+		if (path == null) {
+			return null;
+		}
+		if (!path.startsWith(FILE_PATH)) {
+			log.warn("path does not start with a file prefix: '" + path + "'");
+			return null;
+		}
+		String remainder = path.substring(FILE_PATH.length());
+
+		int slashHere = remainder.lastIndexOf('/');
+		if (slashHere == -1) {
+			log.debug("path does not include a filename: '" + path + "'");
+			return null;
+		}
+		remainder = remainder.substring(0, slashHere);
+
+		return getDefaultNamespace(ctx) + remainder;
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/TempFileHolder.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/TempFileHolder.java
index 7926dc7df..8c7200cb4 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/TempFileHolder.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/TempFileHolder.java
@@ -1,152 +1,152 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage;
-
-import java.io.IOException;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionBindingEvent;
-import javax.servlet.http.HttpSessionBindingListener;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorage;
-import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageSetup;
-import edu.cornell.mannlib.vitro.webapp.filestorage.model.FileInfo;
-
-/**
- * Attaches an uploaded file to the session with a listener, so the file will be
- * deleted if
- * <ul>
- * <li>The session times out.</li>
- * <li>The session is invalidated.</li>
- * <li>The server is shut down.</li>
- * <li>Another file is attached to the session with the same attribute name.</li>
- * </ul>
- * To see that the file isn't deleted, remove it from the session with a call to
- * {@link TempFileHolder#remove(HttpSession, String) remove}.
- */
-public class TempFileHolder implements HttpSessionBindingListener {
-	private static final Log log = LogFactory.getLog(TempFileHolder.class);
-
-	/**
-	 * Create a {@link TempFileHolder} 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,
-			FileInfo fileInfo) {
-		if (session == null) {
-			throw new NullPointerException("session may not be null.");
-		}
-		if (attributeName == null) {
-			throw new NullPointerException("attributeName may not be null.");
-		}
-		if (fileInfo == null) {
-			throw new NullPointerException("fileInfo may not be null.");
-		}
-		log.debug("attach this file: " + fileInfo);
-		session.setAttribute(attributeName, new TempFileHolder(fileInfo));
-	}
-
-	/**
-	 * Get the {@link TempFileHolder} 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 {@link TempFileHolder},
-	 * return null.
-	 */
-	public static FileInfo remove(HttpSession session, String attributeName) {
-		if (session == null) {
-			throw new NullPointerException("session may not be null.");
-		}
-		if (attributeName == null) {
-			throw new NullPointerException("attributeName may not be null.");
-		}
-		Object attribute = session.getAttribute(attributeName);
-		if (attribute instanceof TempFileHolder) {
-			FileInfo fileInfo = ((TempFileHolder) attribute).extractFileInfo();
-			session.removeAttribute(attributeName);
-			log.debug("remove this file: " + fileInfo);
-			return fileInfo;
-		} else if (attribute == null) {
-			return null;
-		} else {
-			session.removeAttribute(attributeName);
-			return null;
-		}
-	}
-
-	private FileInfo fileInfo;
-
-	private TempFileHolder(FileInfo fileInfo) {
-		if (fileInfo == null) {
-			throw new NullPointerException("fileInfo may not be null.");
-		}
-		this.fileInfo = fileInfo;
-	}
-
-	/**
-	 * Gets the {@link FileInfo} payload, and removes it so the file won't be
-	 * deleted when the value is unbound.
-	 * 
-	 * @return
-	 */
-	private FileInfo extractFileInfo() {
-		FileInfo result = this.fileInfo;
-		this.fileInfo = null;
-		return result;
-	}
-
-	/**
-	 * When attached to the session, do nothing.
-	 * 
-	 * @see HttpSessionBindingListener#valueBound(HttpSessionBindingEvent)
-	 */
-	@Override
-	public void valueBound(HttpSessionBindingEvent event) {
-	}
-
-	/**
-	 * When removed from the session, if the {@link #fileInfo} is not empty,
-	 * delete the file. If you had wanted this file, you should have called
-	 * {@link #remove(HttpSession, String) remove}.
-	 * 
-	 * @see HttpSessionBindingListener#valueUnbound(HttpSessionBindingEvent)
-	 */
-	@Override
-	public void valueUnbound(HttpSessionBindingEvent event) {
-		if (fileInfo == null) {
-			log.trace("No file info.");
-			return;
-		}
-
-		if (fileInfo.getBytestreamUri() == null) {
-			log.warn("File info has no URI?");
-			return;
-		}
-
-		HttpSession session = event.getSession();
-		ServletContext servletContext = session.getServletContext();
-
-		FileStorage fs = (FileStorage) servletContext
-				.getAttribute(FileStorageSetup.ATTRIBUTE_NAME);
-		if (fs == null) {
-			log.error("Servlet context does not contain file storage at '"
-					+ FileStorageSetup.ATTRIBUTE_NAME + "'");
-			return;
-		}
-
-		try {
-			fs.deleteFile(fileInfo.getBytestreamUri());
-			log.debug("Deleted file " + fileInfo);
-		} catch (IOException e) {
-			log.error("Failed to delete temp file from session: " + event, e);
-		}
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage;
+
+import java.io.IOException;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionBindingListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorage;
+import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageSetup;
+import edu.cornell.mannlib.vitro.webapp.filestorage.model.FileInfo;
+
+/**
+ * Attaches an uploaded file to the session with a listener, so the file will be
+ * deleted if
+ * <ul>
+ * <li>The session times out.</li>
+ * <li>The session is invalidated.</li>
+ * <li>The server is shut down.</li>
+ * <li>Another file is attached to the session with the same attribute name.</li>
+ * </ul>
+ * To see that the file isn't deleted, remove it from the session with a call to
+ * {@link TempFileHolder#remove(HttpSession, String) remove}.
+ */
+public class TempFileHolder implements HttpSessionBindingListener {
+	private static final Log log = LogFactory.getLog(TempFileHolder.class);
+
+	/**
+	 * Create a {@link TempFileHolder} 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,
+			FileInfo fileInfo) {
+		if (session == null) {
+			throw new NullPointerException("session may not be null.");
+		}
+		if (attributeName == null) {
+			throw new NullPointerException("attributeName may not be null.");
+		}
+		if (fileInfo == null) {
+			throw new NullPointerException("fileInfo may not be null.");
+		}
+		log.debug("attach this file: " + fileInfo);
+		session.setAttribute(attributeName, new TempFileHolder(fileInfo));
+	}
+
+	/**
+	 * Get the {@link TempFileHolder} 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 {@link TempFileHolder},
+	 * return null.
+	 */
+	public static FileInfo remove(HttpSession session, String attributeName) {
+		if (session == null) {
+			throw new NullPointerException("session may not be null.");
+		}
+		if (attributeName == null) {
+			throw new NullPointerException("attributeName may not be null.");
+		}
+		Object attribute = session.getAttribute(attributeName);
+		if (attribute instanceof TempFileHolder) {
+			FileInfo fileInfo = ((TempFileHolder) attribute).extractFileInfo();
+			session.removeAttribute(attributeName);
+			log.debug("remove this file: " + fileInfo);
+			return fileInfo;
+		} else if (attribute == null) {
+			return null;
+		} else {
+			session.removeAttribute(attributeName);
+			return null;
+		}
+	}
+
+	private FileInfo fileInfo;
+
+	private TempFileHolder(FileInfo fileInfo) {
+		if (fileInfo == null) {
+			throw new NullPointerException("fileInfo may not be null.");
+		}
+		this.fileInfo = fileInfo;
+	}
+
+	/**
+	 * Gets the {@link FileInfo} payload, and removes it so the file won't be
+	 * deleted when the value is unbound.
+	 * 
+	 * @return
+	 */
+	private FileInfo extractFileInfo() {
+		FileInfo result = this.fileInfo;
+		this.fileInfo = null;
+		return result;
+	}
+
+	/**
+	 * When attached to the session, do nothing.
+	 * 
+	 * @see HttpSessionBindingListener#valueBound(HttpSessionBindingEvent)
+	 */
+	@Override
+	public void valueBound(HttpSessionBindingEvent event) {
+	}
+
+	/**
+	 * When removed from the session, if the {@link #fileInfo} is not empty,
+	 * delete the file. If you had wanted this file, you should have called
+	 * {@link #remove(HttpSession, String) remove}.
+	 * 
+	 * @see HttpSessionBindingListener#valueUnbound(HttpSessionBindingEvent)
+	 */
+	@Override
+	public void valueUnbound(HttpSessionBindingEvent event) {
+		if (fileInfo == null) {
+			log.trace("No file info.");
+			return;
+		}
+
+		if (fileInfo.getBytestreamUri() == null) {
+			log.warn("File info has no URI?");
+			return;
+		}
+
+		HttpSession session = event.getSession();
+		ServletContext servletContext = session.getServletContext();
+
+		FileStorage fs = (FileStorage) servletContext
+				.getAttribute(FileStorageSetup.ATTRIBUTE_NAME);
+		if (fs == null) {
+			log.error("Servlet context does not contain file storage at '"
+					+ FileStorageSetup.ATTRIBUTE_NAME + "'");
+			return;
+		}
+
+		try {
+			fs.deleteFile(fileInfo.getBytestreamUri());
+			log.debug("Deleted file " + fileInfo);
+		} catch (IOException e) {
+			log.error("Failed to delete temp file from session: " + event, e);
+		}
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/UploadedFileHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/UploadedFileHelper.java
index 30568bff0..bd9c9cda4 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/UploadedFileHelper.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/UploadedFileHelper.java
@@ -1,257 +1,257 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.List;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatementImpl;
-import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
-import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
-import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
-import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileAlreadyExistsException;
-import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorage;
-import edu.cornell.mannlib.vitro.webapp.filestorage.model.FileInfo;
-import edu.cornell.mannlib.vitro.webapp.filestorage.model.ImageInfo;
-
-/**
- * A helper object to handle the mundane details of dealing with uploaded files
- * in the model.
- */
-public class UploadedFileHelper {
-	private static final Log log = LogFactory.getLog(UploadedFileHelper.class);
-
-	private final FileStorage fileStorage;
-	private final WebappDaoFactory wadf;
-	private final IndividualDao individualDao;
-	private final DataPropertyStatementDao dataPropertyStatementDao;
-	private final ObjectPropertyStatementDao objectPropertyStatementDao;
-	private final ServletContext ctx;
-
-	public UploadedFileHelper(FileStorage fileStorage, WebappDaoFactory wadf, ServletContext ctx) {
-		this.fileStorage = fileStorage;
-		this.wadf = wadf;
-		this.individualDao = wadf.getIndividualDao();
-		this.dataPropertyStatementDao = wadf.getDataPropertyStatementDao();
-		this.objectPropertyStatementDao = wadf.getObjectPropertyStatementDao();
-		this.ctx = ctx;
-	}
-
-	/**
-	 * 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,
-			InputStream inputStream) throws FileAlreadyExistsException,
-			IOException {
-		if (filename == null) {
-			throw new NullPointerException("filename may not be null.");
-		}
-		if (mimeType == null) {
-			throw new NullPointerException("mimeType may not be null.");
-		}
-		if (inputStream == null) {
-			throw new NullPointerException("inputStream may not be null.");
-		}
-
-		// Create the file individuals in the model
-		Individual byteStream = createByteStreamIndividual(filename);
-		String bytestreamUri = byteStream.getURI();
-		String aliasUrl = byteStream.getDataValue(VitroVocabulary.FS_ALIAS_URL);
-
-		Individual file = createFileIndividual(mimeType, filename, byteStream);
-		String fileUri = file.getURI();
-
-		// Store the file in the FileStorage system.
-		fileStorage.createFile(bytestreamUri, filename, inputStream);
-
-		// And wrap it all up in a tidy little package.
-		FileInfo.Builder builder = new FileInfo.Builder();
-		builder.setFilename(filename);
-		builder.setMimeType(mimeType);
-		builder.setUri(fileUri);
-		builder.setBytestreamUri(bytestreamUri);
-		builder.setBytestreamAliasUrl(aliasUrl);
-		return builder.build();
-	}
-
-	/**
-	 * Record this image file and thumbnail on this entity.
-	 */
-	public void setImagesOnEntity(String entityUri, FileInfo mainInfo,
-			FileInfo thumbInfo) {
-		if (entityUri == null) {
-			throw new NullPointerException("entityUri may not be null.");
-		}
-		if (mainInfo == null) {
-			throw new NullPointerException("mainInfo may not be null.");
-		}
-		if (thumbInfo == null) {
-			throw new NullPointerException("thumbInfo may not be null.");
-		}
-
-		Individual entity = individualDao.getIndividualByURI(entityUri);
-		if (entity == null) {
-			throw new NullPointerException("No entity found for URI '"
-					+ entityUri + "'.");
-		}
-
-		// Add the thumbnail file to the main image file.
-		objectPropertyStatementDao
-				.insertNewObjectPropertyStatement(new ObjectPropertyStatementImpl(
-						mainInfo.getUri(), VitroVocabulary.FS_THUMBNAIL_IMAGE,
-						thumbInfo.getUri()));
-
-		// Add the main image file to the entity.
-		entity.setMainImageUri(mainInfo.getUri());
-		individualDao.updateIndividual(entity);
-
-		log.debug("Set images on '" + entity.getURI() + "': main=" + mainInfo
-				+ ", thumb=" + thumbInfo);
-	}
-
-	/**
-	 * 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) {
-		ImageInfo imageInfo = ImageInfo.instanceFromEntityUri(wadf, entity);
-		if (imageInfo == null) {
-			log.debug("No image to remove from '" + entity.getURI() + "'");
-			return;
-		}
-
-		// Remove the main image from the entity.
-		entity.setMainImageUri(null);
-		individualDao.updateIndividual(entity);
-
-		// Remove the thumbnail from the main image.
-		ObjectPropertyStatement stmt = new ObjectPropertyStatementImpl(
-				imageInfo.getMainImage().getUri(),
-				VitroVocabulary.FS_THUMBNAIL_IMAGE, imageInfo.getThumbnail()
-						.getUri());
-		objectPropertyStatementDao.deleteObjectPropertyStatement(stmt);
-
-		// If nobody else is using them, get rid of then.
-		deleteIfNotReferenced(imageInfo.getMainImage());
-		deleteIfNotReferenced(imageInfo.getThumbnail());
-	}
-
-	/**
-	 * Create a bytestream individual in the model. The only property is the
-	 * alias URL
-	 */
-	private Individual createByteStreamIndividual(String filename) {
-		Individual byteStream = new IndividualImpl();
-		byteStream.setVClassURI(VitroVocabulary.FS_BYTESTREAM_CLASS);
-
-		String uri = null;
-		try {
-			uri = individualDao.insertNewIndividual(byteStream);
-		} catch (InsertException e) {
-			throw new IllegalStateException(
-					"Failed to create the bytestream individual.", e);
-		}
-
-		dataPropertyStatementDao
-				.insertNewDataPropertyStatement(new DataPropertyStatementImpl(
-						uri, VitroVocabulary.FS_ALIAS_URL, FileServingHelper
-								.getBytestreamAliasUrl(uri, filename, ctx)));
-
-		return individualDao.getIndividualByURI(uri);
-	}
-
-	/**
-	 * Create a file surrogate individual in the model. It has data properties
-	 * for filename and mimeType. It also has a link to its bytestream
-	 * Individual.
-	 */
-	private Individual createFileIndividual(String mimeType, String filename,
-			Individual byteStream) {
-		Individual file = new IndividualImpl();
-		file.setVClassURI(VitroVocabulary.FS_FILE_CLASS);
-
-		String uri = null;
-		try {
-			uri = individualDao.insertNewIndividual(file);
-		} catch (InsertException e) {
-			throw new IllegalStateException(
-					"Failed to create the file individual.", e);
-		}
-
-		dataPropertyStatementDao
-				.insertNewDataPropertyStatement(new DataPropertyStatementImpl(
-						uri, VitroVocabulary.FS_FILENAME, filename));
-		dataPropertyStatementDao
-				.insertNewDataPropertyStatement(new DataPropertyStatementImpl(
-						uri, VitroVocabulary.FS_MIME_TYPE, mimeType));
-		objectPropertyStatementDao
-				.insertNewObjectPropertyStatement(new ObjectPropertyStatementImpl(
-						uri, VitroVocabulary.FS_DOWNLOAD_LOCATION, byteStream
-								.getURI()));
-
-		return individualDao.getIndividualByURI(uri);
-	}
-
-	/**
-	 * If nobody is using this file any more, delete its bytestream from the
-	 * file system, and delete both the surrogate and the bytestream from the
-	 * model.
-	 */
-	private void deleteIfNotReferenced(FileInfo file) {
-		if (!isFileReferenced(file.getUri())) {
-			try {
-				fileStorage.deleteFile(file.getBytestreamUri());
-				individualDao.deleteIndividual(file.getBytestreamUri());
-				individualDao.deleteIndividual(file.getUri());
-			} catch (IOException e) {
-				throw new IllegalStateException("Can't delete the file: '"
-						+ file.getBytestreamUri(), e);
-			}
-		}
-	}
-
-	/**
-	 * Are there any ObjectPropertyStatements in the model whose object is this
-	 * file surrogate?
-	 */
-	private boolean isFileReferenced(String surrogateUri) {
-		if (surrogateUri == null) {
-			return false;
-		}
-
-		ObjectPropertyStatement opStmt = new ObjectPropertyStatementImpl(null,
-				null, surrogateUri);
-		List<ObjectPropertyStatement> stmts = objectPropertyStatementDao
-				.getObjectPropertyStatements(opStmt);
-		if (log.isDebugEnabled()) {
-			log.debug(stmts.size() + " statements referencing '" + surrogateUri
-					+ "'");
-			for (ObjectPropertyStatement stmt : stmts) {
-				log.debug("'" + stmt.getSubjectURI() + "' -- '"
-						+ stmt.getPropertyURI() + "' -- '"
-						+ stmt.getObjectURI() + "'");
-			}
-		}
-		return !stmts.isEmpty();
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatementImpl;
+import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
+import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
+import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileAlreadyExistsException;
+import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorage;
+import edu.cornell.mannlib.vitro.webapp.filestorage.model.FileInfo;
+import edu.cornell.mannlib.vitro.webapp.filestorage.model.ImageInfo;
+
+/**
+ * A helper object to handle the mundane details of dealing with uploaded files
+ * in the model.
+ */
+public class UploadedFileHelper {
+	private static final Log log = LogFactory.getLog(UploadedFileHelper.class);
+
+	private final FileStorage fileStorage;
+	private final WebappDaoFactory wadf;
+	private final IndividualDao individualDao;
+	private final DataPropertyStatementDao dataPropertyStatementDao;
+	private final ObjectPropertyStatementDao objectPropertyStatementDao;
+	private final ServletContext ctx;
+
+	public UploadedFileHelper(FileStorage fileStorage, WebappDaoFactory wadf, ServletContext ctx) {
+		this.fileStorage = fileStorage;
+		this.wadf = wadf;
+		this.individualDao = wadf.getIndividualDao();
+		this.dataPropertyStatementDao = wadf.getDataPropertyStatementDao();
+		this.objectPropertyStatementDao = wadf.getObjectPropertyStatementDao();
+		this.ctx = ctx;
+	}
+
+	/**
+	 * 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,
+			InputStream inputStream) throws FileAlreadyExistsException,
+			IOException {
+		if (filename == null) {
+			throw new NullPointerException("filename may not be null.");
+		}
+		if (mimeType == null) {
+			throw new NullPointerException("mimeType may not be null.");
+		}
+		if (inputStream == null) {
+			throw new NullPointerException("inputStream may not be null.");
+		}
+
+		// Create the file individuals in the model
+		Individual byteStream = createByteStreamIndividual(filename);
+		String bytestreamUri = byteStream.getURI();
+		String aliasUrl = byteStream.getDataValue(VitroVocabulary.FS_ALIAS_URL);
+
+		Individual file = createFileIndividual(mimeType, filename, byteStream);
+		String fileUri = file.getURI();
+
+		// Store the file in the FileStorage system.
+		fileStorage.createFile(bytestreamUri, filename, inputStream);
+
+		// And wrap it all up in a tidy little package.
+		FileInfo.Builder builder = new FileInfo.Builder();
+		builder.setFilename(filename);
+		builder.setMimeType(mimeType);
+		builder.setUri(fileUri);
+		builder.setBytestreamUri(bytestreamUri);
+		builder.setBytestreamAliasUrl(aliasUrl);
+		return builder.build();
+	}
+
+	/**
+	 * Record this image file and thumbnail on this entity.
+	 */
+	public void setImagesOnEntity(String entityUri, FileInfo mainInfo,
+			FileInfo thumbInfo) {
+		if (entityUri == null) {
+			throw new NullPointerException("entityUri may not be null.");
+		}
+		if (mainInfo == null) {
+			throw new NullPointerException("mainInfo may not be null.");
+		}
+		if (thumbInfo == null) {
+			throw new NullPointerException("thumbInfo may not be null.");
+		}
+
+		Individual entity = individualDao.getIndividualByURI(entityUri);
+		if (entity == null) {
+			throw new NullPointerException("No entity found for URI '"
+					+ entityUri + "'.");
+		}
+
+		// Add the thumbnail file to the main image file.
+		objectPropertyStatementDao
+				.insertNewObjectPropertyStatement(new ObjectPropertyStatementImpl(
+						mainInfo.getUri(), VitroVocabulary.FS_THUMBNAIL_IMAGE,
+						thumbInfo.getUri()));
+
+		// Add the main image file to the entity.
+		entity.setMainImageUri(mainInfo.getUri());
+		individualDao.updateIndividual(entity);
+
+		log.debug("Set images on '" + entity.getURI() + "': main=" + mainInfo
+				+ ", thumb=" + thumbInfo);
+	}
+
+	/**
+	 * 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) {
+		ImageInfo imageInfo = ImageInfo.instanceFromEntityUri(wadf, entity);
+		if (imageInfo == null) {
+			log.debug("No image to remove from '" + entity.getURI() + "'");
+			return;
+		}
+
+		// Remove the main image from the entity.
+		entity.setMainImageUri(null);
+		individualDao.updateIndividual(entity);
+
+		// Remove the thumbnail from the main image.
+		ObjectPropertyStatement stmt = new ObjectPropertyStatementImpl(
+				imageInfo.getMainImage().getUri(),
+				VitroVocabulary.FS_THUMBNAIL_IMAGE, imageInfo.getThumbnail()
+						.getUri());
+		objectPropertyStatementDao.deleteObjectPropertyStatement(stmt);
+
+		// If nobody else is using them, get rid of then.
+		deleteIfNotReferenced(imageInfo.getMainImage());
+		deleteIfNotReferenced(imageInfo.getThumbnail());
+	}
+
+	/**
+	 * Create a bytestream individual in the model. The only property is the
+	 * alias URL
+	 */
+	private Individual createByteStreamIndividual(String filename) {
+		Individual byteStream = new IndividualImpl();
+		byteStream.setVClassURI(VitroVocabulary.FS_BYTESTREAM_CLASS);
+
+		String uri = null;
+		try {
+			uri = individualDao.insertNewIndividual(byteStream);
+		} catch (InsertException e) {
+			throw new IllegalStateException(
+					"Failed to create the bytestream individual.", e);
+		}
+
+		dataPropertyStatementDao
+				.insertNewDataPropertyStatement(new DataPropertyStatementImpl(
+						uri, VitroVocabulary.FS_ALIAS_URL, FileServingHelper
+								.getBytestreamAliasUrl(uri, filename, ctx)));
+
+		return individualDao.getIndividualByURI(uri);
+	}
+
+	/**
+	 * Create a file surrogate individual in the model. It has data properties
+	 * for filename and mimeType. It also has a link to its bytestream
+	 * Individual.
+	 */
+	private Individual createFileIndividual(String mimeType, String filename,
+			Individual byteStream) {
+		Individual file = new IndividualImpl();
+		file.setVClassURI(VitroVocabulary.FS_FILE_CLASS);
+
+		String uri = null;
+		try {
+			uri = individualDao.insertNewIndividual(file);
+		} catch (InsertException e) {
+			throw new IllegalStateException(
+					"Failed to create the file individual.", e);
+		}
+
+		dataPropertyStatementDao
+				.insertNewDataPropertyStatement(new DataPropertyStatementImpl(
+						uri, VitroVocabulary.FS_FILENAME, filename));
+		dataPropertyStatementDao
+				.insertNewDataPropertyStatement(new DataPropertyStatementImpl(
+						uri, VitroVocabulary.FS_MIME_TYPE, mimeType));
+		objectPropertyStatementDao
+				.insertNewObjectPropertyStatement(new ObjectPropertyStatementImpl(
+						uri, VitroVocabulary.FS_DOWNLOAD_LOCATION, byteStream
+								.getURI()));
+
+		return individualDao.getIndividualByURI(uri);
+	}
+
+	/**
+	 * If nobody is using this file any more, delete its bytestream from the
+	 * file system, and delete both the surrogate and the bytestream from the
+	 * model.
+	 */
+	private void deleteIfNotReferenced(FileInfo file) {
+		if (!isFileReferenced(file.getUri())) {
+			try {
+				fileStorage.deleteFile(file.getBytestreamUri());
+				individualDao.deleteIndividual(file.getBytestreamUri());
+				individualDao.deleteIndividual(file.getUri());
+			} catch (IOException e) {
+				throw new IllegalStateException("Can't delete the file: '"
+						+ file.getBytestreamUri(), e);
+			}
+		}
+	}
+
+	/**
+	 * Are there any ObjectPropertyStatements in the model whose object is this
+	 * file surrogate?
+	 */
+	private boolean isFileReferenced(String surrogateUri) {
+		if (surrogateUri == null) {
+			return false;
+		}
+
+		ObjectPropertyStatement opStmt = new ObjectPropertyStatementImpl(null,
+				null, surrogateUri);
+		List<ObjectPropertyStatement> stmts = objectPropertyStatementDao
+				.getObjectPropertyStatements(opStmt);
+		if (log.isDebugEnabled()) {
+			log.debug(stmts.size() + " statements referencing '" + surrogateUri
+					+ "'");
+			for (ObjectPropertyStatement stmt : stmts) {
+				log.debug("'" + stmt.getSubjectURI() + "' -- '"
+						+ stmt.getPropertyURI() + "' -- '"
+						+ stmt.getObjectURI() + "'");
+			}
+		}
+		return !stmts.isEmpty();
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileAlreadyExistsException.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileAlreadyExistsException.java
index 4ba18618e..336bd66f2 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileAlreadyExistsException.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileAlreadyExistsException.java
@@ -1,38 +1,38 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage.backend;
-
-import java.io.IOException;
-
-/**
- * Indicates that a file already exists with the specified ID, but with a
- * different filename from the one specified.
- */
-public class FileAlreadyExistsException extends IOException {
-	private final String id;
-	private final String existingFilename;
-	private final String requestedFilename;
-
-	public FileAlreadyExistsException(String id, String existingFilename,
-			String requestedFilename) {
-		super("File with a different name already exists at this ID: '" + id
-				+ "', requested filename: '" + requestedFilename
-				+ "', existing filename: '" + existingFilename + "'");
-		this.id = id;
-		this.existingFilename = existingFilename;
-		this.requestedFilename = requestedFilename;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public String getExistingFilename() {
-		return existingFilename;
-	}
-
-	public String getRequestedFilename() {
-		return requestedFilename;
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage.backend;
+
+import java.io.IOException;
+
+/**
+ * Indicates that a file already exists with the specified ID, but with a
+ * different filename from the one specified.
+ */
+public class FileAlreadyExistsException extends IOException {
+	private final String id;
+	private final String existingFilename;
+	private final String requestedFilename;
+
+	public FileAlreadyExistsException(String id, String existingFilename,
+			String requestedFilename) {
+		super("File with a different name already exists at this ID: '" + id
+				+ "', requested filename: '" + requestedFilename
+				+ "', existing filename: '" + existingFilename + "'");
+		this.id = id;
+		this.existingFilename = existingFilename;
+		this.requestedFilename = requestedFilename;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public String getExistingFilename() {
+		return existingFilename;
+	}
+
+	public String getRequestedFilename() {
+		return requestedFilename;
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorage.java
index df0f089f3..f65c5453b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorage.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorage.java
@@ -1,66 +1,66 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage.backend;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * The interface for the File Storage system.
- */
-public interface FileStorage {
-	/**
-	 * The name of the root directory, within the base directory.
-	 */
-	public static final String FILE_STORAGE_ROOT = "file_storage_root";
-
-	/**
-	 * The name of the file in the base directory that holds the namespace map.
-	 */
-	public static final String FILE_STORAGE_NAMESPACES_PROPERTIES = "file_storage_namespaces.properties";
-
-	/**
-	 * How often to we insert path separator characters?
-	 */
-	int SHORTY_LENGTH = 3;
-	
-	/**
-	 * 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</code> if it does not.
-	 */
-	String getFilename(String id) throws IOException;
-
-	/**
-	 * 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.
-	 */
-	InputStream getInputStream(String id, String filename)
-			throws FileNotFoundException, IOException;
-
-	/**
-	 * 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<code> if a file existed, <code>false</code> otherwise.
-	 */
-	boolean deleteFile(String id) throws IOException;
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage.backend;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * The interface for the File Storage system.
+ */
+public interface FileStorage {
+	/**
+	 * The name of the root directory, within the base directory.
+	 */
+	public static final String FILE_STORAGE_ROOT = "file_storage_root";
+
+	/**
+	 * The name of the file in the base directory that holds the namespace map.
+	 */
+	public static final String FILE_STORAGE_NAMESPACES_PROPERTIES = "file_storage_namespaces.properties";
+
+	/**
+	 * How often to we insert path separator characters?
+	 */
+	int SHORTY_LENGTH = 3;
+	
+	/**
+	 * 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</code> if it does not.
+	 */
+	String getFilename(String id) throws IOException;
+
+	/**
+	 * 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.
+	 */
+	InputStream getInputStream(String id, String filename)
+			throws FileNotFoundException, IOException;
+
+	/**
+	 * 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<code> if a file existed, <code>false</code> otherwise.
+	 */
+	boolean deleteFile(String id) throws IOException;
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageHelper.java
index c213f070a..b2fdf8dbb 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageHelper.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageHelper.java
@@ -1,328 +1,328 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage.backend;
-
-import static edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorage.SHORTY_LENGTH;
-
-import java.io.File;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * A collection of utility routines used by the file storage system. Routines
- * exist to:
- * <ul>
- * <li>encode filenames for safe storage</li>
- * <li>decode filenames to their original values</li>
- * <li>convert an ID (with namespaces) to a path, relative to the root directory
- * </li>
- * <li>convert an ID (with namespaces) to an absolute path</li>
- * <li>convert an ID (with namespaces) and a filename to a full path for storing
- * the file</li>
- * </ul>
- */
-public class FileStorageHelper {
-	private static final Log log = LogFactory.getLog(FileStorageHelper.class);
-
-	public static final char HEX_ESCAPE_CHAR = '^';
-
-	public static final String HEX_ENCODE_SOURCES = "\"*+,<=>?^|\\~";
-
-	public static final char[] PATH_SINGLE_CHARACTER_SOURCES = new char[] {
-			'/', ':', '.' };
-	public static final char[] PATH_SINGLE_CHARACTER_TARGETS = new char[] {
-			'=', '+', ',' };
-
-	/** Same as for path, except that a period is not translated. */
-	public static final char[] NAME_SINGLE_CHARACTER_SOURCES = new char[] {
-			'/', ':' };
-	/** Same as for path, except that a period is not translated. */
-	public static final char[] NAME_SINGLE_CHARACTER_TARGETS = new char[] {
-			'=', '+' };
-
-	/**
-	 * Windows reserves these names (case-insensitive), so they can't be used
-	 * for directories or files.
-	 */
-	public static final String[] WINDOWS_RESERVED_NAMES = new String[] { "CON",
-			"PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5",
-			"COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4",
-			"LPT5", "LPT6", "LPT7", "LPT8", "LPT9" };
-
-	/**
-	 * Encode the filename as needed to guard against illegal characters.
-	 * 
-	 * @see edu.cornell.mannlib.vitro.webapp.utils.filestorage
-	 */
-	public static String encodeName(String filename) {
-		String hexed = addHexEncoding(filename);
-		String cleaned = addSingleCharacterConversions(hexed,
-				NAME_SINGLE_CHARACTER_SOURCES, NAME_SINGLE_CHARACTER_TARGETS);
-		return excludeWindowsReservedNames(cleaned);
-	}
-
-	/**
-	 * Encode special characters to hex sequences.
-	 */
-	private static String addHexEncoding(String clear) {
-		for (int i = 0; i < clear.length(); i++) {
-			char c = clear.charAt(i);
-			if (c > 255) {
-				throw new InvalidCharacterException(c, i, clear);
-			}
-		}
-
-		StringBuilder result = new StringBuilder();
-
-		for (int i = 0; i < clear.length(); i++) {
-			result.append(hexEncodeCharacter(clear.charAt(i)));
-		}
-
-		log.debug("Add hex encodings to '" + clear + "' giving '" + result
-				+ "'");
-		return result.toString();
-	}
-
-	/**
-	 * Create a string holding either the character or its hex-encoding.
-	 */
-	private static String hexEncodeCharacter(char c) {
-		if ((c < 0x21) || (c > 0x7e) || (HEX_ENCODE_SOURCES.indexOf(c) >= 0)) {
-			return new StringBuilder().append(HEX_ESCAPE_CHAR).append(
-					toHexDigit(c / 16)).append(toHexDigit(c % 16)).toString();
-
-		} else {
-			return Character.toString(c);
-		}
-	}
-
-	/**
-	 * Return the correct hex character for this integer value.
-	 */
-	private static char toHexDigit(int i) {
-		return "0123456789abcdef".charAt(i);
-	}
-
-	/**
-	 * Perform common single-character substitutions.
-	 */
-	private static String addSingleCharacterConversions(String encoded,
-			char[] sources, char[] targets) {
-		StringBuilder result = new StringBuilder();
-		for (int i = 0; i < encoded.length(); i++) {
-			char c = encoded.charAt(i);
-			result.append(translateSingleCharacter(c, sources, targets));
-		}
-		log.debug("Add single character conversions to '" + encoded
-				+ "' giving '" + result + "'");
-		return result.toString();
-	}
-
-	/**
-	 * If a character found in the "from" set, return its corresponding
-	 * character from the "to" set. Otherwise, return the character itself.
-	 */
-	private static char translateSingleCharacter(char c, char[] from, char[] to) {
-		for (int j = 0; j < from.length; j++) {
-			if (c == from[j]) {
-				return to[j];
-			}
-		}
-		return c;
-	}
-
-	/**
-	 * If a requested filename, after cleaning, is one of the Windows reserved
-	 * words, add a tilde in front.
-	 */
-	private static String excludeWindowsReservedNames(String cleanedName) {
-		for (String word : WINDOWS_RESERVED_NAMES) {
-			if (word.equalsIgnoreCase(cleanedName)) {
-				return '~' + cleanedName;
-			}
-		}
-		return cleanedName;
-	}
-
-	/**
-	 * Restore the filename to its original form, removing the encoding.
-	 * 
-	 * @see edu.cornell.mannlib.vitro.webapp.utils.filestorage
-	 */
-	public static String decodeName(String stored) {
-		String unexcluded = unexcludeWindowsReservedNames(stored);
-		String hexed = removeSingleCharacterConversions(unexcluded,
-				NAME_SINGLE_CHARACTER_SOURCES, NAME_SINGLE_CHARACTER_TARGETS);
-		return removeHexEncoding(hexed);
-	}
-
-	/**
-	 * If the stored filename was a tilde followed by a Windows reserved word,
-	 * strip the tilde.
-	 */
-	private static String unexcludeWindowsReservedNames(String stored) {
-		if (stored.startsWith("~")) {
-			String remainder = stored.substring(1);
-			for (String word : WINDOWS_RESERVED_NAMES) {
-				if (word.equalsIgnoreCase(remainder)) {
-					return remainder;
-				}
-			}
-		}
-		return stored;
-	}
-
-	/**
-	 * Convert common single-character substitutions back to their original
-	 * values.
-	 */
-	private static String removeSingleCharacterConversions(String cleaned,
-			char[] sources, char[] targets) {
-		StringBuilder result = new StringBuilder();
-		for (int i = 0; i < cleaned.length(); i++) {
-			char c = cleaned.charAt(i);
-			result.append(translateSingleCharacter(c, targets, sources));
-		}
-		log.debug("Remove single character conversions from '" + cleaned
-				+ "' giving '" + result + "'");
-		return result.toString();
-	}
-
-	/**
-	 * Convert hex-encoded characters back to their original values.
-	 */
-	private static String removeHexEncoding(String encoded) {
-		StringBuilder result = new StringBuilder();
-		for (int i = 0; i < encoded.length(); i++) {
-			char c = encoded.charAt(i);
-			if (c == HEX_ESCAPE_CHAR) {
-				try {
-					if (i + 2 >= encoded.length()) {
-						throw new InvalidPathException(
-								"Invalid hex encoding in path: '" + encoded
-										+ "'");
-					}
-					String hexChars = encoded.substring(i + 1, i + 3);
-					int value = Integer.parseInt(hexChars, 16);
-					result.append((char) value);
-					i += 2;
-				} catch (NumberFormatException e) {
-					throw new InvalidPathException(
-							"Invalid hex encoding in path: '" + encoded + "'",
-							e);
-				}
-			} else {
-				result.append(c);
-			}
-		}
-		log.debug("Remove hex encodings from '" + encoded + "' giving '"
-				+ result + "'");
-		return result.toString();
-	}
-
-	/**
-	 * Translate the object ID to a relative directory path. A recognized
-	 * namespace is translated to its prefix, and illegal characters are
-	 * encoded. The resulting string is broken up into 3-character directory
-	 * names (or less). Windows reserved words are prefixed with tilde.
-	 * 
-	 * @see edu.cornell.mannlib.vitro.webapp.utils.filestorage
-	 */
-	public static String id2Path(String id, Map<Character, String> namespacesMap) {
-		char prefix = 0;
-		String localName = id;
-		for (Entry<Character, String> entry : namespacesMap.entrySet()) {
-			String namespace = entry.getValue();
-			if (id.startsWith(namespace)) {
-				prefix = entry.getKey();
-				localName = id.substring(namespace.length());
-				break;
-			}
-		}
-
-		String hexed = addHexEncoding(localName);
-		String cleaned = addSingleCharacterConversions(hexed,
-				PATH_SINGLE_CHARACTER_SOURCES, PATH_SINGLE_CHARACTER_TARGETS);
-		String prefixed = applyPrefixChar(prefix, cleaned);
-		String brokenUp = insertPathDelimiters(prefixed);
-		String result = excludeWindowsWordsFromPath(brokenUp);
-		log.debug("id2Path: id='" + id + "', namespaces='" + namespacesMap
-				+ "', path='" + result + "'");
-		return result;
-	}
-
-	/**
-	 * Now that the cleaning is complete, add the prefix if there is one.
-	 */
-	private static String applyPrefixChar(char prefix, String cleaned) {
-		if (prefix == 0) {
-			return cleaned;
-		} else {
-			return prefix + "~" + cleaned;
-		}
-	}
-
-	/**
-	 * Add path delimiters as needed to turn the cleaned prefixed string into a
-	 * relative path.
-	 */
-	private static String insertPathDelimiters(String prefixed) {
-		StringBuilder path = new StringBuilder();
-		for (int i = 0; i < prefixed.length(); i++) {
-			if ((i % SHORTY_LENGTH == 0) && (i > 0)) {
-				path.append(File.separatorChar);
-			}
-			path.append(prefixed.charAt(i));
-		}
-		log.debug("Insert path delimiters to '" + prefixed + "' giving '"
-				+ path + "'");
-		return path.toString();
-	}
-
-	/**
-	 * Check each part in the path, and if it is a Windows reserved word, add a
-	 * tilde. This only applies to the relative path.
-	 */
-	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) {
-				newPath.append(File.separatorChar);
-			}
-			newPath.append(part);
-		}
-		return newPath.toString();
-	}
-
-	/**
-	 * Translate the object ID and the file storage root directory into a full
-	 * path to the directory that would represent that ID.
-	 * 
-	 * @see edu.cornell.mannlib.vitro.webapp.utils.filestorage
-	 */
-	public static File getPathToIdDirectory(String id,
-			Map<Character, String> namespacesMap, File rootDir) {
-		return new File(rootDir, id2Path(id, namespacesMap));
-	}
-
-	/**
-	 * Translate the object ID, the file storage root directory and the filename
-	 * into a full path to where the file would be stored.
-	 * 
-	 * @see edu.cornell.mannlib.vitro.webapp.utils.filestorage
-	 */
-	public static File getFullPath(File rootDir, String id, String filename,
-			Map<Character, String> namespacesMap) {
-		return new File(getPathToIdDirectory(id, namespacesMap, rootDir),
-				encodeName(filename));
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage.backend;
+
+import static edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorage.SHORTY_LENGTH;
+
+import java.io.File;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A collection of utility routines used by the file storage system. Routines
+ * exist to:
+ * <ul>
+ * <li>encode filenames for safe storage</li>
+ * <li>decode filenames to their original values</li>
+ * <li>convert an ID (with namespaces) to a path, relative to the root directory
+ * </li>
+ * <li>convert an ID (with namespaces) to an absolute path</li>
+ * <li>convert an ID (with namespaces) and a filename to a full path for storing
+ * the file</li>
+ * </ul>
+ */
+public class FileStorageHelper {
+	private static final Log log = LogFactory.getLog(FileStorageHelper.class);
+
+	public static final char HEX_ESCAPE_CHAR = '^';
+
+	public static final String HEX_ENCODE_SOURCES = "\"*+,<=>?^|\\~";
+
+	public static final char[] PATH_SINGLE_CHARACTER_SOURCES = new char[] {
+			'/', ':', '.' };
+	public static final char[] PATH_SINGLE_CHARACTER_TARGETS = new char[] {
+			'=', '+', ',' };
+
+	/** Same as for path, except that a period is not translated. */
+	public static final char[] NAME_SINGLE_CHARACTER_SOURCES = new char[] {
+			'/', ':' };
+	/** Same as for path, except that a period is not translated. */
+	public static final char[] NAME_SINGLE_CHARACTER_TARGETS = new char[] {
+			'=', '+' };
+
+	/**
+	 * Windows reserves these names (case-insensitive), so they can't be used
+	 * for directories or files.
+	 */
+	public static final String[] WINDOWS_RESERVED_NAMES = new String[] { "CON",
+			"PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5",
+			"COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4",
+			"LPT5", "LPT6", "LPT7", "LPT8", "LPT9" };
+
+	/**
+	 * Encode the filename as needed to guard against illegal characters.
+	 * 
+	 * @see edu.cornell.mannlib.vitro.webapp.utils.filestorage
+	 */
+	public static String encodeName(String filename) {
+		String hexed = addHexEncoding(filename);
+		String cleaned = addSingleCharacterConversions(hexed,
+				NAME_SINGLE_CHARACTER_SOURCES, NAME_SINGLE_CHARACTER_TARGETS);
+		return excludeWindowsReservedNames(cleaned);
+	}
+
+	/**
+	 * Encode special characters to hex sequences.
+	 */
+	private static String addHexEncoding(String clear) {
+		for (int i = 0; i < clear.length(); i++) {
+			char c = clear.charAt(i);
+			if (c > 255) {
+				throw new InvalidCharacterException(c, i, clear);
+			}
+		}
+
+		StringBuilder result = new StringBuilder();
+
+		for (int i = 0; i < clear.length(); i++) {
+			result.append(hexEncodeCharacter(clear.charAt(i)));
+		}
+
+		log.debug("Add hex encodings to '" + clear + "' giving '" + result
+				+ "'");
+		return result.toString();
+	}
+
+	/**
+	 * Create a string holding either the character or its hex-encoding.
+	 */
+	private static String hexEncodeCharacter(char c) {
+		if ((c < 0x21) || (c > 0x7e) || (HEX_ENCODE_SOURCES.indexOf(c) >= 0)) {
+			return new StringBuilder().append(HEX_ESCAPE_CHAR).append(
+					toHexDigit(c / 16)).append(toHexDigit(c % 16)).toString();
+
+		} else {
+			return Character.toString(c);
+		}
+	}
+
+	/**
+	 * Return the correct hex character for this integer value.
+	 */
+	private static char toHexDigit(int i) {
+		return "0123456789abcdef".charAt(i);
+	}
+
+	/**
+	 * Perform common single-character substitutions.
+	 */
+	private static String addSingleCharacterConversions(String encoded,
+			char[] sources, char[] targets) {
+		StringBuilder result = new StringBuilder();
+		for (int i = 0; i < encoded.length(); i++) {
+			char c = encoded.charAt(i);
+			result.append(translateSingleCharacter(c, sources, targets));
+		}
+		log.debug("Add single character conversions to '" + encoded
+				+ "' giving '" + result + "'");
+		return result.toString();
+	}
+
+	/**
+	 * If a character found in the "from" set, return its corresponding
+	 * character from the "to" set. Otherwise, return the character itself.
+	 */
+	private static char translateSingleCharacter(char c, char[] from, char[] to) {
+		for (int j = 0; j < from.length; j++) {
+			if (c == from[j]) {
+				return to[j];
+			}
+		}
+		return c;
+	}
+
+	/**
+	 * If a requested filename, after cleaning, is one of the Windows reserved
+	 * words, add a tilde in front.
+	 */
+	private static String excludeWindowsReservedNames(String cleanedName) {
+		for (String word : WINDOWS_RESERVED_NAMES) {
+			if (word.equalsIgnoreCase(cleanedName)) {
+				return '~' + cleanedName;
+			}
+		}
+		return cleanedName;
+	}
+
+	/**
+	 * Restore the filename to its original form, removing the encoding.
+	 * 
+	 * @see edu.cornell.mannlib.vitro.webapp.utils.filestorage
+	 */
+	public static String decodeName(String stored) {
+		String unexcluded = unexcludeWindowsReservedNames(stored);
+		String hexed = removeSingleCharacterConversions(unexcluded,
+				NAME_SINGLE_CHARACTER_SOURCES, NAME_SINGLE_CHARACTER_TARGETS);
+		return removeHexEncoding(hexed);
+	}
+
+	/**
+	 * If the stored filename was a tilde followed by a Windows reserved word,
+	 * strip the tilde.
+	 */
+	private static String unexcludeWindowsReservedNames(String stored) {
+		if (stored.startsWith("~")) {
+			String remainder = stored.substring(1);
+			for (String word : WINDOWS_RESERVED_NAMES) {
+				if (word.equalsIgnoreCase(remainder)) {
+					return remainder;
+				}
+			}
+		}
+		return stored;
+	}
+
+	/**
+	 * Convert common single-character substitutions back to their original
+	 * values.
+	 */
+	private static String removeSingleCharacterConversions(String cleaned,
+			char[] sources, char[] targets) {
+		StringBuilder result = new StringBuilder();
+		for (int i = 0; i < cleaned.length(); i++) {
+			char c = cleaned.charAt(i);
+			result.append(translateSingleCharacter(c, targets, sources));
+		}
+		log.debug("Remove single character conversions from '" + cleaned
+				+ "' giving '" + result + "'");
+		return result.toString();
+	}
+
+	/**
+	 * Convert hex-encoded characters back to their original values.
+	 */
+	private static String removeHexEncoding(String encoded) {
+		StringBuilder result = new StringBuilder();
+		for (int i = 0; i < encoded.length(); i++) {
+			char c = encoded.charAt(i);
+			if (c == HEX_ESCAPE_CHAR) {
+				try {
+					if (i + 2 >= encoded.length()) {
+						throw new InvalidPathException(
+								"Invalid hex encoding in path: '" + encoded
+										+ "'");
+					}
+					String hexChars = encoded.substring(i + 1, i + 3);
+					int value = Integer.parseInt(hexChars, 16);
+					result.append((char) value);
+					i += 2;
+				} catch (NumberFormatException e) {
+					throw new InvalidPathException(
+							"Invalid hex encoding in path: '" + encoded + "'",
+							e);
+				}
+			} else {
+				result.append(c);
+			}
+		}
+		log.debug("Remove hex encodings from '" + encoded + "' giving '"
+				+ result + "'");
+		return result.toString();
+	}
+
+	/**
+	 * Translate the object ID to a relative directory path. A recognized
+	 * namespace is translated to its prefix, and illegal characters are
+	 * encoded. The resulting string is broken up into 3-character directory
+	 * names (or less). Windows reserved words are prefixed with tilde.
+	 * 
+	 * @see edu.cornell.mannlib.vitro.webapp.utils.filestorage
+	 */
+	public static String id2Path(String id, Map<Character, String> namespacesMap) {
+		char prefix = 0;
+		String localName = id;
+		for (Entry<Character, String> entry : namespacesMap.entrySet()) {
+			String namespace = entry.getValue();
+			if (id.startsWith(namespace)) {
+				prefix = entry.getKey();
+				localName = id.substring(namespace.length());
+				break;
+			}
+		}
+
+		String hexed = addHexEncoding(localName);
+		String cleaned = addSingleCharacterConversions(hexed,
+				PATH_SINGLE_CHARACTER_SOURCES, PATH_SINGLE_CHARACTER_TARGETS);
+		String prefixed = applyPrefixChar(prefix, cleaned);
+		String brokenUp = insertPathDelimiters(prefixed);
+		String result = excludeWindowsWordsFromPath(brokenUp);
+		log.debug("id2Path: id='" + id + "', namespaces='" + namespacesMap
+				+ "', path='" + result + "'");
+		return result;
+	}
+
+	/**
+	 * Now that the cleaning is complete, add the prefix if there is one.
+	 */
+	private static String applyPrefixChar(char prefix, String cleaned) {
+		if (prefix == 0) {
+			return cleaned;
+		} else {
+			return prefix + "~" + cleaned;
+		}
+	}
+
+	/**
+	 * Add path delimiters as needed to turn the cleaned prefixed string into a
+	 * relative path.
+	 */
+	private static String insertPathDelimiters(String prefixed) {
+		StringBuilder path = new StringBuilder();
+		for (int i = 0; i < prefixed.length(); i++) {
+			if ((i % SHORTY_LENGTH == 0) && (i > 0)) {
+				path.append(File.separatorChar);
+			}
+			path.append(prefixed.charAt(i));
+		}
+		log.debug("Insert path delimiters to '" + prefixed + "' giving '"
+				+ path + "'");
+		return path.toString();
+	}
+
+	/**
+	 * Check each part in the path, and if it is a Windows reserved word, add a
+	 * tilde. This only applies to the relative path.
+	 */
+	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) {
+				newPath.append(File.separatorChar);
+			}
+			newPath.append(part);
+		}
+		return newPath.toString();
+	}
+
+	/**
+	 * Translate the object ID and the file storage root directory into a full
+	 * path to the directory that would represent that ID.
+	 * 
+	 * @see edu.cornell.mannlib.vitro.webapp.utils.filestorage
+	 */
+	public static File getPathToIdDirectory(String id,
+			Map<Character, String> namespacesMap, File rootDir) {
+		return new File(rootDir, id2Path(id, namespacesMap));
+	}
+
+	/**
+	 * Translate the object ID, the file storage root directory and the filename
+	 * into a full path to where the file would be stored.
+	 * 
+	 * @see edu.cornell.mannlib.vitro.webapp.utils.filestorage
+	 */
+	public static File getFullPath(File rootDir, String id, String filename,
+			Map<Character, String> namespacesMap) {
+		return new File(getPathToIdDirectory(id, namespacesMap, rootDir),
+				encodeName(filename));
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageImpl.java
index b1dc35e35..a78144672 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageImpl.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageImpl.java
@@ -1,412 +1,412 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage.backend;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.Reader;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Properties;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * The default implementation of {@link FileStorage}.
- */
-public class FileStorageImpl implements FileStorage {
-	private static final Log log = LogFactory.getLog(FileStorageImpl.class);
-
-	private final File baseDir;
-	private final File rootDir;
-	private final File namespaceFile;
-	private final Map<Character, String> namespacesMap;
-
-	// ----------------------------------------------------------------------
-	// Constructors and helper methods.
-	// ----------------------------------------------------------------------
-
-	/**
-	 * 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.
-	 */
-	FileStorageImpl(File baseDir, Collection<String> namespaces)
-			throws IOException {
-		checkBaseDirValid(baseDir);
-		checkNamespacesValid(namespaces);
-
-		this.baseDir = baseDir;
-		this.rootDir = new File(this.baseDir, FILE_STORAGE_ROOT);
-
-		this.namespaceFile = new File(baseDir,
-				FILE_STORAGE_NAMESPACES_PROPERTIES);
-
-		if (rootDir.exists() && namespaceFile.exists()) {
-			Map<Character, String> existingMap = readNamespaces();
-			this.namespacesMap = adjustNamespaces(existingMap, namespaces);
-			if (!namespacesMap.equals(existingMap)) {
-				initializeNamespacesFile();
-			}
-		} else if (!rootDir.exists() && !namespaceFile.exists()) {
-			this.namespacesMap = mapNamespaces(namespaces);
-			initializeRootDirectory();
-			initializeNamespacesFile();
-		} else if (rootDir.exists()) {
-			throw new IllegalStateException("Storage directory '"
-					+ baseDir.getPath() + "' has been partially initialized. '"
-					+ FILE_STORAGE_ROOT + "' exists, but '"
-					+ FILE_STORAGE_NAMESPACES_PROPERTIES + "' does not.");
-		} else {
-			throw new IllegalStateException("Storage directory '"
-					+ baseDir.getPath() + "' has been partially initialized. '"
-					+ FILE_STORAGE_NAMESPACES_PROPERTIES + "' exists, but '"
-					+ FILE_STORAGE_ROOT + "' does not.");
-		}
-	}
-
-	private void checkNamespacesValid(Collection<String> namespaces) {
-		if (namespaces == null) {
-			throw new NullPointerException("namespaces may not be null.");
-		}
-	}
-
-	/**
-	 * 'baseDir' must point to an existing, writeable directory.
-	 */
-	private void checkBaseDirValid(File baseDir) {
-		if (baseDir == null) {
-			throw new NullPointerException("baseDir may not be null.");
-		}
-		if (!baseDir.exists()) {
-			throw new IllegalArgumentException(
-					"File upload directory does not exist: '"
-							+ baseDir.getPath() + "'");
-		}
-		if (!baseDir.isDirectory()) {
-			throw new IllegalArgumentException(
-					"File upload directory is not a directory: '"
-							+ baseDir.getPath() + "'");
-		}
-		if (!baseDir.canWrite()) {
-			throw new IllegalArgumentException(
-					"File upload directory is not writeable: '"
-							+ baseDir.getPath() + "'");
-		}
-	}
-
-	/**
-	 * Assign arbitrary prefixes to these namespaces.
-	 */
-	private Map<Character, String> mapNamespaces(Collection<String> namespaces) {
-		Map<Character, String> map = new HashMap<Character, String>();
-		for (String namespace : namespaces) {
-			map.put(findAvailableKey(map), namespace);
-		}
-		return map;
-	}
-
-	/**
-	 * @throws FileNotFoundException
-	 */
-	private void initializeNamespacesFile() throws FileNotFoundException {
-		PrintWriter writer = null;
-		try {
-			writer = new PrintWriter(this.namespaceFile);
-			for (Entry<Character, String> entry : this.namespacesMap.entrySet()) {
-				writer.println(entry.getKey() + " = " + entry.getValue());
-			}
-		} finally {
-			if (writer != null) {
-				writer.close();
-			}
-		}
-	}
-
-	/**
-	 * Create the root directory. Check for success.
-	 */
-	private void initializeRootDirectory() throws IOException {
-		boolean created = this.rootDir.mkdir();
-		if (!created) {
-			throw new IOException("Failed to create root directory '"
-					+ this.rootDir + "'");
-		}
-	}
-
-	/**
-	 * Load the namespaces file from the disk. It's easy to load into a
-	 * {@link Properties}, but we need to convert it to a {@link Map}.
-	 */
-	private Map<Character, String> readNamespaces() throws IOException {
-		Reader reader = null;
-		try {
-			reader = new FileReader(this.namespaceFile);
-			Properties props = new Properties();
-			props.load(reader);
-
-			Map<Character, String> map = new HashMap<Character, String>();
-			for (Object key : props.keySet()) {
-				char keyChar = key.toString().charAt(0);
-				map.put(keyChar, (String) props.get(key));
-			}
-
-			return map;
-		} catch (Exception e) {
-			throw new IOException("Problem loading the namespace file.");
-		} finally {
-			if (reader != null) {
-				try {
-					reader.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-
-	/**
-	 * If any of the requested aren't in the existing map, add them.
-	 */
-	private Map<Character, String> adjustNamespaces(
-			Map<Character, String> existingMap, Collection<String> namespaces) {
-		Map<Character, String> adjustedMap = new HashMap<Character, String>(
-				existingMap);
-
-		for (String namespace : namespaces) {
-			if (!existingMap.values().contains(namespace)) {
-				log.warn("Adding a new namespace to the file storage system: "
-						+ namespace);
-				Character key = findAvailableKey(adjustedMap);
-				adjustedMap.put(key, namespace);
-			}
-		}
-
-		return adjustedMap;
-	}
-
-	/**
-	 * Are there any characters that we're not using as prefixes? We only allow
-	 * a-z.
-	 */
-	private Character findAvailableKey(Map<Character, String> adjustedMap) {
-		for (char key = 'a'; key <= 'z'; key++) {
-			if (!adjustedMap.keySet().contains(key)) {
-				return key;
-			}
-		}
-		throw new IllegalArgumentException(
-				"Can't handle more than 26 namespaces.");
-	}
-
-	// ----------------------------------------------------------------------
-	// package access methods -- used in unit tests.
-	// ----------------------------------------------------------------------
-
-	File getBaseDir() {
-		return this.baseDir;
-	}
-
-	Map<Character, String> getNamespaces() {
-		return this.namespacesMap;
-	}
-
-	// ----------------------------------------------------------------------
-	// Public methods
-	// ----------------------------------------------------------------------
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * <p>
-	 * Before creating the file, we may need to create one or more parent
-	 * directories to put it in.
-	 * </p>
-	 */
-	@Override
-	public void createFile(String id, String filename, InputStream bytes)
-			throws FileAlreadyExistsException, IOException {
-		String existingFilename = getFilename(id);
-		if ((existingFilename != null) && (!filename.equals(existingFilename))) {
-			throw new FileAlreadyExistsException(id, existingFilename, filename);
-
-		}
-
-		File file = FileStorageHelper.getFullPath(this.rootDir, id, filename,
-				this.namespacesMap);
-		File parent = file.getParentFile();
-
-		if (!parent.exists()) {
-			parent.mkdirs();
-			if (!parent.exists()) {
-				throw new IOException(
-						"Failed to create parent directories for file with ID '"
-								+ id + "', file location '" + file + "'");
-			}
-		}
-
-		OutputStream out = null;
-		try {
-			out = new BufferedOutputStream(new FileOutputStream(file));
-			InputStream in = new BufferedInputStream(bytes);
-
-			byte[] buffer = new byte[4096];
-			int howMany;
-			while (-1 != (howMany = in.read(buffer))) {
-				out.write(buffer, 0, howMany);
-			}
-		} finally {
-			if (out != null) {
-				try {
-					out.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * 
-	 * <p>
-	 * If deleting this file leaves its parent directory empty, that directory
-	 * will be deleted. This repeats, up to (but not including) the root
-	 * directory.
-	 */
-	@Override
-	public boolean deleteFile(String id) throws IOException {
-		String existingFilename = getFilename(id);
-		if (existingFilename == null) {
-			return false;
-		}
-
-		File file = FileStorageHelper.getFullPath(this.rootDir, id,
-				existingFilename, this.namespacesMap);
-
-		file.delete();
-		if (file.exists()) {
-			throw new IOException("Failed to delete file with ID '" + id
-					+ "', file location '" + file + "'");
-		}
-
-		deleteEmptyParents(file);
-
-		return true;
-	}
-
-	/**
-	 * We have deleted this file. If the parent directory is now empty, delete
-	 * it. Then check its parent in turn. This continues until we find a parent
-	 * that we will not delete, either because it is not empty, or because it is
-	 * the file storage root.
-	 */
-	private void deleteEmptyParents(File file) {
-		File parent = file.getParentFile();
-		if (parent == null) {
-			log.warn("This is crazy. How can file '" + file.getAbsolutePath()
-					+ "' have no parent?");
-			return;
-		}
-
-		if (parent.equals(rootDir)) {
-			log.trace("Not deleting the root directory.");
-			return;
-		}
-
-		File[] children = parent.listFiles();
-		if (children == null) {
-			log.warn("This is crazy. How can file '" + parent.getAbsolutePath()
-					+ "' not be a directory?");
-			return;
-		}
-
-		if (children.length > 0) {
-			log.trace("Directory '" + parent.getAbsolutePath()
-					+ "' is not empty. Not deleting.");
-			return;
-		}
-
-		log.trace("Deleting empty directory '" + parent.getAbsolutePath() + "'");
-		parent.delete();
-		if (parent.exists()) {
-			log.warn("Failed to delete directory '" + parent.getAbsolutePath()
-					+ "'");
-			return;
-		}
-
-		deleteEmptyParents(parent);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>
-	 * For a non-null result, a directory must exist for the ID, and it must
-	 * contain a file (it may or may not contain other directories).
-	 * </p>
-	 */
-	@Override
-	public String getFilename(String id) throws IOException {
-		File dir = FileStorageHelper.getPathToIdDirectory(id,
-				this.namespacesMap, this.rootDir);
-		log.debug("ID '" + id + "' translates to this directory path: '" + dir
-				+ "'");
-
-		if ((!dir.exists()) || (!dir.isDirectory())) {
-			return null;
-		}
-
-		File[] files = dir.listFiles(new FileFilter() {
-			public boolean accept(File pathname) {
-				return pathname.isFile();
-			}
-		});
-
-		if (files.length == 0) {
-			return null;
-		}
-
-		if (files.length > 1) {
-			throw new IllegalStateException(
-					"More than one file associated with ID: '" + id
-							+ "', directory location '" + dir + "'");
-		}
-
-		return FileStorageHelper.decodeName(files[0].getName());
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	@Override
-	public InputStream getInputStream(String id, String filename)
-			throws IOException {
-
-		File file = FileStorageHelper.getFullPath(this.rootDir, id, filename,
-				this.namespacesMap);
-
-		if (!file.exists()) {
-			throw new FileNotFoundException("No file exists with ID '" + id
-					+ "', file location '" + file + "'");
-		}
-
-		return new FileInputStream(file);
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage.backend;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * The default implementation of {@link FileStorage}.
+ */
+public class FileStorageImpl implements FileStorage {
+	private static final Log log = LogFactory.getLog(FileStorageImpl.class);
+
+	private final File baseDir;
+	private final File rootDir;
+	private final File namespaceFile;
+	private final Map<Character, String> namespacesMap;
+
+	// ----------------------------------------------------------------------
+	// Constructors and helper methods.
+	// ----------------------------------------------------------------------
+
+	/**
+	 * 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.
+	 */
+	FileStorageImpl(File baseDir, Collection<String> namespaces)
+			throws IOException {
+		checkBaseDirValid(baseDir);
+		checkNamespacesValid(namespaces);
+
+		this.baseDir = baseDir;
+		this.rootDir = new File(this.baseDir, FILE_STORAGE_ROOT);
+
+		this.namespaceFile = new File(baseDir,
+				FILE_STORAGE_NAMESPACES_PROPERTIES);
+
+		if (rootDir.exists() && namespaceFile.exists()) {
+			Map<Character, String> existingMap = readNamespaces();
+			this.namespacesMap = adjustNamespaces(existingMap, namespaces);
+			if (!namespacesMap.equals(existingMap)) {
+				initializeNamespacesFile();
+			}
+		} else if (!rootDir.exists() && !namespaceFile.exists()) {
+			this.namespacesMap = mapNamespaces(namespaces);
+			initializeRootDirectory();
+			initializeNamespacesFile();
+		} else if (rootDir.exists()) {
+			throw new IllegalStateException("Storage directory '"
+					+ baseDir.getPath() + "' has been partially initialized. '"
+					+ FILE_STORAGE_ROOT + "' exists, but '"
+					+ FILE_STORAGE_NAMESPACES_PROPERTIES + "' does not.");
+		} else {
+			throw new IllegalStateException("Storage directory '"
+					+ baseDir.getPath() + "' has been partially initialized. '"
+					+ FILE_STORAGE_NAMESPACES_PROPERTIES + "' exists, but '"
+					+ FILE_STORAGE_ROOT + "' does not.");
+		}
+	}
+
+	private void checkNamespacesValid(Collection<String> namespaces) {
+		if (namespaces == null) {
+			throw new NullPointerException("namespaces may not be null.");
+		}
+	}
+
+	/**
+	 * 'baseDir' must point to an existing, writeable directory.
+	 */
+	private void checkBaseDirValid(File baseDir) {
+		if (baseDir == null) {
+			throw new NullPointerException("baseDir may not be null.");
+		}
+		if (!baseDir.exists()) {
+			throw new IllegalArgumentException(
+					"File upload directory does not exist: '"
+							+ baseDir.getPath() + "'");
+		}
+		if (!baseDir.isDirectory()) {
+			throw new IllegalArgumentException(
+					"File upload directory is not a directory: '"
+							+ baseDir.getPath() + "'");
+		}
+		if (!baseDir.canWrite()) {
+			throw new IllegalArgumentException(
+					"File upload directory is not writeable: '"
+							+ baseDir.getPath() + "'");
+		}
+	}
+
+	/**
+	 * Assign arbitrary prefixes to these namespaces.
+	 */
+	private Map<Character, String> mapNamespaces(Collection<String> namespaces) {
+		Map<Character, String> map = new HashMap<Character, String>();
+		for (String namespace : namespaces) {
+			map.put(findAvailableKey(map), namespace);
+		}
+		return map;
+	}
+
+	/**
+	 * @throws FileNotFoundException
+	 */
+	private void initializeNamespacesFile() throws FileNotFoundException {
+		PrintWriter writer = null;
+		try {
+			writer = new PrintWriter(this.namespaceFile);
+			for (Entry<Character, String> entry : this.namespacesMap.entrySet()) {
+				writer.println(entry.getKey() + " = " + entry.getValue());
+			}
+		} finally {
+			if (writer != null) {
+				writer.close();
+			}
+		}
+	}
+
+	/**
+	 * Create the root directory. Check for success.
+	 */
+	private void initializeRootDirectory() throws IOException {
+		boolean created = this.rootDir.mkdir();
+		if (!created) {
+			throw new IOException("Failed to create root directory '"
+					+ this.rootDir + "'");
+		}
+	}
+
+	/**
+	 * Load the namespaces file from the disk. It's easy to load into a
+	 * {@link Properties}, but we need to convert it to a {@link Map}.
+	 */
+	private Map<Character, String> readNamespaces() throws IOException {
+		Reader reader = null;
+		try {
+			reader = new FileReader(this.namespaceFile);
+			Properties props = new Properties();
+			props.load(reader);
+
+			Map<Character, String> map = new HashMap<Character, String>();
+			for (Object key : props.keySet()) {
+				char keyChar = key.toString().charAt(0);
+				map.put(keyChar, (String) props.get(key));
+			}
+
+			return map;
+		} catch (Exception e) {
+			throw new IOException("Problem loading the namespace file.");
+		} finally {
+			if (reader != null) {
+				try {
+					reader.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+	/**
+	 * If any of the requested aren't in the existing map, add them.
+	 */
+	private Map<Character, String> adjustNamespaces(
+			Map<Character, String> existingMap, Collection<String> namespaces) {
+		Map<Character, String> adjustedMap = new HashMap<Character, String>(
+				existingMap);
+
+		for (String namespace : namespaces) {
+			if (!existingMap.values().contains(namespace)) {
+				log.warn("Adding a new namespace to the file storage system: "
+						+ namespace);
+				Character key = findAvailableKey(adjustedMap);
+				adjustedMap.put(key, namespace);
+			}
+		}
+
+		return adjustedMap;
+	}
+
+	/**
+	 * Are there any characters that we're not using as prefixes? We only allow
+	 * a-z.
+	 */
+	private Character findAvailableKey(Map<Character, String> adjustedMap) {
+		for (char key = 'a'; key <= 'z'; key++) {
+			if (!adjustedMap.keySet().contains(key)) {
+				return key;
+			}
+		}
+		throw new IllegalArgumentException(
+				"Can't handle more than 26 namespaces.");
+	}
+
+	// ----------------------------------------------------------------------
+	// package access methods -- used in unit tests.
+	// ----------------------------------------------------------------------
+
+	File getBaseDir() {
+		return this.baseDir;
+	}
+
+	Map<Character, String> getNamespaces() {
+		return this.namespacesMap;
+	}
+
+	// ----------------------------------------------------------------------
+	// Public methods
+	// ----------------------------------------------------------------------
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * <p>
+	 * Before creating the file, we may need to create one or more parent
+	 * directories to put it in.
+	 * </p>
+	 */
+	@Override
+	public void createFile(String id, String filename, InputStream bytes)
+			throws FileAlreadyExistsException, IOException {
+		String existingFilename = getFilename(id);
+		if ((existingFilename != null) && (!filename.equals(existingFilename))) {
+			throw new FileAlreadyExistsException(id, existingFilename, filename);
+
+		}
+
+		File file = FileStorageHelper.getFullPath(this.rootDir, id, filename,
+				this.namespacesMap);
+		File parent = file.getParentFile();
+
+		if (!parent.exists()) {
+			parent.mkdirs();
+			if (!parent.exists()) {
+				throw new IOException(
+						"Failed to create parent directories for file with ID '"
+								+ id + "', file location '" + file + "'");
+			}
+		}
+
+		OutputStream out = null;
+		try {
+			out = new BufferedOutputStream(new FileOutputStream(file));
+			InputStream in = new BufferedInputStream(bytes);
+
+			byte[] buffer = new byte[4096];
+			int howMany;
+			while (-1 != (howMany = in.read(buffer))) {
+				out.write(buffer, 0, howMany);
+			}
+		} finally {
+			if (out != null) {
+				try {
+					out.close();
+				} catch (IOException e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * 
+	 * <p>
+	 * If deleting this file leaves its parent directory empty, that directory
+	 * will be deleted. This repeats, up to (but not including) the root
+	 * directory.
+	 */
+	@Override
+	public boolean deleteFile(String id) throws IOException {
+		String existingFilename = getFilename(id);
+		if (existingFilename == null) {
+			return false;
+		}
+
+		File file = FileStorageHelper.getFullPath(this.rootDir, id,
+				existingFilename, this.namespacesMap);
+
+		file.delete();
+		if (file.exists()) {
+			throw new IOException("Failed to delete file with ID '" + id
+					+ "', file location '" + file + "'");
+		}
+
+		deleteEmptyParents(file);
+
+		return true;
+	}
+
+	/**
+	 * We have deleted this file. If the parent directory is now empty, delete
+	 * it. Then check its parent in turn. This continues until we find a parent
+	 * that we will not delete, either because it is not empty, or because it is
+	 * the file storage root.
+	 */
+	private void deleteEmptyParents(File file) {
+		File parent = file.getParentFile();
+		if (parent == null) {
+			log.warn("This is crazy. How can file '" + file.getAbsolutePath()
+					+ "' have no parent?");
+			return;
+		}
+
+		if (parent.equals(rootDir)) {
+			log.trace("Not deleting the root directory.");
+			return;
+		}
+
+		File[] children = parent.listFiles();
+		if (children == null) {
+			log.warn("This is crazy. How can file '" + parent.getAbsolutePath()
+					+ "' not be a directory?");
+			return;
+		}
+
+		if (children.length > 0) {
+			log.trace("Directory '" + parent.getAbsolutePath()
+					+ "' is not empty. Not deleting.");
+			return;
+		}
+
+		log.trace("Deleting empty directory '" + parent.getAbsolutePath() + "'");
+		parent.delete();
+		if (parent.exists()) {
+			log.warn("Failed to delete directory '" + parent.getAbsolutePath()
+					+ "'");
+			return;
+		}
+
+		deleteEmptyParents(parent);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * For a non-null result, a directory must exist for the ID, and it must
+	 * contain a file (it may or may not contain other directories).
+	 * </p>
+	 */
+	@Override
+	public String getFilename(String id) throws IOException {
+		File dir = FileStorageHelper.getPathToIdDirectory(id,
+				this.namespacesMap, this.rootDir);
+		log.debug("ID '" + id + "' translates to this directory path: '" + dir
+				+ "'");
+
+		if ((!dir.exists()) || (!dir.isDirectory())) {
+			return null;
+		}
+
+		File[] files = dir.listFiles(new FileFilter() {
+			public boolean accept(File pathname) {
+				return pathname.isFile();
+			}
+		});
+
+		if (files.length == 0) {
+			return null;
+		}
+
+		if (files.length > 1) {
+			throw new IllegalStateException(
+					"More than one file associated with ID: '" + id
+							+ "', directory location '" + dir + "'");
+		}
+
+		return FileStorageHelper.decodeName(files[0].getName());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@Override
+	public InputStream getInputStream(String id, String filename)
+			throws IOException {
+
+		File file = FileStorageHelper.getFullPath(this.rootDir, id, filename,
+				this.namespacesMap);
+
+		if (!file.exists()) {
+			throw new FileNotFoundException("No file exists with ID '" + id
+					+ "', file location '" + file + "'");
+		}
+
+		return new FileInputStream(file);
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageSetup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageSetup.java
index 3f7aa29e0..cc3771016 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageSetup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageSetup.java
@@ -1,124 +1,124 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage.backend;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
-import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
-
-/**
- * Initializes the file storage system, and stores a reference in the servlet
- * context.
- */
-public class FileStorageSetup implements ServletContextListener {
-	private static final Log log = LogFactory.getLog(FileStorageSetup.class);
-
-	/**
-	 * The implementation of the {@link FileStorage} system will be stored in
-	 * the {@link ServletContext} as an attribute with this name.
-	 */
-	public static final String ATTRIBUTE_NAME = FileStorage.class.getName();
-
-	/**
-	 * The default implementation will use this key to ask
-	 * {@link ConfigurationProperties} for the vivo home directory. The file
-	 * storage base directory is in a subdirectory below this one.
-	 */
-	public static final String PROPERTY_VITRO_HOME_DIR = "vitro.home";
-	public static final String FILE_STORAGE_SUBDIRECTORY = "uploads";
-
-	/**
-	 * The default implementation will use this key to ask
-	 * {@link ConfigurationProperties} for the default URI namespace.
-	 */
-	public static final String PROPERTY_DEFAULT_NAMESPACE = "Vitro.defaultNamespace";
-
-	/**
-	 * Create an implementation of {@link FileStorage} and store it in the
-	 * {@link ServletContext}, as an attribute named according to
-	 * {@link #ATTRIBUTE_NAME}.
-	 */
-	@Override
-	public void contextInitialized(ServletContextEvent sce) {
-		ServletContext ctx = sce.getServletContext();
-		StartupStatus ss = StartupStatus.getBean(ctx);
-
-		try {
-			File baseDirectory = figureBaseDir(sce);
-			Collection<String> fileNamespace = confirmDefaultNamespace(sce);
-			FileStorage fs = new FileStorageImpl(baseDirectory, fileNamespace);
-
-			ctx.setAttribute(ATTRIBUTE_NAME, fs);
-		} catch (Exception e) {
-			log.fatal("Failed to initialize the file system.", e);
-			ss.fatal(this, "Failed to initialize the file system.", e);
-		}
-	}
-
-	/**
-	 * Get the configuration property for the file storage base directory, and
-	 * check that it points to an existing, writeable directory.
-	 * 
-	 * For use by the constructor in implementations of {@link FileStorage}.
-	 */
-	private File figureBaseDir(ServletContextEvent sce) throws IOException {
-		String homeDirPath = ConfigurationProperties.getBean(sce).getProperty(
-				PROPERTY_VITRO_HOME_DIR);
-		if (homeDirPath == null) {
-			throw new IllegalArgumentException(
-					"Configuration properties must contain a value for '"
-							+ PROPERTY_VITRO_HOME_DIR + "'");
-		}
-
-		File homeDir = new File(homeDirPath);
-		if (!homeDir.exists()) {
-			throw new IllegalStateException("Vitro home directory '"
-					+ homeDir.getAbsolutePath() + "' does not exist.");
-		}
-
-		File baseDir = new File(homeDir, FILE_STORAGE_SUBDIRECTORY);
-		if (!baseDir.exists()) {
-			boolean created = baseDir.mkdir();
-			if (!created) {
-				throw new IOException("Unable to create uploads directory at '"
-						+ baseDir + "'");
-			}
-		}
-		return baseDir;
-	}
-
-	/**
-	 * Get the configuration property for the default namespace. For use by the
-	 * constructor in implementations of {@link FileStorage}.
-	 * 
-	 * @returns a collection containing the default namespace.
-	 */
-	private Collection<String> confirmDefaultNamespace(ServletContextEvent sce) {
-		String defaultNamespace = ConfigurationProperties.getBean(sce)
-				.getProperty(PROPERTY_DEFAULT_NAMESPACE);
-		if (defaultNamespace == null) {
-			throw new IllegalArgumentException(
-					"Configuration properties must contain a value for '"
-							+ PROPERTY_DEFAULT_NAMESPACE + "'");
-		}
-
-		return Collections.singleton(defaultNamespace);
-	}
-
-	@Override
-	public void contextDestroyed(ServletContextEvent sce) {
-		// Nothing to do here.
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage.backend;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
+
+/**
+ * Initializes the file storage system, and stores a reference in the servlet
+ * context.
+ */
+public class FileStorageSetup implements ServletContextListener {
+	private static final Log log = LogFactory.getLog(FileStorageSetup.class);
+
+	/**
+	 * The implementation of the {@link FileStorage} system will be stored in
+	 * the {@link ServletContext} as an attribute with this name.
+	 */
+	public static final String ATTRIBUTE_NAME = FileStorage.class.getName();
+
+	/**
+	 * The default implementation will use this key to ask
+	 * {@link ConfigurationProperties} for the vivo home directory. The file
+	 * storage base directory is in a subdirectory below this one.
+	 */
+	public static final String PROPERTY_VITRO_HOME_DIR = "vitro.home";
+	public static final String FILE_STORAGE_SUBDIRECTORY = "uploads";
+
+	/**
+	 * The default implementation will use this key to ask
+	 * {@link ConfigurationProperties} for the default URI namespace.
+	 */
+	public static final String PROPERTY_DEFAULT_NAMESPACE = "Vitro.defaultNamespace";
+
+	/**
+	 * Create an implementation of {@link FileStorage} and store it in the
+	 * {@link ServletContext}, as an attribute named according to
+	 * {@link #ATTRIBUTE_NAME}.
+	 */
+	@Override
+	public void contextInitialized(ServletContextEvent sce) {
+		ServletContext ctx = sce.getServletContext();
+		StartupStatus ss = StartupStatus.getBean(ctx);
+
+		try {
+			File baseDirectory = figureBaseDir(sce);
+			Collection<String> fileNamespace = confirmDefaultNamespace(sce);
+			FileStorage fs = new FileStorageImpl(baseDirectory, fileNamespace);
+
+			ctx.setAttribute(ATTRIBUTE_NAME, fs);
+		} catch (Exception e) {
+			log.fatal("Failed to initialize the file system.", e);
+			ss.fatal(this, "Failed to initialize the file system.", e);
+		}
+	}
+
+	/**
+	 * Get the configuration property for the file storage base directory, and
+	 * check that it points to an existing, writeable directory.
+	 * 
+	 * For use by the constructor in implementations of {@link FileStorage}.
+	 */
+	private File figureBaseDir(ServletContextEvent sce) throws IOException {
+		String homeDirPath = ConfigurationProperties.getBean(sce).getProperty(
+				PROPERTY_VITRO_HOME_DIR);
+		if (homeDirPath == null) {
+			throw new IllegalArgumentException(
+					"Configuration properties must contain a value for '"
+							+ PROPERTY_VITRO_HOME_DIR + "'");
+		}
+
+		File homeDir = new File(homeDirPath);
+		if (!homeDir.exists()) {
+			throw new IllegalStateException("Vitro home directory '"
+					+ homeDir.getAbsolutePath() + "' does not exist.");
+		}
+
+		File baseDir = new File(homeDir, FILE_STORAGE_SUBDIRECTORY);
+		if (!baseDir.exists()) {
+			boolean created = baseDir.mkdir();
+			if (!created) {
+				throw new IOException("Unable to create uploads directory at '"
+						+ baseDir + "'");
+			}
+		}
+		return baseDir;
+	}
+
+	/**
+	 * Get the configuration property for the default namespace. For use by the
+	 * constructor in implementations of {@link FileStorage}.
+	 * 
+	 * @returns a collection containing the default namespace.
+	 */
+	private Collection<String> confirmDefaultNamespace(ServletContextEvent sce) {
+		String defaultNamespace = ConfigurationProperties.getBean(sce)
+				.getProperty(PROPERTY_DEFAULT_NAMESPACE);
+		if (defaultNamespace == null) {
+			throw new IllegalArgumentException(
+					"Configuration properties must contain a value for '"
+							+ PROPERTY_DEFAULT_NAMESPACE + "'");
+		}
+
+		return Collections.singleton(defaultNamespace);
+	}
+
+	@Override
+	public void contextDestroyed(ServletContextEvent sce) {
+		// Nothing to do here.
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/InvalidCharacterException.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/InvalidCharacterException.java
index b67f6fff0..19147bf39 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/InvalidCharacterException.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/InvalidCharacterException.java
@@ -1,27 +1,27 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage.backend;
-
-/**
- * Indicates that an object ID contains an invalid character.
- */
-public class InvalidCharacterException extends RuntimeException {
-	private final char invalid;
-	private final int position;
-	private final String context;
-
-
-	public InvalidCharacterException(char invalid, int position, String context) {
-		this.invalid = invalid;
-		this.position = position;
-		this.context = context;
-	}
-
-
-	@Override
-	public String getMessage() {
-		return String.format(
-				"Invalid character '%1$c'(0x%1$x) at position %2$d in '%3$s'",
-				(int)invalid, position, context);
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage.backend;
+
+/**
+ * Indicates that an object ID contains an invalid character.
+ */
+public class InvalidCharacterException extends RuntimeException {
+	private final char invalid;
+	private final int position;
+	private final String context;
+
+
+	public InvalidCharacterException(char invalid, int position, String context) {
+		this.invalid = invalid;
+		this.position = position;
+		this.context = context;
+	}
+
+
+	@Override
+	public String getMessage() {
+		return String.format(
+				"Invalid character '%1$c'(0x%1$x) at position %2$d in '%3$s'",
+				(int)invalid, position, context);
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/InvalidPathException.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/InvalidPathException.java
index 3a18777b2..710e034da 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/InvalidPathException.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/InvalidPathException.java
@@ -1,27 +1,27 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage.backend;
-
-/**
- * Indicates a PairTree path ("ppath" or "relative path") that is not correctly
- * formed, and cannot be converted to an object ID.
- */
-public class InvalidPathException extends RuntimeException {
-
-	public InvalidPathException() {
-		super();
-	}
-
-	public InvalidPathException(String message) {
-		super(message);
-	}
-
-	public InvalidPathException(Throwable cause) {
-		super(cause);
-	}
-
-	public InvalidPathException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage.backend;
+
+/**
+ * Indicates a PairTree path ("ppath" or "relative path") that is not correctly
+ * formed, and cannot be converted to an object ID.
+ */
+public class InvalidPathException extends RuntimeException {
+
+	public InvalidPathException() {
+		super();
+	}
+
+	public InvalidPathException(String message) {
+		super(message);
+	}
+
+	public InvalidPathException(Throwable cause) {
+		super(cause);
+	}
+
+	public InvalidPathException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/package.html b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/package.html
index ffa218f3c..200a9b352 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/package.html
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/package.html
@@ -1,282 +1,282 @@
-<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-
-<p>
-The code in this package implements the Vitro file-storage system.
-</p>
-
-<h1>Relationship to PairTree</h1>
-
-<p>
-The system incorporates a number of ideas from the PairTree specification, 
-  <ul>
-    <li>
-      The basic pairtree algorithm - 
-      mapping an encoded identifier string into a filesystem directory path.
-    </li>
-    <li>
-      Identifier string cleaning -
-      encoding identifiers in a two-step process so that all illegal 
-      characters are eliminated, but some commonly-used 
-      illegal characters are handled by simple substitution.
-      Actually, it becomes a three-step process because namespaces are 
-      invoved.
-    </li>
-  </ul> 
-but is different in several respects:
-  <ul>
-    <li>
-      Each "object" will consist only of a single file, 
-      causing the entire issue of object encapsulation to be moot.
-    </li>
-    <li>
-      Filenames will be cleaned in the same manner as identifiers, 
-      guarding against illegal characters in filenames.
-    </li>
-    <li>
-      Character encoding will include backslashes, 
-      for compatibility with Windows.
-    </li>
-    <li>
-      Character encoding will include tildes, to allow for "namespaces". 
-    </li>
-    <li>
-      A namespace/prefix capability will be used to shorten file paths, 
-      but with more flexibility than the prefix algorithm given in the specification.
-    </li>
-    <li>
-      "shorty" directory names may be up to 3 characters long, not 2.
-    </li>
-  </ul> 
-</p>
-
-<h1>Directory structure</h1>
-
-<p>
-  A typical structure would look like this:
-  <pre>
-  + basedir
-  |
-  +--+ file_storage_namespaces.properties
-  |
-  +--+ file_storage_root
-  </pre>
-  The <code>file_storage_root</code> directory contains the subdirectories 
-  that implement the encoded IDs, and the final directory for each ID will 
-  contain a single file that corresponds to that ID. 
-</p>
-
-<h1>Namespaces</h1>
-
-<p>
-  To reduce the length of the file paths, the system will can be initialized
-  to recognize certain sets of characters (loosely termed "namespaces") and
-  to replace them with a given prefix and separator character during ID 
-  encoding. 
-</p>
-<p>
-  For example, the sytem might be initialized with a "namespace" of 
-  "http://vivo.mydomain.edu/file/". If that is the only namespace, it will
-  be internally assigned a prefix of "a", so a URI like this:
-  <pre>http://vivo.mydomain.edu/file/n3424/myPhoto.jpg</pre>
-  would be converted to this:
-  <pre>a~n3424/myPhoto.jpg</pre>
-</p>
-<p>
-  The namespaces and their assigned prefixes are stored in a properties file 
-  when the structure is initialized. When the structure is re-opened, the
-  file is read to find the correct prefixes. The file
-  might look like this:
-  <pre>
-    a = http://the.first.namespace/
-    b = http://the.second.namespace/
-  </pre>
-</p>
-
-<h1>ID encoding</h1>
-
-<p>
-  This is a multi-step process:
-  <ul>
-    <li>
-      <strong>Namespace recognition</strong> -
-      If the ID begins with a recognized namespace, then that namespace is 
-      stripped from the ID, and the prefix associated with that namespace 
-      is set aside for later in the process.
-    </li> 
-    <li>
-      <strong>Rare character encoding</strong> -
-      Illegal characters are translated to their hexadecimal equivalents, 
-      as are some rarely used characters which will be given other 
-      purposes later in the process. The translated characters include any
-      octet outside of the visible ASCII range (21-7e), and these additional
-      characters: 
-      <pre> " * + , &lt; = &gt; ? ^ | \ ~ </pre>
-      The hexadecimal encoding consists of a caret followed by 2 hex digits, 
-      e.g.: ^7C
-    </li> 
-    <li>
-      <strong>Common character encoding</strong> -
-      To keep the file paths short and readable, characters that are used
-      commonly in IDs but may be illegal in the file system are translated
-      to a single, lesser-used character.
-      <ul>
-        <li> / becomes = </li> 
-        <li> : becomes + </li> 
-        <li> . becomes , </li> 
-      </ul>
-    </li> 
-    <li>
-      <strong>Prefixing</strong> -
-      If a namespace was recognized on the ID in the first step, the 
-      associated prefix letter will be prepended to the string, with a 
-      tilde separator.
-    </li> 
-    <li>
-      <strong>Path breakdown</strong> -
-      Path separator characters are inserted after every third character 
-      in the processed ID string.
-    </li> 
-    <li>
-      <strong>Exclusion of reserved Windows filenames</strong> -
-      Windows will not permit certain specific filename or directory names,
-      so if any part of the path would be equal to one of those reserved
-      names, it is prefixed with a tilde. The reserved names are:
-      CON, PRN, AUX, NUL, COM1, COM2, COM3, COM4, COM5, COM6, COM7, COM8, 
-      COM9, LPT1, LPT2, LPT3, LPT4, LPT5, LPT6, LPT7, LPT8, and LPT9.
-      And remember, Windows is case-insensitive. 
-    </li> 
-  </ul>
-  Examples:
-  <br/><code>ark:/13030/xt12t3</code> becomes 
-       <code>ark/+=1/303/0=x/t12/t3</code>
-  <br/><code>http://n2t.info/urn:nbn:se:kb:repos-1</code> becomes 
-       <code>htt/p+=/=n2/t,i/nfo/=ur/n+n/bn+/se+/kb+/rep/os-/1</code>
-  <br/><code>what-the-*@?#!^!~?</code> becomes 
-       <code>wha/t-t/he-/^2a/@^3/f#!/^5e/!^7/e^3/f</code>
-  <br/><code>http://vivo.myDomain.edu/file/n3424</code> with namespace 
-       <code>http://vivo.myDomain.edu/file/</code> and prefix 
-       <code>a</code> becomes 
-       <code>a~n/342/4</code>
-</p>
-
-<h1>Filename encoding</h1>
-
-<p>
-  The name of the file is encoded as needed to guard against illegal 
-  characters for the filesystem, but in practice we expect little encoding
-  to be required, since few files are named with the special characters.
-</p>
-
-<p>
-  The encoding process is the same as the "rare character encoding" and 
-  "common character encoding" steps used for ID encoding, except that 
-  periods are not encoded.
-</p>
-
-<hr/>
-<hr/>
-<hr/>
-
-<h2>
-	This was summarized in a post to the vivo-dev-all list on 11/29/2010
-</h2>
-
-<p>
-	The uploaded image files are identified by a combination of URI and filename. 
-	The URI is used as the principal identifier so we don't need to worry about 
-	collisions if two people each upload an image named "image.jpg". 
-	
-	The filename is retained so the user can use their browser to download their 
-	image from the system and it will be named as they expect it to be.
-</p>
-
-<p>
-	We wanted a way to store thousands of image files so they would not 
-	all be in the same directory. We took our inspiration from the 
-	<a href="https://confluence.ucop.edu/display/Curation/PairTree">PairTree</a> 
-	folks, and modified their algorithm to suit our needs. 
-	
-	The general idea is to store files in a multi-layer directory structure 
-	based on the URI assigned to the file.
-</p>
-
-<p>
-	Let's consider a file with this information:
-	<pre>
-		URI = http://vivo.mydomain.edu/individual/n3156
-		Filename = lily1.jpg
-	</pre>
-</p>
-
-<p>
-	We want to turn the URI into the directory path, but the URI contains 
-	prohibited characters. Using a PairTree-like character substitution, 
-	we might store it at this path:
-	<pre>
-		/usr/local/vivo/uploads/file_storage_root/http+==vivo.mydomain.edu=individual=n3156/lily1.jpg
-	</pre>
-</p>
-
-<p>
-	Using that scheme would mean that each file sits in its own directory 
-	under the storage root. At a large institution, there might be hundreds of 
-	thousands of directories under that root.
-</p>
-
-<p>
-	By breaking this into PairTree-like groupings, we insure that all files 
-	don't go into the same directory. 
-	
-	Limiting to 3-character names will insure a maximum of about 30,000 files 
-	per directory. In practice, the number will be considerably smaller. 
-	
-	So then it would look like this:
-	<pre>
-		/usr/local/vivo/uploads/file_storage_root/htt/p+=/=vi/vo./myd/oma/in./edu/=in/div/idu/al=/n31/56/lily1.jpg
-	</pre>
-</p>
-
-<p>
-	But almost all of our URIs will start with the same namespace, so the 
-	namespace just adds unnecessary and unhelpful depth to the directory tree. 
-	We assign a single-character prefix to that namespace, using the 
-	file_storage_namespaces.properties file in the uploads directory, like this:
-	<pre>
-		a = http://vivo.mydomain.edu/individual/
-	</pre>
-
-	And our URI now looks like this:
-	<pre>
-		a~n3156
-	</pre>
-
-	Which translates to:
-	<pre>
-		/usr/local/vivo/uploads/file_storage_root/a~n/315/6/lily1.jpg
-	</pre>
-</p>
-
-<p>
-	So what we hope we have implemented is a system where:
-	<ul>
-		<li>Files are stored by URI and filename.</li>
-		<li>File paths are constructed to limit the maximum number of files in a directory.</li>
-		<li>"Illegal" characters in URIs or filenames will not cause problems.
-			<ul><li>even if a character is legal on the client and illegal on the server.</li></ul>
-		</li>
-		<li>Frequently-used namespaces on the URIs can be collapsed to short prefix sequences.</li>
-		<li>URIs with unrecognized namespaces will not cause problems.</li>
-	</ul>
-</p>
-
-<p>
-	By the way, almost all of this is implemented in 
-	<pre>
-		edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageHelper
-	</pre>
-	and illustrated in
-	<pre>
-		edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageHelperTest
-	</pre>
-</p>
+<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+
+<p>
+The code in this package implements the Vitro file-storage system.
+</p>
+
+<h1>Relationship to PairTree</h1>
+
+<p>
+The system incorporates a number of ideas from the PairTree specification, 
+  <ul>
+    <li>
+      The basic pairtree algorithm - 
+      mapping an encoded identifier string into a filesystem directory path.
+    </li>
+    <li>
+      Identifier string cleaning -
+      encoding identifiers in a two-step process so that all illegal 
+      characters are eliminated, but some commonly-used 
+      illegal characters are handled by simple substitution.
+      Actually, it becomes a three-step process because namespaces are 
+      invoved.
+    </li>
+  </ul> 
+but is different in several respects:
+  <ul>
+    <li>
+      Each "object" will consist only of a single file, 
+      causing the entire issue of object encapsulation to be moot.
+    </li>
+    <li>
+      Filenames will be cleaned in the same manner as identifiers, 
+      guarding against illegal characters in filenames.
+    </li>
+    <li>
+      Character encoding will include backslashes, 
+      for compatibility with Windows.
+    </li>
+    <li>
+      Character encoding will include tildes, to allow for "namespaces". 
+    </li>
+    <li>
+      A namespace/prefix capability will be used to shorten file paths, 
+      but with more flexibility than the prefix algorithm given in the specification.
+    </li>
+    <li>
+      "shorty" directory names may be up to 3 characters long, not 2.
+    </li>
+  </ul> 
+</p>
+
+<h1>Directory structure</h1>
+
+<p>
+  A typical structure would look like this:
+  <pre>
+  + basedir
+  |
+  +--+ file_storage_namespaces.properties
+  |
+  +--+ file_storage_root
+  </pre>
+  The <code>file_storage_root</code> directory contains the subdirectories 
+  that implement the encoded IDs, and the final directory for each ID will 
+  contain a single file that corresponds to that ID. 
+</p>
+
+<h1>Namespaces</h1>
+
+<p>
+  To reduce the length of the file paths, the system will can be initialized
+  to recognize certain sets of characters (loosely termed "namespaces") and
+  to replace them with a given prefix and separator character during ID 
+  encoding. 
+</p>
+<p>
+  For example, the sytem might be initialized with a "namespace" of 
+  "http://vivo.mydomain.edu/file/". If that is the only namespace, it will
+  be internally assigned a prefix of "a", so a URI like this:
+  <pre>http://vivo.mydomain.edu/file/n3424/myPhoto.jpg</pre>
+  would be converted to this:
+  <pre>a~n3424/myPhoto.jpg</pre>
+</p>
+<p>
+  The namespaces and their assigned prefixes are stored in a properties file 
+  when the structure is initialized. When the structure is re-opened, the
+  file is read to find the correct prefixes. The file
+  might look like this:
+  <pre>
+    a = http://the.first.namespace/
+    b = http://the.second.namespace/
+  </pre>
+</p>
+
+<h1>ID encoding</h1>
+
+<p>
+  This is a multi-step process:
+  <ul>
+    <li>
+      <strong>Namespace recognition</strong> -
+      If the ID begins with a recognized namespace, then that namespace is 
+      stripped from the ID, and the prefix associated with that namespace 
+      is set aside for later in the process.
+    </li> 
+    <li>
+      <strong>Rare character encoding</strong> -
+      Illegal characters are translated to their hexadecimal equivalents, 
+      as are some rarely used characters which will be given other 
+      purposes later in the process. The translated characters include any
+      octet outside of the visible ASCII range (21-7e), and these additional
+      characters: 
+      <pre> " * + , &lt; = &gt; ? ^ | \ ~ </pre>
+      The hexadecimal encoding consists of a caret followed by 2 hex digits, 
+      e.g.: ^7C
+    </li> 
+    <li>
+      <strong>Common character encoding</strong> -
+      To keep the file paths short and readable, characters that are used
+      commonly in IDs but may be illegal in the file system are translated
+      to a single, lesser-used character.
+      <ul>
+        <li> / becomes = </li> 
+        <li> : becomes + </li> 
+        <li> . becomes , </li> 
+      </ul>
+    </li> 
+    <li>
+      <strong>Prefixing</strong> -
+      If a namespace was recognized on the ID in the first step, the 
+      associated prefix letter will be prepended to the string, with a 
+      tilde separator.
+    </li> 
+    <li>
+      <strong>Path breakdown</strong> -
+      Path separator characters are inserted after every third character 
+      in the processed ID string.
+    </li> 
+    <li>
+      <strong>Exclusion of reserved Windows filenames</strong> -
+      Windows will not permit certain specific filename or directory names,
+      so if any part of the path would be equal to one of those reserved
+      names, it is prefixed with a tilde. The reserved names are:
+      CON, PRN, AUX, NUL, COM1, COM2, COM3, COM4, COM5, COM6, COM7, COM8, 
+      COM9, LPT1, LPT2, LPT3, LPT4, LPT5, LPT6, LPT7, LPT8, and LPT9.
+      And remember, Windows is case-insensitive. 
+    </li> 
+  </ul>
+  Examples:
+  <br/><code>ark:/13030/xt12t3</code> becomes 
+       <code>ark/+=1/303/0=x/t12/t3</code>
+  <br/><code>http://n2t.info/urn:nbn:se:kb:repos-1</code> becomes 
+       <code>htt/p+=/=n2/t,i/nfo/=ur/n+n/bn+/se+/kb+/rep/os-/1</code>
+  <br/><code>what-the-*@?#!^!~?</code> becomes 
+       <code>wha/t-t/he-/^2a/@^3/f#!/^5e/!^7/e^3/f</code>
+  <br/><code>http://vivo.myDomain.edu/file/n3424</code> with namespace 
+       <code>http://vivo.myDomain.edu/file/</code> and prefix 
+       <code>a</code> becomes 
+       <code>a~n/342/4</code>
+</p>
+
+<h1>Filename encoding</h1>
+
+<p>
+  The name of the file is encoded as needed to guard against illegal 
+  characters for the filesystem, but in practice we expect little encoding
+  to be required, since few files are named with the special characters.
+</p>
+
+<p>
+  The encoding process is the same as the "rare character encoding" and 
+  "common character encoding" steps used for ID encoding, except that 
+  periods are not encoded.
+</p>
+
+<hr/>
+<hr/>
+<hr/>
+
+<h2>
+	This was summarized in a post to the vivo-dev-all list on 11/29/2010
+</h2>
+
+<p>
+	The uploaded image files are identified by a combination of URI and filename. 
+	The URI is used as the principal identifier so we don't need to worry about 
+	collisions if two people each upload an image named "image.jpg". 
+	
+	The filename is retained so the user can use their browser to download their 
+	image from the system and it will be named as they expect it to be.
+</p>
+
+<p>
+	We wanted a way to store thousands of image files so they would not 
+	all be in the same directory. We took our inspiration from the 
+	<a href="https://confluence.ucop.edu/display/Curation/PairTree">PairTree</a> 
+	folks, and modified their algorithm to suit our needs. 
+	
+	The general idea is to store files in a multi-layer directory structure 
+	based on the URI assigned to the file.
+</p>
+
+<p>
+	Let's consider a file with this information:
+	<pre>
+		URI = http://vivo.mydomain.edu/individual/n3156
+		Filename = lily1.jpg
+	</pre>
+</p>
+
+<p>
+	We want to turn the URI into the directory path, but the URI contains 
+	prohibited characters. Using a PairTree-like character substitution, 
+	we might store it at this path:
+	<pre>
+		/usr/local/vivo/uploads/file_storage_root/http+==vivo.mydomain.edu=individual=n3156/lily1.jpg
+	</pre>
+</p>
+
+<p>
+	Using that scheme would mean that each file sits in its own directory 
+	under the storage root. At a large institution, there might be hundreds of 
+	thousands of directories under that root.
+</p>
+
+<p>
+	By breaking this into PairTree-like groupings, we insure that all files 
+	don't go into the same directory. 
+	
+	Limiting to 3-character names will insure a maximum of about 30,000 files 
+	per directory. In practice, the number will be considerably smaller. 
+	
+	So then it would look like this:
+	<pre>
+		/usr/local/vivo/uploads/file_storage_root/htt/p+=/=vi/vo./myd/oma/in./edu/=in/div/idu/al=/n31/56/lily1.jpg
+	</pre>
+</p>
+
+<p>
+	But almost all of our URIs will start with the same namespace, so the 
+	namespace just adds unnecessary and unhelpful depth to the directory tree. 
+	We assign a single-character prefix to that namespace, using the 
+	file_storage_namespaces.properties file in the uploads directory, like this:
+	<pre>
+		a = http://vivo.mydomain.edu/individual/
+	</pre>
+
+	And our URI now looks like this:
+	<pre>
+		a~n3156
+	</pre>
+
+	Which translates to:
+	<pre>
+		/usr/local/vivo/uploads/file_storage_root/a~n/315/6/lily1.jpg
+	</pre>
+</p>
+
+<p>
+	So what we hope we have implemented is a system where:
+	<ul>
+		<li>Files are stored by URI and filename.</li>
+		<li>File paths are constructed to limit the maximum number of files in a directory.</li>
+		<li>"Illegal" characters in URIs or filenames will not cause problems.
+			<ul><li>even if a character is legal on the client and illegal on the server.</li></ul>
+		</li>
+		<li>Frequently-used namespaces on the URIs can be collapsed to short prefix sequences.</li>
+		<li>URIs with unrecognized namespaces will not cause problems.</li>
+	</ul>
+</p>
+
+<p>
+	By the way, almost all of this is implemented in 
+	<pre>
+		edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageHelper
+	</pre>
+	and illustrated in
+	<pre>
+		edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageHelperTest
+	</pre>
+</p>
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/model/FileInfo.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/model/FileInfo.java
index 6a2a02d34..8d825dadf 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/model/FileInfo.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/model/FileInfo.java
@@ -1,290 +1,290 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage.model;
-
-import java.util.List;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatementImpl;
-import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
-import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.filestorage.FileServingHelper;
-
-/**
- * An immutable packet of information about an uploaded file, with a builder
- * class to permit incremental construction.
- */
-public class FileInfo {
-	private static final Log log = LogFactory.getLog(FileInfo.class);
-
-	// ----------------------------------------------------------------------
-	// static Factory methods.
-	// ----------------------------------------------------------------------
-
-	/**
-	 * If this request URL represents a BytestreamAliasURL, find the bytestream
-	 * URI, find the surrogate, and get the info. Otherwise, return null.
-	 */
-	public static FileInfo instanceFromAliasUrl(
-			WebappDaoFactory webappDaoFactory, String path, ServletContext ctx) {
-		String bytestreamUri = FileServingHelper.getBytestreamUri(path, ctx);
-		if (bytestreamUri == null) {
-			return null;
-		}
-		return instanceFromBytestreamUri(webappDaoFactory, bytestreamUri);
-	}
-
-	/**
-	 * If this URI represents a file bytestream, find its surrogate and get its
-	 * info. Otherwise, return null.
-	 */
-	public static FileInfo instanceFromBytestreamUri(
-			WebappDaoFactory webappDaoFactory, String bytestreamUri) {
-		IndividualDao individualDao = webappDaoFactory.getIndividualDao();
-		Individual entity = individualDao.getIndividualByURI(bytestreamUri);
-		if (!isFileBytestream(entity)) {
-			return null;
-		}
-
-		ObjectPropertyStatementDao objectPropertyStatementDao = webappDaoFactory
-				.getObjectPropertyStatementDao();
-		ObjectPropertyStatement opStmt = new ObjectPropertyStatementImpl(null,
-				VitroVocabulary.FS_DOWNLOAD_LOCATION, entity.getURI());
-		List<ObjectPropertyStatement> stmts = objectPropertyStatementDao
-				.getObjectPropertyStatements(opStmt);
-
-		if (stmts.size() > 1) {
-			String uris = "";
-			for (ObjectPropertyStatement stmt : stmts) {
-				uris += "'" + stmt.getSubjectURI() + "' ";
-			}
-			log.warn("Found " + stmts.size() + " Individuals that claim '"
-					+ entity.getURI() + "' as its bytestream:" + uris);
-		}
-		if (stmts.isEmpty()) {
-			log.warn("No individual claims '" + entity.getURI()
-					+ "' as its bytestream.");
-			return null;
-		}
-
-		String surrogateUri = stmts.get(0).getSubjectURI();
-		return instanceFromSurrogateUri(webappDaoFactory, surrogateUri);
-	}
-
-	/**
-	 * If this URI represents a file surrogate, get its info. Otherwise, return
-	 * null.
-	 */
-	public static FileInfo instanceFromSurrogateUri(
-			WebappDaoFactory webappDaoFactory, String uri) {
-		IndividualDao individualDao = webappDaoFactory.getIndividualDao();
-		Individual surrogate = individualDao.getIndividualByURI(uri);
-		if (!isFileSurrogate(surrogate)) {
-			return null;
-		}
-
-		String filename = surrogate.getDataValue(VitroVocabulary.FS_FILENAME);
-		if (filename == null) {
-			log.error("File had no filename: '" + uri + "'");
-			return null;
-		} else {
-			log.debug("Filename for '" + uri + "' was '" + filename + "'");
-		}
-
-		String mimeType = surrogate.getDataValue(VitroVocabulary.FS_MIME_TYPE);
-		if (mimeType == null) {
-			log.error("File had no mimeType: '" + uri + "'");
-			return null;
-		} else {
-			log.debug("mimeType for '" + uri + "' was '" + mimeType + "'");
-		}
-
-		Individual byteStream = surrogate
-				.getRelatedIndividual(VitroVocabulary.FS_DOWNLOAD_LOCATION);
-		if (byteStream == null) {
-			log.error("File surrogate '" + uri
-					+ "' had no associated bytestream.");
-			return null;
-		}
-
-		String bytestreamUri = findBytestreamUri(byteStream, uri);
-		if (bytestreamUri == null) {
-			log.error("Bytestream of file surrogate '" + uri + "' had no URI: "
-					+ byteStream);
-			return null;
-		}
-
-		String bytestreamAliasUrl = findBytestreamAliasUrl(byteStream, uri);
-		if (bytestreamAliasUrl == null) {
-			log.error("Bytestream  '" + bytestreamUri + "' had no alias URL.");
-			return null;
-		}
-
-		return new FileInfo.Builder().setUri(uri).setFilename(filename)
-				.setMimeType(mimeType).setBytestreamUri(bytestreamUri)
-				.setBytestreamAliasUrl(bytestreamAliasUrl).build();
-	}
-
-	/**
-	 * Is this a FileByteStream individual?
-	 */
-	private static boolean isFileBytestream(Individual entity) {
-		if (entity == null) {
-			return false;
-		}
-		if (entity.isVClass(VitroVocabulary.FS_BYTESTREAM_CLASS)) {
-			log.debug("Entity '" + entity.getURI() + "' is a bytestream");
-			return true;
-		}
-		log.debug("Entity '" + entity.getURI() + "' is not a bytestream");
-		return false;
-	}
-
-	/**
-	 * Is this a File individual?
-	 */
-	private static boolean isFileSurrogate(Individual entity) {
-		if (entity == null) {
-			return false;
-		}
-		if (entity.isVClass(VitroVocabulary.FS_FILE_CLASS)) {
-			log.debug("Entity '" + entity.getURI() + "' is a file surrogate");
-			return true;
-		}
-		log.debug("Entity '" + entity.getURI() + "' is not a file surrogate");
-		return false;
-	}
-
-	/**
-	 * Get the URI of the bytestream, or null if there is none.
-	 */
-	private static String findBytestreamUri(Individual byteStream,
-			String surrogateUri) {
-		if (byteStream == null) {
-			return null;
-		}
-
-		String bytestreamUri = byteStream.getURI();
-		log.debug("File surrogate'" + surrogateUri
-				+ "' had associated bytestream: '" + byteStream.getURI() + "'");
-		return bytestreamUri;
-	}
-
-	/**
-	 * Get the alias URL from the bytestream, or null if there is none.
-	 */
-	private static String findBytestreamAliasUrl(Individual byteStream,
-			String surrogateUri) {
-		if (byteStream == null) {
-			return null;
-		}
-
-		String aliasUrl = byteStream.getDataValue(VitroVocabulary.FS_ALIAS_URL);
-		if (aliasUrl == null) {
-			log.error("File had no aliasUrl: '" + surrogateUri + "'");
-		} else {
-			log.debug("aliasUrl for '" + surrogateUri + "' was '" + aliasUrl
-					+ "'");
-		}
-		return aliasUrl;
-	}
-
-	// ----------------------------------------------------------------------
-	// The instance variables and methods.
-	// ----------------------------------------------------------------------
-
-	private final String uri;
-	private final String filename;
-	private final String mimeType;
-	private final String bytestreamUri;
-	private final String bytestreamAliasUrl;
-
-	private FileInfo(Builder builder) {
-		this.uri = builder.uri;
-		this.filename = builder.filename;
-		this.mimeType = builder.mimeType;
-		this.bytestreamUri = builder.bytestreamUri;
-		this.bytestreamAliasUrl = builder.bytestreamAliasUrl;
-	}
-
-	public String getUri() {
-		return uri;
-	}
-
-	public String getFilename() {
-		return filename;
-	}
-
-	public String getMimeType() {
-		return mimeType;
-	}
-
-	public String getBytestreamUri() {
-		return bytestreamUri;
-	}
-
-	public String getBytestreamAliasUrl() {
-		return bytestreamAliasUrl;
-	}
-
-	@Override
-	public String toString() {
-		return "FileInfo[uri=" + uri + ", filename=" + filename + ", mimeType="
-				+ mimeType + ", bytestreamUri=" + bytestreamUri + ", aliasUrl="
-				+ bytestreamAliasUrl + "]";
-	}
-
-	// ----------------------------------------------------------------------
-	// The builder.
-	// ----------------------------------------------------------------------
-
-	/**
-	 * A builder class allows us to supply the values one at a time, and then
-	 * freeze them into an immutable object.
-	 */
-	public static class Builder {
-		private String uri;
-		private String filename;
-		private String mimeType;
-		private String bytestreamUri;
-		private String bytestreamAliasUrl;
-
-		public Builder setUri(String uri) {
-			this.uri = uri;
-			return this;
-		}
-
-		public Builder setFilename(String filename) {
-			this.filename = filename;
-			return this;
-		}
-
-		public Builder setMimeType(String mimeType) {
-			this.mimeType = mimeType;
-			return this;
-		}
-
-		public Builder setBytestreamUri(String bytestreamUri) {
-			this.bytestreamUri = bytestreamUri;
-			return this;
-		}
-
-		public Builder setBytestreamAliasUrl(String bytestreamAliasUrl) {
-			this.bytestreamAliasUrl = bytestreamAliasUrl;
-			return this;
-		}
-
-		public FileInfo build() {
-			return new FileInfo(this);
-		}
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage.model;
+
+import java.util.List;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatementImpl;
+import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.filestorage.FileServingHelper;
+
+/**
+ * An immutable packet of information about an uploaded file, with a builder
+ * class to permit incremental construction.
+ */
+public class FileInfo {
+	private static final Log log = LogFactory.getLog(FileInfo.class);
+
+	// ----------------------------------------------------------------------
+	// static Factory methods.
+	// ----------------------------------------------------------------------
+
+	/**
+	 * If this request URL represents a BytestreamAliasURL, find the bytestream
+	 * URI, find the surrogate, and get the info. Otherwise, return null.
+	 */
+	public static FileInfo instanceFromAliasUrl(
+			WebappDaoFactory webappDaoFactory, String path, ServletContext ctx) {
+		String bytestreamUri = FileServingHelper.getBytestreamUri(path, ctx);
+		if (bytestreamUri == null) {
+			return null;
+		}
+		return instanceFromBytestreamUri(webappDaoFactory, bytestreamUri);
+	}
+
+	/**
+	 * If this URI represents a file bytestream, find its surrogate and get its
+	 * info. Otherwise, return null.
+	 */
+	public static FileInfo instanceFromBytestreamUri(
+			WebappDaoFactory webappDaoFactory, String bytestreamUri) {
+		IndividualDao individualDao = webappDaoFactory.getIndividualDao();
+		Individual entity = individualDao.getIndividualByURI(bytestreamUri);
+		if (!isFileBytestream(entity)) {
+			return null;
+		}
+
+		ObjectPropertyStatementDao objectPropertyStatementDao = webappDaoFactory
+				.getObjectPropertyStatementDao();
+		ObjectPropertyStatement opStmt = new ObjectPropertyStatementImpl(null,
+				VitroVocabulary.FS_DOWNLOAD_LOCATION, entity.getURI());
+		List<ObjectPropertyStatement> stmts = objectPropertyStatementDao
+				.getObjectPropertyStatements(opStmt);
+
+		if (stmts.size() > 1) {
+			String uris = "";
+			for (ObjectPropertyStatement stmt : stmts) {
+				uris += "'" + stmt.getSubjectURI() + "' ";
+			}
+			log.warn("Found " + stmts.size() + " Individuals that claim '"
+					+ entity.getURI() + "' as its bytestream:" + uris);
+		}
+		if (stmts.isEmpty()) {
+			log.warn("No individual claims '" + entity.getURI()
+					+ "' as its bytestream.");
+			return null;
+		}
+
+		String surrogateUri = stmts.get(0).getSubjectURI();
+		return instanceFromSurrogateUri(webappDaoFactory, surrogateUri);
+	}
+
+	/**
+	 * If this URI represents a file surrogate, get its info. Otherwise, return
+	 * null.
+	 */
+	public static FileInfo instanceFromSurrogateUri(
+			WebappDaoFactory webappDaoFactory, String uri) {
+		IndividualDao individualDao = webappDaoFactory.getIndividualDao();
+		Individual surrogate = individualDao.getIndividualByURI(uri);
+		if (!isFileSurrogate(surrogate)) {
+			return null;
+		}
+
+		String filename = surrogate.getDataValue(VitroVocabulary.FS_FILENAME);
+		if (filename == null) {
+			log.error("File had no filename: '" + uri + "'");
+			return null;
+		} else {
+			log.debug("Filename for '" + uri + "' was '" + filename + "'");
+		}
+
+		String mimeType = surrogate.getDataValue(VitroVocabulary.FS_MIME_TYPE);
+		if (mimeType == null) {
+			log.error("File had no mimeType: '" + uri + "'");
+			return null;
+		} else {
+			log.debug("mimeType for '" + uri + "' was '" + mimeType + "'");
+		}
+
+		Individual byteStream = surrogate
+				.getRelatedIndividual(VitroVocabulary.FS_DOWNLOAD_LOCATION);
+		if (byteStream == null) {
+			log.error("File surrogate '" + uri
+					+ "' had no associated bytestream.");
+			return null;
+		}
+
+		String bytestreamUri = findBytestreamUri(byteStream, uri);
+		if (bytestreamUri == null) {
+			log.error("Bytestream of file surrogate '" + uri + "' had no URI: "
+					+ byteStream);
+			return null;
+		}
+
+		String bytestreamAliasUrl = findBytestreamAliasUrl(byteStream, uri);
+		if (bytestreamAliasUrl == null) {
+			log.error("Bytestream  '" + bytestreamUri + "' had no alias URL.");
+			return null;
+		}
+
+		return new FileInfo.Builder().setUri(uri).setFilename(filename)
+				.setMimeType(mimeType).setBytestreamUri(bytestreamUri)
+				.setBytestreamAliasUrl(bytestreamAliasUrl).build();
+	}
+
+	/**
+	 * Is this a FileByteStream individual?
+	 */
+	private static boolean isFileBytestream(Individual entity) {
+		if (entity == null) {
+			return false;
+		}
+		if (entity.isVClass(VitroVocabulary.FS_BYTESTREAM_CLASS)) {
+			log.debug("Entity '" + entity.getURI() + "' is a bytestream");
+			return true;
+		}
+		log.debug("Entity '" + entity.getURI() + "' is not a bytestream");
+		return false;
+	}
+
+	/**
+	 * Is this a File individual?
+	 */
+	private static boolean isFileSurrogate(Individual entity) {
+		if (entity == null) {
+			return false;
+		}
+		if (entity.isVClass(VitroVocabulary.FS_FILE_CLASS)) {
+			log.debug("Entity '" + entity.getURI() + "' is a file surrogate");
+			return true;
+		}
+		log.debug("Entity '" + entity.getURI() + "' is not a file surrogate");
+		return false;
+	}
+
+	/**
+	 * Get the URI of the bytestream, or null if there is none.
+	 */
+	private static String findBytestreamUri(Individual byteStream,
+			String surrogateUri) {
+		if (byteStream == null) {
+			return null;
+		}
+
+		String bytestreamUri = byteStream.getURI();
+		log.debug("File surrogate'" + surrogateUri
+				+ "' had associated bytestream: '" + byteStream.getURI() + "'");
+		return bytestreamUri;
+	}
+
+	/**
+	 * Get the alias URL from the bytestream, or null if there is none.
+	 */
+	private static String findBytestreamAliasUrl(Individual byteStream,
+			String surrogateUri) {
+		if (byteStream == null) {
+			return null;
+		}
+
+		String aliasUrl = byteStream.getDataValue(VitroVocabulary.FS_ALIAS_URL);
+		if (aliasUrl == null) {
+			log.error("File had no aliasUrl: '" + surrogateUri + "'");
+		} else {
+			log.debug("aliasUrl for '" + surrogateUri + "' was '" + aliasUrl
+					+ "'");
+		}
+		return aliasUrl;
+	}
+
+	// ----------------------------------------------------------------------
+	// The instance variables and methods.
+	// ----------------------------------------------------------------------
+
+	private final String uri;
+	private final String filename;
+	private final String mimeType;
+	private final String bytestreamUri;
+	private final String bytestreamAliasUrl;
+
+	private FileInfo(Builder builder) {
+		this.uri = builder.uri;
+		this.filename = builder.filename;
+		this.mimeType = builder.mimeType;
+		this.bytestreamUri = builder.bytestreamUri;
+		this.bytestreamAliasUrl = builder.bytestreamAliasUrl;
+	}
+
+	public String getUri() {
+		return uri;
+	}
+
+	public String getFilename() {
+		return filename;
+	}
+
+	public String getMimeType() {
+		return mimeType;
+	}
+
+	public String getBytestreamUri() {
+		return bytestreamUri;
+	}
+
+	public String getBytestreamAliasUrl() {
+		return bytestreamAliasUrl;
+	}
+
+	@Override
+	public String toString() {
+		return "FileInfo[uri=" + uri + ", filename=" + filename + ", mimeType="
+				+ mimeType + ", bytestreamUri=" + bytestreamUri + ", aliasUrl="
+				+ bytestreamAliasUrl + "]";
+	}
+
+	// ----------------------------------------------------------------------
+	// The builder.
+	// ----------------------------------------------------------------------
+
+	/**
+	 * A builder class allows us to supply the values one at a time, and then
+	 * freeze them into an immutable object.
+	 */
+	public static class Builder {
+		private String uri;
+		private String filename;
+		private String mimeType;
+		private String bytestreamUri;
+		private String bytestreamAliasUrl;
+
+		public Builder setUri(String uri) {
+			this.uri = uri;
+			return this;
+		}
+
+		public Builder setFilename(String filename) {
+			this.filename = filename;
+			return this;
+		}
+
+		public Builder setMimeType(String mimeType) {
+			this.mimeType = mimeType;
+			return this;
+		}
+
+		public Builder setBytestreamUri(String bytestreamUri) {
+			this.bytestreamUri = bytestreamUri;
+			return this;
+		}
+
+		public Builder setBytestreamAliasUrl(String bytestreamAliasUrl) {
+			this.bytestreamAliasUrl = bytestreamAliasUrl;
+			return this;
+		}
+
+		public FileInfo build() {
+			return new FileInfo(this);
+		}
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/model/ImageInfo.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/model/ImageInfo.java
index beca0c9c1..036163303 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/model/ImageInfo.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/model/ImageInfo.java
@@ -1,127 +1,127 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage.model;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-
-/**
- * An immutable packet of information about an iamge file and its thumbnail.
- */
-public class ImageInfo {
-	private static final Log log = LogFactory.getLog(ImageInfo.class);
-	
-	public static final ImageInfo EMPTY_IMAGE_INFO = emptyInstance();
-	
-	// ----------------------------------------------------------------------
-	// static Factory methods.
-	// ----------------------------------------------------------------------
-
-	/**
-	 * This is a place holder for an Individual with no image.
-	 */
-	private static ImageInfo emptyInstance() {
-		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.
-	 */
-	public static ImageInfo instanceFromEntityUri(
-			WebappDaoFactory webappDaoFactory, Individual entity) {
-		if (webappDaoFactory == null) {
-			throw new NullPointerException("webappDaoFactory may not be null.");
-		}
-
-		if (entity == null) {
-			return null;
-		}
-
-		IndividualDao individualDao = webappDaoFactory.getIndividualDao();
-
-		String mainImageUri = entity.getMainImageUri();
-		if (mainImageUri == null) {
-			log.debug("Entity '" + entity.getURI()
-					+ "' had no associated main image.");
-			return null;
-		} else {
-			log.debug("Entity '" + entity.getURI()
-					+ "' had associated main image: '" + mainImageUri + "'");
-		}
-
-		Individual mainFile = individualDao.getIndividualByURI(mainImageUri);
-		if (mainFile == null) {
-			log.error("Entity '" + entity.getURI()
-					+ "' has a main image URI that does not refer to an "
-					+ "individual: mainImageURI=" + mainImageUri);
-			return null;
-		}
-
-		Individual thumbFile = mainFile
-				.getRelatedIndividual(VitroVocabulary.FS_THUMBNAIL_IMAGE);
-		if (thumbFile == null) {
-			log.warn("Main image file '" + mainImageUri
-					+ "' had no associated thumbnail.");
-			return null;
-		} else {
-			log.debug("Main image file '" + mainImageUri
-					+ "' had associated thumbnail: '" + thumbFile.getURI()
-					+ "'");
-		}
-
-		FileInfo mainInfo = FileInfo.instanceFromSurrogateUri(webappDaoFactory,
-				mainFile.getURI());
-		if (mainInfo == null) {
-			log.error("Entity '" + entity.getURI()
-					+ "' has a mainImage that is not a File "
-					+ "surrogate: mainImageURI=" + mainImageUri);
-			return null;
-		}
-
-		FileInfo thumbInfo = FileInfo.instanceFromSurrogateUri(
-				webappDaoFactory, thumbFile.getURI());
-		if (thumbInfo == null) {
-			log.error("Entity '" + entity.getURI()
-					+ "' has a mainImage with a thumbnail that is not a File "
-					+ "surrogate: mainImageURI=" + mainImageUri
-					+ ", thumbnailURI=" + thumbFile.getURI());
-			return null;
-		}
-
-		return new ImageInfo(mainInfo, thumbInfo);
-	}
-
-	// ----------------------------------------------------------------------
-	// instance fields and methods.
-	// ----------------------------------------------------------------------
-
-	private final FileInfo mainImage;
-	private final FileInfo thumbnail;
-
-	public ImageInfo(FileInfo mainImage, FileInfo thumbnail) {
-		if (mainImage == null) {
-			throw new NullPointerException("mainImage may not be null.");
-		}
-		if (thumbnail == null) {
-			throw new NullPointerException("thumbnail may not be null.");
-		}
-		this.mainImage = mainImage;
-		this.thumbnail = thumbnail;
-	}
-
-	public FileInfo getMainImage() {
-		return mainImage;
-	}
-
-	public FileInfo getThumbnail() {
-		return thumbnail;
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage.model;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+
+/**
+ * An immutable packet of information about an iamge file and its thumbnail.
+ */
+public class ImageInfo {
+	private static final Log log = LogFactory.getLog(ImageInfo.class);
+	
+	public static final ImageInfo EMPTY_IMAGE_INFO = emptyInstance();
+	
+	// ----------------------------------------------------------------------
+	// static Factory methods.
+	// ----------------------------------------------------------------------
+
+	/**
+	 * This is a place holder for an Individual with no image.
+	 */
+	private static ImageInfo emptyInstance() {
+		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.
+	 */
+	public static ImageInfo instanceFromEntityUri(
+			WebappDaoFactory webappDaoFactory, Individual entity) {
+		if (webappDaoFactory == null) {
+			throw new NullPointerException("webappDaoFactory may not be null.");
+		}
+
+		if (entity == null) {
+			return null;
+		}
+
+		IndividualDao individualDao = webappDaoFactory.getIndividualDao();
+
+		String mainImageUri = entity.getMainImageUri();
+		if (mainImageUri == null) {
+			log.debug("Entity '" + entity.getURI()
+					+ "' had no associated main image.");
+			return null;
+		} else {
+			log.debug("Entity '" + entity.getURI()
+					+ "' had associated main image: '" + mainImageUri + "'");
+		}
+
+		Individual mainFile = individualDao.getIndividualByURI(mainImageUri);
+		if (mainFile == null) {
+			log.error("Entity '" + entity.getURI()
+					+ "' has a main image URI that does not refer to an "
+					+ "individual: mainImageURI=" + mainImageUri);
+			return null;
+		}
+
+		Individual thumbFile = mainFile
+				.getRelatedIndividual(VitroVocabulary.FS_THUMBNAIL_IMAGE);
+		if (thumbFile == null) {
+			log.warn("Main image file '" + mainImageUri
+					+ "' had no associated thumbnail.");
+			return null;
+		} else {
+			log.debug("Main image file '" + mainImageUri
+					+ "' had associated thumbnail: '" + thumbFile.getURI()
+					+ "'");
+		}
+
+		FileInfo mainInfo = FileInfo.instanceFromSurrogateUri(webappDaoFactory,
+				mainFile.getURI());
+		if (mainInfo == null) {
+			log.error("Entity '" + entity.getURI()
+					+ "' has a mainImage that is not a File "
+					+ "surrogate: mainImageURI=" + mainImageUri);
+			return null;
+		}
+
+		FileInfo thumbInfo = FileInfo.instanceFromSurrogateUri(
+				webappDaoFactory, thumbFile.getURI());
+		if (thumbInfo == null) {
+			log.error("Entity '" + entity.getURI()
+					+ "' has a mainImage with a thumbnail that is not a File "
+					+ "surrogate: mainImageURI=" + mainImageUri
+					+ ", thumbnailURI=" + thumbFile.getURI());
+			return null;
+		}
+
+		return new ImageInfo(mainInfo, thumbInfo);
+	}
+
+	// ----------------------------------------------------------------------
+	// instance fields and methods.
+	// ----------------------------------------------------------------------
+
+	private final FileInfo mainImage;
+	private final FileInfo thumbnail;
+
+	public ImageInfo(FileInfo mainImage, FileInfo thumbnail) {
+		if (mainImage == null) {
+			throw new NullPointerException("mainImage may not be null.");
+		}
+		if (thumbnail == null) {
+			throw new NullPointerException("thumbnail may not be null.");
+		}
+		this.mainImage = mainImage;
+		this.thumbnail = thumbnail;
+	}
+
+	public FileInfo getMainImage() {
+		return mainImage;
+	}
+
+	public FileInfo getThumbnail() {
+		return thumbnail;
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/serving/FileServingServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/serving/FileServingServlet.java
index defd15a54..0a9375ba4 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/serving/FileServingServlet.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/serving/FileServingServlet.java
@@ -1,229 +1,229 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage.serving;
-
-import static javax.servlet.http.HttpServletResponse.SC_OK;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.UnavailableException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorage;
-import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageSetup;
-import edu.cornell.mannlib.vitro.webapp.filestorage.model.FileInfo;
-
-/**
- * <p>
- * Handles a request to serve an uploaded file from the file storage system.
- * </p>
- * <p>
- * The path of the request should be the "alias URL" of the desired file. We
- * need to:
- * <ul>
- * <li>Use the alias URL to find the URI of the file bytestream object.</li>
- * <li>Find the file surrogate object to get the MIME type of the file, and
- * confirm the filename.</li>
- * <li>Set the MIME type on the output stream and serve the bytes.</li>
- * </ul>
- * </p>
- * <p>
- * If the request is superficially correct, but no such file can be found,
- * return a 404. If there is a break in the data structures within the model or
- * the file system, return a 500.
- * </p>
- */
-public class FileServingServlet extends VitroHttpServlet {
-	/** If we can't locate the requested image, use this one instead. */
-	private static final String PATH_MISSING_LINK_IMAGE = "/images/missingLink.png";
-
-	private static final Log log = LogFactory.getLog(FileServingServlet.class);
-
-	private FileStorage fileStorage;
-
-	/**
-	 * Get a reference to the File Storage system.
-	 */
-	@Override
-	public void init() throws ServletException {
-		Object o = getServletContext().getAttribute(
-				FileStorageSetup.ATTRIBUTE_NAME);
-		if (o instanceof FileStorage) {
-			fileStorage = (FileStorage) o;
-		} else {
-			throw new UnavailableException(
-					"The ServletContext did not hold a FileStorage object at '"
-							+ FileStorageSetup.ATTRIBUTE_NAME
-							+ "'; found this instead: " + o);
-		}
-	}
-
-	@Override
-	protected void doGet(HttpServletRequest rawRequest,
-			HttpServletResponse response) throws ServletException, IOException {
-		VitroRequest request = new VitroRequest(rawRequest);
-
-		// Use the alias URL to get the URI of the bytestream object.
-		String path = request.getServletPath() + request.getPathInfo();
-		log.debug("Path is '" + path + "'");
-
-		/*
-		 * Get the mime type and an InputStream from the file. If we can't, use
-		 * the dummy image file instead.
-		 */
-		InputStream in;
-		String mimeType = null;
-		try {
-			FileInfo fileInfo = figureFileInfo(request.getWebappDaoFactory(),
-					path);
-			mimeType = fileInfo.getMimeType();
-
-			String actualFilename = findAndValidateFilename(fileInfo, path);
-
-			in = openImageInputStream(fileInfo, actualFilename);
-		} catch (FileServingException e) {
-			log.info("Failed to serve the file at '" + path + "' -- " + e);
-			in = openMissingLinkImage(request);
-			mimeType = "image/png";
-		} catch (Exception e) {
-			log.warn("Failed to serve the file at '" + path + "' -- " + e);
-			in = openMissingLinkImage(request);
-			mimeType = "image/png";
-		}
-
-		/*
-		 * Everything is ready. Set the status and the content type, and send
-		 * the image bytes.
-		 */
-		response.setStatus(SC_OK);
-
-		if (mimeType != null) {
-			response.setContentType(mimeType);
-		}
-
-		ServletOutputStream out = null;
-		try {
-			out = response.getOutputStream();
-			byte[] buffer = new byte[8192];
-			int howMany;
-			while (-1 != (howMany = in.read(buffer))) {
-				out.write(buffer, 0, howMany);
-			}
-		} finally {
-			try {
-				in.close();
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-			if (out != null) {
-				try {
-					out.close();
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-
-	private FileInfo figureFileInfo(WebappDaoFactory fullWadf, String path)
-			throws FileServingException {
-		FileInfo fileInfo = FileInfo.instanceFromAliasUrl(fullWadf, path,
-				getServletContext());
-		if (fileInfo == null) {
-			throw new FileServingException("The request path is not valid "
-					+ "for the File servlet: '" + path + "'");
-		}
-		log.debug("File info is '" + fileInfo + "'");
-		return fileInfo;
-	}
-
-	/** Validate that the file exists, with the requested URI and filename. */
-	private String findAndValidateFilename(FileInfo fileInfo, String path)
-			throws FileServingException {
-		String requestedFilename = figureFilename(path);
-		String actualFilename = fileInfo.getFilename();
-		if (!actualFilename.equals(requestedFilename)
-				&& !actualFilename.equals(decode(requestedFilename))) {
-			throw new FileServingException(
-					"The requested filename does not match the "
-							+ "actual filename; request: '" + path
-							+ "', actual: '" + actualFilename + "'");
-		}
-		log.debug("Actual filename is '" + actualFilename + "'");
-		return actualFilename;
-	}
-
-	/** The filename is the portion of the path after the last slash. */
-	private String figureFilename(String path) {
-		int slashHere = path.lastIndexOf('/');
-		if (slashHere == -1) {
-			return path;
-		} else {
-			return path.substring(slashHere + 1);
-		}
-	}
-
-	/** The filename may have been encoded for URL transfer. */
-	private String decode(String filename) {
-		try {
-			return URLDecoder.decode(filename, "UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			log.error("No UTF-8 decoder? How did this happen?", e);
-			return filename;
-		}
-	}
-
-	private InputStream openImageInputStream(FileInfo fileInfo,
-			String actualFilename) throws IOException {
-		return fileStorage.getInputStream(fileInfo.getBytestreamUri(),
-				actualFilename);
-	}
-
-	/** Any suprises when opening the image? Use this one instead. */
-	private InputStream openMissingLinkImage(VitroRequest vreq)
-			throws FileNotFoundException {
-		InputStream stream = vreq.getSession().getServletContext()
-				.getResourceAsStream(PATH_MISSING_LINK_IMAGE);
-		if (stream == null) {
-			throw new FileNotFoundException("No image file at '"
-					+ PATH_MISSING_LINK_IMAGE + "'");
-		}
-		return stream;
-	}
-
-	/**
-	 * A POST request is treated the same as a GET request.
-	 */
-	@Override
-	protected void doPost(HttpServletRequest request,
-			HttpServletResponse response) throws ServletException, IOException {
-		doGet(request, response);
-	}
-
-	/**
-	 * There was a problem serving the file bytestream.
-	 */
-	private static class FileServingException extends Exception {
-		public FileServingException(String message) {
-			super(message);
-		}
-
-		public FileServingException(String message, Throwable cause) {
-			super(message, cause);
-		}
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage.serving;
+
+import static javax.servlet.http.HttpServletResponse.SC_OK;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.UnavailableException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroHttpServlet;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorage;
+import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageSetup;
+import edu.cornell.mannlib.vitro.webapp.filestorage.model.FileInfo;
+
+/**
+ * <p>
+ * Handles a request to serve an uploaded file from the file storage system.
+ * </p>
+ * <p>
+ * The path of the request should be the "alias URL" of the desired file. We
+ * need to:
+ * <ul>
+ * <li>Use the alias URL to find the URI of the file bytestream object.</li>
+ * <li>Find the file surrogate object to get the MIME type of the file, and
+ * confirm the filename.</li>
+ * <li>Set the MIME type on the output stream and serve the bytes.</li>
+ * </ul>
+ * </p>
+ * <p>
+ * If the request is superficially correct, but no such file can be found,
+ * return a 404. If there is a break in the data structures within the model or
+ * the file system, return a 500.
+ * </p>
+ */
+public class FileServingServlet extends VitroHttpServlet {
+	/** If we can't locate the requested image, use this one instead. */
+	private static final String PATH_MISSING_LINK_IMAGE = "/images/missingLink.png";
+
+	private static final Log log = LogFactory.getLog(FileServingServlet.class);
+
+	private FileStorage fileStorage;
+
+	/**
+	 * Get a reference to the File Storage system.
+	 */
+	@Override
+	public void init() throws ServletException {
+		Object o = getServletContext().getAttribute(
+				FileStorageSetup.ATTRIBUTE_NAME);
+		if (o instanceof FileStorage) {
+			fileStorage = (FileStorage) o;
+		} else {
+			throw new UnavailableException(
+					"The ServletContext did not hold a FileStorage object at '"
+							+ FileStorageSetup.ATTRIBUTE_NAME
+							+ "'; found this instead: " + o);
+		}
+	}
+
+	@Override
+	protected void doGet(HttpServletRequest rawRequest,
+			HttpServletResponse response) throws ServletException, IOException {
+		VitroRequest request = new VitroRequest(rawRequest);
+
+		// Use the alias URL to get the URI of the bytestream object.
+		String path = request.getServletPath() + request.getPathInfo();
+		log.debug("Path is '" + path + "'");
+
+		/*
+		 * Get the mime type and an InputStream from the file. If we can't, use
+		 * the dummy image file instead.
+		 */
+		InputStream in;
+		String mimeType = null;
+		try {
+			FileInfo fileInfo = figureFileInfo(request.getWebappDaoFactory(),
+					path);
+			mimeType = fileInfo.getMimeType();
+
+			String actualFilename = findAndValidateFilename(fileInfo, path);
+
+			in = openImageInputStream(fileInfo, actualFilename);
+		} catch (FileServingException e) {
+			log.info("Failed to serve the file at '" + path + "' -- " + e);
+			in = openMissingLinkImage(request);
+			mimeType = "image/png";
+		} catch (Exception e) {
+			log.warn("Failed to serve the file at '" + path + "' -- " + e);
+			in = openMissingLinkImage(request);
+			mimeType = "image/png";
+		}
+
+		/*
+		 * Everything is ready. Set the status and the content type, and send
+		 * the image bytes.
+		 */
+		response.setStatus(SC_OK);
+
+		if (mimeType != null) {
+			response.setContentType(mimeType);
+		}
+
+		ServletOutputStream out = null;
+		try {
+			out = response.getOutputStream();
+			byte[] buffer = new byte[8192];
+			int howMany;
+			while (-1 != (howMany = in.read(buffer))) {
+				out.write(buffer, 0, howMany);
+			}
+		} finally {
+			try {
+				in.close();
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+			if (out != null) {
+				try {
+					out.close();
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
+			}
+		}
+	}
+
+	private FileInfo figureFileInfo(WebappDaoFactory fullWadf, String path)
+			throws FileServingException {
+		FileInfo fileInfo = FileInfo.instanceFromAliasUrl(fullWadf, path,
+				getServletContext());
+		if (fileInfo == null) {
+			throw new FileServingException("The request path is not valid "
+					+ "for the File servlet: '" + path + "'");
+		}
+		log.debug("File info is '" + fileInfo + "'");
+		return fileInfo;
+	}
+
+	/** Validate that the file exists, with the requested URI and filename. */
+	private String findAndValidateFilename(FileInfo fileInfo, String path)
+			throws FileServingException {
+		String requestedFilename = figureFilename(path);
+		String actualFilename = fileInfo.getFilename();
+		if (!actualFilename.equals(requestedFilename)
+				&& !actualFilename.equals(decode(requestedFilename))) {
+			throw new FileServingException(
+					"The requested filename does not match the "
+							+ "actual filename; request: '" + path
+							+ "', actual: '" + actualFilename + "'");
+		}
+		log.debug("Actual filename is '" + actualFilename + "'");
+		return actualFilename;
+	}
+
+	/** The filename is the portion of the path after the last slash. */
+	private String figureFilename(String path) {
+		int slashHere = path.lastIndexOf('/');
+		if (slashHere == -1) {
+			return path;
+		} else {
+			return path.substring(slashHere + 1);
+		}
+	}
+
+	/** The filename may have been encoded for URL transfer. */
+	private String decode(String filename) {
+		try {
+			return URLDecoder.decode(filename, "UTF-8");
+		} catch (UnsupportedEncodingException e) {
+			log.error("No UTF-8 decoder? How did this happen?", e);
+			return filename;
+		}
+	}
+
+	private InputStream openImageInputStream(FileInfo fileInfo,
+			String actualFilename) throws IOException {
+		return fileStorage.getInputStream(fileInfo.getBytestreamUri(),
+				actualFilename);
+	}
+
+	/** Any suprises when opening the image? Use this one instead. */
+	private InputStream openMissingLinkImage(VitroRequest vreq)
+			throws FileNotFoundException {
+		InputStream stream = vreq.getSession().getServletContext()
+				.getResourceAsStream(PATH_MISSING_LINK_IMAGE);
+		if (stream == null) {
+			throw new FileNotFoundException("No image file at '"
+					+ PATH_MISSING_LINK_IMAGE + "'");
+		}
+		return stream;
+	}
+
+	/**
+	 * A POST request is treated the same as a GET request.
+	 */
+	@Override
+	protected void doPost(HttpServletRequest request,
+			HttpServletResponse response) throws ServletException, IOException {
+		doGet(request, response);
+	}
+
+	/**
+	 * There was a problem serving the file bytestream.
+	 */
+	private static class FileServingException extends Exception {
+		public FileServingException(String message) {
+			super(message);
+		}
+
+		public FileServingException(String message, Throwable cause) {
+			super(message, cause);
+		}
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/uploadrequest/FileUploadServletRequest.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/uploadrequest/FileUploadServletRequest.java
index 8f795df1c..6ecba1d70 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/uploadrequest/FileUploadServletRequest.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/uploadrequest/FileUploadServletRequest.java
@@ -1,113 +1,113 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-
-/**
- * <p>
- * Wraps an HTTP request and parses it for file uploads, without losing the
- * request parameters.
- * </p>
- * <p>
- * The request will have an attribute named by {@link #FILE_ITEM_MAP}. Either
- * this attribute or the call to {@link #getFiles()} will produce a map that may
- * be empty but is never null. The keys to the map are the field names for the
- * file fields. Since a form may have multiple fields with the same name, each
- * field name maps to a list of items. If a user does not provide a file to be
- * uploaded in a given field, the length of the file will be 0.
- * </p>
- * <p>
- * If the uploaded file(s) would be larger than the <code>maxFileSize</code>,
- * {@link #parseRequest(HttpServletRequest, int)} does not throw an Exception.
- * Instead, it records the exception in a request attribute named by
- * {@link #FILE_UPLOAD_EXCEPTION}. This attribute can be accessed directly, or
- * indirectly via the methods {@link #hasFileUploadException()} and
- * {@link #getFileUploadException()}. If there is an exception, the file item
- * map (see above) will still be non-null, but it will be empty.
- * </p>
- * <p>
- * Most methods are declared here simply delegate to the wrapped request.
- * Methods that have to do with parameters, files, or parsing exceptions, are
- * handled differently for simple requests and multipart request, and are
- * implemented in the sub-classes.
- * </p>
- */
-@SuppressWarnings("deprecation")
-public abstract class FileUploadServletRequest extends HttpServletRequestWrapper  {
-	public static final String FILE_ITEM_MAP = "file_item_map";
-	public static final String FILE_UPLOAD_EXCEPTION = "file_upload_exception";
-
-	// ----------------------------------------------------------------------
-	// The factory method
-	// ----------------------------------------------------------------------
-
-	/**
-	 * Wrap this {@link HttpServletRequest} in an appropriate wrapper class.
-	 */
-	public static FileUploadServletRequest parseRequest(
-			HttpServletRequest request, int maxFileSize) throws IOException {
-		boolean isMultipart = ServletFileUpload.isMultipartContent(request);
-		if (isMultipart) {
-			return new MultipartHttpServletRequest(request, maxFileSize);
-		} else {
-			return new SimpleHttpServletRequestWrapper(request);
-		}
-	}
-
-	// ----------------------------------------------------------------------
-	// The constructor and the delegate.
-	// ----------------------------------------------------------------------
-
-	private final HttpServletRequest delegate;
-
-	public FileUploadServletRequest(HttpServletRequest delegate) {
-	    super(delegate);
-		this.delegate = delegate;
-	}
-
-	protected HttpServletRequest getDelegate() {
-		return this.delegate;
-	}
-
-	// ----------------------------------------------------------------------
-	// New functionality to be implemented by the subclasses.
-	// ----------------------------------------------------------------------
-
-	/** Was this a multipart HTTP request? */
-	public abstract boolean isMultipart();
-
-	/**
-	 * Get the map of file items, by name.
-	 */
-	public abstract Map<String, List<FileItem>> getFiles();
-
-	/**
-	 * Find a non-empty file item with this name.
-	 * 
-	 * @return the first such file item, or <code>null</code> if no matching,
-	 *         non-empty items were found.
-	 */
-	public abstract FileItem getFileItem(String string);
-
-	/**
-	 * Was there an exception when uploading the file items?
-	 */
-	public abstract boolean hasFileUploadException();
-
-	/**
-	 * Get the exception that occurred when uploading the file items. If no such
-	 * exception, return <code>null</code>.
-	 */
-	public abstract FileUploadException getFileUploadException();
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+
+/**
+ * <p>
+ * Wraps an HTTP request and parses it for file uploads, without losing the
+ * request parameters.
+ * </p>
+ * <p>
+ * The request will have an attribute named by {@link #FILE_ITEM_MAP}. Either
+ * this attribute or the call to {@link #getFiles()} will produce a map that may
+ * be empty but is never null. The keys to the map are the field names for the
+ * file fields. Since a form may have multiple fields with the same name, each
+ * field name maps to a list of items. If a user does not provide a file to be
+ * uploaded in a given field, the length of the file will be 0.
+ * </p>
+ * <p>
+ * If the uploaded file(s) would be larger than the <code>maxFileSize</code>,
+ * {@link #parseRequest(HttpServletRequest, int)} does not throw an Exception.
+ * Instead, it records the exception in a request attribute named by
+ * {@link #FILE_UPLOAD_EXCEPTION}. This attribute can be accessed directly, or
+ * indirectly via the methods {@link #hasFileUploadException()} and
+ * {@link #getFileUploadException()}. If there is an exception, the file item
+ * map (see above) will still be non-null, but it will be empty.
+ * </p>
+ * <p>
+ * Most methods are declared here simply delegate to the wrapped request.
+ * Methods that have to do with parameters, files, or parsing exceptions, are
+ * handled differently for simple requests and multipart request, and are
+ * implemented in the sub-classes.
+ * </p>
+ */
+@SuppressWarnings("deprecation")
+public abstract class FileUploadServletRequest extends HttpServletRequestWrapper  {
+	public static final String FILE_ITEM_MAP = "file_item_map";
+	public static final String FILE_UPLOAD_EXCEPTION = "file_upload_exception";
+
+	// ----------------------------------------------------------------------
+	// The factory method
+	// ----------------------------------------------------------------------
+
+	/**
+	 * Wrap this {@link HttpServletRequest} in an appropriate wrapper class.
+	 */
+	public static FileUploadServletRequest parseRequest(
+			HttpServletRequest request, int maxFileSize) throws IOException {
+		boolean isMultipart = ServletFileUpload.isMultipartContent(request);
+		if (isMultipart) {
+			return new MultipartHttpServletRequest(request, maxFileSize);
+		} else {
+			return new SimpleHttpServletRequestWrapper(request);
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// The constructor and the delegate.
+	// ----------------------------------------------------------------------
+
+	private final HttpServletRequest delegate;
+
+	public FileUploadServletRequest(HttpServletRequest delegate) {
+	    super(delegate);
+		this.delegate = delegate;
+	}
+
+	protected HttpServletRequest getDelegate() {
+		return this.delegate;
+	}
+
+	// ----------------------------------------------------------------------
+	// New functionality to be implemented by the subclasses.
+	// ----------------------------------------------------------------------
+
+	/** Was this a multipart HTTP request? */
+	public abstract boolean isMultipart();
+
+	/**
+	 * Get the map of file items, by name.
+	 */
+	public abstract Map<String, List<FileItem>> getFiles();
+
+	/**
+	 * Find a non-empty file item with this name.
+	 * 
+	 * @return the first such file item, or <code>null</code> if no matching,
+	 *         non-empty items were found.
+	 */
+	public abstract FileItem getFileItem(String string);
+
+	/**
+	 * Was there an exception when uploading the file items?
+	 */
+	public abstract boolean hasFileUploadException();
+
+	/**
+	 * Get the exception that occurred when uploading the file items. If no such
+	 * exception, return <code>null</code>.
+	 */
+	public abstract FileUploadException getFileUploadException();
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/uploadrequest/MultipartHttpServletRequest.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/uploadrequest/MultipartHttpServletRequest.java
index b78da5318..76f90a174 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/uploadrequest/MultipartHttpServletRequest.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/uploadrequest/MultipartHttpServletRequest.java
@@ -1,306 +1,306 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.servlet.ServletFileUpload;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * A wrapper for a servlet request that holds multipart content. Parsing the
- * request will consume the parameters, so we need to hold them here to answer
- * any parameter-related requests. File-related information will also be held
- * here, to answer file-related requests.
- */
-public class MultipartHttpServletRequest extends FileUploadServletRequest {
-	private static final Log log = LogFactory
-			.getLog(MultipartHttpServletRequest.class);
-
-	private static final String[] EMPTY_ARRAY = new String[0];
-
-	private Map<String, List<String>> parameters;
-	private Map<String, List<FileItem>> files;
-	private FileUploadException fileUploadException;
-
-    private boolean storeFilesToTempDir = false;
-    private int maxFileSize = 0;
-    private File tempDir = null;
-
-    /** 
-     * Parse the multipart request. Store the info about the request parameters.
-     * Don't store the uploaded files to a temporary directory to allow streaming.
-     *
-     * Only use this constructor if you plan to consume the FileItems using streaming
-     * to deal with inputs of very large sizes.
-     *
-     * In all other case you should use the maxFileSize constructor to deal with
-     * the size of the uploaded file in a safe way.
-     */
-    public MultipartHttpServletRequest(HttpServletRequest request)
-        throws IOException{
-        super(request);
-        storeFilesToTempDir = false;
-        
-    }
-            
-	/**
-	 * Parse the multipart request. Store the info about the request parameters
-	 * and the uploaded files to a temporary directory.
-     *
-     * This offers a simple way to deal with uploaded files by having a size
-     * limit.  This limit may be rather large if desired. Many megabytes for example.
-	 */
-	public MultipartHttpServletRequest(HttpServletRequest request,
-			int maxFileSize) throws IOException {
-		super(request);
-        storeFilesToTempDir = true;
-        this.maxFileSize = maxFileSize;
-        this.tempDir = figureTemporaryDirectory(request);
-	}
-
-    private void setup(HttpServletRequest request){
-		Map<String, List<String>> parameters = new HashMap<String, List<String>>();
-		Map<String, List<FileItem>> files = new HashMap<String, List<FileItem>>();
-
-		ServletFileUpload upload = createUploadHandler();
-        
-		//File tempDir = figureTemporaryDirectory(request);
-		//ServletFileUpload upload = createUploadHandler(maxFileSize, tempDir);
-
-		parseQueryString(request.getQueryString(), parameters);
-
-		try {
-			List<FileItem> items = parseRequestIntoFileItems(request, upload);
-
-			for (FileItem item : items) {
-				// Process a regular form field
-				if (item.isFormField()) {
-					addToParameters(parameters, item.getFieldName(), item
-							.getString("UTF-8"));
-					log.debug("Form field (parameter) " + item.getFieldName()
-							+ "=" + item.getString());
-				} else {
-					addToFileItems(files, item);
-					log.debug("File " + item.getFieldName() + ": "
-							+ item.getName());
-				}
-			}
-		} catch (FileUploadException e) {
-			fileUploadException = e;
-			request.setAttribute(
-					FileUploadServletRequest.FILE_UPLOAD_EXCEPTION, e);
-		} catch (UnsupportedEncodingException e) {
-		    log.error("could not convert to UTF-8",e);
-        }
-
-		this.parameters = Collections.unmodifiableMap(parameters);
-		log.debug("Parameters are: " + this.parameters);
-		this.files = Collections.unmodifiableMap(files);
-		log.debug("Files are: " + this.files);
-		request.setAttribute(FILE_ITEM_MAP, this.files);
-    }
-
-	/**
-	 * Pull any parameters out of the URL.
-	 */
-	private void parseQueryString(String queryString,
-			Map<String, List<String>> parameters) {
-		log.debug("Query string is : '" + queryString + "'");
-		if (queryString != null) {
-			String[] pieces = queryString.split("&");
-
-			for (String piece : pieces) {
-				int equalsHere = piece.indexOf('=');
-				if (piece.trim().isEmpty()) {
-					// Ignore an empty piece.
-				} else if (equalsHere <= 0) {
-					// A parameter without a value.
-					addToParameters(parameters, decode(piece), "");
-				} else {
-					// A parameter with a value.
-					String key = piece.substring(0, equalsHere);
-					String value = piece.substring(equalsHere + 1);
-					addToParameters(parameters, decode(key), decode(value));
-				}
-			}
-		}
-		log.debug("Parameters from query string are: " + parameters);
-	}
-
-	/**
-	 * Remove any special URL-style encoding.
-	 */
-	private String decode(String encoded) {
-		try {
-			return URLDecoder.decode(encoded, "UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			log.error(e, e);
-			return encoded;
-		}
-	}
-
-	/**
-	 * Find the temporary storage directory for this webapp.
-	 */
-	private File figureTemporaryDirectory(HttpServletRequest request) {
-		return (File) request.getSession().getServletContext().getAttribute(
-				"javax.servlet.context.tempdir");
-	}
-
-    
-    /**
-     * Create an upload handler based on this.storeFilesToTempDir.
-     */
-    private ServletFileUpload createUploadHandler(){
-        if( storeFilesToTempDir ){
-            return createUploadHandler( this.maxFileSize, this.tempDir );
-        }else{
-            return new ServletFileUpload();
-        }
-    }
-
-	/**
-	 * Create an upload handler that will throw an exception if the file is too
-	 * large.
-	 */
-	private ServletFileUpload createUploadHandler(int maxFileSize, File tempDir) {
-		DiskFileItemFactory factory = new DiskFileItemFactory();
-		factory.setSizeThreshold(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD);
-		factory.setRepository(tempDir);
-
-		ServletFileUpload upload = new ServletFileUpload(factory);
-		upload.setSizeMax(maxFileSize);
-
-		return upload;
-	}
-
-	/** Either create a new List for the value, or add to an existing List. */
-	private void addToParameters(Map<String, List<String>> map, String name,
-			String value) {
-		if (!map.containsKey(name)) {
-			map.put(name, new ArrayList<String>());
-		}
-		map.get(name).add(value);
-	}
-
-	/** Either create a new List for the file, or add to an existing List. */
-	private void addToFileItems(Map<String, List<FileItem>> map, FileItem file) {
-		String name = file.getFieldName();
-		if (!map.containsKey(name)) {
-			map.put(name, new ArrayList<FileItem>());
-		}
-		map.get(name).add(file);
-	}
-
-	/** Minimize the code that uses the unchecked cast. */
-	@SuppressWarnings("unchecked")
-	private List<FileItem> parseRequestIntoFileItems(HttpServletRequest req,
-			ServletFileUpload upload) throws FileUploadException {
-		return upload.parseRequest(req);
-	}
-
-	// ----------------------------------------------------------------------
-	// This is a multipart request, so make the file info available. If there
-	// was an exception during parsing, make that available too.
-	// ----------------------------------------------------------------------
-
-	@Override
-	public boolean isMultipart() {
-		return true;
-	}
-
-	@Override
-	public Map<String, List<FileItem>> getFiles() {
-		return files;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 * <p>
-	 * There may be more than one file item with the given name. If the first
-	 * one is empty (size is zero), keep looking for a non-empty one.
-	 * </p>
-	 */
-	@Override
-	public FileItem getFileItem(String name) {
-		List<FileItem> items = files.get(name);
-		if (items == null) {
-			return null;
-		}
-
-		for (FileItem item : items) {
-			if (item.getSize() > 0L) {
-				return item;
-			}
-		}
-
-		return null;
-	}
-
-	@Override
-	public FileUploadException getFileUploadException() {
-		return fileUploadException;
-	}
-
-	@Override
-	public boolean hasFileUploadException() {
-		return fileUploadException != null;
-	}
-
-	// ----------------------------------------------------------------------
-	// Parameter-related methods won't find anything on the delegate request,
-	// since parsing consumed the parameters. So we need to look to the parsed
-	// info for the answers.
-	// ----------------------------------------------------------------------
-
-	@Override
-	public String getParameter(String name) {
-		if (parameters.containsKey(name)) {
-			return parameters.get(name).get(0);
-		} else {
-			return null;
-		}
-	}
-
-	@Override
-	public Enumeration<?> getParameterNames() {
-		return Collections.enumeration(parameters.keySet());
-	}
-
-	@Override
-	public String[] getParameterValues(String name) {
-		if (parameters.containsKey(name)) {
-			return parameters.get(name).toArray(EMPTY_ARRAY);
-		} else {
-			return null;
-		}
-	}
-
-	@Override
-	public Map<String, String[]> getParameterMap() {
-		Map<String, String[]> result = new HashMap<String, String[]>();
-		for (Entry<String, List<String>> entry : parameters.entrySet()) {
-			result.put(entry.getKey(), entry.getValue().toArray(EMPTY_ARRAY));
-		}
-		log.debug("resulting parameter map: " + result);
-		return result;
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A wrapper for a servlet request that holds multipart content. Parsing the
+ * request will consume the parameters, so we need to hold them here to answer
+ * any parameter-related requests. File-related information will also be held
+ * here, to answer file-related requests.
+ */
+public class MultipartHttpServletRequest extends FileUploadServletRequest {
+	private static final Log log = LogFactory
+			.getLog(MultipartHttpServletRequest.class);
+
+	private static final String[] EMPTY_ARRAY = new String[0];
+
+	private Map<String, List<String>> parameters;
+	private Map<String, List<FileItem>> files;
+	private FileUploadException fileUploadException;
+
+    private boolean storeFilesToTempDir = false;
+    private int maxFileSize = 0;
+    private File tempDir = null;
+
+    /** 
+     * Parse the multipart request. Store the info about the request parameters.
+     * Don't store the uploaded files to a temporary directory to allow streaming.
+     *
+     * Only use this constructor if you plan to consume the FileItems using streaming
+     * to deal with inputs of very large sizes.
+     *
+     * In all other case you should use the maxFileSize constructor to deal with
+     * the size of the uploaded file in a safe way.
+     */
+    public MultipartHttpServletRequest(HttpServletRequest request)
+        throws IOException{
+        super(request);
+        storeFilesToTempDir = false;
+        
+    }
+            
+	/**
+	 * Parse the multipart request. Store the info about the request parameters
+	 * and the uploaded files to a temporary directory.
+     *
+     * This offers a simple way to deal with uploaded files by having a size
+     * limit.  This limit may be rather large if desired. Many megabytes for example.
+	 */
+	public MultipartHttpServletRequest(HttpServletRequest request,
+			int maxFileSize) throws IOException {
+		super(request);
+        storeFilesToTempDir = true;
+        this.maxFileSize = maxFileSize;
+        this.tempDir = figureTemporaryDirectory(request);
+	}
+
+    private void setup(HttpServletRequest request){
+		Map<String, List<String>> parameters = new HashMap<String, List<String>>();
+		Map<String, List<FileItem>> files = new HashMap<String, List<FileItem>>();
+
+		ServletFileUpload upload = createUploadHandler();
+        
+		//File tempDir = figureTemporaryDirectory(request);
+		//ServletFileUpload upload = createUploadHandler(maxFileSize, tempDir);
+
+		parseQueryString(request.getQueryString(), parameters);
+
+		try {
+			List<FileItem> items = parseRequestIntoFileItems(request, upload);
+
+			for (FileItem item : items) {
+				// Process a regular form field
+				if (item.isFormField()) {
+					addToParameters(parameters, item.getFieldName(), item
+							.getString("UTF-8"));
+					log.debug("Form field (parameter) " + item.getFieldName()
+							+ "=" + item.getString());
+				} else {
+					addToFileItems(files, item);
+					log.debug("File " + item.getFieldName() + ": "
+							+ item.getName());
+				}
+			}
+		} catch (FileUploadException e) {
+			fileUploadException = e;
+			request.setAttribute(
+					FileUploadServletRequest.FILE_UPLOAD_EXCEPTION, e);
+		} catch (UnsupportedEncodingException e) {
+		    log.error("could not convert to UTF-8",e);
+        }
+
+		this.parameters = Collections.unmodifiableMap(parameters);
+		log.debug("Parameters are: " + this.parameters);
+		this.files = Collections.unmodifiableMap(files);
+		log.debug("Files are: " + this.files);
+		request.setAttribute(FILE_ITEM_MAP, this.files);
+    }
+
+	/**
+	 * Pull any parameters out of the URL.
+	 */
+	private void parseQueryString(String queryString,
+			Map<String, List<String>> parameters) {
+		log.debug("Query string is : '" + queryString + "'");
+		if (queryString != null) {
+			String[] pieces = queryString.split("&");
+
+			for (String piece : pieces) {
+				int equalsHere = piece.indexOf('=');
+				if (piece.trim().isEmpty()) {
+					// Ignore an empty piece.
+				} else if (equalsHere <= 0) {
+					// A parameter without a value.
+					addToParameters(parameters, decode(piece), "");
+				} else {
+					// A parameter with a value.
+					String key = piece.substring(0, equalsHere);
+					String value = piece.substring(equalsHere + 1);
+					addToParameters(parameters, decode(key), decode(value));
+				}
+			}
+		}
+		log.debug("Parameters from query string are: " + parameters);
+	}
+
+	/**
+	 * Remove any special URL-style encoding.
+	 */
+	private String decode(String encoded) {
+		try {
+			return URLDecoder.decode(encoded, "UTF-8");
+		} catch (UnsupportedEncodingException e) {
+			log.error(e, e);
+			return encoded;
+		}
+	}
+
+	/**
+	 * Find the temporary storage directory for this webapp.
+	 */
+	private File figureTemporaryDirectory(HttpServletRequest request) {
+		return (File) request.getSession().getServletContext().getAttribute(
+				"javax.servlet.context.tempdir");
+	}
+
+    
+    /**
+     * Create an upload handler based on this.storeFilesToTempDir.
+     */
+    private ServletFileUpload createUploadHandler(){
+        if( storeFilesToTempDir ){
+            return createUploadHandler( this.maxFileSize, this.tempDir );
+        }else{
+            return new ServletFileUpload();
+        }
+    }
+
+	/**
+	 * Create an upload handler that will throw an exception if the file is too
+	 * large.
+	 */
+	private ServletFileUpload createUploadHandler(int maxFileSize, File tempDir) {
+		DiskFileItemFactory factory = new DiskFileItemFactory();
+		factory.setSizeThreshold(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD);
+		factory.setRepository(tempDir);
+
+		ServletFileUpload upload = new ServletFileUpload(factory);
+		upload.setSizeMax(maxFileSize);
+
+		return upload;
+	}
+
+	/** Either create a new List for the value, or add to an existing List. */
+	private void addToParameters(Map<String, List<String>> map, String name,
+			String value) {
+		if (!map.containsKey(name)) {
+			map.put(name, new ArrayList<String>());
+		}
+		map.get(name).add(value);
+	}
+
+	/** Either create a new List for the file, or add to an existing List. */
+	private void addToFileItems(Map<String, List<FileItem>> map, FileItem file) {
+		String name = file.getFieldName();
+		if (!map.containsKey(name)) {
+			map.put(name, new ArrayList<FileItem>());
+		}
+		map.get(name).add(file);
+	}
+
+	/** Minimize the code that uses the unchecked cast. */
+	@SuppressWarnings("unchecked")
+	private List<FileItem> parseRequestIntoFileItems(HttpServletRequest req,
+			ServletFileUpload upload) throws FileUploadException {
+		return upload.parseRequest(req);
+	}
+
+	// ----------------------------------------------------------------------
+	// This is a multipart request, so make the file info available. If there
+	// was an exception during parsing, make that available too.
+	// ----------------------------------------------------------------------
+
+	@Override
+	public boolean isMultipart() {
+		return true;
+	}
+
+	@Override
+	public Map<String, List<FileItem>> getFiles() {
+		return files;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 * <p>
+	 * There may be more than one file item with the given name. If the first
+	 * one is empty (size is zero), keep looking for a non-empty one.
+	 * </p>
+	 */
+	@Override
+	public FileItem getFileItem(String name) {
+		List<FileItem> items = files.get(name);
+		if (items == null) {
+			return null;
+		}
+
+		for (FileItem item : items) {
+			if (item.getSize() > 0L) {
+				return item;
+			}
+		}
+
+		return null;
+	}
+
+	@Override
+	public FileUploadException getFileUploadException() {
+		return fileUploadException;
+	}
+
+	@Override
+	public boolean hasFileUploadException() {
+		return fileUploadException != null;
+	}
+
+	// ----------------------------------------------------------------------
+	// Parameter-related methods won't find anything on the delegate request,
+	// since parsing consumed the parameters. So we need to look to the parsed
+	// info for the answers.
+	// ----------------------------------------------------------------------
+
+	@Override
+	public String getParameter(String name) {
+		if (parameters.containsKey(name)) {
+			return parameters.get(name).get(0);
+		} else {
+			return null;
+		}
+	}
+
+	@Override
+	public Enumeration<?> getParameterNames() {
+		return Collections.enumeration(parameters.keySet());
+	}
+
+	@Override
+	public String[] getParameterValues(String name) {
+		if (parameters.containsKey(name)) {
+			return parameters.get(name).toArray(EMPTY_ARRAY);
+		} else {
+			return null;
+		}
+	}
+
+	@Override
+	public Map<String, String[]> getParameterMap() {
+		Map<String, String[]> result = new HashMap<String, String[]>();
+		for (Entry<String, List<String>> entry : parameters.entrySet()) {
+			result.put(entry.getKey(), entry.getValue().toArray(EMPTY_ARRAY));
+		}
+		log.debug("resulting parameter map: " + result);
+		return result;
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/uploadrequest/SimpleHttpServletRequestWrapper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/uploadrequest/SimpleHttpServletRequestWrapper.java
index d7ffc1274..246377048 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/uploadrequest/SimpleHttpServletRequestWrapper.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/uploadrequest/SimpleHttpServletRequestWrapper.java
@@ -1,81 +1,81 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest;
-
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.FileUploadException;
-
-/**
- * A wrapper for a servlet request that does not hold multipart content. Pass
- * all parameter-related requests to the delegate, and give simple answers to
- * all file-related requests.
- */
-class SimpleHttpServletRequestWrapper extends FileUploadServletRequest {
-
-	SimpleHttpServletRequestWrapper(HttpServletRequest request) {
-		super(request);
-		request.setAttribute(FILE_ITEM_MAP, Collections.EMPTY_MAP);
-	}
-
-	// ----------------------------------------------------------------------
-	// Not a multipart request, so there are no files or upload exceptions.
-	// ----------------------------------------------------------------------
-
-	@Override
-	public boolean isMultipart() {
-		return false;
-	}
-
-	@Override
-	public Map<String, List<FileItem>> getFiles() {
-		return Collections.emptyMap();
-	}
-
-	@Override
-	public FileItem getFileItem(String string) {
-		return null;
-	}
-
-	@Override
-	public FileUploadException getFileUploadException() {
-		return null;
-	}
-
-	@Override
-	public boolean hasFileUploadException() {
-		return false;
-	}
-
-	// ----------------------------------------------------------------------
-	// Since this is not a multipart request, the parameter methods can be
-	// delegated.
-	// ----------------------------------------------------------------------
-
-	@Override
-	public String getParameter(String name) {
-		return getDelegate().getParameter(name);
-	}
-
-	@Override
-	public Map<?, ?> getParameterMap() {
-		return getDelegate().getParameterMap();
-	}
-
-	@Override
-	public Enumeration<?> getParameterNames() {
-		return getDelegate().getParameterNames();
-	}
-
-	@Override
-	public String[] getParameterValues(String name) {
-		return getDelegate().getParameterValues(name);
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage.uploadrequest;
+
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileUploadException;
+
+/**
+ * A wrapper for a servlet request that does not hold multipart content. Pass
+ * all parameter-related requests to the delegate, and give simple answers to
+ * all file-related requests.
+ */
+class SimpleHttpServletRequestWrapper extends FileUploadServletRequest {
+
+	SimpleHttpServletRequestWrapper(HttpServletRequest request) {
+		super(request);
+		request.setAttribute(FILE_ITEM_MAP, Collections.EMPTY_MAP);
+	}
+
+	// ----------------------------------------------------------------------
+	// Not a multipart request, so there are no files or upload exceptions.
+	// ----------------------------------------------------------------------
+
+	@Override
+	public boolean isMultipart() {
+		return false;
+	}
+
+	@Override
+	public Map<String, List<FileItem>> getFiles() {
+		return Collections.emptyMap();
+	}
+
+	@Override
+	public FileItem getFileItem(String string) {
+		return null;
+	}
+
+	@Override
+	public FileUploadException getFileUploadException() {
+		return null;
+	}
+
+	@Override
+	public boolean hasFileUploadException() {
+		return false;
+	}
+
+	// ----------------------------------------------------------------------
+	// Since this is not a multipart request, the parameter methods can be
+	// delegated.
+	// ----------------------------------------------------------------------
+
+	@Override
+	public String getParameter(String name) {
+		return getDelegate().getParameter(name);
+	}
+
+	@Override
+	public Map<?, ?> getParameterMap() {
+		return getDelegate().getParameterMap();
+	}
+
+	@Override
+	public Enumeration<?> getParameterNames() {
+		return getDelegate().getParameterNames();
+	}
+
+	@Override
+	public String[] getParameterValues(String name) {
+		return getDelegate().getParameterValues(name);
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java
index faa7f9ee2..c20b6ff3b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filters/StartupStatusDisplayFilter.java
@@ -1,142 +1,142 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filters;
-
-import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang.StringUtils;
-
-import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
-import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
-import freemarker.cache.WebappTemplateLoader;
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-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.
- */
-public class StartupStatusDisplayFilter implements Filter {
-	private static final String TEMPLATE_PATH = "/templates/freemarker/body/admin/startupStatus-displayRaw.ftl";
-
-	private ServletContext ctx;
-	private StartupStatus ss;
-	private boolean statusAlreadyDisplayed;
-
-	@Override
-	public void init(FilterConfig filterConfig) throws ServletException {
-		ctx = filterConfig.getServletContext();
-		ss = StartupStatus.getBean(ctx);
-		statusAlreadyDisplayed = false;
-	}
-
-	@Override
-	public void destroy() {
-		// nothing to do.
-	}
-
-	@Override
-	public void doFilter(ServletRequest req, ServletResponse resp,
-			FilterChain chain) throws IOException, ServletException {
-		if (ss.allClear() || (!isFatal() && statusAlreadyDisplayed)) {
-			chain.doFilter(req, resp);
-			return;
-		}
-
-		displayStartupStatus(req, resp);
-		statusAlreadyDisplayed = true;
-	}
-
-	private void displayStartupStatus(ServletRequest req, ServletResponse resp)
-			throws IOException, ServletException {
-		HttpServletResponse hresp = (HttpServletResponse) resp;
-		HttpServletRequest hreq = (HttpServletRequest) req;
-
-		try {
-			Map<String, Object> bodyMap = new HashMap<String, Object>();
-			bodyMap.put("status", ss);
-			bodyMap.put("showLink", !isFatal());
-			bodyMap.put("contextPath", getContextPath());
-			bodyMap.put("applicationName", getApplicationName());
-
-			String url = "";
-
-			String path = hreq.getRequestURI();
-			if (path != null) {
-				url = path;
-			}
-
-			String query = hreq.getQueryString();
-			if (!StringUtils.isEmpty(query)) {
-				url = url + "?" + query;
-			}
-
-			bodyMap.put("url", url);
-
-			hresp.setContentType("text/html;charset=UTF-8");
-			hresp.setStatus(SC_INTERNAL_SERVER_ERROR);
-			Template tpl = loadFreemarkerTemplate();
-			tpl.process(bodyMap, hresp.getWriter());
-		} catch (TemplateException e) {
-			throw new ServletException("Problem with Freemarker Template", e);
-		}
-	}
-
-	private String getContextPath() {
-		String cp = ctx.getContextPath();
-		if ((cp == null) || cp.isEmpty()) {
-			return "The application";
-		} else {
-			return cp;
-		}
-	}
-
-	private Object getApplicationName() {
-		String name = "";
-		try {
-			WebappDaoFactory wadf = ModelAccess.on(ctx).getWebappDaoFactory();
-			ApplicationBean app = wadf.getApplicationDao().getApplicationBean();
-			name = app.getApplicationName();
-		} catch (Exception e) {
-			// deal with problems below
-		}
-
-		if ((name != null) && (!name.isEmpty())) {
-			return name;
-		} else {
-			return getContextPath();
-		}
-	}
-
-	private Template loadFreemarkerTemplate() throws IOException {
-		Configuration cfg = new Configuration();
-		cfg.setTemplateLoader(new WebappTemplateLoader(ctx));
-		return cfg.getTemplate(TEMPLATE_PATH);
-	}
-
-	private boolean isFatal() {
-		return !ss.getErrorItems().isEmpty();
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filters;
+
+import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+
+import edu.cornell.mannlib.vitro.webapp.beans.ApplicationBean;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
+import freemarker.cache.WebappTemplateLoader;
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+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.
+ */
+public class StartupStatusDisplayFilter implements Filter {
+	private static final String TEMPLATE_PATH = "/templates/freemarker/body/admin/startupStatus-displayRaw.ftl";
+
+	private ServletContext ctx;
+	private StartupStatus ss;
+	private boolean statusAlreadyDisplayed;
+
+	@Override
+	public void init(FilterConfig filterConfig) throws ServletException {
+		ctx = filterConfig.getServletContext();
+		ss = StartupStatus.getBean(ctx);
+		statusAlreadyDisplayed = false;
+	}
+
+	@Override
+	public void destroy() {
+		// nothing to do.
+	}
+
+	@Override
+	public void doFilter(ServletRequest req, ServletResponse resp,
+			FilterChain chain) throws IOException, ServletException {
+		if (ss.allClear() || (!isFatal() && statusAlreadyDisplayed)) {
+			chain.doFilter(req, resp);
+			return;
+		}
+
+		displayStartupStatus(req, resp);
+		statusAlreadyDisplayed = true;
+	}
+
+	private void displayStartupStatus(ServletRequest req, ServletResponse resp)
+			throws IOException, ServletException {
+		HttpServletResponse hresp = (HttpServletResponse) resp;
+		HttpServletRequest hreq = (HttpServletRequest) req;
+
+		try {
+			Map<String, Object> bodyMap = new HashMap<String, Object>();
+			bodyMap.put("status", ss);
+			bodyMap.put("showLink", !isFatal());
+			bodyMap.put("contextPath", getContextPath());
+			bodyMap.put("applicationName", getApplicationName());
+
+			String url = "";
+
+			String path = hreq.getRequestURI();
+			if (path != null) {
+				url = path;
+			}
+
+			String query = hreq.getQueryString();
+			if (!StringUtils.isEmpty(query)) {
+				url = url + "?" + query;
+			}
+
+			bodyMap.put("url", url);
+
+			hresp.setContentType("text/html;charset=UTF-8");
+			hresp.setStatus(SC_INTERNAL_SERVER_ERROR);
+			Template tpl = loadFreemarkerTemplate();
+			tpl.process(bodyMap, hresp.getWriter());
+		} catch (TemplateException e) {
+			throw new ServletException("Problem with Freemarker Template", e);
+		}
+	}
+
+	private String getContextPath() {
+		String cp = ctx.getContextPath();
+		if ((cp == null) || cp.isEmpty()) {
+			return "The application";
+		} else {
+			return cp;
+		}
+	}
+
+	private Object getApplicationName() {
+		String name = "";
+		try {
+			WebappDaoFactory wadf = ModelAccess.on(ctx).getWebappDaoFactory();
+			ApplicationBean app = wadf.getApplicationDao().getApplicationBean();
+			name = app.getApplicationName();
+		} catch (Exception e) {
+			// deal with problems below
+		}
+
+		if ((name != null) && (!name.isEmpty())) {
+			return name;
+		} else {
+			return getContextPath();
+		}
+	}
+
+	private Template loadFreemarkerTemplate() throws IOException {
+		Configuration cfg = new Configuration();
+		cfg.setTemplateLoader(new WebappTemplateLoader(ctx));
+		return cfg.getTemplate(TEMPLATE_PATH);
+	}
+
+	private boolean isFatal() {
+		return !ss.getErrorItems().isEmpty();
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/IndexingException.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/IndexingException.java
index a71d9d250..6d77947d0 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/IndexingException.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/IndexingException.java
@@ -1,12 +1,12 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.search;
-
-public class IndexingException extends java.lang.Exception {
-    public IndexingException(String i){
-        super(i);
-    }
-    public IndexingException(){
-        super();
-    }
-}
+package edu.cornell.mannlib.vitro.webapp.search;
+
+public class IndexingException extends java.lang.Exception {
+    public IndexingException(String i){
+        super(i);
+    }
+    public IndexingException(){
+        super();
+    }
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/SearchException.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/SearchException.java
index ee9d54fe5..2e79f7fec 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/SearchException.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/SearchException.java
@@ -1,10 +1,10 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.search;
-
-public class SearchException extends Exception{
-    public SearchException(String in){
-        super(in);
-    }
-
-}
+package edu.cornell.mannlib.vitro.webapp.search;
+
+public class SearchException extends Exception{
+    public SearchException(String in){
+        super(in);
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/ObjectSourceIface.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/ObjectSourceIface.java
index c2ccdb5be..a0061975c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/ObjectSourceIface.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/ObjectSourceIface.java
@@ -1,13 +1,13 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.search.beans;
-
+package edu.cornell.mannlib.vitro.webapp.search.beans;
+
 import java.util.Iterator;
-
-public interface ObjectSourceIface {
-
-    Iterator<String> getAllOfThisTypeIterator();
-
-    Iterator<String> getUpdatedSinceIterator(long msSinceEpoc);
-
-}
+
+public interface ObjectSourceIface {
+
+    Iterator<String> getAllOfThisTypeIterator();
+
+    Iterator<String> getUpdatedSinceIterator(long msSinceEpoc);
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/VitroQuery.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/VitroQuery.java
index b8a09fb72..96da868d7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/VitroQuery.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/VitroQuery.java
@@ -1,7 +1,7 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.search.beans;
-
+package edu.cornell.mannlib.vitro.webapp.search.beans;
+
 import java.util.Collections;
 import java.util.Map;
 
@@ -9,47 +9,47 @@ import org.joda.time.DateTime;
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.search.SearchException;
-
-public abstract class VitroQuery {
-    /**
-     * The parameter name for http requests.
-     */
-    public static final String QUERY_PARAMETER_NAME = "querytext";
-    public static final String QUERY_PARAMETER_EARLIEST = "earliest";
-    public static final String QUERY_PARAMETER_LATEST = "latest";
-    public static final String QUERY_PARAMETER_IGNORE_TIMESTAMP= "ignore_timestamp";
-
-    DateTime earliest;
-    DateTime latest;
-    Map parameters = null;
-
-    /**
-     * Make a VitroQuery with the request parameters 
-     * for when the query needs to be created.
-     */
-    public VitroQuery(VitroRequest request){
-        parameters =request.getParameterMap();
-        if( parameters == null )
-            parameters = Collections.EMPTY_MAP;
-    }
-
-    /**
-     * Gets the parameters that were passed into this query from the
-     * HttpRequest so they can be displayed to the user on return to a
-     * search form.
-     *
-     * @return
-     */
-    public Map getParameters(){
-        return parameters;
-    }
-
-    public abstract String getTerms();
-
-    /**
-     * This is intended to return an specilized query object
-     * for your implementation of the search.
-     * @return
-     */
-    public abstract Object getQuery() throws SearchException;
-}
+
+public abstract class VitroQuery {
+    /**
+     * The parameter name for http requests.
+     */
+    public static final String QUERY_PARAMETER_NAME = "querytext";
+    public static final String QUERY_PARAMETER_EARLIEST = "earliest";
+    public static final String QUERY_PARAMETER_LATEST = "latest";
+    public static final String QUERY_PARAMETER_IGNORE_TIMESTAMP= "ignore_timestamp";
+
+    DateTime earliest;
+    DateTime latest;
+    Map parameters = null;
+
+    /**
+     * Make a VitroQuery with the request parameters 
+     * for when the query needs to be created.
+     */
+    public VitroQuery(VitroRequest request){
+        parameters =request.getParameterMap();
+        if( parameters == null )
+            parameters = Collections.EMPTY_MAP;
+    }
+
+    /**
+     * Gets the parameters that were passed into this query from the
+     * HttpRequest so they can be displayed to the user on return to a
+     * search form.
+     *
+     * @return
+     */
+    public Map getParameters(){
+        return parameters;
+    }
+
+    public abstract String getTerms();
+
+    /**
+     * This is intended to return an specilized query object
+     * for your implementation of the search.
+     * @return
+     */
+    public abstract Object getQuery() throws SearchException;
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/VitroQueryFactory.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/VitroQueryFactory.java
index 7237ea76e..2d3d016dc 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/VitroQueryFactory.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/beans/VitroQueryFactory.java
@@ -1,10 +1,10 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.search.beans;
-
+package edu.cornell.mannlib.vitro.webapp.search.beans;
+
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.search.SearchException;
-
-public interface VitroQueryFactory {
-    public VitroQuery getQuery(VitroRequest req) throws SearchException;
-}
+
+public interface VitroQueryFactory {
+    public VitroQuery getQuery(VitroRequest req) throws SearchException;
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java
index b4c1738a3..a8a26b217 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/controller/DataAutocompleteController.java
@@ -1,167 +1,167 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.search.controller;
-
-import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
-
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.solr.client.solrj.SolrQuery;
-import org.apache.solr.client.solrj.SolrServer;
-import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.common.SolrDocument;
-import org.apache.solr.common.SolrDocumentList;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.query.DatasetFactory;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.ajax.SparqlUtils;
-import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController;
-import edu.cornell.mannlib.vitro.webapp.controller.ajax.SparqlUtils.AjaxControllerException;
-import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames;
-import edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup;
-
-/**
- * DataAutocompleteController generates autocomplete content
- * for data properties using sparql queries
- * . 
- */
-
-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; 
-
-    public static final int MAX_QUERY_LENGTH = 500;
-    
-    @Override
-    protected Actions requiredActions(VitroRequest vreq) {
-    	//used to be basic vitro ajax permission but need to query full model
-    	return SimplePermission.QUERY_FULL_MODEL.ACTIONS;
-    }
-    
-    @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);
-            String property = vreq.getParameter(PARAM_PROPERTY);
-            //Get sparql query for this property
-            String sparqlQuery = getSparqlQuery(qtxt, property);
-            //Forward this to SparqlQueryAjaxController as that already
-            //handles execution of query and will return json results
-      //      String encodedQuery = URLEncoder.encode(sparqlQuery, "UTF-8");
-      //      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);
-			outputResults(response, query, model);
-			return;
-        } catch(AjaxControllerException ex) {
-        	log.error(ex, ex);
-			response.sendError(ex.getStatusCode());
-        }
-        catch (Throwable e) {
-            log.error(e, e);            
-            //doSearchError(response);
-        }
-    }
-    
-    private void outputResults(HttpServletResponse response, Query query,
-			Model model)     throws IOException{
-    	Dataset dataset = DatasetFactory.create(model);
-    	//Iterate through results and print out array of strings
-    	List<String> outputResults = new ArrayList<String>();
-		QueryExecution qe = QueryExecutionFactory.create(query, dataset);
-		try {
-			ResultSet results = qe.execSelect();
-			while(results.hasNext()) {
-	    		QuerySolution qs = results.nextSolution();
-	    		Literal dataLiteral = qs.getLiteral("dataLiteral");
-	    		String dataValue = dataLiteral.getString();
-	    		outputResults.add(dataValue);
-	    	}
-	        JSONArray jsonArray = new JSONArray(outputResults);
-	        try {
-	        	response.getWriter().write(jsonArray.toString());
-	        } catch (Throwable 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 . " + 
-		"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 
-	        // with the default autocomplete configuration it chokes.
-	        doNoSearchResults(response);
-	    }
-
-	    private void doNoSearchResults(HttpServletResponse response) throws IOException {
-	        response.getWriter().write("[]");
-	    }
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.search.controller;
+
+import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.solr.client.solrj.SolrQuery;
+import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.response.QueryResponse;
+import org.apache.solr.common.SolrDocument;
+import org.apache.solr.common.SolrDocumentList;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.query.DatasetFactory;
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.ajax.SparqlUtils;
+import edu.cornell.mannlib.vitro.webapp.controller.ajax.VitroAjaxController;
+import edu.cornell.mannlib.vitro.webapp.controller.ajax.SparqlUtils.AjaxControllerException;
+import edu.cornell.mannlib.vitro.webapp.search.VitroSearchTermNames;
+import edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup;
+
+/**
+ * DataAutocompleteController generates autocomplete content
+ * for data properties using sparql queries
+ * . 
+ */
+
+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; 
+
+    public static final int MAX_QUERY_LENGTH = 500;
+    
+    @Override
+    protected Actions requiredActions(VitroRequest vreq) {
+    	//used to be basic vitro ajax permission but need to query full model
+    	return SimplePermission.QUERY_FULL_MODEL.ACTIONS;
+    }
+    
+    @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);
+            String property = vreq.getParameter(PARAM_PROPERTY);
+            //Get sparql query for this property
+            String sparqlQuery = getSparqlQuery(qtxt, property);
+            //Forward this to SparqlQueryAjaxController as that already
+            //handles execution of query and will return json results
+      //      String encodedQuery = URLEncoder.encode(sparqlQuery, "UTF-8");
+      //      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);
+			outputResults(response, query, model);
+			return;
+        } catch(AjaxControllerException ex) {
+        	log.error(ex, ex);
+			response.sendError(ex.getStatusCode());
+        }
+        catch (Throwable e) {
+            log.error(e, e);            
+            //doSearchError(response);
+        }
+    }
+    
+    private void outputResults(HttpServletResponse response, Query query,
+			Model model)     throws IOException{
+    	Dataset dataset = DatasetFactory.create(model);
+    	//Iterate through results and print out array of strings
+    	List<String> outputResults = new ArrayList<String>();
+		QueryExecution qe = QueryExecutionFactory.create(query, dataset);
+		try {
+			ResultSet results = qe.execSelect();
+			while(results.hasNext()) {
+	    		QuerySolution qs = results.nextSolution();
+	    		Literal dataLiteral = qs.getLiteral("dataLiteral");
+	    		String dataValue = dataLiteral.getString();
+	    		outputResults.add(dataValue);
+	    	}
+	        JSONArray jsonArray = new JSONArray(outputResults);
+	        try {
+	        	response.getWriter().write(jsonArray.toString());
+	        } catch (Throwable 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 . " + 
+		"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 
+	        // with the default autocomplete configuration it chokes.
+	        doNoSearchResults(response);
+	    }
+
+	    private void doNoSearchResults(HttpServletResponse response) throws IOException {
+	        response.getWriter().write("[]");
+	    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/docbuilder/Obj2DocIface.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/docbuilder/Obj2DocIface.java
index 4f138507f..fbbb76b06 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/search/docbuilder/Obj2DocIface.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/search/docbuilder/Obj2DocIface.java
@@ -1,47 +1,47 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.search.docbuilder;
-
-import edu.cornell.mannlib.vitro.webapp.search.IndexingException;
-
-/**
- * The Obj2Doc is an object that can translate something into
- * an object that the indexer can use.
- *
- * @author bdc34
- *
- */
-public interface Obj2DocIface {
-    /**
-     * Tests to see if this Obj2Doc an translate this object.
-     * @param obj
-     * @return
-     */
-    public boolean canTranslate(Object obj);
-
-    /**
-     * Returns an object that the indexer can use.
-     * @param obj
-     * @return
-     * @throws IndexingException 
-     */
-    public Object translate(Object obj) throws IndexingException;
-
-    /**
-     * Returns a vitro object from a search result/hit.
-     *
-     */
-    public Object unTranslate(Object result);
-
-    /**
-     * Test to see if this can untranslate a search result/hit.
-     */
-    public boolean canUnTranslate(Object result);
-
-    /**
-     * Gets the id used by the index for this obj.
-     * @param obj
-     * @return
-     */
-    public Object getIndexId(Object obj);
-}
+package edu.cornell.mannlib.vitro.webapp.search.docbuilder;
+
+import edu.cornell.mannlib.vitro.webapp.search.IndexingException;
+
+/**
+ * The Obj2Doc is an object that can translate something into
+ * an object that the indexer can use.
+ *
+ * @author bdc34
+ *
+ */
+public interface Obj2DocIface {
+    /**
+     * Tests to see if this Obj2Doc an translate this object.
+     * @param obj
+     * @return
+     */
+    public boolean canTranslate(Object obj);
+
+    /**
+     * Returns an object that the indexer can use.
+     * @param obj
+     * @return
+     * @throws IndexingException 
+     */
+    public Object translate(Object obj) throws IndexingException;
+
+    /**
+     * Returns a vitro object from a search result/hit.
+     *
+     */
+    public Object unTranslate(Object result);
+
+    /**
+     * Test to see if this can untranslate a search result/hit.
+     */
+    public boolean canUnTranslate(Object result);
+
+    /**
+     * Gets the id used by the index for this obj.
+     * @param obj
+     * @return
+     */
+    public Object getIndexId(Object obj);
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/startup/StartupManager.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/startup/StartupManager.java
index 4c5114b77..a3a6f76e2 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/startup/StartupManager.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/startup/StartupManager.java
@@ -1,222 +1,222 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.startup;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * 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
- * page (or any other requested page).
- */
-public class StartupManager implements ServletContextListener {
-	private static final Log log = LogFactory.getLog(StartupManager.class);
-
-	public static final String FILE_OF_STARTUP_LISTENERS = "/WEB-INF/resources/startup_listeners.txt";
-
-	private final List<ServletContextListener> initializeList = new ArrayList<ServletContextListener>();
-
-	/**
-	 * These can be instance variables without risk, since contextInitialized()
-	 * will only be called once per instance.
-	 */
-	private ServletContext ctx;
-	private StartupStatus ss;
-
-	/**
-	 * 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.
-	 */
-	@Override
-	public void contextInitialized(ServletContextEvent sce) {
-		ctx = sce.getServletContext();
-		ss = StartupStatus.getBean(ctx);
-
-		try {
-			findAndInstantiateListeners();
-
-			for (ServletContextListener listener : initializeList) {
-				if (ss.isStartupAborted()) {
-					ss.listenerNotExecuted(listener);
-				} else {
-					initialize(listener, sce);
-				}
-			}
-			log.info("Called 'contextInitialized' on all listeners.");
-		} catch (Exception e) {
-			ss.fatal(this, "Startup threw an unexpected exception.", e);
-			log.error("Startup threw an unexpected exception.", e);
-		}
-	}
-
-	/**
-	 * 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() {
-		List<String> classNames = readFileOfListeners();
-
-		for (String className : classNames) {
-			ServletContextListener listener = instantiateListener(className);
-			if (listener != null) {
-				initializeList.add(listener);
-			}
-		}
-
-		checkForDuplicateListeners();
-	}
-
-	/**
-	 * 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() {
-		List<String> list = new ArrayList<String>();
-
-		InputStream is = null;
-		BufferedReader br = null;
-		try {
-			is = ctx.getResourceAsStream(FILE_OF_STARTUP_LISTENERS);
-			br = new BufferedReader(new InputStreamReader(is));
-
-			String line;
-			while (null != (line = br.readLine())) {
-				String trimmed = line.trim();
-				if (!trimmed.isEmpty() && !trimmed.startsWith("#")) {
-					list.add(trimmed);
-				}
-			}
-		} catch (NullPointerException e) {
-			ss.fatal(this, "Unable to locate the list of startup listeners: "
-					+ FILE_OF_STARTUP_LISTENERS);
-		} catch (IOException e) {
-			ss.fatal(this,
-					"Failed while processing the list of startup listeners:  "
-							+ FILE_OF_STARTUP_LISTENERS, e);
-		} finally {
-			if (br != null) {
-				try {
-					br.close();
-				} catch (IOException e) {
-					log.error(e);
-				}
-			}
-			if (is != null) {
-				try {
-					is.close();
-				} catch (IOException e) {
-					log.error(e);
-				}
-			}
-		}
-
-		log.debug("Classnames of listeners = " + list);
-		return list;
-	}
-
-	/**
-	 * 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) {
-		try {
-			Class<?> c = Class.forName(className);
-			Object o = c.newInstance();
-			return (ServletContextListener) o;
-		} catch (ClassCastException e) {
-			ss.fatal(this, "Instance of '" + className
-					+ "' is not a ServletContextListener", e);
-			return null;
-		} catch (Exception e) {
-			ss.fatal(this, "Failed to instantiate listener: '" + className
-					+ "'", e);
-			return null;
-		} catch (ExceptionInInitializerError e) {
-			ss.fatal(this, "Failed to instantiate listener: '" + className
-					+ "'", e);
-			return null;
-		}
-	}
-
-	/**
-	 * Call contextInitialized() on the listener.
-	 * 
-	 * If there is an unexpected exception, set a fatal error.
-	 */
-	private void initialize(ServletContextListener listener,
-			ServletContextEvent sce) {
-		try {
-			log.debug("Initializing '" + listener.getClass().getName() + "'");
-			listener.contextInitialized(sce);
-			ss.listenerExecuted(listener);
-		} catch (Exception e) {
-			ss.fatal(listener, "Threw unexpected exception", e);
-		}
-	}
-
-	/**
-	 * If we have more than one listener from the same class, set a fatal error.
-	 */
-	private void checkForDuplicateListeners() {
-		for (int i = 0; i < initializeList.size(); i++) {
-			for (int j = i + 1; j < initializeList.size(); j++) {
-				ServletContextListener iListener = initializeList.get(i);
-				ServletContextListener jListener = initializeList.get(j);
-				if (iListener.getClass().equals(jListener.getClass())) {
-					ss.fatal(this,
-							("File contains duplicate listener classes: '"
-									+ iListener.getClass().getName() + "'"));
-				}
-			}
-		}
-	}
-
-	/**
-	 * Notify the listeners that the context is being destroyed, in the reverse
-	 * order from how they were notified at initialization.
-	 */
-	@Override
-	public void contextDestroyed(ServletContextEvent sce) {
-		List<ServletContextListener> destroyList = new ArrayList<ServletContextListener>(
-				initializeList);
-		Collections.reverse(destroyList);
-
-		for (ServletContextListener listener : destroyList) {
-			try {
-				log.debug("Destroying '" + listener.getClass().getName() + "'");
-				listener.contextDestroyed(sce);
-			} catch (Exception e) {
-				log.error("Unexpected exception from contextDestroyed() on '"
-						+ listener.getClass().getName() + "'", e);
-			}
-		}
-		log.info("Called 'contextDestroyed' on all listeners.");
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.startup;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * 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
+ * page (or any other requested page).
+ */
+public class StartupManager implements ServletContextListener {
+	private static final Log log = LogFactory.getLog(StartupManager.class);
+
+	public static final String FILE_OF_STARTUP_LISTENERS = "/WEB-INF/resources/startup_listeners.txt";
+
+	private final List<ServletContextListener> initializeList = new ArrayList<ServletContextListener>();
+
+	/**
+	 * These can be instance variables without risk, since contextInitialized()
+	 * will only be called once per instance.
+	 */
+	private ServletContext ctx;
+	private StartupStatus ss;
+
+	/**
+	 * 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.
+	 */
+	@Override
+	public void contextInitialized(ServletContextEvent sce) {
+		ctx = sce.getServletContext();
+		ss = StartupStatus.getBean(ctx);
+
+		try {
+			findAndInstantiateListeners();
+
+			for (ServletContextListener listener : initializeList) {
+				if (ss.isStartupAborted()) {
+					ss.listenerNotExecuted(listener);
+				} else {
+					initialize(listener, sce);
+				}
+			}
+			log.info("Called 'contextInitialized' on all listeners.");
+		} catch (Exception e) {
+			ss.fatal(this, "Startup threw an unexpected exception.", e);
+			log.error("Startup threw an unexpected exception.", e);
+		}
+	}
+
+	/**
+	 * 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() {
+		List<String> classNames = readFileOfListeners();
+
+		for (String className : classNames) {
+			ServletContextListener listener = instantiateListener(className);
+			if (listener != null) {
+				initializeList.add(listener);
+			}
+		}
+
+		checkForDuplicateListeners();
+	}
+
+	/**
+	 * 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() {
+		List<String> list = new ArrayList<String>();
+
+		InputStream is = null;
+		BufferedReader br = null;
+		try {
+			is = ctx.getResourceAsStream(FILE_OF_STARTUP_LISTENERS);
+			br = new BufferedReader(new InputStreamReader(is));
+
+			String line;
+			while (null != (line = br.readLine())) {
+				String trimmed = line.trim();
+				if (!trimmed.isEmpty() && !trimmed.startsWith("#")) {
+					list.add(trimmed);
+				}
+			}
+		} catch (NullPointerException e) {
+			ss.fatal(this, "Unable to locate the list of startup listeners: "
+					+ FILE_OF_STARTUP_LISTENERS);
+		} catch (IOException e) {
+			ss.fatal(this,
+					"Failed while processing the list of startup listeners:  "
+							+ FILE_OF_STARTUP_LISTENERS, e);
+		} finally {
+			if (br != null) {
+				try {
+					br.close();
+				} catch (IOException e) {
+					log.error(e);
+				}
+			}
+			if (is != null) {
+				try {
+					is.close();
+				} catch (IOException e) {
+					log.error(e);
+				}
+			}
+		}
+
+		log.debug("Classnames of listeners = " + list);
+		return list;
+	}
+
+	/**
+	 * 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) {
+		try {
+			Class<?> c = Class.forName(className);
+			Object o = c.newInstance();
+			return (ServletContextListener) o;
+		} catch (ClassCastException e) {
+			ss.fatal(this, "Instance of '" + className
+					+ "' is not a ServletContextListener", e);
+			return null;
+		} catch (Exception e) {
+			ss.fatal(this, "Failed to instantiate listener: '" + className
+					+ "'", e);
+			return null;
+		} catch (ExceptionInInitializerError e) {
+			ss.fatal(this, "Failed to instantiate listener: '" + className
+					+ "'", e);
+			return null;
+		}
+	}
+
+	/**
+	 * Call contextInitialized() on the listener.
+	 * 
+	 * If there is an unexpected exception, set a fatal error.
+	 */
+	private void initialize(ServletContextListener listener,
+			ServletContextEvent sce) {
+		try {
+			log.debug("Initializing '" + listener.getClass().getName() + "'");
+			listener.contextInitialized(sce);
+			ss.listenerExecuted(listener);
+		} catch (Exception e) {
+			ss.fatal(listener, "Threw unexpected exception", e);
+		}
+	}
+
+	/**
+	 * If we have more than one listener from the same class, set a fatal error.
+	 */
+	private void checkForDuplicateListeners() {
+		for (int i = 0; i < initializeList.size(); i++) {
+			for (int j = i + 1; j < initializeList.size(); j++) {
+				ServletContextListener iListener = initializeList.get(i);
+				ServletContextListener jListener = initializeList.get(j);
+				if (iListener.getClass().equals(jListener.getClass())) {
+					ss.fatal(this,
+							("File contains duplicate listener classes: '"
+									+ iListener.getClass().getName() + "'"));
+				}
+			}
+		}
+	}
+
+	/**
+	 * Notify the listeners that the context is being destroyed, in the reverse
+	 * order from how they were notified at initialization.
+	 */
+	@Override
+	public void contextDestroyed(ServletContextEvent sce) {
+		List<ServletContextListener> destroyList = new ArrayList<ServletContextListener>(
+				initializeList);
+		Collections.reverse(destroyList);
+
+		for (ServletContextListener listener : destroyList) {
+			try {
+				log.debug("Destroying '" + listener.getClass().getName() + "'");
+				listener.contextDestroyed(sce);
+			} catch (Exception e) {
+				log.error("Unexpected exception from contextDestroyed() on '"
+						+ listener.getClass().getName() + "'", e);
+			}
+		}
+		log.info("Called 'contextDestroyed' on all listeners.");
+	}
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/startup/StartupStatus.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/startup/StartupStatus.java
index 6c3e4a3df..94c55ca3b 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/startup/StartupStatus.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/startup/StartupStatus.java
@@ -1,322 +1,322 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.startup;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.ServletContext;
-import javax.servlet.ServletContextListener;
-
-import org.apache.commons.logging.Log;
-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.
- */
-public class StartupStatus {
-	private static final Log log = LogFactory.getLog(StartupStatus.class);
-
-	protected static final String ATTRIBUTE_NAME = "STARTUP_STATUS";
-
-	// ----------------------------------------------------------------------
-	// static methods
-	// ----------------------------------------------------------------------
-
-	public static StartupStatus getBean(ServletContext ctx) {
-		StartupStatus ss;
-
-		Object o = ctx.getAttribute(ATTRIBUTE_NAME);
-		if (o instanceof StartupStatus) {
-			ss = (StartupStatus) o;
-		} else {
-			ss = new StartupStatus();
-			ctx.setAttribute(ATTRIBUTE_NAME, ss);
-		}
-
-		return ss;
-	}
-
-	// ----------------------------------------------------------------------
-	// methods to set status - note that these write to the log also.
-	// ----------------------------------------------------------------------
-
-	private SynchronizedStatusItemList itemList = new SynchronizedStatusItemList();
-
-	public void info(ServletContextListener listener, String message) {
-		addItem(StatusItem.Level.INFO, listener, message, null);
-	}
-
-	public void info(ServletContextListener listener, String message,
-			Throwable cause) {
-		addItem(StatusItem.Level.INFO, listener, message, cause);
-	}
-
-	public void warning(ServletContextListener listener, String message) {
-		addItem(StatusItem.Level.WARNING, listener, message, null);
-	}
-
-	public void warning(ServletContextListener listener, String message,
-			Throwable cause) {
-		addItem(StatusItem.Level.WARNING, listener, message, cause);
-	}
-
-	public void fatal(ServletContextListener listener, String message) {
-		addItem(StatusItem.Level.FATAL, listener, message, null);
-	}
-
-	public void fatal(ServletContextListener listener, String message,
-			Throwable cause) {
-		addItem(StatusItem.Level.FATAL, listener, message, cause);
-	}
-
-	/** Say that a previous fatal error prevented this listener from running. */
-	public void listenerNotExecuted(ServletContextListener listener) {
-		addItem(StatusItem.Level.NOT_EXECUTED,
-				listener,
-				"Not executed - startup was aborted by a previous fatal error.",
-				null);
-	}
-
-	/** Create a simple item for this listener if no other exists. */
-	public void listenerExecuted(ServletContextListener listener) {
-		List<StatusItem> itemsForThisListener = getItemsForListener(listener);
-		if (itemsForThisListener.isEmpty()) {
-			addItem(StatusItem.Level.INFO, listener, "Ran successfully.", null);
-		}
-	}
-
-	private void addItem(StatusItem.Level level, ServletContextListener source,
-			String message, Throwable cause) {
-		StatusItem item = new StatusItem(level, source, message, cause);
-		itemList.add(item);
-
-		String logMessage = "From " + item.getShortSourceName() + ": "
-				+ item.getMessage();
-		if (item.getLevel() == StatusItem.Level.FATAL) {
-			if (cause == null) {
-				log.fatal(logMessage);
-			} else {
-				log.fatal(logMessage, cause);
-			}
-		} else if (item.getLevel() == StatusItem.Level.WARNING) {
-			if (cause == null) {
-				log.warn(logMessage);
-			} else {
-				log.warn(logMessage, cause);
-			}
-		} else {
-			if (cause == null) {
-				log.info(logMessage);
-			} else {
-				log.info(logMessage, cause);
-			}
-		}
-	}
-
-	// ----------------------------------------------------------------------
-	// methods to query status
-	// ----------------------------------------------------------------------
-
-	public boolean allClear() {
-		return getErrorItems().isEmpty() && getWarningItems().isEmpty();
-	}
-
-	public boolean isStartupAborted() {
-		return !getErrorItems().isEmpty();
-	}
-
-	public List<StatusItem> getStatusItems() {
-		return itemList.filterItems(StatusItemFilter.ALL_ITEMS_FILTER);
-	}
-
-	public List<StatusItem> getErrorItems() {
-		return itemList.filterItems(StatusItemFilter.ERROR_ITEMS_FILTER);
-	}
-
-	public List<StatusItem> getWarningItems() {
-		return itemList.filterItems(StatusItemFilter.WARNING_ITEMS_FILTER);
-	}
-
-	public List<StatusItem> getItemsForListener(ServletContextListener listener) {
-		return itemList.filterItems(StatusItemFilter.listenerFilter(listener));
-	}
-
-	// ----------------------------------------------------------------------
-	// helper classes
-	// ----------------------------------------------------------------------
-
-	/**
-	 * An immutable item that can't throw an exception during construction and
-	 * will always contain suitable, non-null values.
-	 */
-	public static class StatusItem {
-		public enum Level {
-			INFO, WARNING, FATAL, NOT_EXECUTED
-		}
-
-		private final Level level;
-		private final String sourceName;
-		private final String shortSourceName;
-		private final String message;
-		private final String cause;
-
-		private boolean unexpectedArguments;
-
-		public StatusItem(Level level, ServletContextListener source,
-				String message, Throwable cause) {
-			this.level = figureLevel(level);
-			this.sourceName = figureSourceName(source);
-			this.shortSourceName = figureShortSourceName(source);
-			this.message = message;
-			this.cause = figureCauseString(cause);
-
-			if (unexpectedArguments) {
-				log.error("Unexpected arguments to "
-						+ StatusItem.class.getName() + ": level=" + level
-						+ ", source=" + source + ", message=" + message
-						+ ", cause=" + cause);
-			}
-		}
-
-		/** Level should never be null: we have a problem. */
-		private Level figureLevel(Level newLevel) {
-			if (newLevel == null) {
-				unexpectedArguments = true;
-				return Level.FATAL;
-			} else {
-				return newLevel;
-			}
-		}
-
-		private String figureSourceName(ServletContextListener source) {
-			if (source == null) {
-				unexpectedArguments = true;
-				return "UNKNOWN SOURCE";
-			} else {
-				return source.getClass().getName();
-			}
-		}
-
-		/**
-		 * Don't just use getSimpleName(): on an inner class we'd like to see
-		 * the parent also.
-		 */
-		private String figureShortSourceName(ServletContextListener source) {
-			if (source == null) {
-				unexpectedArguments = true;
-				return "UNKNOWN_SOURCE";
-			} else {
-				String sourceClassName = source.getClass().getName();
-				int lastPeriodHere = sourceClassName.lastIndexOf('.');
-				return sourceClassName.substring(lastPeriodHere + 1);
-			}
-		}
-
-		/** Cause may be null - that's not unexpected. */
-		private String figureCauseString(Throwable newCause) {
-			if (newCause == null) {
-				return "";
-			} else {
-				StringWriter sw = new StringWriter();
-				PrintWriter pw = new PrintWriter(sw);
-				newCause.printStackTrace(pw);
-				return sw.toString();
-			}
-		}
-
-		public Level getLevel() {
-			return level;
-		}
-
-		public String getSourceName() {
-			return sourceName;
-		}
-
-		public String getShortSourceName() {
-			return shortSourceName;
-		}
-
-		public String getMessage() {
-			return message;
-		}
-
-		public String getCause() {
-			return cause;
-		}
-
-	}
-
-	/**
-	 * A filter class and some basic instances.
-	 */
-	private static abstract class StatusItemFilter {
-		public abstract boolean accept(StatusItem item);
-
-		public static final StatusItemFilter ALL_ITEMS_FILTER = new StatusItemFilter() {
-			@Override
-			public boolean accept(StatusItem item) {
-				return true;
-			}
-		};
-
-		public static final StatusItemFilter ERROR_ITEMS_FILTER = new StatusItemFilter() {
-			@Override
-			public boolean accept(StatusItem item) {
-				return item.level == StatusItem.Level.FATAL;
-			}
-		};
-
-		public static final StatusItemFilter WARNING_ITEMS_FILTER = new StatusItemFilter() {
-			@Override
-			public boolean accept(StatusItem item) {
-				return item.level == StatusItem.Level.WARNING;
-			}
-		};
-
-		public static StatusItemFilter listenerFilter(
-				ServletContextListener listener) {
-			final String listenerName = listener.getClass().getName();
-
-			return new StatusItemFilter() {
-				@Override
-				public boolean accept(StatusItem item) {
-					return item.getSourceName().equals(listenerName);
-				}
-			};
-
-		}
-	}
-
-	/**
-	 * A list, with synchronized methods for adding to it, and for getting a
-	 * filtered subset of it.
-	 */
-	private class SynchronizedStatusItemList {
-		private final List<StatusItem> list = new ArrayList<StatusItem>();
-
-		public void add(StatusItem item) {
-			synchronized (list) {
-				list.add(item);
-			}
-		}
-
-		public List<StatusItem> filterItems(StatusItemFilter filter) {
-			List<StatusItem> filteredList = new ArrayList<StatusItem>();
-			synchronized (list) {
-				for (StatusItem item : list) {
-					if (filter.accept(item)) {
-						filteredList.add(item);
-					}
-				}
-			}
-			return filteredList;
-		}
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.startup;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextListener;
+
+import org.apache.commons.logging.Log;
+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.
+ */
+public class StartupStatus {
+	private static final Log log = LogFactory.getLog(StartupStatus.class);
+
+	protected static final String ATTRIBUTE_NAME = "STARTUP_STATUS";
+
+	// ----------------------------------------------------------------------
+	// static methods
+	// ----------------------------------------------------------------------
+
+	public static StartupStatus getBean(ServletContext ctx) {
+		StartupStatus ss;
+
+		Object o = ctx.getAttribute(ATTRIBUTE_NAME);
+		if (o instanceof StartupStatus) {
+			ss = (StartupStatus) o;
+		} else {
+			ss = new StartupStatus();
+			ctx.setAttribute(ATTRIBUTE_NAME, ss);
+		}
+
+		return ss;
+	}
+
+	// ----------------------------------------------------------------------
+	// methods to set status - note that these write to the log also.
+	// ----------------------------------------------------------------------
+
+	private SynchronizedStatusItemList itemList = new SynchronizedStatusItemList();
+
+	public void info(ServletContextListener listener, String message) {
+		addItem(StatusItem.Level.INFO, listener, message, null);
+	}
+
+	public void info(ServletContextListener listener, String message,
+			Throwable cause) {
+		addItem(StatusItem.Level.INFO, listener, message, cause);
+	}
+
+	public void warning(ServletContextListener listener, String message) {
+		addItem(StatusItem.Level.WARNING, listener, message, null);
+	}
+
+	public void warning(ServletContextListener listener, String message,
+			Throwable cause) {
+		addItem(StatusItem.Level.WARNING, listener, message, cause);
+	}
+
+	public void fatal(ServletContextListener listener, String message) {
+		addItem(StatusItem.Level.FATAL, listener, message, null);
+	}
+
+	public void fatal(ServletContextListener listener, String message,
+			Throwable cause) {
+		addItem(StatusItem.Level.FATAL, listener, message, cause);
+	}
+
+	/** Say that a previous fatal error prevented this listener from running. */
+	public void listenerNotExecuted(ServletContextListener listener) {
+		addItem(StatusItem.Level.NOT_EXECUTED,
+				listener,
+				"Not executed - startup was aborted by a previous fatal error.",
+				null);
+	}
+
+	/** Create a simple item for this listener if no other exists. */
+	public void listenerExecuted(ServletContextListener listener) {
+		List<StatusItem> itemsForThisListener = getItemsForListener(listener);
+		if (itemsForThisListener.isEmpty()) {
+			addItem(StatusItem.Level.INFO, listener, "Ran successfully.", null);
+		}
+	}
+
+	private void addItem(StatusItem.Level level, ServletContextListener source,
+			String message, Throwable cause) {
+		StatusItem item = new StatusItem(level, source, message, cause);
+		itemList.add(item);
+
+		String logMessage = "From " + item.getShortSourceName() + ": "
+				+ item.getMessage();
+		if (item.getLevel() == StatusItem.Level.FATAL) {
+			if (cause == null) {
+				log.fatal(logMessage);
+			} else {
+				log.fatal(logMessage, cause);
+			}
+		} else if (item.getLevel() == StatusItem.Level.WARNING) {
+			if (cause == null) {
+				log.warn(logMessage);
+			} else {
+				log.warn(logMessage, cause);
+			}
+		} else {
+			if (cause == null) {
+				log.info(logMessage);
+			} else {
+				log.info(logMessage, cause);
+			}
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// methods to query status
+	// ----------------------------------------------------------------------
+
+	public boolean allClear() {
+		return getErrorItems().isEmpty() && getWarningItems().isEmpty();
+	}
+
+	public boolean isStartupAborted() {
+		return !getErrorItems().isEmpty();
+	}
+
+	public List<StatusItem> getStatusItems() {
+		return itemList.filterItems(StatusItemFilter.ALL_ITEMS_FILTER);
+	}
+
+	public List<StatusItem> getErrorItems() {
+		return itemList.filterItems(StatusItemFilter.ERROR_ITEMS_FILTER);
+	}
+
+	public List<StatusItem> getWarningItems() {
+		return itemList.filterItems(StatusItemFilter.WARNING_ITEMS_FILTER);
+	}
+
+	public List<StatusItem> getItemsForListener(ServletContextListener listener) {
+		return itemList.filterItems(StatusItemFilter.listenerFilter(listener));
+	}
+
+	// ----------------------------------------------------------------------
+	// helper classes
+	// ----------------------------------------------------------------------
+
+	/**
+	 * An immutable item that can't throw an exception during construction and
+	 * will always contain suitable, non-null values.
+	 */
+	public static class StatusItem {
+		public enum Level {
+			INFO, WARNING, FATAL, NOT_EXECUTED
+		}
+
+		private final Level level;
+		private final String sourceName;
+		private final String shortSourceName;
+		private final String message;
+		private final String cause;
+
+		private boolean unexpectedArguments;
+
+		public StatusItem(Level level, ServletContextListener source,
+				String message, Throwable cause) {
+			this.level = figureLevel(level);
+			this.sourceName = figureSourceName(source);
+			this.shortSourceName = figureShortSourceName(source);
+			this.message = message;
+			this.cause = figureCauseString(cause);
+
+			if (unexpectedArguments) {
+				log.error("Unexpected arguments to "
+						+ StatusItem.class.getName() + ": level=" + level
+						+ ", source=" + source + ", message=" + message
+						+ ", cause=" + cause);
+			}
+		}
+
+		/** Level should never be null: we have a problem. */
+		private Level figureLevel(Level newLevel) {
+			if (newLevel == null) {
+				unexpectedArguments = true;
+				return Level.FATAL;
+			} else {
+				return newLevel;
+			}
+		}
+
+		private String figureSourceName(ServletContextListener source) {
+			if (source == null) {
+				unexpectedArguments = true;
+				return "UNKNOWN SOURCE";
+			} else {
+				return source.getClass().getName();
+			}
+		}
+
+		/**
+		 * Don't just use getSimpleName(): on an inner class we'd like to see
+		 * the parent also.
+		 */
+		private String figureShortSourceName(ServletContextListener source) {
+			if (source == null) {
+				unexpectedArguments = true;
+				return "UNKNOWN_SOURCE";
+			} else {
+				String sourceClassName = source.getClass().getName();
+				int lastPeriodHere = sourceClassName.lastIndexOf('.');
+				return sourceClassName.substring(lastPeriodHere + 1);
+			}
+		}
+
+		/** Cause may be null - that's not unexpected. */
+		private String figureCauseString(Throwable newCause) {
+			if (newCause == null) {
+				return "";
+			} else {
+				StringWriter sw = new StringWriter();
+				PrintWriter pw = new PrintWriter(sw);
+				newCause.printStackTrace(pw);
+				return sw.toString();
+			}
+		}
+
+		public Level getLevel() {
+			return level;
+		}
+
+		public String getSourceName() {
+			return sourceName;
+		}
+
+		public String getShortSourceName() {
+			return shortSourceName;
+		}
+
+		public String getMessage() {
+			return message;
+		}
+
+		public String getCause() {
+			return cause;
+		}
+
+	}
+
+	/**
+	 * A filter class and some basic instances.
+	 */
+	private static abstract class StatusItemFilter {
+		public abstract boolean accept(StatusItem item);
+
+		public static final StatusItemFilter ALL_ITEMS_FILTER = new StatusItemFilter() {
+			@Override
+			public boolean accept(StatusItem item) {
+				return true;
+			}
+		};
+
+		public static final StatusItemFilter ERROR_ITEMS_FILTER = new StatusItemFilter() {
+			@Override
+			public boolean accept(StatusItem item) {
+				return item.level == StatusItem.Level.FATAL;
+			}
+		};
+
+		public static final StatusItemFilter WARNING_ITEMS_FILTER = new StatusItemFilter() {
+			@Override
+			public boolean accept(StatusItem item) {
+				return item.level == StatusItem.Level.WARNING;
+			}
+		};
+
+		public static StatusItemFilter listenerFilter(
+				ServletContextListener listener) {
+			final String listenerName = listener.getClass().getName();
+
+			return new StatusItemFilter() {
+				@Override
+				public boolean accept(StatusItem item) {
+					return item.getSourceName().equals(listenerName);
+				}
+			};
+
+		}
+	}
+
+	/**
+	 * A list, with synchronized methods for adding to it, and for getting a
+	 * filtered subset of it.
+	 */
+	private class SynchronizedStatusItemList {
+		private final List<StatusItem> list = new ArrayList<StatusItem>();
+
+		public void add(StatusItem item) {
+			synchronized (list) {
+				list.add(item);
+			}
+		}
+
+		public List<StatusItem> filterItems(StatusItemFilter filter) {
+			List<StatusItem> filteredList = new ArrayList<StatusItem>();
+			synchronized (list) {
+				for (StatusItem item : list) {
+					if (filter.accept(item)) {
+						filteredList.add(item);
+					}
+				}
+			}
+			return filteredList;
+		}
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/MailUtil.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/MailUtil.java
index f0c2bece0..1604dbeae 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/MailUtil.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/MailUtil.java
@@ -1,69 +1,69 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.utils;
-import java.io.IOException;
-import java.util.Date;
-import java.util.List;
-
-import javax.mail.Message;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-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++){
-	                    address[i] = new InternetAddress(deliverToArray.get(i));
-	                }
-	                msg.setRecipients( Message.RecipientType.TO, address );
-	            }
-
-	            // Set the subject and text
-	            msg.setSubject( subject );
-
-	            // add the multipart to the message
-	            msg.setContent(messageText,"text/html");
-
-	            // set the Date: header
-	            msg.setSentDate( new Date() );
-	            Transport.send( msg ); // try to send the message via smtp - catch error exceptions
-            } catch(Exception ex) {
-            	log.error("Exception sending message :"  + ex.getMessage(), ex);
-            }
-        }
-        
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils;
+import java.io.IOException;
+import java.util.Date;
+import java.util.List;
+
+import javax.mail.Message;
+import javax.mail.Session;
+import javax.mail.Transport;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+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++){
+	                    address[i] = new InternetAddress(deliverToArray.get(i));
+	                }
+	                msg.setRecipients( Message.RecipientType.TO, address );
+	            }
+
+	            // Set the subject and text
+	            msg.setSubject( subject );
+
+	            // add the multipart to the message
+	            msg.setContent(messageText,"text/html");
+
+	            // set the Date: header
+	            msg.setSentDate( new Date() );
+	            Transport.send( msg ); // try to send the message via smtp - catch error exceptions
+            } catch(Exception ex) {
+            	log.error("Exception sending message :"  + ex.getMessage(), ex);
+            }
+        }
+        
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ClassGroupPageData.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ClassGroupPageData.java
index 234fdabf9..8952c38d6 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ClassGroupPageData.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ClassGroupPageData.java
@@ -1,192 +1,192 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.utils.dataGetter;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.json.JSONObject;
-
-import com.hp.hpl.jena.rdf.model.Model;
-
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupsForRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateModel;
-
-/**
- * This will pass these variables to the template:
- * classGroupUri: uri of the classgroup associated with this page.
- * vClassGroup: a data structure that is the classgroup associated with this page.     
- */
-public class ClassGroupPageData extends DataGetterBase implements DataGetter{
-	
-    private static final Log log = LogFactory.getLog(ClassGroupPageData.class);
-    String dataGetterURI;
-    String classGroupUri;
-    VitroRequest vreq;
-    ServletContext context;
-
-    /**
-     * Constructor with display model and data getter URI that will be called by reflection.
-     */
-    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 ) 
-    		throw new IllegalArgumentException("VitroRequest  may not be 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.classGroupUri = 	DataGetterUtils.getClassGroupForDataGetter(displayModel, dataGetterURI);
-    }
-    
-    
-    @Override
-    public Map<String, Object> getData(Map<String, Object> pageData) { 
-    	  HashMap<String, Object> data = new HashMap<String,Object>();
-          data.put("classGroupUri", this.classGroupUri);
-
-          VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
-          List<VClassGroup> vcgList = vcgc.getGroups();
-          VClassGroup group = null;
-          for( VClassGroup vcg : vcgList){
-              if( vcg.getURI() != null && vcg.getURI().equals(classGroupUri)){
-                  group = vcg;
-                  break;
-              }
-          }
-          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);
-              if( group != null ){
-                  List<VClassGroup> vcgFullList = vreq.getWebappDaoFactory().getVClassGroupDao()
-                      .getPublicGroupsWithVClasses(false, true, false);
-                  for( VClassGroup vcg : vcgFullList ){
-                      if( classGroupUri.equals(vcg.getURI()) ){
-                          group = vcg;
-                          break;
-                      }                                
-                  }
-                  
-                  setAllClassCountsToZero(group);
-
-                  log.debug("Retrieved class group " + group.getURI()
-                        + " and returning to template");
-                  if (log.isDebugEnabled()) {
-                      List<VClass> groupClasses = group.getVitroClassList();
-                      for (VClass v : groupClasses) {
-                        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;
-        for( VClassGroup vcg : vcgList){
-            if( vcg.getURI() != null && vcg.getURI().equals(classGroupUri)){
-                group = vcg;
-                break;
-            }
-        }
-        
-        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);
-            if( group != null ){
-                List<VClassGroup> vcgFullList = vreq.getWebappDaoFactory().getVClassGroupDao()
-                    .getPublicGroupsWithVClasses(false, true, false);
-                for( VClassGroup vcg : vcgFullList ){
-                    if( classGroupUri.equals(vcg.getURI()) ){
-                        group = vcg;
-                        break;
-                    }                                
-                }
-                if( group == null ){
-                    log.error("Cannot get classgroup '" + classGroupUri + "'");
-                    return null;
-                }else{
-                    setAllClassCountsToZero(group);
-                }
-            }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?getRenderedSolrIndividualsByVClass=1&vclassId=");
-    }
-    
-    /**
-     * Query to get the definition of the ClassGroupDataGetter for a given data getter URI - specifically
-     * the class group uri
-     */
-    private static final String forClassGroupURI = "<" + DisplayVocabulary.FOR_CLASSGROUP + ">";
-    private static final String dataGetterQuery =
-        "PREFIX display: <" + DisplayVocabulary.DISPLAY_NS +"> \n" +
-        "SELECT ?classGroupUri WHERE { \n" +
-        "  ?dataGetterUri "+forClassGroupURI+" ?classGroupUri . \n" +
-        "}";      
-
-    
-    
-    /**
-     * For processing of JSONObject
-     */
-    //Currently empty, TODO: Review requirements
-    public JSONObject convertToJSON(Map<String, Object> dataMap, VitroRequest vreq) {
-    	JSONObject rObj = null;
-    	return rObj;
-    }
-    protected static void setAllClassCountsToZero(VClassGroup vcg){
-        for(VClass vc : vcg){
-            vc.setEntityCount(0);
-        }
-    }
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils.dataGetter;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONObject;
+
+import com.hp.hpl.jena.rdf.model.Model;
+
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupsForRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
+import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateModel;
+
+/**
+ * This will pass these variables to the template:
+ * classGroupUri: uri of the classgroup associated with this page.
+ * vClassGroup: a data structure that is the classgroup associated with this page.     
+ */
+public class ClassGroupPageData extends DataGetterBase implements DataGetter{
+	
+    private static final Log log = LogFactory.getLog(ClassGroupPageData.class);
+    String dataGetterURI;
+    String classGroupUri;
+    VitroRequest vreq;
+    ServletContext context;
+
+    /**
+     * Constructor with display model and data getter URI that will be called by reflection.
+     */
+    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 ) 
+    		throw new IllegalArgumentException("VitroRequest  may not be 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.classGroupUri = 	DataGetterUtils.getClassGroupForDataGetter(displayModel, dataGetterURI);
+    }
+    
+    
+    @Override
+    public Map<String, Object> getData(Map<String, Object> pageData) { 
+    	  HashMap<String, Object> data = new HashMap<String,Object>();
+          data.put("classGroupUri", this.classGroupUri);
+
+          VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
+          List<VClassGroup> vcgList = vcgc.getGroups();
+          VClassGroup group = null;
+          for( VClassGroup vcg : vcgList){
+              if( vcg.getURI() != null && vcg.getURI().equals(classGroupUri)){
+                  group = vcg;
+                  break;
+              }
+          }
+          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);
+              if( group != null ){
+                  List<VClassGroup> vcgFullList = vreq.getWebappDaoFactory().getVClassGroupDao()
+                      .getPublicGroupsWithVClasses(false, true, false);
+                  for( VClassGroup vcg : vcgFullList ){
+                      if( classGroupUri.equals(vcg.getURI()) ){
+                          group = vcg;
+                          break;
+                      }                                
+                  }
+                  
+                  setAllClassCountsToZero(group);
+
+                  log.debug("Retrieved class group " + group.getURI()
+                        + " and returning to template");
+                  if (log.isDebugEnabled()) {
+                      List<VClass> groupClasses = group.getVitroClassList();
+                      for (VClass v : groupClasses) {
+                        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;
+        for( VClassGroup vcg : vcgList){
+            if( vcg.getURI() != null && vcg.getURI().equals(classGroupUri)){
+                group = vcg;
+                break;
+            }
+        }
+        
+        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);
+            if( group != null ){
+                List<VClassGroup> vcgFullList = vreq.getWebappDaoFactory().getVClassGroupDao()
+                    .getPublicGroupsWithVClasses(false, true, false);
+                for( VClassGroup vcg : vcgFullList ){
+                    if( classGroupUri.equals(vcg.getURI()) ){
+                        group = vcg;
+                        break;
+                    }                                
+                }
+                if( group == null ){
+                    log.error("Cannot get classgroup '" + classGroupUri + "'");
+                    return null;
+                }else{
+                    setAllClassCountsToZero(group);
+                }
+            }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?getRenderedSolrIndividualsByVClass=1&vclassId=");
+    }
+    
+    /**
+     * Query to get the definition of the ClassGroupDataGetter for a given data getter URI - specifically
+     * the class group uri
+     */
+    private static final String forClassGroupURI = "<" + DisplayVocabulary.FOR_CLASSGROUP + ">";
+    private static final String dataGetterQuery =
+        "PREFIX display: <" + DisplayVocabulary.DISPLAY_NS +"> \n" +
+        "SELECT ?classGroupUri WHERE { \n" +
+        "  ?dataGetterUri "+forClassGroupURI+" ?classGroupUri . \n" +
+        "}";      
+
+    
+    
+    /**
+     * For processing of JSONObject
+     */
+    //Currently empty, TODO: Review requirements
+    public JSONObject convertToJSON(Map<String, Object> dataMap, VitroRequest vreq) {
+    	JSONObject rObj = null;
+    	return rObj;
+    }
+    protected static void setAllClassCountsToZero(VClassGroup vcg){
+        for(VClass vc : vcg){
+            vc.setEntityCount(0);
+        }
+    }
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ExecuteDataRetrieval.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ExecuteDataRetrieval.java
index 7cb461648..d9bdcebcb 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ExecuteDataRetrieval.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/ExecuteDataRetrieval.java
@@ -1,75 +1,75 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-package edu.cornell.mannlib.vitro.webapp.utils.dataGetter;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.rdf.model.Model;
-
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-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;
-    Model displayModel = null;
-
-    /**
-     * Constructor with display model and data getter URI that will be called by reflection.
-     */
-    public ExecuteDataRetrieval(VitroRequest vreq, Model displayModel, Individual individual){
-        //not sure if we need display model or vreq for this?
-    	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?
-    	HashSet<DataGetter> dataGetters = new HashSet<DataGetter>();
-    	List<VClass> vclasses = this.individual.getVClasses();
-    	//For any of the vclasses that apply to this individual, check whether
-    	//there are any datagetter assigned for that class
-    	try {
-	    	for(VClass v: vclasses) {
-	    		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);
-    	}
-    	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) 
-    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    
-        mapForTemplate.put("individualURI", this.individual.getURI());
-        for( DataGetter dg : dgList){            
-            Map<String,Object> moreData = dg.getData(mapForTemplate);            
-            if( moreData != null ){
-                mapForTemplate.putAll(moreData);
-            }
-        }                       
-    }
-    
-	
-	
-    
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+package edu.cornell.mannlib.vitro.webapp.utils.dataGetter;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.rdf.model.Model;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+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;
+    Model displayModel = null;
+
+    /**
+     * Constructor with display model and data getter URI that will be called by reflection.
+     */
+    public ExecuteDataRetrieval(VitroRequest vreq, Model displayModel, Individual individual){
+        //not sure if we need display model or vreq for this?
+    	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?
+    	HashSet<DataGetter> dataGetters = new HashSet<DataGetter>();
+    	List<VClass> vclasses = this.individual.getVClasses();
+    	//For any of the vclasses that apply to this individual, check whether
+    	//there are any datagetter assigned for that class
+    	try {
+	    	for(VClass v: vclasses) {
+	    		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);
+    	}
+    	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) 
+    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    
+        mapForTemplate.put("individualURI", this.individual.getURI());
+        for( DataGetter dg : dgList){            
+            Map<String,Object> moreData = dg.getData(mapForTemplate);            
+            if( moreData != null ){
+                mapForTemplate.putAll(moreData);
+            }
+        }                       
+    }
+    
+	
+	
+    
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/FixedHTMLDataGetter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/FixedHTMLDataGetter.java
index afa3b2f6e..2a30c62f0 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/FixedHTMLDataGetter.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/FixedHTMLDataGetter.java
@@ -1,128 +1,128 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-package edu.cornell.mannlib.vitro.webapp.utils.dataGetter;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.QuerySolutionMap;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.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{    
-    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) {     
-    	 Map<String, Object> rmap = new HashMap<String,Object>();
-    	 rmap.put("variableName", this.saveToVar);
-         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;
-    }
-
-    /**
-     * Configure this instance based on the URI and display model.
-     */
-    protected void configure(VitroRequest vreq, Model displayModel, String dataGetterURI) {
-    	if( vreq == null ) 
-    		throw new IllegalArgumentException("VitroRequest  may not be 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;        
-        
-        QuerySolutionMap initBindings = new QuerySolutionMap();
-        initBindings.add("dataGetterURI", ResourceFactory.createResource(this.dataGetterURI));
-        
-        int count = 0;
-        Query dataGetterConfigurationQuery = QueryFactory.create(dataGetterQuery) ;               
-        displayModel.enterCriticalSection(Lock.READ);
-        try{
-            QueryExecution qexec = QueryExecutionFactory.create(
-                    dataGetterConfigurationQuery, displayModel, initBindings) ;        
-            ResultSet res = qexec.execSelect();
-            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();                    
-                    
-                        
-                    //saveToVar is OPTIONAL
-                    Literal saveTo = soln.getLiteral("saveToVar");
-                    if( saveTo != null && saveTo.isLiteral() ){
-                        this.saveToVar = saveTo.asLiteral().getLexicalForm();                        
-                    }else{
-                        this.saveToVar = defaultVarNameForResults;
-                    }
-                }
-            }finally{ qexec.close(); }
-        }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.
-     */
-    private static final String dataGetterQuery =
-        "PREFIX display: <" + DisplayVocabulary.DISPLAY_NS +"> \n" +
-        "SELECT ?saveToVar ?htmlValue WHERE { \n" +
-        "  ?dataGetterURI "+saveToVarPropertyURI+" ?saveToVar . \n" +
-        "  ?dataGetterURI "+htmlValuePropertyURI+" ?htmlValue . \n" +
-        "}";      
-
-   
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+package edu.cornell.mannlib.vitro.webapp.utils.dataGetter;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.QuerySolutionMap;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+import com.hp.hpl.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{    
+    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) {     
+    	 Map<String, Object> rmap = new HashMap<String,Object>();
+    	 rmap.put("variableName", this.saveToVar);
+         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;
+    }
+
+    /**
+     * Configure this instance based on the URI and display model.
+     */
+    protected void configure(VitroRequest vreq, Model displayModel, String dataGetterURI) {
+    	if( vreq == null ) 
+    		throw new IllegalArgumentException("VitroRequest  may not be 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;        
+        
+        QuerySolutionMap initBindings = new QuerySolutionMap();
+        initBindings.add("dataGetterURI", ResourceFactory.createResource(this.dataGetterURI));
+        
+        int count = 0;
+        Query dataGetterConfigurationQuery = QueryFactory.create(dataGetterQuery) ;               
+        displayModel.enterCriticalSection(Lock.READ);
+        try{
+            QueryExecution qexec = QueryExecutionFactory.create(
+                    dataGetterConfigurationQuery, displayModel, initBindings) ;        
+            ResultSet res = qexec.execSelect();
+            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();                    
+                    
+                        
+                    //saveToVar is OPTIONAL
+                    Literal saveTo = soln.getLiteral("saveToVar");
+                    if( saveTo != null && saveTo.isLiteral() ){
+                        this.saveToVar = saveTo.asLiteral().getLexicalForm();                        
+                    }else{
+                        this.saveToVar = defaultVarNameForResults;
+                    }
+                }
+            }finally{ qexec.close(); }
+        }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.
+     */
+    private static final String dataGetterQuery =
+        "PREFIX display: <" + DisplayVocabulary.DISPLAY_NS +"> \n" +
+        "SELECT ?saveToVar ?htmlValue WHERE { \n" +
+        "  ?dataGetterURI "+saveToVarPropertyURI+" ?saveToVar . \n" +
+        "  ?dataGetterURI "+htmlValuePropertyURI+" ?htmlValue . \n" +
+        "}";      
+
+   
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/IndividualsForClassesDataGetter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/IndividualsForClassesDataGetter.java
index 2e5012719..1788e3fa4 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/IndividualsForClassesDataGetter.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/IndividualsForClassesDataGetter.java
@@ -1,406 +1,406 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.utils.dataGetter;
-
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.json.JSONObject;
-
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.QuerySolutionMap;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.jena.shared.Lock;
-
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupsForRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateModel;
-
-/**
- * This will pass these variables to the template:
- * classGroupUri: uri of the classgroup associated with this page.
- * vClassGroup: a data structure that is the classgroup associated with this page.     
- */
-public class IndividualsForClassesDataGetter extends DataGetterBase implements DataGetter{
-    private static final Log log = LogFactory.getLog(IndividualsForClassesDataGetter.class);
-    protected static String restrictClassesTemplateName = null;
-    VitroRequest vreq;
-    ServletContext context;
-    String dataGetterURI;
-    String classGroupURI;
-    Map<String, Object> classIntersectionsMap;
-    private final static String defaultTemplate =  "page-classgroup.ftl";
-
-    /**
-     * Constructor with display model and data getter URI that will be called by reflection.
-     */
-    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 ) 
-    		throw new IllegalArgumentException("VitroRequest  may not be 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.classGroupURI = DataGetterUtils.getClassGroupForDataGetter(displayModel, dataGetterURI);
-        this.classIntersectionsMap = getClassIntersectionsMap(displayModel);
-    }
-    
-    /**
-     * Get the classes and classes to restrict by - if any
-     */
-
-    protected Map<String, Object> getClassIntersectionsMap(Model displayModel) {
-    	  QuerySolutionMap initBindings = new QuerySolutionMap();
-          initBindings.add("dataGetterUri", ResourceFactory.createResource(this.dataGetterURI));
-          try {
-	         QueryExecution qexec = QueryExecutionFactory.create( dataGetterQuery, displayModel , initBindings);
-	     	 Map<String, Object> classesAndRestrictions = new HashMap<String, Object>();
-	         List<String> classes = new ArrayList<String>();
-	         displayModel.enterCriticalSection(Lock.READ);
-
-	          try{
-	              List<String>  restrictClasses = new ArrayList<String>();
-	              HashMap<String, String> restrictClassesPresentMap = new HashMap<String, String>();
-	              ResultSet resultSet = qexec.execSelect();        
-	              while(resultSet.hasNext()){
-	                  QuerySolution soln = resultSet.next();
-	                  classes.add(DataGetterUtils.nodeToString(soln.get("class")));
-	                  String restrictClass = DataGetterUtils.nodeToString(soln.get("restrictClass"));
-	                  if(!restrictClass.isEmpty() && !restrictClassesPresentMap.containsKey(restrictClass)) {
-	                  	restrictClasses.add(restrictClass);
-	                  	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("restrictClasses", restrictClasses);
-	              return classesAndRestrictions;
-
-	          }finally{
-	              qexec.close();
-	          }
-	      }finally{
-	          displayModel.leaveCriticalSection();
-	      }
-               
-    }
-    
-    @Override
-    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);
-        	log.debug("Retrieving classes for " + classes.toString() + " and restricting by " + restrictClasses.toString());
-        	processClassesAndRestrictions(vreq, context, data, classes, restrictClasses);
-        	 //Also add data service url
-            //Hardcoding for now, need a more dynamic way of doing this
-            data.put("dataServiceUrlIndividualsByVClass", this.getDataServiceUrl());
-            //this is the class group associated with the data getter utilized for display on menu editing, not the custom one created
-            data.put("classGroupUri",this.classGroupURI);
-            //default template, overridden at page level if specified in display model
-            data.put("bodyTemplate", defaultTemplate);
-        } 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, 
-    		HashMap<String, Object> data, List<String> classes, List<String> restrictClasses ) {
-    	processClassesForDisplay(vreq, context, data, classes);
-    	processRestrictionClasses(vreq, context, data, restrictClasses);
-    	processIntersections(vreq, context, data);
-    	
-    }
-    
-
-
-	//At this point, data specifices whether or not intersections included
-    private void processIntersections(VitroRequest vreq,
-			ServletContext context, HashMap<String, Object> data) {
-    	VClassGroup classesGroup = (VClassGroup) data.get("vClassGroup");
-    	List<VClass> vclassList = classesGroup.getVitroClassList();
-    	List<VClass> restrictClasses = (List<VClass>) data.get("restrictVClasses");
-    	//if there are restrict classes, then update counts
-    	if(restrictClasses.size() > 0) {
-    		log.debug("Restriction classes exist");
-    		List<VClass> newVClassList = new ArrayList<VClass>();
-    		//Iterate through vclasses and get updated counts, iterated and saved in same order as initially included
-    		for(VClass v: vclassList) {
-    			int oldCount = v.getEntityCount();
-    			//Making a copy so as to ensure we don't touch the values in the cache
-    			VClass copyVClass = makeCopyVClass(v);
-    			int count = retrieveCount(vreq, context, v, restrictClasses);
-    			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);
-    		//TODO: Do we need to do this again or will this already be reset?
-    		data.put("vClassGroup", classesGroup);
-    	}
-	}
-
-    private VClass makeCopyVClass(VClass v) {
-    	VClass copyVClass = new VClass(v.getURI());
-		copyVClass.setLocalName(copyVClass.getLocalName());
-		copyVClass.setDisplayRank(v.getDisplayRank());
-		copyVClass.setName(v.getName());
-		copyVClass.setNamespace(v.getNamespace());
-		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 solr query that returns only count of individuals
-		log.debug("Entity count is " + v.getEntityCount());
-		List<String> classUris = new ArrayList<String>();
-		classUris.add(v.getURI());
-		for(VClass r: restrictClasses) {
-			classUris.add(r.getURI());
-		}
-		long count =  DataGetterUtils.getIndividualCountForIntersection(vreq, context, classUris);
-		return new Long(count).intValue();
-
-	}
-
-	private void processClassesForDisplay(VitroRequest vreq, ServletContext context, HashMap<String, Object> data, List<String> classes) {
-    	VClassGroup classesGroup = new VClassGroup();
-    	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
-    		VClass vclass = vcgc.getCachedVClass(classUri);
-    		//if not found in cache, possibly due to not being in any class group
-			if(vclass == null) {
-				vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(classUri);
-			}
-    		if(vclass != null) {
-    			log.debug("VClass does exist for " + classUri + " and entity count is " + vclass.getEntityCount());
-    			vClasses.add(vclass);
-    		} else {
-    			log.debug("Vclass " + classUri + " does not exist in the cache");
-    			log.error("Error occurred, vclass does not exist for this uri " + classUri);
-    			//Throw exception here
-    		}
-    	}
-    	//Sort these classes
-    	Collections.sort(vClasses);
-    	log.debug("Sorting complete for V Classes");
-    	classesGroup.setVitroClassList(vClasses);
-    	log.debug("Returning vitro class list in data for template");
-    	//Set vclass group
-    	data.put("vClassGroup", classesGroup);
-    }	
-    
-    private void processRestrictionClasses(VitroRequest vreq, ServletContext context, 
-    		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);
-
-	    	if(restrictClasses.size() > 0) {
-	    		//classes for restriction are not displayed so don't need to include their class individual counts
-	    		for(String restrictClassUri: restrictClasses) {
-	    			//Also uses cache to remain consistent with process classes and also allow
-	    			//vclasses to be returned even if switched to display model, although
-	    			//uris used within display model editing and not vclass objects
-	    			VClass vclass = vcgc.getCachedVClass(restrictClassUri);
-	    			//if not found in cache, possibly due to not being in any class group
-	    			if(vclass == null) {
-	    				vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(restrictClassUri);
-	    			}
-	        		if(vclass != null) {
-	        			log.debug("Found restrict class and adding to list " + restrictClassUri);
-	        			restrictVClasses.add(vclass);
-	        		} else {
-	        			log.error("Error occurred, vclass does not exist for this uri " + restrictClassUri);
-	        		}
-	        		//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, ","));
-	    	data.put("restrictVClasses", restrictVClasses);
-	    	//not sure if this is useful
-	    	data.put("restrictVClassGroup", restrictClassesGroup);
-    	} catch(Exception ex) {
-    		log.error("An error occurred in processing restriction classes ", ex);
-    	}
-    }
-    
-    public static VClassGroupTemplateModel getClassGroup(String classGroupUri, ServletContext context, VitroRequest vreq){
-        
-        VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
-        List<VClassGroup> vcgList = vcgc.getGroups();
-        VClassGroup group = null;
-        for( VClassGroup vcg : vcgList){
-            if( vcg.getURI() != null && vcg.getURI().equals(classGroupUri)){
-                group = vcg;
-                break;
-            }
-        }
-        
-        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);
-            if( group != null ){
-                List<VClassGroup> vcgFullList = vreq.getWebappDaoFactory().getVClassGroupDao()
-                    .getPublicGroupsWithVClasses(false, true, false);
-                for( VClassGroup vcg : vcgFullList ){
-                    if( classGroupUri.equals(vcg.getURI()) ){
-                        group = vcg;
-                        break;
-                    }                                
-                }
-                if( group == null ){
-                    log.error("Cannot get classgroup '" + classGroupUri + "'");
-                    return null;
-                }else{
-                    setAllClassCountsToZero(group);
-                }
-            }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?getRenderedSolrIndividualsByVClass=1&vclassId=");
-    }
-    /**
-     * For processig of JSONObject
-     */
-    public JSONObject convertToJSON(Map<String, Object> map, VitroRequest vreq) {
-    	JSONObject rObj = DataGetterUtils.processVclassResultsJSON(map, vreq, true);
-    	return rObj;
-    }
-    
-    protected static void setAllClassCountsToZero(VClassGroup vcg){
-        for(VClass vc : vcg){
-            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);                
-            }catch(NumberFormatException nfe){
-                log.debug("could not parse page parameter");
-                return 1;
-            }                
-        }else{                   
-            return 1;
-        }
-    }
-    
-    //Get template parameter
-    private static String getRestrictClassesTemplateName() {
-    	return restrictClassesTemplateName;
-
-    }
-    
-    private static final String prefixes = 
-        "PREFIX rdf:   <" + VitroVocabulary.RDF +"> \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" + 
-   	 "SELECT ?class ?restrictClass WHERE {\n" +
-        " ?dataGetterUri <" + DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS + "> ?class . \n" +
-        "    OPTIONAL {?dg <"+ DisplayVocabulary.RESTRICT_RESULTS_BY + "> ?restrictClass } .\n" +    
-        "} \n" ;
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils.dataGetter;
+
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONObject;
+
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.QuerySolutionMap;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+import com.hp.hpl.jena.shared.Lock;
+
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupsForRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
+import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateModel;
+
+/**
+ * This will pass these variables to the template:
+ * classGroupUri: uri of the classgroup associated with this page.
+ * vClassGroup: a data structure that is the classgroup associated with this page.     
+ */
+public class IndividualsForClassesDataGetter extends DataGetterBase implements DataGetter{
+    private static final Log log = LogFactory.getLog(IndividualsForClassesDataGetter.class);
+    protected static String restrictClassesTemplateName = null;
+    VitroRequest vreq;
+    ServletContext context;
+    String dataGetterURI;
+    String classGroupURI;
+    Map<String, Object> classIntersectionsMap;
+    private final static String defaultTemplate =  "page-classgroup.ftl";
+
+    /**
+     * Constructor with display model and data getter URI that will be called by reflection.
+     */
+    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 ) 
+    		throw new IllegalArgumentException("VitroRequest  may not be 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.classGroupURI = DataGetterUtils.getClassGroupForDataGetter(displayModel, dataGetterURI);
+        this.classIntersectionsMap = getClassIntersectionsMap(displayModel);
+    }
+    
+    /**
+     * Get the classes and classes to restrict by - if any
+     */
+
+    protected Map<String, Object> getClassIntersectionsMap(Model displayModel) {
+    	  QuerySolutionMap initBindings = new QuerySolutionMap();
+          initBindings.add("dataGetterUri", ResourceFactory.createResource(this.dataGetterURI));
+          try {
+	         QueryExecution qexec = QueryExecutionFactory.create( dataGetterQuery, displayModel , initBindings);
+	     	 Map<String, Object> classesAndRestrictions = new HashMap<String, Object>();
+	         List<String> classes = new ArrayList<String>();
+	         displayModel.enterCriticalSection(Lock.READ);
+
+	          try{
+	              List<String>  restrictClasses = new ArrayList<String>();
+	              HashMap<String, String> restrictClassesPresentMap = new HashMap<String, String>();
+	              ResultSet resultSet = qexec.execSelect();        
+	              while(resultSet.hasNext()){
+	                  QuerySolution soln = resultSet.next();
+	                  classes.add(DataGetterUtils.nodeToString(soln.get("class")));
+	                  String restrictClass = DataGetterUtils.nodeToString(soln.get("restrictClass"));
+	                  if(!restrictClass.isEmpty() && !restrictClassesPresentMap.containsKey(restrictClass)) {
+	                  	restrictClasses.add(restrictClass);
+	                  	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("restrictClasses", restrictClasses);
+	              return classesAndRestrictions;
+
+	          }finally{
+	              qexec.close();
+	          }
+	      }finally{
+	          displayModel.leaveCriticalSection();
+	      }
+               
+    }
+    
+    @Override
+    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);
+        	log.debug("Retrieving classes for " + classes.toString() + " and restricting by " + restrictClasses.toString());
+        	processClassesAndRestrictions(vreq, context, data, classes, restrictClasses);
+        	 //Also add data service url
+            //Hardcoding for now, need a more dynamic way of doing this
+            data.put("dataServiceUrlIndividualsByVClass", this.getDataServiceUrl());
+            //this is the class group associated with the data getter utilized for display on menu editing, not the custom one created
+            data.put("classGroupUri",this.classGroupURI);
+            //default template, overridden at page level if specified in display model
+            data.put("bodyTemplate", defaultTemplate);
+        } 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, 
+    		HashMap<String, Object> data, List<String> classes, List<String> restrictClasses ) {
+    	processClassesForDisplay(vreq, context, data, classes);
+    	processRestrictionClasses(vreq, context, data, restrictClasses);
+    	processIntersections(vreq, context, data);
+    	
+    }
+    
+
+
+	//At this point, data specifices whether or not intersections included
+    private void processIntersections(VitroRequest vreq,
+			ServletContext context, HashMap<String, Object> data) {
+    	VClassGroup classesGroup = (VClassGroup) data.get("vClassGroup");
+    	List<VClass> vclassList = classesGroup.getVitroClassList();
+    	List<VClass> restrictClasses = (List<VClass>) data.get("restrictVClasses");
+    	//if there are restrict classes, then update counts
+    	if(restrictClasses.size() > 0) {
+    		log.debug("Restriction classes exist");
+    		List<VClass> newVClassList = new ArrayList<VClass>();
+    		//Iterate through vclasses and get updated counts, iterated and saved in same order as initially included
+    		for(VClass v: vclassList) {
+    			int oldCount = v.getEntityCount();
+    			//Making a copy so as to ensure we don't touch the values in the cache
+    			VClass copyVClass = makeCopyVClass(v);
+    			int count = retrieveCount(vreq, context, v, restrictClasses);
+    			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);
+    		//TODO: Do we need to do this again or will this already be reset?
+    		data.put("vClassGroup", classesGroup);
+    	}
+	}
+
+    private VClass makeCopyVClass(VClass v) {
+    	VClass copyVClass = new VClass(v.getURI());
+		copyVClass.setLocalName(copyVClass.getLocalName());
+		copyVClass.setDisplayRank(v.getDisplayRank());
+		copyVClass.setName(v.getName());
+		copyVClass.setNamespace(v.getNamespace());
+		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 solr query that returns only count of individuals
+		log.debug("Entity count is " + v.getEntityCount());
+		List<String> classUris = new ArrayList<String>();
+		classUris.add(v.getURI());
+		for(VClass r: restrictClasses) {
+			classUris.add(r.getURI());
+		}
+		long count =  DataGetterUtils.getIndividualCountForIntersection(vreq, context, classUris);
+		return new Long(count).intValue();
+
+	}
+
+	private void processClassesForDisplay(VitroRequest vreq, ServletContext context, HashMap<String, Object> data, List<String> classes) {
+    	VClassGroup classesGroup = new VClassGroup();
+    	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
+    		VClass vclass = vcgc.getCachedVClass(classUri);
+    		//if not found in cache, possibly due to not being in any class group
+			if(vclass == null) {
+				vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(classUri);
+			}
+    		if(vclass != null) {
+    			log.debug("VClass does exist for " + classUri + " and entity count is " + vclass.getEntityCount());
+    			vClasses.add(vclass);
+    		} else {
+    			log.debug("Vclass " + classUri + " does not exist in the cache");
+    			log.error("Error occurred, vclass does not exist for this uri " + classUri);
+    			//Throw exception here
+    		}
+    	}
+    	//Sort these classes
+    	Collections.sort(vClasses);
+    	log.debug("Sorting complete for V Classes");
+    	classesGroup.setVitroClassList(vClasses);
+    	log.debug("Returning vitro class list in data for template");
+    	//Set vclass group
+    	data.put("vClassGroup", classesGroup);
+    }	
+    
+    private void processRestrictionClasses(VitroRequest vreq, ServletContext context, 
+    		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);
+
+	    	if(restrictClasses.size() > 0) {
+	    		//classes for restriction are not displayed so don't need to include their class individual counts
+	    		for(String restrictClassUri: restrictClasses) {
+	    			//Also uses cache to remain consistent with process classes and also allow
+	    			//vclasses to be returned even if switched to display model, although
+	    			//uris used within display model editing and not vclass objects
+	    			VClass vclass = vcgc.getCachedVClass(restrictClassUri);
+	    			//if not found in cache, possibly due to not being in any class group
+	    			if(vclass == null) {
+	    				vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(restrictClassUri);
+	    			}
+	        		if(vclass != null) {
+	        			log.debug("Found restrict class and adding to list " + restrictClassUri);
+	        			restrictVClasses.add(vclass);
+	        		} else {
+	        			log.error("Error occurred, vclass does not exist for this uri " + restrictClassUri);
+	        		}
+	        		//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, ","));
+	    	data.put("restrictVClasses", restrictVClasses);
+	    	//not sure if this is useful
+	    	data.put("restrictVClassGroup", restrictClassesGroup);
+    	} catch(Exception ex) {
+    		log.error("An error occurred in processing restriction classes ", ex);
+    	}
+    }
+    
+    public static VClassGroupTemplateModel getClassGroup(String classGroupUri, ServletContext context, VitroRequest vreq){
+        
+        VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
+        List<VClassGroup> vcgList = vcgc.getGroups();
+        VClassGroup group = null;
+        for( VClassGroup vcg : vcgList){
+            if( vcg.getURI() != null && vcg.getURI().equals(classGroupUri)){
+                group = vcg;
+                break;
+            }
+        }
+        
+        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);
+            if( group != null ){
+                List<VClassGroup> vcgFullList = vreq.getWebappDaoFactory().getVClassGroupDao()
+                    .getPublicGroupsWithVClasses(false, true, false);
+                for( VClassGroup vcg : vcgFullList ){
+                    if( classGroupUri.equals(vcg.getURI()) ){
+                        group = vcg;
+                        break;
+                    }                                
+                }
+                if( group == null ){
+                    log.error("Cannot get classgroup '" + classGroupUri + "'");
+                    return null;
+                }else{
+                    setAllClassCountsToZero(group);
+                }
+            }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?getRenderedSolrIndividualsByVClass=1&vclassId=");
+    }
+    /**
+     * For processig of JSONObject
+     */
+    public JSONObject convertToJSON(Map<String, Object> map, VitroRequest vreq) {
+    	JSONObject rObj = DataGetterUtils.processVclassResultsJSON(map, vreq, true);
+    	return rObj;
+    }
+    
+    protected static void setAllClassCountsToZero(VClassGroup vcg){
+        for(VClass vc : vcg){
+            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);                
+            }catch(NumberFormatException nfe){
+                log.debug("could not parse page parameter");
+                return 1;
+            }                
+        }else{                   
+            return 1;
+        }
+    }
+    
+    //Get template parameter
+    private static String getRestrictClassesTemplateName() {
+    	return restrictClassesTemplateName;
+
+    }
+    
+    private static final String prefixes = 
+        "PREFIX rdf:   <" + VitroVocabulary.RDF +"> \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" + 
+   	 "SELECT ?class ?restrictClass WHERE {\n" +
+        " ?dataGetterUri <" + DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS + "> ?class . \n" +
+        "    OPTIONAL {?dg <"+ DisplayVocabulary.RESTRICT_RESULTS_BY + "> ?restrictClass } .\n" +    
+        "} \n" ;
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SolrIndividualsDataGetter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SolrIndividualsDataGetter.java
index bc790bc10..278b8c645 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SolrIndividualsDataGetter.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/dataGetter/SolrIndividualsDataGetter.java
@@ -1,220 +1,220 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-package edu.cornell.mannlib.vitro.webapp.utils.dataGetter;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.QuerySolutionMap;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.jena.shared.Lock;
-
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController.SearchException;
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
-import edu.cornell.mannlib.vitro.webapp.utils.solr.SolrQueryUtils;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividual;
-
-public class SolrIndividualsDataGetter extends DataGetterBase implements DataGetter{    
-    String dataGetterURI;
-    List<String> vclassUris = null;
-    String saveToVar;
-    VitroRequest vreq;
-    ServletContext context;
-    
-    
-    final static Log log = LogFactory.getLog(SolrIndividualsDataGetter.class);
-    //default template
-    private final static String defaultTemplate = "menupage--defaultSolrIndividuals.ftl";
-    
-    /**
-     * Constructor with display model and data getter URI that will be called by reflection.
-     */
-    public SolrIndividualsDataGetter(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) { 
-    	// 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 doSolrQuery( merged);
-    }
-
-    /**
-     * Configure this instance based on the URI and display model.
-     */
-    protected void configure(VitroRequest vreq, Model displayModel, String dataGetterURI) {
-    	if( vreq == null ) 
-    		throw new IllegalArgumentException("VitroRequest  may not be 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.vclassUris = new ArrayList<String>();
-        QuerySolutionMap initBindings = new QuerySolutionMap();
-        initBindings.add("dataGetterURI", ResourceFactory.createResource(this.dataGetterURI));
-        
-        int count = 0;
-        Query dataGetterConfigurationQuery = QueryFactory.create(dataGetterQuery) ;               
-        displayModel.enterCriticalSection(Lock.READ);
-        try{
-            QueryExecution qexec = QueryExecutionFactory.create(
-                    dataGetterConfigurationQuery, displayModel, initBindings) ;        
-            ResultSet res = qexec.execSelect();
-            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();                        
-                    }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();                        
-                    }
-                    if(vclassUriStr != null) {
-                    	this.vclassUris.add(vclassUriStr);
-                    }
-                }
-            }finally{ qexec.close(); }
-        }finally{ displayModel.leaveCriticalSection(); }                
-    }
-    
-
-    //Partially copied from IndividualListController
-    private  Map<String, Object> doSolrQuery( Map<String, String[]> merged) {
-    	if(vclassUris.size() == 0) {
-    		if(merged.containsKey("vclassuri")) {
-    			this.vclassUris = Arrays.asList(merged.get("vclassuri"));
-    		} else {
-    			log.error("No vclass uri found.  Solr 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
-    	if(vclassUris.size() > 0) {
-	    	String vClassURI = vclassUris.get(0);
-	    	//First, get the vclass object
-	    	 VClass vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vClassURI);
-	         if (vclass == null) {
-	             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();  
-             String title;
-             if (classGroup == null) {
-                 title = vclass.getName();
-             } else {
-                 title = classGroup.getPublicName();
-                 body.put("subtitle", vclass.getName());
-             }
-             body.put("title", title);
-             populateSolrQueryResults(vclass, body);
-             body.put("bodyTemplate", this.defaultTemplate);
-    	} else {
-    		log.error("No VClass URIs found.  No query will be executed");
-    	}
-    	return body;
-    }
-
-    private void populateSolrQueryResults(VClass vclass, Map<String, Object> body) {
-        try {
-	    	String alpha = SolrQueryUtils.getAlphaParameter(vreq);
-	        int page = SolrQueryUtils.getPageParameter(vreq);
-	        Map<String,Object> map = IndividualListController.getResultsForVClass(
-	                vclass.getURI(), 
-	                page, 
-	                alpha, 
-	                vreq.getWebappDaoFactory().getIndividualDao(), 
-	                vreq.getSession().getServletContext());                                
-	        body.putAll(map);
-	
-	        @SuppressWarnings("unchecked")
-	        List<Individual> inds = (List<Individual>)map.get("entities");
-	        List<ListedIndividual> indsTm = new ArrayList<ListedIndividual>();
-	        if (inds != null) {
-	            for ( Individual ind : inds ) {
-	                indsTm.add(new ListedIndividual(ind,vreq));
-	            }
-	        }
-	        body.put("individuals", indsTm);    
-	        body.put("rdfUrl", UrlBuilder.getUrl("/listrdf", "vclass", vclass.getURI())); 
-        } catch (SearchException ex) {
-            log.error("Error retrieving results for display.", ex);
-        }
-        catch(Exception ex) {
-        	log.error("Error occurred in retrieving results ", ex);
-        }
-    }
-
-    private static final String saveToVarPropertyURI= "<" + DisplayVocabulary.SAVE_TO_VAR+ ">";
-    private static final String vclassIdPropertyURI= "<" + DisplayVocabulary.VCLASSID+ ">";
-
-
-    public static final String defaultVarNameForResults = "results";
-    
-    /**
-     * Query to get the definition of the Solr individuals data getter for a given URI.
-     */
-    private static final String dataGetterQuery =
-        "PREFIX display: <" + DisplayVocabulary.DISPLAY_NS +"> \n" +
-        "SELECT ?vclassUri ?saveToVar WHERE { \n" +
-        "  OPTIONAL{ ?dataGetterURI "+saveToVarPropertyURI+" ?saveToVar } \n " +
-        "  OPTIONAL{ ?dataGetterURI "+vclassIdPropertyURI+" ?vclassUri } \n " +
-        "}";      
-
-   
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+package edu.cornell.mannlib.vitro.webapp.utils.dataGetter;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.query.Query;
+import com.hp.hpl.jena.query.QueryExecution;
+import com.hp.hpl.jena.query.QueryExecutionFactory;
+import com.hp.hpl.jena.query.QueryFactory;
+import com.hp.hpl.jena.query.QuerySolution;
+import com.hp.hpl.jena.query.QuerySolutionMap;
+import com.hp.hpl.jena.query.ResultSet;
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+import com.hp.hpl.jena.shared.Lock;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController.SearchException;
+import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+import edu.cornell.mannlib.vitro.webapp.utils.solr.SolrQueryUtils;
+import edu.cornell.mannlib.vitro.webapp.web.templatemodels.individuallist.ListedIndividual;
+
+public class SolrIndividualsDataGetter extends DataGetterBase implements DataGetter{    
+    String dataGetterURI;
+    List<String> vclassUris = null;
+    String saveToVar;
+    VitroRequest vreq;
+    ServletContext context;
+    
+    
+    final static Log log = LogFactory.getLog(SolrIndividualsDataGetter.class);
+    //default template
+    private final static String defaultTemplate = "menupage--defaultSolrIndividuals.ftl";
+    
+    /**
+     * Constructor with display model and data getter URI that will be called by reflection.
+     */
+    public SolrIndividualsDataGetter(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) { 
+    	// 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 doSolrQuery( merged);
+    }
+
+    /**
+     * Configure this instance based on the URI and display model.
+     */
+    protected void configure(VitroRequest vreq, Model displayModel, String dataGetterURI) {
+    	if( vreq == null ) 
+    		throw new IllegalArgumentException("VitroRequest  may not be 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.vclassUris = new ArrayList<String>();
+        QuerySolutionMap initBindings = new QuerySolutionMap();
+        initBindings.add("dataGetterURI", ResourceFactory.createResource(this.dataGetterURI));
+        
+        int count = 0;
+        Query dataGetterConfigurationQuery = QueryFactory.create(dataGetterQuery) ;               
+        displayModel.enterCriticalSection(Lock.READ);
+        try{
+            QueryExecution qexec = QueryExecutionFactory.create(
+                    dataGetterConfigurationQuery, displayModel, initBindings) ;        
+            ResultSet res = qexec.execSelect();
+            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();                        
+                    }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();                        
+                    }
+                    if(vclassUriStr != null) {
+                    	this.vclassUris.add(vclassUriStr);
+                    }
+                }
+            }finally{ qexec.close(); }
+        }finally{ displayModel.leaveCriticalSection(); }                
+    }
+    
+
+    //Partially copied from IndividualListController
+    private  Map<String, Object> doSolrQuery( Map<String, String[]> merged) {
+    	if(vclassUris.size() == 0) {
+    		if(merged.containsKey("vclassuri")) {
+    			this.vclassUris = Arrays.asList(merged.get("vclassuri"));
+    		} else {
+    			log.error("No vclass uri found.  Solr 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
+    	if(vclassUris.size() > 0) {
+	    	String vClassURI = vclassUris.get(0);
+	    	//First, get the vclass object
+	    	 VClass vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vClassURI);
+	         if (vclass == null) {
+	             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();  
+             String title;
+             if (classGroup == null) {
+                 title = vclass.getName();
+             } else {
+                 title = classGroup.getPublicName();
+                 body.put("subtitle", vclass.getName());
+             }
+             body.put("title", title);
+             populateSolrQueryResults(vclass, body);
+             body.put("bodyTemplate", this.defaultTemplate);
+    	} else {
+    		log.error("No VClass URIs found.  No query will be executed");
+    	}
+    	return body;
+    }
+
+    private void populateSolrQueryResults(VClass vclass, Map<String, Object> body) {
+        try {
+	    	String alpha = SolrQueryUtils.getAlphaParameter(vreq);
+	        int page = SolrQueryUtils.getPageParameter(vreq);
+	        Map<String,Object> map = IndividualListController.getResultsForVClass(
+	                vclass.getURI(), 
+	                page, 
+	                alpha, 
+	                vreq.getWebappDaoFactory().getIndividualDao(), 
+	                vreq.getSession().getServletContext());                                
+	        body.putAll(map);
+	
+	        @SuppressWarnings("unchecked")
+	        List<Individual> inds = (List<Individual>)map.get("entities");
+	        List<ListedIndividual> indsTm = new ArrayList<ListedIndividual>();
+	        if (inds != null) {
+	            for ( Individual ind : inds ) {
+	                indsTm.add(new ListedIndividual(ind,vreq));
+	            }
+	        }
+	        body.put("individuals", indsTm);    
+	        body.put("rdfUrl", UrlBuilder.getUrl("/listrdf", "vclass", vclass.getURI())); 
+        } catch (SearchException ex) {
+            log.error("Error retrieving results for display.", ex);
+        }
+        catch(Exception ex) {
+        	log.error("Error occurred in retrieving results ", ex);
+        }
+    }
+
+    private static final String saveToVarPropertyURI= "<" + DisplayVocabulary.SAVE_TO_VAR+ ">";
+    private static final String vclassIdPropertyURI= "<" + DisplayVocabulary.VCLASSID+ ">";
+
+
+    public static final String defaultVarNameForResults = "results";
+    
+    /**
+     * Query to get the definition of the Solr individuals data getter for a given URI.
+     */
+    private static final String dataGetterQuery =
+        "PREFIX display: <" + DisplayVocabulary.DISPLAY_NS +"> \n" +
+        "SELECT ?vclassUri ?saveToVar WHERE { \n" +
+        "  OPTIONAL{ ?dataGetterURI "+saveToVarPropertyURI+" ?saveToVar } \n " +
+        "  OPTIONAL{ ?dataGetterURI "+vclassIdPropertyURI+" ?vclassUri } \n " +
+        "}";      
+
+   
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/generators/EditModeUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/generators/EditModeUtils.java
index de7285560..b69b1aebe 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/generators/EditModeUtils.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/generators/EditModeUtils.java
@@ -1,85 +1,85 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.utils.generators;
-
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
-import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils;
-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 
-    	Individual object = EditConfigurationUtils.getObjectIndividual(vreq);
-    	boolean foundErrorMode = false;
-    	int numberEditModes = 0;
-    	int numberRepairModes = 0;
-    	int numberPredicates = possiblePredicates.size();
-    	for(String predicate:possiblePredicates) {
-    		EditMode mode = FrontEndEditingUtils.getEditMode(vreq, object, predicate);
-    		log.debug("Checking edit mode for " + predicate + " and retrieved " + mode.toString());
-    		//Any error  mode should result in error
-    		if(mode == EditMode.ERROR) {
-    			log.debug("Edit mode is error for " + predicate);
-    			foundErrorMode = true;
-    			break;
-    		}
-    		if(mode == EditMode.EDIT) {
-    			log.debug("Edit mode is EDIT for " + predicate);
-    			numberEditModes++;
-    		}
-    		else if(mode == EditMode.REPAIR) {
-    			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) 
-    	{
-    		return EditMode.ERROR;
-    	}
-    	EditMode mode = EditMode.ADD;
-    	//if exactly one edit mode found, then edit mode
-    	if(numberEditModes == 1) {
-    		mode = EditMode.EDIT;
-    	}
-    	//if all modes are repair, this means that all of them have zero statements returning
-    	//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);
-    }
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils.generators;
+
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
+import edu.cornell.mannlib.vitro.webapp.utils.FrontEndEditingUtils;
+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 
+    	Individual object = EditConfigurationUtils.getObjectIndividual(vreq);
+    	boolean foundErrorMode = false;
+    	int numberEditModes = 0;
+    	int numberRepairModes = 0;
+    	int numberPredicates = possiblePredicates.size();
+    	for(String predicate:possiblePredicates) {
+    		EditMode mode = FrontEndEditingUtils.getEditMode(vreq, object, predicate);
+    		log.debug("Checking edit mode for " + predicate + " and retrieved " + mode.toString());
+    		//Any error  mode should result in error
+    		if(mode == EditMode.ERROR) {
+    			log.debug("Edit mode is error for " + predicate);
+    			foundErrorMode = true;
+    			break;
+    		}
+    		if(mode == EditMode.EDIT) {
+    			log.debug("Edit mode is EDIT for " + predicate);
+    			numberEditModes++;
+    		}
+    		else if(mode == EditMode.REPAIR) {
+    			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) 
+    	{
+    		return EditMode.ERROR;
+    	}
+    	EditMode mode = EditMode.ADD;
+    	//if exactly one edit mode found, then edit mode
+    	if(numberEditModes == 1) {
+    		mode = EditMode.EDIT;
+    	}
+    	//if all modes are repair, this means that all of them have zero statements returning
+    	//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/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java
index 5df4b1eae..9e7ebb44a 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/MenuManagementDataUtils.java
@@ -1,28 +1,28 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.utils.menuManagement;
-
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-
-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 
- * parameters, and VIVO will have its own version or extend this
- */
-public class MenuManagementDataUtils {
-    private static final Log log = LogFactory.getLog(MenuManagementDataUtils.class);
-
-    //Data that is to be returned to template that does not involve data getters
-    //e.g. what are the current class groups, etc.
-    public static void includeRequiredSystemData(ServletContext context, Map<String, Object> templateData) {
-    	
-    	
-    }
-    
-
-    
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils.menuManagement;
+
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+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 
+ * parameters, and VIVO will have its own version or extend this
+ */
+public class MenuManagementDataUtils {
+    private static final Log log = LogFactory.getLog(MenuManagementDataUtils.class);
+
+    //Data that is to be returned to template that does not involve data getters
+    //e.g. what are the current class groups, etc.
+    public static void includeRequiredSystemData(ServletContext context, Map<String, Object> templateData) {
+    	
+    	
+    }
+    
+
+    
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessClassGroup.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessClassGroup.java
index 89baf89da..489a2801f 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessClassGroup.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessClassGroup.java
@@ -1,54 +1,54 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.utils.menuManagement;
-
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.jena.vocabulary.RDF;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData;
-import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetterUtils;
-
-/*
- * Handle processing of data retrieved from ClassGroupPage data getter to return to form template
- * and handle processing of form submission to create the appropriate individuals for classes data getter
- */
-public class ProcessClassGroup implements ProcessDataGetter{
-    private static final Log log = LogFactory.getLog(ProcessClassGroup.class);
-
-  //template data represents what needs to be modified and returned to template
-	//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 
-		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, 
-				ResourceFactory.createResource(dataGetterTypeUri)));
-		return dgModel;
-    }
-    
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils.menuManagement;
+
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+import com.hp.hpl.jena.vocabulary.RDF;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData;
+import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetterUtils;
+
+/*
+ * Handle processing of data retrieved from ClassGroupPage data getter to return to form template
+ * and handle processing of form submission to create the appropriate individuals for classes data getter
+ */
+public class ProcessClassGroup implements ProcessDataGetter{
+    private static final Log log = LogFactory.getLog(ProcessClassGroup.class);
+
+  //template data represents what needs to be modified and returned to template
+	//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 
+		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, 
+				ResourceFactory.createResource(dataGetterTypeUri)));
+		return dgModel;
+    }
+    
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessDataGetter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessDataGetter.java
index 49c3e9263..1e36e3796 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessDataGetter.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessDataGetter.java
@@ -1,20 +1,20 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.utils.menuManagement;
-
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.Resource;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-
-public interface ProcessDataGetter{
-    public void populateTemplate(HttpServletRequest req, Map<String, Object> pageData, Map<String, Object> templateData);
-
-    public  Model processSubmission(VitroRequest vreq, Resource dataGetterResource);
-    
-    
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils.menuManagement;
+
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.Resource;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+
+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/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessIndividualsForClasses.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessIndividualsForClasses.java
index 105c4cf0d..7f8f22172 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessIndividualsForClasses.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/ProcessIndividualsForClasses.java
@@ -1,124 +1,124 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.utils.menuManagement;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-import com.hp.hpl.jena.vocabulary.RDF;
-
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
-import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetterUtils;
-import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter;
-
-/*
- * Handle processing of data retrieved from IndividualsForClasses data getter to return to form template
- * and handle processing of form submission to create the appropriate individuals for classes data getter
- */
-public class 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) {
-		initTemplateData(templateData);
-		populateIncludedClasses(pageData, templateData);
-		populateRestrictedClasses(pageData, templateData);
-		//Also save the class group for display
-		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();
-		for(VClass v:classList) {
-			classUris.add(v.getURI());
-		}
-		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
-    //No separate inputs for classes to restrict by yet so check if this includes a subset of classes
-	public boolean useProcessor(VitroRequest vreq) {
-		return(!allClassesSelected(vreq));
-	}
-	@Override
-	public  Model processSubmission(VitroRequest vreq, Resource dataGetterResource) {
-		String[] selectedClasses = vreq.getParameterValues("classInClassGroup");
-		String dataGetterTypeUri = DataGetterUtils.generateDataGetterTypeURI(IndividualsForClassesDataGetter.class.getName());
-		Model dgModel = ModelFactory.createDefaultModel();
-		dgModel.add(dgModel.createStatement(dataGetterResource, 
-				RDF.type, 
-				ResourceFactory.createResource(dataGetterTypeUri)));
-		for(String classUri: selectedClasses) {
-			dgModel.add(dgModel.createStatement(
-					dataGetterResource, 
-					ResourceFactory.createProperty(DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS),
-					ResourceFactory.createResource(classUri)));
-		}
-		
-		//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
-		/*
-		if(restrictionClassesSelected(vreq)) {
-			String[] restrictedClasses = vreq.getParameterValues("restrictedClassUris");
-			for(String restrictedClassUri: restrictedClasses) {
-				dgModel.add(dgModel.createStatement(
-						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
-	/*
-	private  boolean restrictionClassesSelected(VitroRequest vreq) {
-	   String restrictedClasses = vreq.getParameter("restrictedClassUri");
-		return (restrictedClasses != null && !restrictedClasses.isEmpty());
-	}
-	*/		
-		
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils.menuManagement;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+import com.hp.hpl.jena.vocabulary.RDF;
+
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.DisplayVocabulary;
+import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.DataGetterUtils;
+import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter;
+
+/*
+ * Handle processing of data retrieved from IndividualsForClasses data getter to return to form template
+ * and handle processing of form submission to create the appropriate individuals for classes data getter
+ */
+public class 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) {
+		initTemplateData(templateData);
+		populateIncludedClasses(pageData, templateData);
+		populateRestrictedClasses(pageData, templateData);
+		//Also save the class group for display
+		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();
+		for(VClass v:classList) {
+			classUris.add(v.getURI());
+		}
+		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
+    //No separate inputs for classes to restrict by yet so check if this includes a subset of classes
+	public boolean useProcessor(VitroRequest vreq) {
+		return(!allClassesSelected(vreq));
+	}
+	@Override
+	public  Model processSubmission(VitroRequest vreq, Resource dataGetterResource) {
+		String[] selectedClasses = vreq.getParameterValues("classInClassGroup");
+		String dataGetterTypeUri = DataGetterUtils.generateDataGetterTypeURI(IndividualsForClassesDataGetter.class.getName());
+		Model dgModel = ModelFactory.createDefaultModel();
+		dgModel.add(dgModel.createStatement(dataGetterResource, 
+				RDF.type, 
+				ResourceFactory.createResource(dataGetterTypeUri)));
+		for(String classUri: selectedClasses) {
+			dgModel.add(dgModel.createStatement(
+					dataGetterResource, 
+					ResourceFactory.createProperty(DisplayVocabulary.GETINDIVIDUALS_FOR_CLASS),
+					ResourceFactory.createResource(classUri)));
+		}
+		
+		//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
+		/*
+		if(restrictionClassesSelected(vreq)) {
+			String[] restrictedClasses = vreq.getParameterValues("restrictedClassUris");
+			for(String restrictedClassUri: restrictedClasses) {
+				dgModel.add(dgModel.createStatement(
+						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
+	/*
+	private  boolean restrictionClassesSelected(VitroRequest vreq) {
+	   String restrictedClasses = vreq.getParameter("restrictedClassUri");
+		return (restrictedClasses != null && !restrictedClasses.isEmpty());
+	}
+	*/		
+		
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/SelectDataGetterUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/SelectDataGetterUtils.java
index 1190735cb..c14326c6d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/SelectDataGetterUtils.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/menuManagement/SelectDataGetterUtils.java
@@ -1,74 +1,74 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.utils.menuManagement;
-
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Resource;
-
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData;
-import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter;
-
-/*
- * 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 SelectDataGetterUtils {
-    private static final Log log = LogFactory.getLog(SelectDataGetterUtils.class);
-
-    /**Get data for an existing page and set variables for the template accordingly**/
-   
-    
-	public static void processAndRetrieveData(VitroRequest vreq, ServletContext context, Map<String, Object> pageData, String dataGetterClass, Map<String, Object> templateData) {
-		//The type of the data getter will show how to process the data from the data getter
-		ProcessDataGetter processor = selectProcessor(dataGetterClass);
-		processor.populateTemplate(vreq, pageData, templateData);
-	}
-	
-	//This will be different in VIVO than in VITRO
-	private static ProcessDataGetter selectProcessor(String dataGetterClass) {
-		if(dataGetterClass.equals(ClassGroupPageData.class.getName())) {
-			return new ProcessClassGroup();
-		} else if(dataGetterClass.equals(IndividualsForClassesDataGetter.class.getName())) {
-			//below should be for vitro specific version
-			return new ProcessIndividualsForClasses();
-		} 
-		return null;
-	}
-
-	
-    
-
-    /**Process parameters from form and select appropriate data getter on this basis **/   
-    public static Model createDataGetterModel(VitroRequest vreq, Resource dataGetterResource) {
-		Model dataGetterModel = null;
-    	if(dataGetterResource != null) {
-    		//If "All selected" then use class group else use individuals for classes
-    		dataGetterModel = ModelFactory.createDefaultModel();
-    		
-    		ProcessIndividualsForClasses individualsProcess = new ProcessIndividualsForClasses();
-
-    		ProcessClassGroup classGroupProcess = new ProcessClassGroup();
-    		if(individualsProcess.useProcessor(vreq)) {
-    			dataGetterModel = individualsProcess.processSubmission(vreq, dataGetterResource);
-    		} else {
-    			dataGetterModel = classGroupProcess.processSubmission(vreq, dataGetterResource);
-    		}
-    		
-    		
-    	} else {
-    		log.error("Data getter is null ");
-    	}
-    	return dataGetterModel;
-		
-	}
-    
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils.menuManagement;
+
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Resource;
+
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData;
+import edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter;
+
+/*
+ * 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 SelectDataGetterUtils {
+    private static final Log log = LogFactory.getLog(SelectDataGetterUtils.class);
+
+    /**Get data for an existing page and set variables for the template accordingly**/
+   
+    
+	public static void processAndRetrieveData(VitroRequest vreq, ServletContext context, Map<String, Object> pageData, String dataGetterClass, Map<String, Object> templateData) {
+		//The type of the data getter will show how to process the data from the data getter
+		ProcessDataGetter processor = selectProcessor(dataGetterClass);
+		processor.populateTemplate(vreq, pageData, templateData);
+	}
+	
+	//This will be different in VIVO than in VITRO
+	private static ProcessDataGetter selectProcessor(String dataGetterClass) {
+		if(dataGetterClass.equals(ClassGroupPageData.class.getName())) {
+			return new ProcessClassGroup();
+		} else if(dataGetterClass.equals(IndividualsForClassesDataGetter.class.getName())) {
+			//below should be for vitro specific version
+			return new ProcessIndividualsForClasses();
+		} 
+		return null;
+	}
+
+	
+    
+
+    /**Process parameters from form and select appropriate data getter on this basis **/   
+    public static Model createDataGetterModel(VitroRequest vreq, Resource dataGetterResource) {
+		Model dataGetterModel = null;
+    	if(dataGetterResource != null) {
+    		//If "All selected" then use class group else use individuals for classes
+    		dataGetterModel = ModelFactory.createDefaultModel();
+    		
+    		ProcessIndividualsForClasses individualsProcess = new ProcessIndividualsForClasses();
+
+    		ProcessClassGroup classGroupProcess = new ProcessClassGroup();
+    		if(individualsProcess.useProcessor(vreq)) {
+    			dataGetterModel = individualsProcess.processSubmission(vreq, dataGetterResource);
+    		} else {
+    			dataGetterModel = classGroupProcess.processSubmission(vreq, dataGetterResource);
+    		}
+    		
+    		
+    	} else {
+    		log.error("Data getter is null ");
+    	}
+    	return dataGetterModel;
+		
+	}
+    
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/IndividualsForClassesDataGetter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/IndividualsForClassesDataGetter.java
index 3e0fd62b6..902f8ca9d 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/IndividualsForClassesDataGetter.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/IndividualsForClassesDataGetter.java
@@ -1,316 +1,316 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter;
-
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.json.JSONObject;
-
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.dao.PageDao;
-import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupsForRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
-import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateModel;
-
-/**
- * This will pass these variables to the template:
- * classGroupUri: uri of the classgroup associated with this page.
- * vClassGroup: a data structure that is the classgroup associated with this page.     
- */
-public class IndividualsForClassesDataGetter implements PageDataGetter{
-    private static final Log log = LogFactory.getLog(IndividualsForClassesDataGetter.class);
-    protected static String restrictClassesTemplateName = null;
-    @Override
-	public Map<String,Object> getData(ServletContext context, VitroRequest vreq, String pageUri, Map<String, Object> page ){
-        this.setTemplateName();
-    	HashMap<String, Object> data = new HashMap<String,Object>();
-        //This is the old technique of getting class intersections
-        PageDao pageDao = vreq.getWebappDaoFactory().getPageDao();
-        Map<String, Object> classIntersectionsMap = getClassIntersectionsMap(pageDao, pageUri);
-        
-        try{
-        	List<String> classes = retrieveClasses(context, classIntersectionsMap);
-        	List<String> restrictClasses = retrieveRestrictClasses(context, classIntersectionsMap);
-        	log.debug("Retrieving classes for " + classes.toString() + " and restricting by " + restrictClasses.toString());
-        	processClassesAndRestrictions(vreq, context, data, classes, restrictClasses);
-        	 //Also add data service url
-            //Hardcoding for now, need a more dynamic way of doing this
-            data.put("dataServiceUrlIndividualsByVClass", this.getDataServiceUrl());
-            //this is the class group associated with the data getter utilized for display on menu editing, not the custom one created
-            data.put("classGroupUri", pageDao.getClassGroupPage(pageUri));
-        } catch(Exception ex) {
-        	log.error("An error occurred retrieving Vclass Intersection individuals", ex);
-        }
-             
-        return data;
-    }        
-   
-    protected void setTemplateName() {
-    	this.restrictClassesTemplateName = "restricted";
-    }
-    
-    protected Map<String, Object> getClassIntersectionsMap(PageDao pageDao, 
-			String pageUri) {
-		// TODO Auto-generated method stub
-    	return pageDao.getClassesAndRestrictionsForPage(pageUri);
-	}
-    
-    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, 
-    		HashMap<String, Object> data, List<String> classes, List<String> restrictClasses ) {
-    	processClassesForDisplay(vreq, context, data, classes);
-    	processRestrictionClasses(vreq, context, data, restrictClasses);
-    	processIntersections(vreq, context, data);
-    	
-    }
-    
-
-
-	//At this point, data specifices whether or not intersections included
-    private void processIntersections(VitroRequest vreq,
-			ServletContext context, HashMap<String, Object> data) {
-    	VClassGroup classesGroup = (VClassGroup) data.get("vClassGroup");
-    	List<VClass> vclassList = classesGroup.getVitroClassList();
-    	List<VClass> restrictClasses = (List<VClass>) data.get("restrictVClasses");
-    	//if there are restrict classes, then update counts
-    	if(restrictClasses.size() > 0) {
-    		log.debug("Restriction classes exist");
-    		List<VClass> newVClassList = new ArrayList<VClass>();
-    		//Iterate through vclasses and get updated counts, iterated and saved in same order as initially included
-    		for(VClass v: vclassList) {
-    			int oldCount = v.getEntityCount();
-    			//Making a copy so as to ensure we don't touch the values in the cache
-    			VClass copyVClass = makeCopyVClass(v);
-    			int count = retrieveCount(vreq, context, v, restrictClasses);
-    			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);
-    		//TODO: Do we need to do this again or will this already be reset?
-    		data.put("vClassGroup", classesGroup);
-    	}
-	}
-
-    private VClass makeCopyVClass(VClass v) {
-    	VClass copyVClass = new VClass(v.getURI());
-		copyVClass.setLocalName(copyVClass.getLocalName());
-		copyVClass.setDisplayRank(v.getDisplayRank());
-		copyVClass.setName(v.getName());
-		copyVClass.setNamespace(v.getNamespace());
-		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 solr query that returns only count of individuals
-		log.debug("Entity count is " + v.getEntityCount());
-		List<String> classUris = new ArrayList<String>();
-		classUris.add(v.getURI());
-		for(VClass r: restrictClasses) {
-			classUris.add(r.getURI());
-		}
-		long count =  PageDataGetterUtils.getIndividualCountForIntersection(vreq, context, classUris);
-		return new Long(count).intValue();
-
-	}
-
-	private void processClassesForDisplay(VitroRequest vreq, ServletContext context, HashMap<String, Object> data, List<String> classes) {
-    	VClassGroup classesGroup = new VClassGroup();
-    	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
-    		VClass vclass = vcgc.getCachedVClass(classUri);
-    		//if not found in cache, possibly due to not being in any class group
-			if(vclass == null) {
-				vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(classUri);
-			}
-    		if(vclass != null) {
-    			log.debug("VClass does exist for " + classUri + " and entity count is " + vclass.getEntityCount());
-    			vClasses.add(vclass);
-    		} else {
-    			log.debug("Vclass " + classUri + " does not exist in the cache");
-    			log.error("Error occurred, vclass does not exist for this uri " + classUri);
-    			//Throw exception here
-    		}
-    	}
-    	//Sort these classes
-    	Collections.sort(vClasses);
-    	log.debug("Sorting complete for V Classes");
-    	classesGroup.setVitroClassList(vClasses);
-    	log.debug("Returning vitro class list in data for template");
-    	//Set vclass group
-    	data.put("vClassGroup", classesGroup);
-    }	
-    
-    private void processRestrictionClasses(VitroRequest vreq, ServletContext context, 
-    		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);
-
-	    	if(restrictClasses.size() > 0) {
-	    		//classes for restriction are not displayed so don't need to include their class individual counts
-	    		for(String restrictClassUri: restrictClasses) {
-	    			//Also uses cache to remain consistent with process classes and also allow
-	    			//vclasses to be returned even if switched to display model, although
-	    			//uris used within display model editing and not vclass objects
-	    			VClass vclass = vcgc.getCachedVClass(restrictClassUri);
-	    			//if not found in cache, possibly due to not being in any class group
-	    			if(vclass == null) {
-	    				vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(restrictClassUri);
-	    			}
-	        		if(vclass != null) {
-	        			log.debug("Found restrict class and adding to list " + restrictClassUri);
-	        			restrictVClasses.add(vclass);
-	        		} else {
-	        			log.error("Error occurred, vclass does not exist for this uri " + restrictClassUri);
-	        		}
-	        		//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, ","));
-	    	data.put("restrictVClasses", restrictVClasses);
-	    	//not sure if this is useful
-	    	data.put("restrictVClassGroup", restrictClassesGroup);
-    	} catch(Exception ex) {
-    		log.error("An error occurred in processing restriction classes ", ex);
-    	}
-    }
-    
-    public static VClassGroupTemplateModel getClassGroup(String classGroupUri, ServletContext context, VitroRequest vreq){
-        
-        VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
-        List<VClassGroup> vcgList = vcgc.getGroups();
-        VClassGroup group = null;
-        for( VClassGroup vcg : vcgList){
-            if( vcg.getURI() != null && vcg.getURI().equals(classGroupUri)){
-                group = vcg;
-                break;
-            }
-        }
-        
-        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);
-            if( group != null ){
-                List<VClassGroup> vcgFullList = vreq.getWebappDaoFactory().getVClassGroupDao()
-                    .getPublicGroupsWithVClasses(false, true, false);
-                for( VClassGroup vcg : vcgFullList ){
-                    if( classGroupUri.equals(vcg.getURI()) ){
-                        group = vcg;
-                        break;
-                    }                                
-                }
-                if( group == null ){
-                    log.error("Cannot get classgroup '" + classGroupUri + "'");
-                    return null;
-                }else{
-                    setAllClassCountsToZero(group);
-                }
-            }else{
-                log.error("classgroup " + classGroupUri + " does not exist in the system");
-                return null;
-            }            
-        }
-        
-        return new VClassGroupTemplateModel(group);
-    }
-    
-    @Override
-	public String getType(){
-        return PageDataGetterUtils.generateDataGetterTypeURI(IndividualsForClassesDataGetter.class.getName());
-    } 
-    
-    //Get data servuice
-    @Override
-	public String getDataServiceUrl() {
-    	return UrlBuilder.getUrl("/dataservice?getSolrIndividualsByVClasses=1&vclassId=");
-    }
-    /**
-     * For processig of JSONObject
-     */
-    @Override
-	public JSONObject convertToJSON(Map<String, Object> map, VitroRequest vreq) {
-    	JSONObject rObj = PageDataGetterUtils.processVclassResultsJSON(map, vreq, true);
-    	return rObj;
-    }
-    
-    protected static void setAllClassCountsToZero(VClassGroup vcg){
-        for(VClass vc : vcg){
-            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);                
-            }catch(NumberFormatException nfe){
-                log.debug("could not parse page parameter");
-                return 1;
-            }                
-        }else{                   
-            return 1;
-        }
-    }
-    
-    //Get template parameter
-    private static String getRestrictClassesTemplateName() {
-    	return restrictClassesTemplateName;
-
-    }
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter;
+
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONObject;
+
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.dao.PageDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupsForRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
+import edu.cornell.mannlib.vitro.webapp.web.templatemodels.VClassGroupTemplateModel;
+
+/**
+ * This will pass these variables to the template:
+ * classGroupUri: uri of the classgroup associated with this page.
+ * vClassGroup: a data structure that is the classgroup associated with this page.     
+ */
+public class IndividualsForClassesDataGetter implements PageDataGetter{
+    private static final Log log = LogFactory.getLog(IndividualsForClassesDataGetter.class);
+    protected static String restrictClassesTemplateName = null;
+    @Override
+	public Map<String,Object> getData(ServletContext context, VitroRequest vreq, String pageUri, Map<String, Object> page ){
+        this.setTemplateName();
+    	HashMap<String, Object> data = new HashMap<String,Object>();
+        //This is the old technique of getting class intersections
+        PageDao pageDao = vreq.getWebappDaoFactory().getPageDao();
+        Map<String, Object> classIntersectionsMap = getClassIntersectionsMap(pageDao, pageUri);
+        
+        try{
+        	List<String> classes = retrieveClasses(context, classIntersectionsMap);
+        	List<String> restrictClasses = retrieveRestrictClasses(context, classIntersectionsMap);
+        	log.debug("Retrieving classes for " + classes.toString() + " and restricting by " + restrictClasses.toString());
+        	processClassesAndRestrictions(vreq, context, data, classes, restrictClasses);
+        	 //Also add data service url
+            //Hardcoding for now, need a more dynamic way of doing this
+            data.put("dataServiceUrlIndividualsByVClass", this.getDataServiceUrl());
+            //this is the class group associated with the data getter utilized for display on menu editing, not the custom one created
+            data.put("classGroupUri", pageDao.getClassGroupPage(pageUri));
+        } catch(Exception ex) {
+        	log.error("An error occurred retrieving Vclass Intersection individuals", ex);
+        }
+             
+        return data;
+    }        
+   
+    protected void setTemplateName() {
+    	this.restrictClassesTemplateName = "restricted";
+    }
+    
+    protected Map<String, Object> getClassIntersectionsMap(PageDao pageDao, 
+			String pageUri) {
+		// TODO Auto-generated method stub
+    	return pageDao.getClassesAndRestrictionsForPage(pageUri);
+	}
+    
+    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, 
+    		HashMap<String, Object> data, List<String> classes, List<String> restrictClasses ) {
+    	processClassesForDisplay(vreq, context, data, classes);
+    	processRestrictionClasses(vreq, context, data, restrictClasses);
+    	processIntersections(vreq, context, data);
+    	
+    }
+    
+
+
+	//At this point, data specifices whether or not intersections included
+    private void processIntersections(VitroRequest vreq,
+			ServletContext context, HashMap<String, Object> data) {
+    	VClassGroup classesGroup = (VClassGroup) data.get("vClassGroup");
+    	List<VClass> vclassList = classesGroup.getVitroClassList();
+    	List<VClass> restrictClasses = (List<VClass>) data.get("restrictVClasses");
+    	//if there are restrict classes, then update counts
+    	if(restrictClasses.size() > 0) {
+    		log.debug("Restriction classes exist");
+    		List<VClass> newVClassList = new ArrayList<VClass>();
+    		//Iterate through vclasses and get updated counts, iterated and saved in same order as initially included
+    		for(VClass v: vclassList) {
+    			int oldCount = v.getEntityCount();
+    			//Making a copy so as to ensure we don't touch the values in the cache
+    			VClass copyVClass = makeCopyVClass(v);
+    			int count = retrieveCount(vreq, context, v, restrictClasses);
+    			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);
+    		//TODO: Do we need to do this again or will this already be reset?
+    		data.put("vClassGroup", classesGroup);
+    	}
+	}
+
+    private VClass makeCopyVClass(VClass v) {
+    	VClass copyVClass = new VClass(v.getURI());
+		copyVClass.setLocalName(copyVClass.getLocalName());
+		copyVClass.setDisplayRank(v.getDisplayRank());
+		copyVClass.setName(v.getName());
+		copyVClass.setNamespace(v.getNamespace());
+		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 solr query that returns only count of individuals
+		log.debug("Entity count is " + v.getEntityCount());
+		List<String> classUris = new ArrayList<String>();
+		classUris.add(v.getURI());
+		for(VClass r: restrictClasses) {
+			classUris.add(r.getURI());
+		}
+		long count =  PageDataGetterUtils.getIndividualCountForIntersection(vreq, context, classUris);
+		return new Long(count).intValue();
+
+	}
+
+	private void processClassesForDisplay(VitroRequest vreq, ServletContext context, HashMap<String, Object> data, List<String> classes) {
+    	VClassGroup classesGroup = new VClassGroup();
+    	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
+    		VClass vclass = vcgc.getCachedVClass(classUri);
+    		//if not found in cache, possibly due to not being in any class group
+			if(vclass == null) {
+				vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(classUri);
+			}
+    		if(vclass != null) {
+    			log.debug("VClass does exist for " + classUri + " and entity count is " + vclass.getEntityCount());
+    			vClasses.add(vclass);
+    		} else {
+    			log.debug("Vclass " + classUri + " does not exist in the cache");
+    			log.error("Error occurred, vclass does not exist for this uri " + classUri);
+    			//Throw exception here
+    		}
+    	}
+    	//Sort these classes
+    	Collections.sort(vClasses);
+    	log.debug("Sorting complete for V Classes");
+    	classesGroup.setVitroClassList(vClasses);
+    	log.debug("Returning vitro class list in data for template");
+    	//Set vclass group
+    	data.put("vClassGroup", classesGroup);
+    }	
+    
+    private void processRestrictionClasses(VitroRequest vreq, ServletContext context, 
+    		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);
+
+	    	if(restrictClasses.size() > 0) {
+	    		//classes for restriction are not displayed so don't need to include their class individual counts
+	    		for(String restrictClassUri: restrictClasses) {
+	    			//Also uses cache to remain consistent with process classes and also allow
+	    			//vclasses to be returned even if switched to display model, although
+	    			//uris used within display model editing and not vclass objects
+	    			VClass vclass = vcgc.getCachedVClass(restrictClassUri);
+	    			//if not found in cache, possibly due to not being in any class group
+	    			if(vclass == null) {
+	    				vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(restrictClassUri);
+	    			}
+	        		if(vclass != null) {
+	        			log.debug("Found restrict class and adding to list " + restrictClassUri);
+	        			restrictVClasses.add(vclass);
+	        		} else {
+	        			log.error("Error occurred, vclass does not exist for this uri " + restrictClassUri);
+	        		}
+	        		//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, ","));
+	    	data.put("restrictVClasses", restrictVClasses);
+	    	//not sure if this is useful
+	    	data.put("restrictVClassGroup", restrictClassesGroup);
+    	} catch(Exception ex) {
+    		log.error("An error occurred in processing restriction classes ", ex);
+    	}
+    }
+    
+    public static VClassGroupTemplateModel getClassGroup(String classGroupUri, ServletContext context, VitroRequest vreq){
+        
+        VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(vreq);
+        List<VClassGroup> vcgList = vcgc.getGroups();
+        VClassGroup group = null;
+        for( VClassGroup vcg : vcgList){
+            if( vcg.getURI() != null && vcg.getURI().equals(classGroupUri)){
+                group = vcg;
+                break;
+            }
+        }
+        
+        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);
+            if( group != null ){
+                List<VClassGroup> vcgFullList = vreq.getWebappDaoFactory().getVClassGroupDao()
+                    .getPublicGroupsWithVClasses(false, true, false);
+                for( VClassGroup vcg : vcgFullList ){
+                    if( classGroupUri.equals(vcg.getURI()) ){
+                        group = vcg;
+                        break;
+                    }                                
+                }
+                if( group == null ){
+                    log.error("Cannot get classgroup '" + classGroupUri + "'");
+                    return null;
+                }else{
+                    setAllClassCountsToZero(group);
+                }
+            }else{
+                log.error("classgroup " + classGroupUri + " does not exist in the system");
+                return null;
+            }            
+        }
+        
+        return new VClassGroupTemplateModel(group);
+    }
+    
+    @Override
+	public String getType(){
+        return PageDataGetterUtils.generateDataGetterTypeURI(IndividualsForClassesDataGetter.class.getName());
+    } 
+    
+    //Get data servuice
+    @Override
+	public String getDataServiceUrl() {
+    	return UrlBuilder.getUrl("/dataservice?getSolrIndividualsByVClasses=1&vclassId=");
+    }
+    /**
+     * For processig of JSONObject
+     */
+    @Override
+	public JSONObject convertToJSON(Map<String, Object> map, VitroRequest vreq) {
+    	JSONObject rObj = PageDataGetterUtils.processVclassResultsJSON(map, vreq, true);
+    	return rObj;
+    }
+    
+    protected static void setAllClassCountsToZero(VClassGroup vcg){
+        for(VClass vc : vcg){
+            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);                
+            }catch(NumberFormatException nfe){
+                log.debug("could not parse page parameter");
+                return 1;
+            }                
+        }else{                   
+            return 1;
+        }
+    }
+    
+    //Get template parameter
+    private static String getRestrictClassesTemplateName() {
+    	return restrictClassesTemplateName;
+
+    }
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/PageDataGetterUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/PageDataGetterUtils.java
index c02edbe85..94dd8d378 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/PageDataGetterUtils.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/PageDataGetterUtils.java
@@ -1,339 +1,339 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter;
-
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.json.JSONArray;
-import org.json.JSONObject;
-
-import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
-import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController.PageRecord;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
-import edu.cornell.mannlib.vitro.webapp.controller.json.JsonServlet;
-import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupsForRequest;
-import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
-
-public class PageDataGetterUtils {
-    protected static final String DATA_GETTER_MAP = "pageTypeToDataGetterMap";
-    private static final Log log = LogFactory.getLog(PageDataGetterUtils.class);
-
-    public static Map<String,Object> getDataForPage(String pageUri, VitroRequest vreq, ServletContext context) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
-        //Based on page type get the appropriate data getter
-        Map<String, Object> page = vreq.getWebappDaoFactory().getPageDao().getPage(pageUri);        
-        
-        Map<String,Object> data = new HashMap<String,Object>();
-        List<PageDataGetter> dataGetters = getPageDataGetterObjects(vreq, pageUri);
-        for(PageDataGetter getter: dataGetters) {
-            try{
-                Map<String,Object> moreData = null;
-                moreData = getAdditionalData(pageUri, getter.getType(), page, vreq, getter, context);
-                if( moreData != null)
-                    data.putAll(moreData);
-            }catch(Throwable th){
-                log.error(th,th);
-            } 
-        }
-        return data;
-    }
-
-    /**
-     * 
-     * 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?
-     * @throws ClassNotFoundException 
-     * @throws IllegalAccessException 
-     * @throws InstantiationException 
-     */
-    public static JSONObject covertDataToJSONForPage(String pageUri, Map<String, Object> data, VitroRequest vreq, ServletContext context) throws InstantiationException, IllegalAccessException, ClassNotFoundException {       
-        //Get PageDataGetter types associated with pageUri
-        JSONObject rObj = null;        
-        List<PageDataGetter> dataGetters = getPageDataGetterObjects(vreq, pageUri);
-        for(PageDataGetter getter: dataGetters) {
-        	 JSONObject typeObj = null;
-             try{
-                 typeObj = getter.convertToJSON(data, vreq);
-                 if( typeObj != null) {
-                     //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
-                         rObj.put(getter.getType(), typeObj);
-                     } else {
-                         rObj = typeObj;
-                     }
-                 }      
-        	
-            } catch(Throwable th){
-                log.error(th,th);
-            }
-        }     
-        return rObj;
-    }
-    
-    public static Map<String,Object> getAdditionalData(
-            String pageUri, String dataGetterName, Map<String, Object> page, VitroRequest vreq, PageDataGetter getter, ServletContext context) {        
-        if(dataGetterName == null || dataGetterName.isEmpty())
-            return Collections.emptyMap();
-           
-      
-        if( getter != null ){
-            try{
-            	log.debug("Retrieve data for this data getter for " + pageUri);
-                return getter.getData(context, vreq, pageUri, page);
-            }catch(Throwable th){
-                log.error(th,th);
-                return Collections.emptyMap();
-            }
-        } else {
-            return Collections.emptyMap();
-        }
-    }
-    
-    /***
-     * For the page, get the actual Data Getters to be employed.
-     * @throws ClassNotFoundException 
-     * @throws IllegalAccessException 
-     * @throws InstantiationException 
-     */
-    public static List<PageDataGetter> getPageDataGetterObjects(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( PageDataGetter.class.isAssignableFrom(clz)){    		        		
-    		    PageDataGetter pg = (PageDataGetter) clz.newInstance();
-    		    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:")) {
-    		String[] splitArray = dataGetterClassUri.split("java:");
-    		if(splitArray.length > 1) {
-    			return splitArray[1];
-    		}
-    	}
-    	return dataGetterClassUri;
-    }
-    
-    /**
-     * Get Individual count for Solr query for intersection of multiple classes
-     */
-    public static long getIndividualCountForIntersection(VitroRequest vreq, ServletContext context, List<String> classUris) {
-    	 return IndividualListController.getIndividualCount(classUris, vreq.getWebappDaoFactory().getIndividualDao(), context);
-    }
-    
-    
-    /**
-     * Process results related to VClass or vclasses. Handles both single and multiple vclasses being sent.
-     */
-    public static JSONObject processVclassResultsJSON(Map<String, Object> map, VitroRequest vreq, boolean multipleVclasses) {
-        JSONObject rObj = new JSONObject();
-        VClass vclass=null;         
-        
-        try { 
-              
-            // Properties from ontologies used by VIVO - should not be in vitro
-            DataProperty fNameDp = (new DataProperty());                         
-            fNameDp.setURI("http://xmlns.com/foaf/0.1/firstName");
-            DataProperty lNameDp = (new DataProperty());
-            lNameDp.setURI("http://xmlns.com/foaf/0.1/lastName");
-            DataProperty preferredTitleDp = (new DataProperty());
-            preferredTitleDp.setURI("http://vivoweb.org/ontology/core#preferredTitle");
-              
-            if( log.isDebugEnabled() ){
-                @SuppressWarnings("unchecked")
-                Enumeration<String> e = vreq.getParameterNames();
-                while(e.hasMoreElements()){
-                    String name = e.nextElement();
-                    log.debug("parameter: " + name);
-                    for( String value : vreq.getParameterValues(name) ){
-                        log.debug("value for " + name + ": '" + value + "'");
-                    }            
-                }
-            }
-              
-            //need an unfiltered dao to get firstnames and lastnames
-            WebappDaoFactory fullWdf = vreq.getUnfilteredWebappDaoFactory();
-                      
-            String[] vitroClassIdStr = vreq.getParameterValues("vclassId");                            
-            if ( vitroClassIdStr != null && vitroClassIdStr.length > 0){    
-                for(String vclassId: vitroClassIdStr) {
-                    vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vclassId);
-                    if (vclass == null) {
-                        log.error("Couldn't retrieve vclass ");   
-                        throw new Exception ("Class " + vclassId + " not found");
-                    }  
-                  }
-            }else{
-                log.error("parameter vclassId URI parameter expected ");
-                throw new Exception("parameter vclassId URI parameter expected ");
-            }
-            List<String> vclassIds = Arrays.asList(vitroClassIdStr);                           
-            //if single vclass expected, then include vclass. This relates to what the expected behavior is, not size of list 
-            if(!multipleVclasses) {
-                //currently used for ClassGroupPage
-                rObj.put("vclass", 
-                          new JSONObject().put("URI",vclass.getURI())
-                                  .put("name",vclass.getName()));
-            } else {
-                //For now, utilize very last VClass (assume that that is the one to be employed)
-                //TODO: Find more general way of dealing with this
-                //put multiple ones in?
-                if(vclassIds.size() > 0) {
-                	int numberVClasses = vclassIds.size();
-                    vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vclassIds.get(numberVClasses - 1));
-                    rObj.put("vclass", new JSONObject().put("URI",vclass.getURI())
-                              .put("name",vclass.getName()));
-                } 
-                // rObj.put("vclasses",  new JSONObject().put("URIs",vitroClassIdStr)
-                //                .put("name",vclass.getName()));
-            }
-            if (vclass != null) {                                    
-                  
-                rObj.put("totalCount", map.get("totalCount"));
-                rObj.put("alpha", map.get("alpha"));
-                                  
-                List<Individual> inds = (List<Individual>)map.get("entities");
-                log.debug("Number of individuals returned from request: " + inds.size());
-                JSONArray jInds = new JSONArray();
-                for(Individual ind : inds ){
-                    JSONObject jo = new JSONObject();
-                    jo.put("URI", ind.getURI());
-                    jo.put("label",ind.getRdfsLabel());
-                    jo.put("name",ind.getName());
-                    jo.put("thumbUrl", ind.getThumbUrl());
-                    jo.put("imageUrl", ind.getImageUrl());
-                    jo.put("profileUrl", UrlBuilder.getIndividualProfileUrl(ind, vreq));
-                      
-                    jo.put("mostSpecificTypes", JsonServlet.getMostSpecificTypes(ind,fullWdf));                                          
-                    jo.put("preferredTitle", JsonServlet.getDataPropertyValue(ind, preferredTitleDp, fullWdf));                    
-                      
-                    jInds.put(jo);
-                }
-                rObj.put("individuals", jInds);
-                  
-                JSONArray wpages = new JSONArray();
-                //Made sure that PageRecord here is SolrIndividualListController not IndividualListController
-                List<PageRecord> pages = (List<PageRecord>)map.get("pages");                
-                for( PageRecord pr: pages ){                    
-                    JSONObject p = new JSONObject();
-                    p.put("text", pr.text);
-                    p.put("param", pr.param);
-                    p.put("index", pr.index);
-                    wpages.put( p );
-                }
-                rObj.put("pages",wpages);    
-                  
-                JSONArray jletters = new JSONArray();
-                List<String> letters = Controllers.getLetters();
-                for( String s : letters){
-                    JSONObject jo = new JSONObject();
-                    jo.put("text", s);
-                    jo.put("param", "alpha=" + URLEncoder.encode(s, "UTF-8"));
-                    jletters.put( jo );
-                }
-                rObj.put("letters", jletters);
-            }            
-        } catch(Exception ex) {
-             log.error("Error occurred in processing JSON object", ex);
-        }
-        return rObj;
-    }
-    
-    /*
-     * Copied from JSONServlet as expect this to be related to VitroClassGroup
-     */
-    public static JSONObject processVClassGroupJSON(VitroRequest vreq, ServletContext context, VClassGroup vcg) {
-        JSONObject map = new JSONObject();           
-        try {
-            ArrayList<JSONObject> classes = new ArrayList<JSONObject>(vcg.size());
-            for( VClass vc : vcg){
-                JSONObject vcObj = new JSONObject();
-                vcObj.put("name", vc.getName());
-                vcObj.put("URI", vc.getURI());
-                vcObj.put("entityCount", vc.getEntityCount());
-                classes.add(vcObj);
-            }
-            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;        
-    }
-    
-	
-    //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 
-    	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
-        //results in errors for some reason
-        List<HashMap<String, String>> classGroups = new ArrayList<HashMap<String, String>>();
-        for(VClassGroup vcg: vcgList) {
-        	HashMap<String, String> hs = new HashMap<String, String>();
-        	hs.put("publicName", vcg.getPublicName());
-        	hs.put("URI", vcg.getURI());
-        	classGroups.add(hs);
-        }
-        return classGroups;
-    }
-    
-    //Return data getter type to be employed in display model
-    public static String generateDataGetterTypeURI(String dataGetterClassName) {
-    	return "java:" + dataGetterClassName;
-    }
-    
-   //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"
-	public static void getClassGroupForDataGetter(HttpServletRequest req, Map<String, Object> pageData, Map<String, Object> templateData) {
-    	//Get the class group from VClassGroup, this is the same as the class group for the class group page data getter
-		//and the associated class group (not custom) for individuals datagetter
-		String classGroupUri = (String) pageData.get("classGroupUri");
-		VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(req);
-    	VClassGroup group = vcgc.getGroup(classGroupUri);
-
-		templateData.put("classGroup", group);
-		templateData.put("associatedPage", group.getPublicName());
-		templateData.put("associatedPageURI", group.getURI());
-    }
-    
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter;
+
+import java.net.URLEncoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
+import edu.cornell.mannlib.vitro.webapp.controller.Controllers;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.IndividualListController.PageRecord;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder;
+import edu.cornell.mannlib.vitro.webapp.controller.json.JsonServlet;
+import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupsForRequest;
+import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache;
+
+public class PageDataGetterUtils {
+    protected static final String DATA_GETTER_MAP = "pageTypeToDataGetterMap";
+    private static final Log log = LogFactory.getLog(PageDataGetterUtils.class);
+
+    public static Map<String,Object> getDataForPage(String pageUri, VitroRequest vreq, ServletContext context) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
+        //Based on page type get the appropriate data getter
+        Map<String, Object> page = vreq.getWebappDaoFactory().getPageDao().getPage(pageUri);        
+        
+        Map<String,Object> data = new HashMap<String,Object>();
+        List<PageDataGetter> dataGetters = getPageDataGetterObjects(vreq, pageUri);
+        for(PageDataGetter getter: dataGetters) {
+            try{
+                Map<String,Object> moreData = null;
+                moreData = getAdditionalData(pageUri, getter.getType(), page, vreq, getter, context);
+                if( moreData != null)
+                    data.putAll(moreData);
+            }catch(Throwable th){
+                log.error(th,th);
+            } 
+        }
+        return data;
+    }
+
+    /**
+     * 
+     * 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?
+     * @throws ClassNotFoundException 
+     * @throws IllegalAccessException 
+     * @throws InstantiationException 
+     */
+    public static JSONObject covertDataToJSONForPage(String pageUri, Map<String, Object> data, VitroRequest vreq, ServletContext context) throws InstantiationException, IllegalAccessException, ClassNotFoundException {       
+        //Get PageDataGetter types associated with pageUri
+        JSONObject rObj = null;        
+        List<PageDataGetter> dataGetters = getPageDataGetterObjects(vreq, pageUri);
+        for(PageDataGetter getter: dataGetters) {
+        	 JSONObject typeObj = null;
+             try{
+                 typeObj = getter.convertToJSON(data, vreq);
+                 if( typeObj != null) {
+                     //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
+                         rObj.put(getter.getType(), typeObj);
+                     } else {
+                         rObj = typeObj;
+                     }
+                 }      
+        	
+            } catch(Throwable th){
+                log.error(th,th);
+            }
+        }     
+        return rObj;
+    }
+    
+    public static Map<String,Object> getAdditionalData(
+            String pageUri, String dataGetterName, Map<String, Object> page, VitroRequest vreq, PageDataGetter getter, ServletContext context) {        
+        if(dataGetterName == null || dataGetterName.isEmpty())
+            return Collections.emptyMap();
+           
+      
+        if( getter != null ){
+            try{
+            	log.debug("Retrieve data for this data getter for " + pageUri);
+                return getter.getData(context, vreq, pageUri, page);
+            }catch(Throwable th){
+                log.error(th,th);
+                return Collections.emptyMap();
+            }
+        } else {
+            return Collections.emptyMap();
+        }
+    }
+    
+    /***
+     * For the page, get the actual Data Getters to be employed.
+     * @throws ClassNotFoundException 
+     * @throws IllegalAccessException 
+     * @throws InstantiationException 
+     */
+    public static List<PageDataGetter> getPageDataGetterObjects(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( PageDataGetter.class.isAssignableFrom(clz)){    		        		
+    		    PageDataGetter pg = (PageDataGetter) clz.newInstance();
+    		    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:")) {
+    		String[] splitArray = dataGetterClassUri.split("java:");
+    		if(splitArray.length > 1) {
+    			return splitArray[1];
+    		}
+    	}
+    	return dataGetterClassUri;
+    }
+    
+    /**
+     * Get Individual count for Solr query for intersection of multiple classes
+     */
+    public static long getIndividualCountForIntersection(VitroRequest vreq, ServletContext context, List<String> classUris) {
+    	 return IndividualListController.getIndividualCount(classUris, vreq.getWebappDaoFactory().getIndividualDao(), context);
+    }
+    
+    
+    /**
+     * Process results related to VClass or vclasses. Handles both single and multiple vclasses being sent.
+     */
+    public static JSONObject processVclassResultsJSON(Map<String, Object> map, VitroRequest vreq, boolean multipleVclasses) {
+        JSONObject rObj = new JSONObject();
+        VClass vclass=null;         
+        
+        try { 
+              
+            // Properties from ontologies used by VIVO - should not be in vitro
+            DataProperty fNameDp = (new DataProperty());                         
+            fNameDp.setURI("http://xmlns.com/foaf/0.1/firstName");
+            DataProperty lNameDp = (new DataProperty());
+            lNameDp.setURI("http://xmlns.com/foaf/0.1/lastName");
+            DataProperty preferredTitleDp = (new DataProperty());
+            preferredTitleDp.setURI("http://vivoweb.org/ontology/core#preferredTitle");
+              
+            if( log.isDebugEnabled() ){
+                @SuppressWarnings("unchecked")
+                Enumeration<String> e = vreq.getParameterNames();
+                while(e.hasMoreElements()){
+                    String name = e.nextElement();
+                    log.debug("parameter: " + name);
+                    for( String value : vreq.getParameterValues(name) ){
+                        log.debug("value for " + name + ": '" + value + "'");
+                    }            
+                }
+            }
+              
+            //need an unfiltered dao to get firstnames and lastnames
+            WebappDaoFactory fullWdf = vreq.getUnfilteredWebappDaoFactory();
+                      
+            String[] vitroClassIdStr = vreq.getParameterValues("vclassId");                            
+            if ( vitroClassIdStr != null && vitroClassIdStr.length > 0){    
+                for(String vclassId: vitroClassIdStr) {
+                    vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vclassId);
+                    if (vclass == null) {
+                        log.error("Couldn't retrieve vclass ");   
+                        throw new Exception ("Class " + vclassId + " not found");
+                    }  
+                  }
+            }else{
+                log.error("parameter vclassId URI parameter expected ");
+                throw new Exception("parameter vclassId URI parameter expected ");
+            }
+            List<String> vclassIds = Arrays.asList(vitroClassIdStr);                           
+            //if single vclass expected, then include vclass. This relates to what the expected behavior is, not size of list 
+            if(!multipleVclasses) {
+                //currently used for ClassGroupPage
+                rObj.put("vclass", 
+                          new JSONObject().put("URI",vclass.getURI())
+                                  .put("name",vclass.getName()));
+            } else {
+                //For now, utilize very last VClass (assume that that is the one to be employed)
+                //TODO: Find more general way of dealing with this
+                //put multiple ones in?
+                if(vclassIds.size() > 0) {
+                	int numberVClasses = vclassIds.size();
+                    vclass = vreq.getWebappDaoFactory().getVClassDao().getVClassByURI(vclassIds.get(numberVClasses - 1));
+                    rObj.put("vclass", new JSONObject().put("URI",vclass.getURI())
+                              .put("name",vclass.getName()));
+                } 
+                // rObj.put("vclasses",  new JSONObject().put("URIs",vitroClassIdStr)
+                //                .put("name",vclass.getName()));
+            }
+            if (vclass != null) {                                    
+                  
+                rObj.put("totalCount", map.get("totalCount"));
+                rObj.put("alpha", map.get("alpha"));
+                                  
+                List<Individual> inds = (List<Individual>)map.get("entities");
+                log.debug("Number of individuals returned from request: " + inds.size());
+                JSONArray jInds = new JSONArray();
+                for(Individual ind : inds ){
+                    JSONObject jo = new JSONObject();
+                    jo.put("URI", ind.getURI());
+                    jo.put("label",ind.getRdfsLabel());
+                    jo.put("name",ind.getName());
+                    jo.put("thumbUrl", ind.getThumbUrl());
+                    jo.put("imageUrl", ind.getImageUrl());
+                    jo.put("profileUrl", UrlBuilder.getIndividualProfileUrl(ind, vreq));
+                      
+                    jo.put("mostSpecificTypes", JsonServlet.getMostSpecificTypes(ind,fullWdf));                                          
+                    jo.put("preferredTitle", JsonServlet.getDataPropertyValue(ind, preferredTitleDp, fullWdf));                    
+                      
+                    jInds.put(jo);
+                }
+                rObj.put("individuals", jInds);
+                  
+                JSONArray wpages = new JSONArray();
+                //Made sure that PageRecord here is SolrIndividualListController not IndividualListController
+                List<PageRecord> pages = (List<PageRecord>)map.get("pages");                
+                for( PageRecord pr: pages ){                    
+                    JSONObject p = new JSONObject();
+                    p.put("text", pr.text);
+                    p.put("param", pr.param);
+                    p.put("index", pr.index);
+                    wpages.put( p );
+                }
+                rObj.put("pages",wpages);    
+                  
+                JSONArray jletters = new JSONArray();
+                List<String> letters = Controllers.getLetters();
+                for( String s : letters){
+                    JSONObject jo = new JSONObject();
+                    jo.put("text", s);
+                    jo.put("param", "alpha=" + URLEncoder.encode(s, "UTF-8"));
+                    jletters.put( jo );
+                }
+                rObj.put("letters", jletters);
+            }            
+        } catch(Exception ex) {
+             log.error("Error occurred in processing JSON object", ex);
+        }
+        return rObj;
+    }
+    
+    /*
+     * Copied from JSONServlet as expect this to be related to VitroClassGroup
+     */
+    public static JSONObject processVClassGroupJSON(VitroRequest vreq, ServletContext context, VClassGroup vcg) {
+        JSONObject map = new JSONObject();           
+        try {
+            ArrayList<JSONObject> classes = new ArrayList<JSONObject>(vcg.size());
+            for( VClass vc : vcg){
+                JSONObject vcObj = new JSONObject();
+                vcObj.put("name", vc.getName());
+                vcObj.put("URI", vc.getURI());
+                vcObj.put("entityCount", vc.getEntityCount());
+                classes.add(vcObj);
+            }
+            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;        
+    }
+    
+	
+    //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 
+    	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
+        //results in errors for some reason
+        List<HashMap<String, String>> classGroups = new ArrayList<HashMap<String, String>>();
+        for(VClassGroup vcg: vcgList) {
+        	HashMap<String, String> hs = new HashMap<String, String>();
+        	hs.put("publicName", vcg.getPublicName());
+        	hs.put("URI", vcg.getURI());
+        	classGroups.add(hs);
+        }
+        return classGroups;
+    }
+    
+    //Return data getter type to be employed in display model
+    public static String generateDataGetterTypeURI(String dataGetterClassName) {
+    	return "java:" + dataGetterClassName;
+    }
+    
+   //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"
+	public static void getClassGroupForDataGetter(HttpServletRequest req, Map<String, Object> pageData, Map<String, Object> templateData) {
+    	//Get the class group from VClassGroup, this is the same as the class group for the class group page data getter
+		//and the associated class group (not custom) for individuals datagetter
+		String classGroupUri = (String) pageData.get("classGroupUri");
+		VClassGroupsForRequest vcgc = VClassGroupCache.getVClassGroups(req);
+    	VClassGroup group = vcgc.getGroup(classGroupUri);
+
+		templateData.put("classGroup", group);
+		templateData.put("associatedPage", group.getPublicName());
+		templateData.put("associatedPageURI", group.getURI());
+    }
+    
 }
\ No newline at end of file
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/MiscWebUtils.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/MiscWebUtils.java
index 62bb48629..7db3834d8 100755
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/MiscWebUtils.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/MiscWebUtils.java
@@ -1,7 +1,7 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-package edu.cornell.mannlib.vitro.webapp.web;
-
+package edu.cornell.mannlib.vitro.webapp.web;
+
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.List;
@@ -24,61 +24,61 @@ import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
 import edu.cornell.mannlib.vitro.webapp.beans.VClass;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
-
-public class MiscWebUtils {
-    /**
-         * Takes each http request parameter in req that has a name that matches
-         * 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");
-                return current;
-            }
-    //         try{
-    //             current.store(System.out,"header from store");
-    //         }catch( Exception ex){
-    //             log.debug("exception in utilBean");
-    //         }
-
-            Enumeration names = req.getParameterNames();
-            String value = null;
-            String name = null;
-            while( names.hasMoreElements() ){
-                name = (String)names.nextElement();
-    //             log.debug("parameter name: " + name);
-                value = req.getParameter( name );
-                if( value != null ){
-    //                 log.debug("*** current set " + name + " to " + value );
-                        current.setProperty(name,value);
-                }
-
-            }
-            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.
-     *
-     * @param req
-     * @param attribute
-     */
-    public static String writeAttribute(HttpServletRequest request,  String attribute)
-    throws JspException{
-        Object contentObj=request.getAttribute(attribute);
-        if(contentObj == null )
-            throw new JspException("Attribute " + attribute + " in request attributes was null.");
-        if( ! (contentObj instanceof String) ){
-            String className = contentObj.getClass().getName();
-            throw new JspException("Class of "+attribute+" is " + className + ", it should be String");
-        }
-        return (String) contentObj;
-    }
+
+public class MiscWebUtils {
+    /**
+         * Takes each http request parameter in req that has a name that matches
+         * 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");
+                return current;
+            }
+    //         try{
+    //             current.store(System.out,"header from store");
+    //         }catch( Exception ex){
+    //             log.debug("exception in utilBean");
+    //         }
+
+            Enumeration names = req.getParameterNames();
+            String value = null;
+            String name = null;
+            while( names.hasMoreElements() ){
+                name = (String)names.nextElement();
+    //             log.debug("parameter name: " + name);
+                value = req.getParameter( name );
+                if( value != null ){
+    //                 log.debug("*** current set " + name + " to " + value );
+                        current.setProperty(name,value);
+                }
+
+            }
+            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.
+     *
+     * @param req
+     * @param attribute
+     */
+    public static String writeAttribute(HttpServletRequest request,  String attribute)
+    throws JspException{
+        Object contentObj=request.getAttribute(attribute);
+        if(contentObj == null )
+            throw new JspException("Attribute " + attribute + " in request attributes was null.");
+        if( ! (contentObj instanceof String) ){
+            String className = contentObj.getClass().getName();
+            throw new JspException("Class of "+attribute+" is " + className + ", it should be String");
+        }
+        return (String) contentObj;
+    }
 
 	public static String getCustomShortView(HttpServletRequest request) {	
 		Individual object = ((ObjectPropertyStatement) request
@@ -137,104 +137,104 @@ public class MiscWebUtils {
 
         return null;	    
 	}
-	
-    /**
-     * returns a table of the req attributes
-     * @param req
-     * @return
-     */
-    public static String getRequestAttributes( HttpServletRequest req){
-        String val = "<table>";
-        Enumeration names = req.getAttributeNames();
-        while(names.hasMoreElements() ){
-            String name = (String)names.nextElement();
-            val += "\n\t<tr><td>" + name + "</td><td><pre>";
-            String value = null;
-            try{
-                Object obj = req.getAttribute(name);
-                value = (obj instanceof Model || obj instanceof ModelCom) ? "[Jena model object]" :
-                	(obj == null) ? "[null]" : 
-                		StringEscapeUtils.escapeHtml(obj.toString());
-            }catch(Exception ex){
-                value = "unable to get value" ;
-            }  catch (Error er){
-                value="unable to get value";
-            } catch (Throwable th){
-                value = "unable to get value";
-            }
-            val += value + "</pre></td></tr>\n";
-        }
-        return val + "</table>";
-    }
-
-    public static String getRequestParam( HttpServletRequest req){
-        String val = "<table>";
-        Enumeration names = req.getParameterNames();
-        while(names.hasMoreElements() ){
-
-            String name = (String)names.nextElement();
-            val += "\n\t<tr><td><h3>" + name + "</h3><td><pre>";
-            String value = null;
-            try{
-                Object obj = req.getParameter(name);
-                value = (obj == null) ? "[null]" : 
-                	StringEscapeUtils.escapeHtml(obj.toString());
-            }catch(Exception ex){
-                value = "unable to get value" ;
-            }  catch (Error er){
-                value="unable to get value";
-            } catch (Throwable th){
-                value = "unable to get value";
-            }
-            val += value + "</pre><td></tr>\n";
-        }
-        return val + "</table>";
-    }
-
-    public static String getSessionAttributes(HttpServletRequest req){
-        String val = "<table>";
-        Enumeration names = req.getSession().getAttributeNames();
-        while(names.hasMoreElements() ){
-            String name = (String)names.nextElement();
-            val += "\n\t<tr><td><h3>" + name + "</h3><td><pre>";
-            String value = null;
-            try{
-                Object obj = req.getSession().getAttribute(name);
-                value = (obj instanceof Model || obj instanceof ModelCom) ? "[Jena model object]" :
-                	(obj == null) ? "[null]" : 
-                		StringEscapeUtils.escapeHtml(obj.toString());
-            }catch(Exception ex){
-                value = "unable to get value" ;
-            }  catch (Error er){
-                value="unable to get value";
-            } catch (Throwable th){
-                value = "unable to get value";
-            }
-            val += value + "</pre></td></tr>\n";
-        }
-        return val + "</table>";
-    }
-
-    public static String getReqInfo( HttpServletRequest req){
-        String rv = null;
-        try{
-            rv =
-         "<table>"
-        +"<tr><td><h2>Request Attributes:</h2></td></tr>"
-        +"<tr><td>" + getRequestAttributes(req) + "</td></tr>"
-        +"<tr><td>--------------------------</td></tr>"
-        +"<tr><td><h2>Request Parameters:</h2></td></tr>"
-        +"<tr><td>" + getRequestParam(req) + "</td></tr>"
-        +"<tr><td>---------------------------</td></td>"
-        +"<tr><td><h2>Session Attributes:</h2></td></tr>"
-        +"<tr><td>"+ getSessionAttributes(req) +"</td></tr>"
-        + "</table>";
-        }catch(Throwable t){
-            rv = "MiscWebUtils.getRequestParam() Error :\n"+t;
-            t.printStackTrace();
-        }
-        return rv;
-    }
+	
+    /**
+     * returns a table of the req attributes
+     * @param req
+     * @return
+     */
+    public static String getRequestAttributes( HttpServletRequest req){
+        String val = "<table>";
+        Enumeration names = req.getAttributeNames();
+        while(names.hasMoreElements() ){
+            String name = (String)names.nextElement();
+            val += "\n\t<tr><td>" + name + "</td><td><pre>";
+            String value = null;
+            try{
+                Object obj = req.getAttribute(name);
+                value = (obj instanceof Model || obj instanceof ModelCom) ? "[Jena model object]" :
+                	(obj == null) ? "[null]" : 
+                		StringEscapeUtils.escapeHtml(obj.toString());
+            }catch(Exception ex){
+                value = "unable to get value" ;
+            }  catch (Error er){
+                value="unable to get value";
+            } catch (Throwable th){
+                value = "unable to get value";
+            }
+            val += value + "</pre></td></tr>\n";
+        }
+        return val + "</table>";
+    }
+
+    public static String getRequestParam( HttpServletRequest req){
+        String val = "<table>";
+        Enumeration names = req.getParameterNames();
+        while(names.hasMoreElements() ){
+
+            String name = (String)names.nextElement();
+            val += "\n\t<tr><td><h3>" + name + "</h3><td><pre>";
+            String value = null;
+            try{
+                Object obj = req.getParameter(name);
+                value = (obj == null) ? "[null]" : 
+                	StringEscapeUtils.escapeHtml(obj.toString());
+            }catch(Exception ex){
+                value = "unable to get value" ;
+            }  catch (Error er){
+                value="unable to get value";
+            } catch (Throwable th){
+                value = "unable to get value";
+            }
+            val += value + "</pre><td></tr>\n";
+        }
+        return val + "</table>";
+    }
+
+    public static String getSessionAttributes(HttpServletRequest req){
+        String val = "<table>";
+        Enumeration names = req.getSession().getAttributeNames();
+        while(names.hasMoreElements() ){
+            String name = (String)names.nextElement();
+            val += "\n\t<tr><td><h3>" + name + "</h3><td><pre>";
+            String value = null;
+            try{
+                Object obj = req.getSession().getAttribute(name);
+                value = (obj instanceof Model || obj instanceof ModelCom) ? "[Jena model object]" :
+                	(obj == null) ? "[null]" : 
+                		StringEscapeUtils.escapeHtml(obj.toString());
+            }catch(Exception ex){
+                value = "unable to get value" ;
+            }  catch (Error er){
+                value="unable to get value";
+            } catch (Throwable th){
+                value = "unable to get value";
+            }
+            val += value + "</pre></td></tr>\n";
+        }
+        return val + "</table>";
+    }
+
+    public static String getReqInfo( HttpServletRequest req){
+        String rv = null;
+        try{
+            rv =
+         "<table>"
+        +"<tr><td><h2>Request Attributes:</h2></td></tr>"
+        +"<tr><td>" + getRequestAttributes(req) + "</td></tr>"
+        +"<tr><td>--------------------------</td></tr>"
+        +"<tr><td><h2>Request Parameters:</h2></td></tr>"
+        +"<tr><td>" + getRequestParam(req) + "</td></tr>"
+        +"<tr><td>---------------------------</td></td>"
+        +"<tr><td><h2>Session Attributes:</h2></td></tr>"
+        +"<tr><td>"+ getSessionAttributes(req) +"</td></tr>"
+        + "</table>";
+        }catch(Throwable t){
+            rv = "MiscWebUtils.getRequestParam() Error :\n"+t;
+            t.printStackTrace();
+        }
+        return rv;
+    }
 
 
     public static void debugPrintHeaders(HttpServletRequest req){
@@ -256,59 +256,59 @@ public class MiscWebUtils {
 	    	}            
 	    }
     }
-    
-    /**
-        This isfrom org.json.simple.JSONObject
-
-     * " => \" , \ => \\
-	 * @param s
-	 * @return
-	 */
-	public static String escape(String s){
-		if(s==null)
-			return null;
-		StringBuffer sb=new StringBuffer();
-		for(int i=0;i<s.length();i++){
-			char ch=s.charAt(i);
-			switch(ch){
-			case '"':
-				sb.append("\\\"");
-				break;
-			case '\\':
-				sb.append("\\\\");
-				break;
-			case '\b':
-				sb.append("\\b");
-				break;
-			case '\f':
-				sb.append("\\f");
-				break;
-			case '\n':
-				sb.append("\\n");
-				break;
-			case '\r':
-				sb.append("\\r");
-				break;
-			case '\t':
-				sb.append("\\t");
-				break;
-			case '/':
-				sb.append("\\/");
-				break;
-			default:
-				if(ch>='\u0000' && ch<='\u001F'){
-					String ss=Integer.toHexString(ch);
-					sb.append("\\u");
-					for(int k=0;k<4-ss.length();k++){
-						sb.append('0');
-					}
-					sb.append(ss.toUpperCase());
-				}
-				else{
-					sb.append(ch);
-				}
-			}
-		}//for
-		return sb.toString();
-	}
-}
+    
+    /**
+        This isfrom org.json.simple.JSONObject
+
+     * " => \" , \ => \\
+	 * @param s
+	 * @return
+	 */
+	public static String escape(String s){
+		if(s==null)
+			return null;
+		StringBuffer sb=new StringBuffer();
+		for(int i=0;i<s.length();i++){
+			char ch=s.charAt(i);
+			switch(ch){
+			case '"':
+				sb.append("\\\"");
+				break;
+			case '\\':
+				sb.append("\\\\");
+				break;
+			case '\b':
+				sb.append("\\b");
+				break;
+			case '\f':
+				sb.append("\\f");
+				break;
+			case '\n':
+				sb.append("\\n");
+				break;
+			case '\r':
+				sb.append("\\r");
+				break;
+			case '\t':
+				sb.append("\\t");
+				break;
+			case '/':
+				sb.append("\\/");
+				break;
+			default:
+				if(ch>='\u0000' && ch<='\u001F'){
+					String ss=Integer.toHexString(ch);
+					sb.append("\\u");
+					for(int k=0;k<4-ss.length();k++){
+						sb.append('0');
+					}
+					sb.append(ss.toUpperCase());
+				}
+				else{
+					sb.append(ch);
+				}
+			}
+		}//for
+		return sb.toString();
+	}
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/MultiValueEditSubmissionTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/MultiValueEditSubmissionTemplateModel.java
index b60b9b3ff..763fb1f95 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/MultiValueEditSubmissionTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/edit/MultiValueEditSubmissionTemplateModel.java
@@ -1,44 +1,44 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.web.templatemodels.edit;
-
-import java.util.Map;
-import java.util.List;
-import com.hp.hpl.jena.rdf.model.Literal;
-
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
-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;
-    	//Transforms from string to list of literals TO string to list of strings
-        return EditConfigurationUtils.transformLiteralMap(editSub.getLiteralsFromForm());
-    }
-
-   
-    public Map<String, String> getValidationErrors() {
-    	if(editSub ==  null)
-    		return null;
-        return editSub.getValidationErrors();
-    }
-
-    public Map<String, List<String>> getUrisFromForm() {
-    	if(editSub ==  null)
-    		return null;
-        return editSub.getUrisFromForm();
-    }
-    
-    public boolean getSubmissionExists() {
-    	return (this.editSub != null);
-    }
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.web.templatemodels.edit;
+
+import java.util.Map;
+import java.util.List;
+import com.hp.hpl.jena.rdf.model.Literal;
+
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.EditConfigurationUtils;
+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;
+    	//Transforms from string to list of literals TO string to list of strings
+        return EditConfigurationUtils.transformLiteralMap(editSub.getLiteralsFromForm());
+    }
+
+   
+    public Map<String, String> getValidationErrors() {
+    	if(editSub ==  null)
+    		return null;
+        return editSub.getValidationErrors();
+    }
+
+    public Map<String, List<String>> getUrisFromForm() {
+    	if(editSub ==  null)
+    		return null;
+        return editSub.getUrisFromForm();
+    }
+    
+    public boolean getSubmissionExists() {
+    	return (this.editSub != null);
+    }
+
+}
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/MaintainDuplicatesObjectPropertyDataPostProcessor.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/MaintainDuplicatesObjectPropertyDataPostProcessor.java
index 8ee416db6..65fe7b0e5 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/MaintainDuplicatesObjectPropertyDataPostProcessor.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/MaintainDuplicatesObjectPropertyDataPostProcessor.java
@@ -1,42 +1,42 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-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);   
-    
-    public MaintainDuplicatesObjectPropertyDataPostProcessor(ObjectPropertyTemplateModel optm,
-            WebappDaoFactory wdf) {
-        super(optm, wdf);
-    }
-
-    @Override
-    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);           
-         }
-    }
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+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);   
+    
+    public MaintainDuplicatesObjectPropertyDataPostProcessor(ObjectPropertyTemplateModel optm,
+            WebappDaoFactory wdf) {
+        super(optm, wdf);
+    }
+
+    @Override
+    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);           
+         }
+    }
+
+}
diff --git a/webapp/src/edu/ucsf/vitro/opensocial/GadgetController.java b/webapp/src/edu/ucsf/vitro/opensocial/GadgetController.java
index 5947802c0..7326925af 100644
--- a/webapp/src/edu/ucsf/vitro/opensocial/GadgetController.java
+++ b/webapp/src/edu/ucsf/vitro/opensocial/GadgetController.java
@@ -1,104 +1,104 @@
-package edu.ucsf.vitro.opensocial;
-
-import java.io.IOException;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
-
-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())) {
-    		OpenSocialManager.clearCache();
-    		return new RedirectResponseValues("/");
-    	}
-    	else if ("/sandbox".equalsIgnoreCase(vreq.getPathInfo())) {
-    		boolean sandbox = "True".equalsIgnoreCase(ConfigurationProperties.getBean(vreq.getSession()
-    				.getServletContext()).getProperty("OpenSocial.sandbox"));
-    		if (!sandbox) {
-    			return new ExceptionResponseValues( new Exception("Sandbox not available"));
-    		}
-    		return processGadgetSandbox(vreq);
-    	}
-    	else {
-    		return processGadgetDetails(vreq);
-    	}
-    }    	
-
-    protected ResponseValues processGadgetDetails(VitroRequest vreq) {
-    	try {
-	        Map<String, Object> body = new HashMap<String, Object>();
-
-            body.put("title", "Gadget Details");            
-	        // VIVO OpenSocial Extension by UCSF
-	        try {
-		        OpenSocialManager openSocialManager = new OpenSocialManager(vreq, "gadgetDetails");
-		        body.put(OpenSocialManager.TAG_NAME, openSocialManager);
-		        if (openSocialManager.isVisible()) {
-		        	body.put("bodyOnload", "my.init();");
-		        }
-	        } catch (IOException e) {
-	            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())) {
-    		vreq.getSession().setAttribute(OpenSocialManager.OPENSOCIAL_GADGETS, vreq.getParameter("gadgetURLS"));
-			vreq.getSession().setAttribute(OpenSocialManager.OPENSOCIAL_DEBUG, vreq.getParameter("debug") != null);
-			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");            
-        
-        try {
-	        OpenSocialManager openSocialManager = new OpenSocialManager(vreq, "gadgetSandbox");
-	        String gadgetURLS = "";
-	        for (GadgetSpec gadget : openSocialManager.getAllDBGadgets(false).values())
-	        {
-	            gadgetURLS += gadget.getGadgetURL() + System.getProperty("line.separator");
-	        }
-	        body.put("gadgetURLS", gadgetURLS);
-	        body.put(OpenSocialManager.TAG_NAME, openSocialManager);
-        } catch (IOException e) {
-            log.error("IOException in doTemplate()", e);
-        } catch (SQLException e) {
-            log.error("SQLException in doTemplate()", e);
-        }	               
-	        
-        
-        return new TemplateResponseValues("gadgetLogin.ftl", body);
-    }
-
-}
+package edu.ucsf.vitro.opensocial;
+
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerHttpServlet;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ExceptionResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.RedirectResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.TemplateResponseValues;
+
+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())) {
+    		OpenSocialManager.clearCache();
+    		return new RedirectResponseValues("/");
+    	}
+    	else if ("/sandbox".equalsIgnoreCase(vreq.getPathInfo())) {
+    		boolean sandbox = "True".equalsIgnoreCase(ConfigurationProperties.getBean(vreq.getSession()
+    				.getServletContext()).getProperty("OpenSocial.sandbox"));
+    		if (!sandbox) {
+    			return new ExceptionResponseValues( new Exception("Sandbox not available"));
+    		}
+    		return processGadgetSandbox(vreq);
+    	}
+    	else {
+    		return processGadgetDetails(vreq);
+    	}
+    }    	
+
+    protected ResponseValues processGadgetDetails(VitroRequest vreq) {
+    	try {
+	        Map<String, Object> body = new HashMap<String, Object>();
+
+            body.put("title", "Gadget Details");            
+	        // VIVO OpenSocial Extension by UCSF
+	        try {
+		        OpenSocialManager openSocialManager = new OpenSocialManager(vreq, "gadgetDetails");
+		        body.put(OpenSocialManager.TAG_NAME, openSocialManager);
+		        if (openSocialManager.isVisible()) {
+		        	body.put("bodyOnload", "my.init();");
+		        }
+	        } catch (IOException e) {
+	            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())) {
+    		vreq.getSession().setAttribute(OpenSocialManager.OPENSOCIAL_GADGETS, vreq.getParameter("gadgetURLS"));
+			vreq.getSession().setAttribute(OpenSocialManager.OPENSOCIAL_DEBUG, vreq.getParameter("debug") != null);
+			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");            
+        
+        try {
+	        OpenSocialManager openSocialManager = new OpenSocialManager(vreq, "gadgetSandbox");
+	        String gadgetURLS = "";
+	        for (GadgetSpec gadget : openSocialManager.getAllDBGadgets(false).values())
+	        {
+	            gadgetURLS += gadget.getGadgetURL() + System.getProperty("line.separator");
+	        }
+	        body.put("gadgetURLS", gadgetURLS);
+	        body.put(OpenSocialManager.TAG_NAME, openSocialManager);
+        } catch (IOException e) {
+            log.error("IOException in doTemplate()", e);
+        } catch (SQLException e) {
+            log.error("SQLException in doTemplate()", e);
+        }	               
+	        
+        
+        return new TemplateResponseValues("gadgetLogin.ftl", body);
+    }
+
+}
diff --git a/webapp/src/edu/ucsf/vitro/opensocial/GadgetSpec.java b/webapp/src/edu/ucsf/vitro/opensocial/GadgetSpec.java
index 38ff92277..251113b7f 100644
--- a/webapp/src/edu/ucsf/vitro/opensocial/GadgetSpec.java
+++ b/webapp/src/edu/ucsf/vitro/opensocial/GadgetSpec.java
@@ -1,179 +1,179 @@
-package edu.ucsf.vitro.opensocial;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.dbcp.BasicDataSource;
-
-public class GadgetSpec {
-	private int appId = 0;
-	private String name;
-	private String openSocialGadgetURL;
-	private List<String> channels = new ArrayList<String>();
-	private Map<String, GadgetViewRequirements> viewRequirements = new HashMap<String, GadgetViewRequirements>();
-	boolean enabled;
-	private boolean unknownGadget = false;
-
-	public GadgetSpec(int appId, String name, String openSocialGadgetURL,
-			List<String> channels, BasicDataSource ds, boolean enabled, boolean unknownGadget)
-			throws SQLException {
-		this.appId = appId;
-		this.name = name;
-		this.openSocialGadgetURL = openSocialGadgetURL;
-		this.channels.addAll(channels);
-		this.enabled = enabled;
-		this.unknownGadget = unknownGadget;
-
-		// Load gadgets from the DB first
-		if (!unknownGadget) {
-			Connection conn = null;
-			Statement stmt = null;
-			ResultSet rset = null;
-
-			try {
-				String sqlCommand = "select page, viewer_req, owner_req, view, chromeId, opt_params, display_order from orng_app_views where appId = "
-						+ appId;
-				conn = ds.getConnection();
-				stmt = conn.createStatement();
-				rset = stmt.executeQuery(sqlCommand);
-				while (rset.next()) {
-					viewRequirements.put(
-							rset.getString(1),
-							new GadgetViewRequirements(rset.getString(1), rset
-									.getString(2), rset.getString(3), rset
-									.getString(4), rset.getString(5), rset
-									.getString(6), rset.getInt(7)));
-				}
-			} finally {
-				try {
-					rset.close();
-				} catch (Exception e) {
-				}
-				try {
-					stmt.close();
-				} catch (Exception e) {
-				}
-				try {
-					conn.close();
-				} catch (Exception e) {
-				}
-			}
-		}
-	}
-
-	public int getAppId() {
-		return appId;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public String getGadgetURL() {
-		return openSocialGadgetURL;
-	}
-
-	public List<String> getChannels() {
-		return channels;
-	}
-
-	public boolean listensTo(String channel) { // if an unknownd gadget just say yes,
-												// we don't care about
-												// performance in this situation
-		return unknownGadget || channels.contains(channel);
-	}
-
-	public GadgetViewRequirements getGadgetViewRequirements(String page) {
-		if (viewRequirements.containsKey(page)) {
-			return viewRequirements.get(page);
-		}
-		return null;
-	}
-
-	public boolean show(String viewerId, String ownerId, String page,
-			BasicDataSource ds) throws SQLException {
-		boolean show = true;
-		// if there are no view requirements, go ahead and show it. We are
-		// likely testing out a new gadget
-		// if there are some, turn it off unless this page is
-		if (viewRequirements.size() > 0) {
-			show = false;
-		}
-
-		if (viewRequirements.containsKey(page)) {
-			show = true;
-			GadgetViewRequirements req = getGadgetViewRequirements(page);
-			if ('U' == req.getViewerReq() && viewerId == null) {
-				show = false;
-			} else if ('R' == req.getViewerReq()) {
-				show &= isRegisteredTo(viewerId, ds);
-			}
-			if ('R' == req.getOwnerReq()) {
-				show &= isRegisteredTo(ownerId, ds);
-			} else if ('S' == req.getOwnerReq()) {
-				show &= (viewerId == ownerId);
-			}
-		}
-		return show;
-	}
-
-	public boolean isRegisteredTo(String personId, BasicDataSource ds)
-			throws SQLException {
-		int count = 0;
-
-		Connection conn = null;
-		Statement stmt = null;
-		ResultSet rset = null;
-
-		try {
-			String sqlCommand = "select count(*) from orng_app_registry where appId = "
-					+ getAppId() + " and personId = '" + personId + "';";
-			conn = ds.getConnection();
-			stmt = conn.createStatement();
-			rset = stmt.executeQuery(sqlCommand);
-			while (rset.next()) {
-				count = rset.getInt(1);
-			}
-		} finally {
-			try {
-				rset.close();
-			} catch (Exception e) {
-			}
-			try {
-				stmt.close();
-			} catch (Exception e) {
-			}
-			try {
-				conn.close();
-			} catch (Exception e) {
-			}
-		}
-
-		return (count == 1);
-	}
-
-	public boolean fromSandbox() {
-		return unknownGadget;
-	}
-
-	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;
-	}
-
-}
+package edu.ucsf.vitro.opensocial;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.dbcp.BasicDataSource;
+
+public class GadgetSpec {
+	private int appId = 0;
+	private String name;
+	private String openSocialGadgetURL;
+	private List<String> channels = new ArrayList<String>();
+	private Map<String, GadgetViewRequirements> viewRequirements = new HashMap<String, GadgetViewRequirements>();
+	boolean enabled;
+	private boolean unknownGadget = false;
+
+	public GadgetSpec(int appId, String name, String openSocialGadgetURL,
+			List<String> channels, BasicDataSource ds, boolean enabled, boolean unknownGadget)
+			throws SQLException {
+		this.appId = appId;
+		this.name = name;
+		this.openSocialGadgetURL = openSocialGadgetURL;
+		this.channels.addAll(channels);
+		this.enabled = enabled;
+		this.unknownGadget = unknownGadget;
+
+		// Load gadgets from the DB first
+		if (!unknownGadget) {
+			Connection conn = null;
+			Statement stmt = null;
+			ResultSet rset = null;
+
+			try {
+				String sqlCommand = "select page, viewer_req, owner_req, view, chromeId, opt_params, display_order from orng_app_views where appId = "
+						+ appId;
+				conn = ds.getConnection();
+				stmt = conn.createStatement();
+				rset = stmt.executeQuery(sqlCommand);
+				while (rset.next()) {
+					viewRequirements.put(
+							rset.getString(1),
+							new GadgetViewRequirements(rset.getString(1), rset
+									.getString(2), rset.getString(3), rset
+									.getString(4), rset.getString(5), rset
+									.getString(6), rset.getInt(7)));
+				}
+			} finally {
+				try {
+					rset.close();
+				} catch (Exception e) {
+				}
+				try {
+					stmt.close();
+				} catch (Exception e) {
+				}
+				try {
+					conn.close();
+				} catch (Exception e) {
+				}
+			}
+		}
+	}
+
+	public int getAppId() {
+		return appId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public String getGadgetURL() {
+		return openSocialGadgetURL;
+	}
+
+	public List<String> getChannels() {
+		return channels;
+	}
+
+	public boolean listensTo(String channel) { // if an unknownd gadget just say yes,
+												// we don't care about
+												// performance in this situation
+		return unknownGadget || channels.contains(channel);
+	}
+
+	public GadgetViewRequirements getGadgetViewRequirements(String page) {
+		if (viewRequirements.containsKey(page)) {
+			return viewRequirements.get(page);
+		}
+		return null;
+	}
+
+	public boolean show(String viewerId, String ownerId, String page,
+			BasicDataSource ds) throws SQLException {
+		boolean show = true;
+		// if there are no view requirements, go ahead and show it. We are
+		// likely testing out a new gadget
+		// if there are some, turn it off unless this page is
+		if (viewRequirements.size() > 0) {
+			show = false;
+		}
+
+		if (viewRequirements.containsKey(page)) {
+			show = true;
+			GadgetViewRequirements req = getGadgetViewRequirements(page);
+			if ('U' == req.getViewerReq() && viewerId == null) {
+				show = false;
+			} else if ('R' == req.getViewerReq()) {
+				show &= isRegisteredTo(viewerId, ds);
+			}
+			if ('R' == req.getOwnerReq()) {
+				show &= isRegisteredTo(ownerId, ds);
+			} else if ('S' == req.getOwnerReq()) {
+				show &= (viewerId == ownerId);
+			}
+		}
+		return show;
+	}
+
+	public boolean isRegisteredTo(String personId, BasicDataSource ds)
+			throws SQLException {
+		int count = 0;
+
+		Connection conn = null;
+		Statement stmt = null;
+		ResultSet rset = null;
+
+		try {
+			String sqlCommand = "select count(*) from orng_app_registry where appId = "
+					+ getAppId() + " and personId = '" + personId + "';";
+			conn = ds.getConnection();
+			stmt = conn.createStatement();
+			rset = stmt.executeQuery(sqlCommand);
+			while (rset.next()) {
+				count = rset.getInt(1);
+			}
+		} finally {
+			try {
+				rset.close();
+			} catch (Exception e) {
+			}
+			try {
+				stmt.close();
+			} catch (Exception e) {
+			}
+			try {
+				conn.close();
+			} catch (Exception e) {
+			}
+		}
+
+		return (count == 1);
+	}
+
+	public boolean fromSandbox() {
+		return unknownGadget;
+	}
+
+	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/webapp/src/edu/ucsf/vitro/opensocial/GadgetViewRequirements.java b/webapp/src/edu/ucsf/vitro/opensocial/GadgetViewRequirements.java
index 7378fecaa..da04a3679 100644
--- a/webapp/src/edu/ucsf/vitro/opensocial/GadgetViewRequirements.java
+++ b/webapp/src/edu/ucsf/vitro/opensocial/GadgetViewRequirements.java
@@ -1,50 +1,50 @@
-package edu.ucsf.vitro.opensocial;
-
-public class GadgetViewRequirements {
-	private char viewerReq; // U for User or null for no requirement
-	private char ownerReq; // R for Registered or null for no requirement
-	private String view;
-	private String chromeId;
-	private String optParams;
-	private int display_order;
-
-	public GadgetViewRequirements(char viewerReq, char ownerReq,
-			String view, String chromeId, String optParams, int display_order) {
-		this.viewerReq = viewerReq;
-		this.ownerReq = ownerReq;
-		this.view = view;
-		this.chromeId = chromeId;
-		this.optParams = optParams;
-		this.display_order = display_order;
-	}
-
-	public GadgetViewRequirements(String page, String viewerReq,
-			String ownerReq, String view, String chromeId, String optParams, int display_order) {
-		this(viewerReq != null ? viewerReq.charAt(0) : ' ',
-				ownerReq != null ? ownerReq.charAt(0) : ' ', view, chromeId, optParams, display_order);
-	}
-
-	public char getViewerReq() {
-		return viewerReq;
-	}
-
-	public char getOwnerReq() {
-		return ownerReq;
-	}
-
-	public String getView() {
-		return view;
-	}
-
-	public String getChromeId() {
-		return chromeId;
-	}
-
-	public String getOptParams() {
-		return optParams != null && optParams.trim().length() > 0 ? optParams : "{}";
-	}
-
-	int getDisplayOrder() {
-		return display_order;
-	}
-}
+package edu.ucsf.vitro.opensocial;
+
+public class GadgetViewRequirements {
+	private char viewerReq; // U for User or null for no requirement
+	private char ownerReq; // R for Registered or null for no requirement
+	private String view;
+	private String chromeId;
+	private String optParams;
+	private int display_order;
+
+	public GadgetViewRequirements(char viewerReq, char ownerReq,
+			String view, String chromeId, String optParams, int display_order) {
+		this.viewerReq = viewerReq;
+		this.ownerReq = ownerReq;
+		this.view = view;
+		this.chromeId = chromeId;
+		this.optParams = optParams;
+		this.display_order = display_order;
+	}
+
+	public GadgetViewRequirements(String page, String viewerReq,
+			String ownerReq, String view, String chromeId, String optParams, int display_order) {
+		this(viewerReq != null ? viewerReq.charAt(0) : ' ',
+				ownerReq != null ? ownerReq.charAt(0) : ' ', view, chromeId, optParams, display_order);
+	}
+
+	public char getViewerReq() {
+		return viewerReq;
+	}
+
+	public char getOwnerReq() {
+		return ownerReq;
+	}
+
+	public String getView() {
+		return view;
+	}
+
+	public String getChromeId() {
+		return chromeId;
+	}
+
+	public String getOptParams() {
+		return optParams != null && optParams.trim().length() > 0 ? optParams : "{}";
+	}
+
+	int getDisplayOrder() {
+		return display_order;
+	}
+}
diff --git a/webapp/src/edu/ucsf/vitro/opensocial/OpenSocialManager.java b/webapp/src/edu/ucsf/vitro/opensocial/OpenSocialManager.java
index f7794812c..a7968ce7e 100644
--- a/webapp/src/edu/ucsf/vitro/opensocial/OpenSocialManager.java
+++ b/webapp/src/edu/ucsf/vitro/opensocial/OpenSocialManager.java
@@ -1,484 +1,484 @@
-package edu.ucsf.vitro.opensocial;
-
-import java.io.IOException;
-import java.net.Socket;
-import java.net.URLEncoder;
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.dbcp.BasicDataSource;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.HasProfile;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
-import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
-import edu.cornell.mannlib.vitro.webapp.controller.individual.IndividualRequestAnalysisContextImpl;
-import edu.cornell.mannlib.vitro.webapp.controller.individual.IndividualRequestAnalyzer;
-import edu.cornell.mannlib.vitro.webapp.controller.individual.IndividualRequestInfo;
-
-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";
-
-	public static final String JSON_PERSONID_CHANNEL = "JSONPersonIds";
-	public static final String JSON_PMID_CHANNEL = "JSONPubMedIds";
-	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);	
-
-	// 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;
-	private String ownerId = null;
-	private boolean isDebug = false;
-	private boolean noCache = false;
-	private String pageName;
-	private ConfigurationProperties configuration;
-
-	private BasicDataSource dataSource;
-
-	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));
-		this.noCache = vreq.getSession() != null
-				&& Boolean.TRUE.equals(vreq.getSession().getAttribute(OPENSOCIAL_NOCACHE));
-		this.pageName = pageName;
-
-		configuration = ConfigurationProperties.getBean(vreq.getSession()
-				.getServletContext());
-
-		if (configuration.getProperty(SHINDIG_URL_PROP) == null) {
-			// do nothing
-			return;
-		}
-
-		// Analyze the request to figure out whose page we are viewing.
-		this.ownerId = figureOwnerId(vreq);
-
-		// If we are authorized to edit on behalf of the page owner,
-		// set the viewer ID to be the owner ID, so it looks like we are the page owner.
-		if (editMode) {
-			this.viewerId = ownerId;
-		}
-		else {
-			// If we have a profile page, use that URI. Otherwise, use the URI of the logged-in user account, if any.
-			UserAccount viewer = LoginStatusBean.getCurrentUser(vreq);
-			Collection<String> profileUris = HasProfile.getProfileUris(RequestIdentifiers.getIdBundleForRequest(vreq));
-			if (!profileUris.isEmpty()) {
-				this.viewerId = profileUris.iterator().next();
-			} else if (viewer != null) {
-				this.viewerId = viewer.getUri();
-			} else {
-				this.viewerId = null;
-			}
-		}
-		
-		String requestAppId = vreq.getParameter("appId");
-
-		dataSource = new BasicDataSource();
-		dataSource.setDriverClassName(DEFAULT_DRIVER);
-		dataSource.setUsername(configuration
-				.getProperty("VitroConnection.DataSource.username"));
-		dataSource.setPassword(configuration
-				.getProperty("VitroConnection.DataSource.password"));
-		dataSource.setUrl(configuration
-				.getProperty("VitroConnection.DataSource.url"));
-
-		// Load gadgets from the DB first
-		Map<String, GadgetSpec> allDBGadgets = getAllDBGadgets(!noCache);
-
-		// Add sandbox gadgets if they are present
-		if (vreq.getSession() != null && vreq.getSession().getAttribute(OPENSOCIAL_GADGETS) != null) {		
-			gadgets = getSandboxGadgets(vreq, allDBGadgets, requestAppId);
-		}
-		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.getAppId() ==  Integer.parseInt(requestAppId))
-						) && 
-						gadgetSpec.show(viewerId, ownerId, pageName, dataSource)
-						) {
-					String securityToken = socketSendReceive(viewerId, ownerId, "" + gadgetSpec.getAppId());
-					gadgets.add(new PreparedGadget(gadgetSpec, this, moduleId++, securityToken));
-				}
-			}
-		}
-
-		// sort the gadgets
-		Collections.sort(gadgets);
-	}
-	
-	public static void clearCache() {
-		gadgetCache = null;
-	}
-
-	private String figureOwnerId(VitroRequest vreq) {
-		IndividualRequestAnalyzer requestAnalyzer = new IndividualRequestAnalyzer(vreq,
-				new IndividualRequestAnalysisContextImpl(vreq));
-		IndividualRequestInfo requestInfo = requestAnalyzer.analyze();
-		Individual owner = requestInfo.getIndividual();
-		return owner != null ? owner.getURI() : null;
-	}
-	
-	private String getGadgetFileNameFromURL(String url) {
-		String[] urlbits = url.split("/");
-		return urlbits[urlbits.length - 1];
-	}
-
-	public boolean isDebug() {
-		return isDebug;
-	}
-
-	public boolean noCache() {
-		return noCache;
-	}
-
-	public String getOwnerId() {
-		return ownerId;
-	}
-
-	public boolean hasGadgetListeningTo(String channel) {
-		for (PreparedGadget gadget : getVisibleGadgets()) {
-			if (gadget.getGadgetSpec().listensTo(channel)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public static List<String> getOpenSocialId(List<Individual> individuals) {
-		List<String> personIds = new ArrayList<String>();
-		for (Individual ind : individuals) {
-			personIds.add(ind.getURI());
-		}
-		return personIds;
-	}
-
-	// JSON Helper Functions
-	public static String buildJSONPersonIds(List<String> personIds,
-			String message) throws JSONException {
-		JSONObject json = new JSONObject();
-		json.put("message", message);
-		json.put("personIds", personIds);
-		return json.toString();
-	}
-	
-	public static String buildJSONPersonIds(String personId, String message) throws JSONException {
-		List<String> personIds = new ArrayList<String>();
-		personIds.add(personId);
-		return buildJSONPersonIds(personIds, message);
-	}
-
-	public static String buildJSONPersonIds(Individual ind, String message) throws JSONException {
-		List<String> personIds = new ArrayList<String>();
-		personIds.add(ind.getURI());
-		return buildJSONPersonIds(personIds, message);
-	}
-
-	public void setPubsubData(String key, String value) {
-		if (pubsubdata.containsKey(key)) {
-			pubsubdata.remove(key);
-		}
-		if (value != null && !value.isEmpty()) {
-			pubsubdata.put(key, value);
-		}
-	}
-
-	public Map<String, String> getPubsubData() {
-		return pubsubdata;
-	}
-
-	public void removePubsubGadgetsWithoutData() {
-		// if any visible gadgets depend on pubsub data that isn't present,
-		// throw them out
-		List<PreparedGadget> removedGadgets = new ArrayList<PreparedGadget>();
-		for (PreparedGadget gadget : gadgets) {
-			for (String channel : gadget.getGadgetSpec().getChannels()) {
-				if (!pubsubdata.containsKey(channel)) {
-					removedGadgets.add(gadget);
-					break;
-				}
-			}
-		}
-		for (PreparedGadget gadget : removedGadgets) {
-			gadgets.remove(gadget);
-		}
-	}
-
-	public void removeGadget(String name) {
-		// if any visible gadgets depend on pubsub data that isn't present,
-		// throw them out
-		PreparedGadget gadgetToRemove = null;
-		for (PreparedGadget gadget : gadgets) {
-			if (name.equals(gadget.getName())) {
-				gadgetToRemove = gadget;
-				break;
-			}
-		}
-		gadgets.remove(gadgetToRemove);
-	}
-
-	public String getPageName() {
-		return pageName;
-	}
-
-	public String getIdToUrlMapJavascript() {
-		String retval = "var idToUrlMap = {";
-		for (PreparedGadget gadget : gadgets) {
-			// retval += gadget.GetAppId() + ":'" + gadget.GetGadgetURL() +
-			// "', ";
-			retval += "'remote_iframe_" + gadget.getAppId() + "':'"
-					+ gadget.getGadgetURL() + "', ";
-		}
-		return retval.substring(0, retval.length() - 2) + "};";
-	}
-
-	public boolean isVisible() {
-		// always have turned on for ProfileDetails.aspx because we want to
-		// generate the "profile was viewed" in Javascript (bot proof)
-		// regardless of any gadgets being visible, and we need this to be True
-		// for the shindig javascript libraries to load
-		return (configuration.getProperty(SHINDIG_URL_PROP) != null
-				&& (getVisibleGadgets().size() > 0) || getPageName().equals(
-				"/display"));
-	}
-
-	public List<PreparedGadget> getVisibleGadgets() {
-		return gadgets;
-	}
-
-	public void postActivity(int userId, String title) throws SQLException {
-		postActivity(userId, title, null, null, null);
-	}
-
-	public void postActivity(int userId, String title, String body) throws SQLException {
-		postActivity(userId, title, body, null, null);
-	}
-
-	public void postActivity(int userId, String title, String body,
-			String xtraId1Type, String xtraId1Value) throws SQLException {
-		Connection conn = null;
-		Statement stmt = null;
-		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>" 
-				+ (body != null ? "<body>" + body + "</body>" : "") + "</activity>','"
-				+ xtraId1Type + "','" + xtraId1Value + "');";		
-		try {
-			conn = dataSource.getConnection();
-			stmt = conn.createStatement();
-			stmt.executeUpdate(sqlCommand);
-		} finally {
-			try {
-				stmt.close();
-			} catch (Exception e) {
-			}
-			try {
-				conn.close();
-			} catch (Exception e) {
-			}
-		}
-			
-	}
-
-	private String socketSendReceive(String viewer, String owner, String gadget)
-			throws IOException {
-		// These keys need to match what you see in
-		// edu.ucsf.orng.shindig.service.SecureTokenGeneratorService in
-		// Shindig
-		String[] tokenService = configuration.getProperty(
-				"OpenSocial.tokenService").split(":");
-		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.
-		Socket s = new Socket(tokenService[0],
-				Integer.parseInt(tokenService[1]));
-
-		// Send request to the server.
-		s.getOutputStream().write(request.getBytes());
-
-		// Receive the encoded content.
-		int bytes = 0;
-		String page = "";
-		byte[] bytesReceived = new byte[256];
-
-		// The following will block until the page is transmitted.
-		while ((bytes = s.getInputStream().read(bytesReceived)) > 0) {
-			page += new String(bytesReceived, 0, bytes);
-		};
-
-		return page;
-	}
-	
-	public String getContainerJavascriptSrc() {
-		return configuration.getProperty(SHINDIG_URL_PROP)
-				+ "/gadgets/js/core:dynamic-height:osapi:pubsub:rpc:views:rdf:shindig-container.js?c=1"
-				+ (isDebug ? "&debug=1" : "");
-	}
-
-	public String getGadgetJavascript() {
-		String lineSeparator = System.getProperty("line.separator");
-		String gadgetScriptText = "var my = {};" + lineSeparator
-				+ "my.gadgetSpec = function(appId, name, url, secureToken, view, chrome_id, opt_params, visible_scope) {"
-				+ lineSeparator + "this.appId = appId;" + lineSeparator
-				+ "this.name = name;" + lineSeparator + "this.url = url;"
-				+ lineSeparator + "this.secureToken = secureToken;"
-				+ lineSeparator + "this.view = view || 'default';"
-				+ lineSeparator + "this.chrome_id = chrome_id;" 
-				+ lineSeparator + "this.opt_params = opt_params;" + lineSeparator
-				+ "this.visible_scope = visible_scope;" + lineSeparator + "};"
-				+ lineSeparator + "my.pubsubData = {};" + lineSeparator;
-		for (String key : getPubsubData().keySet()) {
-			gadgetScriptText += "my.pubsubData['" + key + "'] = '"
-					+ getPubsubData().get(key) + "';" + lineSeparator;
-		}
-		gadgetScriptText += "my.openSocialURL = '"
-				+ configuration.getProperty(SHINDIG_URL_PROP) + "';"
-				+ lineSeparator + "my.debug = " + (isDebug() ? "1" : "0") + ";"
-				+ lineSeparator + "my.noCache = " + (noCache() ? "1" : "0")
-				+ ";" + lineSeparator + "my.gadgets = [";
-		for (PreparedGadget gadget : getVisibleGadgets()) {
-			gadgetScriptText += "new my.gadgetSpec(" + gadget.getAppId() + ",'"
-					+ gadget.getName() + "','" + gadget.getGadgetURL() + "','"
-					+ gadget.getSecurityToken() + "','" + gadget.getView()
-					+ "','" + gadget.getChromeId() + "'," + gadget.getOptParams() + ",'"
-					+ gadget.getGadgetSpec().getVisibleScope() + "'), ";
-		}
-		gadgetScriptText = gadgetScriptText.substring(0,
-				gadgetScriptText.length() - 2)
-				+ "];"
-				+ lineSeparator;
-
-		return gadgetScriptText;
-	}
-	
-	Map<String, GadgetSpec> getAllDBGadgets(boolean useCache) throws SQLException 
-	{
-		// great place to add cache
-        // check cache first
-		Map<String, GadgetSpec> allDBGadgets = useCache ? gadgetCache : null;		
-		if (allDBGadgets == null) {
-			allDBGadgets = new HashMap<String, GadgetSpec>();
-			Connection conn = null;
-			Statement stmt = null;
-			ResultSet rset = null;
-			try {
-	
-				String sqlCommand = "select appId, name, url, channels, enabled from orng_apps";
-	
-				conn = dataSource.getConnection();
-				stmt = conn.createStatement();
-				rset = stmt.executeQuery(sqlCommand);
-	
-				while (rset.next()) {
-					String channelsStr = rset.getString(4);
-					List<String> channels = Arrays.asList(channelsStr != null && channelsStr.length() > 0 ? channelsStr.split(" ") : new String[0]);
-					GadgetSpec spec = new GadgetSpec(rset.getInt(1),
-							rset.getString(2), rset.getString(3), channels, dataSource, rset.getBoolean(5), false);
-					String gadgetFileName = getGadgetFileNameFromURL(rset.getString(3));
-	
-					allDBGadgets.put(gadgetFileName, spec);
-				}
-			} 
-			finally {
-				try {
-					rset.close();
-				} catch (Exception e) {
-				}
-				try {
-					stmt.close();
-				} catch (Exception e) {
-				}
-				try {
-					conn.close();
-				} catch (Exception e) {
-				}
-			}
-			if (useCache) {
-				gadgetCache = allDBGadgets;
-			}
-		}
-
-		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 
-		// gadget/sandbox form!
-		String openSocialGadgetURLS = (String) vreq.getSession()
-				.getAttribute(OPENSOCIAL_GADGETS);
-		String[] urls = openSocialGadgetURLS.split(System.getProperty("line.separator"));
-		for (String openSocialGadgetURL : urls) {
-			openSocialGadgetURL = openSocialGadgetURL.trim();
-			if (openSocialGadgetURL.length() == 0)
-				continue;
-			int appId = 0; // if URL matches one in the DB, use DB provided
-							// appId, otherwise generate one
-			String gadgetFileName = getGadgetFileNameFromURL(openSocialGadgetURL);
-			String name = gadgetFileName;
-			List<String> channels = new ArrayList<String>();
-			boolean unknownGadget = true;
-			if (allDBGadgets.containsKey(gadgetFileName)) {
-				appId = allDBGadgets.get(gadgetFileName).getAppId();
-				name = allDBGadgets.get(gadgetFileName).getName();
-				channels = allDBGadgets.get(gadgetFileName).getChannels();
-				unknownGadget = false;
-			} else {
-				log.warn("Could not find " + gadgetFileName + " in " + allDBGadgets.keySet());
-				appId = Math.abs(openSocialGadgetURL.hashCode());
-			}
-			// if they asked for a specific one, only let it in
-			if (requestAppId != null && Integer.parseInt(requestAppId) != appId) {
-				continue;
-			}
-			GadgetSpec gadget = new GadgetSpec(appId, name,
-					openSocialGadgetURL, channels, dataSource, true, unknownGadget);
-			// only add ones that are visible in this context!
-			int moduleId = 0;
-			if (unknownGadget
-					|| gadget.show(viewerId, ownerId, pageName, dataSource)) {
-				String securityToken = socketSendReceive(viewerId, ownerId,
-						"" + gadget.getAppId());
-				sandboxGadgets.add(new PreparedGadget(gadget, this, moduleId++,
-						securityToken));
-			}
-		}
-		return sandboxGadgets;
-		
-	}
-}
+package edu.ucsf.vitro.opensocial;
+
+import java.io.IOException;
+import java.net.Socket;
+import java.net.URLEncoder;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.RequestIdentifiers;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.HasProfile;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
+import edu.cornell.mannlib.vitro.webapp.controller.individual.IndividualRequestAnalysisContextImpl;
+import edu.cornell.mannlib.vitro.webapp.controller.individual.IndividualRequestAnalyzer;
+import edu.cornell.mannlib.vitro.webapp.controller.individual.IndividualRequestInfo;
+
+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";
+
+	public static final String JSON_PERSONID_CHANNEL = "JSONPersonIds";
+	public static final String JSON_PMID_CHANNEL = "JSONPubMedIds";
+	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);	
+
+	// 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;
+	private String ownerId = null;
+	private boolean isDebug = false;
+	private boolean noCache = false;
+	private String pageName;
+	private ConfigurationProperties configuration;
+
+	private BasicDataSource dataSource;
+
+	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));
+		this.noCache = vreq.getSession() != null
+				&& Boolean.TRUE.equals(vreq.getSession().getAttribute(OPENSOCIAL_NOCACHE));
+		this.pageName = pageName;
+
+		configuration = ConfigurationProperties.getBean(vreq.getSession()
+				.getServletContext());
+
+		if (configuration.getProperty(SHINDIG_URL_PROP) == null) {
+			// do nothing
+			return;
+		}
+
+		// Analyze the request to figure out whose page we are viewing.
+		this.ownerId = figureOwnerId(vreq);
+
+		// If we are authorized to edit on behalf of the page owner,
+		// set the viewer ID to be the owner ID, so it looks like we are the page owner.
+		if (editMode) {
+			this.viewerId = ownerId;
+		}
+		else {
+			// If we have a profile page, use that URI. Otherwise, use the URI of the logged-in user account, if any.
+			UserAccount viewer = LoginStatusBean.getCurrentUser(vreq);
+			Collection<String> profileUris = HasProfile.getProfileUris(RequestIdentifiers.getIdBundleForRequest(vreq));
+			if (!profileUris.isEmpty()) {
+				this.viewerId = profileUris.iterator().next();
+			} else if (viewer != null) {
+				this.viewerId = viewer.getUri();
+			} else {
+				this.viewerId = null;
+			}
+		}
+		
+		String requestAppId = vreq.getParameter("appId");
+
+		dataSource = new BasicDataSource();
+		dataSource.setDriverClassName(DEFAULT_DRIVER);
+		dataSource.setUsername(configuration
+				.getProperty("VitroConnection.DataSource.username"));
+		dataSource.setPassword(configuration
+				.getProperty("VitroConnection.DataSource.password"));
+		dataSource.setUrl(configuration
+				.getProperty("VitroConnection.DataSource.url"));
+
+		// Load gadgets from the DB first
+		Map<String, GadgetSpec> allDBGadgets = getAllDBGadgets(!noCache);
+
+		// Add sandbox gadgets if they are present
+		if (vreq.getSession() != null && vreq.getSession().getAttribute(OPENSOCIAL_GADGETS) != null) {		
+			gadgets = getSandboxGadgets(vreq, allDBGadgets, requestAppId);
+		}
+		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.getAppId() ==  Integer.parseInt(requestAppId))
+						) && 
+						gadgetSpec.show(viewerId, ownerId, pageName, dataSource)
+						) {
+					String securityToken = socketSendReceive(viewerId, ownerId, "" + gadgetSpec.getAppId());
+					gadgets.add(new PreparedGadget(gadgetSpec, this, moduleId++, securityToken));
+				}
+			}
+		}
+
+		// sort the gadgets
+		Collections.sort(gadgets);
+	}
+	
+	public static void clearCache() {
+		gadgetCache = null;
+	}
+
+	private String figureOwnerId(VitroRequest vreq) {
+		IndividualRequestAnalyzer requestAnalyzer = new IndividualRequestAnalyzer(vreq,
+				new IndividualRequestAnalysisContextImpl(vreq));
+		IndividualRequestInfo requestInfo = requestAnalyzer.analyze();
+		Individual owner = requestInfo.getIndividual();
+		return owner != null ? owner.getURI() : null;
+	}
+	
+	private String getGadgetFileNameFromURL(String url) {
+		String[] urlbits = url.split("/");
+		return urlbits[urlbits.length - 1];
+	}
+
+	public boolean isDebug() {
+		return isDebug;
+	}
+
+	public boolean noCache() {
+		return noCache;
+	}
+
+	public String getOwnerId() {
+		return ownerId;
+	}
+
+	public boolean hasGadgetListeningTo(String channel) {
+		for (PreparedGadget gadget : getVisibleGadgets()) {
+			if (gadget.getGadgetSpec().listensTo(channel)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	public static List<String> getOpenSocialId(List<Individual> individuals) {
+		List<String> personIds = new ArrayList<String>();
+		for (Individual ind : individuals) {
+			personIds.add(ind.getURI());
+		}
+		return personIds;
+	}
+
+	// JSON Helper Functions
+	public static String buildJSONPersonIds(List<String> personIds,
+			String message) throws JSONException {
+		JSONObject json = new JSONObject();
+		json.put("message", message);
+		json.put("personIds", personIds);
+		return json.toString();
+	}
+	
+	public static String buildJSONPersonIds(String personId, String message) throws JSONException {
+		List<String> personIds = new ArrayList<String>();
+		personIds.add(personId);
+		return buildJSONPersonIds(personIds, message);
+	}
+
+	public static String buildJSONPersonIds(Individual ind, String message) throws JSONException {
+		List<String> personIds = new ArrayList<String>();
+		personIds.add(ind.getURI());
+		return buildJSONPersonIds(personIds, message);
+	}
+
+	public void setPubsubData(String key, String value) {
+		if (pubsubdata.containsKey(key)) {
+			pubsubdata.remove(key);
+		}
+		if (value != null && !value.isEmpty()) {
+			pubsubdata.put(key, value);
+		}
+	}
+
+	public Map<String, String> getPubsubData() {
+		return pubsubdata;
+	}
+
+	public void removePubsubGadgetsWithoutData() {
+		// if any visible gadgets depend on pubsub data that isn't present,
+		// throw them out
+		List<PreparedGadget> removedGadgets = new ArrayList<PreparedGadget>();
+		for (PreparedGadget gadget : gadgets) {
+			for (String channel : gadget.getGadgetSpec().getChannels()) {
+				if (!pubsubdata.containsKey(channel)) {
+					removedGadgets.add(gadget);
+					break;
+				}
+			}
+		}
+		for (PreparedGadget gadget : removedGadgets) {
+			gadgets.remove(gadget);
+		}
+	}
+
+	public void removeGadget(String name) {
+		// if any visible gadgets depend on pubsub data that isn't present,
+		// throw them out
+		PreparedGadget gadgetToRemove = null;
+		for (PreparedGadget gadget : gadgets) {
+			if (name.equals(gadget.getName())) {
+				gadgetToRemove = gadget;
+				break;
+			}
+		}
+		gadgets.remove(gadgetToRemove);
+	}
+
+	public String getPageName() {
+		return pageName;
+	}
+
+	public String getIdToUrlMapJavascript() {
+		String retval = "var idToUrlMap = {";
+		for (PreparedGadget gadget : gadgets) {
+			// retval += gadget.GetAppId() + ":'" + gadget.GetGadgetURL() +
+			// "', ";
+			retval += "'remote_iframe_" + gadget.getAppId() + "':'"
+					+ gadget.getGadgetURL() + "', ";
+		}
+		return retval.substring(0, retval.length() - 2) + "};";
+	}
+
+	public boolean isVisible() {
+		// always have turned on for ProfileDetails.aspx because we want to
+		// generate the "profile was viewed" in Javascript (bot proof)
+		// regardless of any gadgets being visible, and we need this to be True
+		// for the shindig javascript libraries to load
+		return (configuration.getProperty(SHINDIG_URL_PROP) != null
+				&& (getVisibleGadgets().size() > 0) || getPageName().equals(
+				"/display"));
+	}
+
+	public List<PreparedGadget> getVisibleGadgets() {
+		return gadgets;
+	}
+
+	public void postActivity(int userId, String title) throws SQLException {
+		postActivity(userId, title, null, null, null);
+	}
+
+	public void postActivity(int userId, String title, String body) throws SQLException {
+		postActivity(userId, title, body, null, null);
+	}
+
+	public void postActivity(int userId, String title, String body,
+			String xtraId1Type, String xtraId1Value) throws SQLException {
+		Connection conn = null;
+		Statement stmt = null;
+		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>" 
+				+ (body != null ? "<body>" + body + "</body>" : "") + "</activity>','"
+				+ xtraId1Type + "','" + xtraId1Value + "');";		
+		try {
+			conn = dataSource.getConnection();
+			stmt = conn.createStatement();
+			stmt.executeUpdate(sqlCommand);
+		} finally {
+			try {
+				stmt.close();
+			} catch (Exception e) {
+			}
+			try {
+				conn.close();
+			} catch (Exception e) {
+			}
+		}
+			
+	}
+
+	private String socketSendReceive(String viewer, String owner, String gadget)
+			throws IOException {
+		// These keys need to match what you see in
+		// edu.ucsf.orng.shindig.service.SecureTokenGeneratorService in
+		// Shindig
+		String[] tokenService = configuration.getProperty(
+				"OpenSocial.tokenService").split(":");
+		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.
+		Socket s = new Socket(tokenService[0],
+				Integer.parseInt(tokenService[1]));
+
+		// Send request to the server.
+		s.getOutputStream().write(request.getBytes());
+
+		// Receive the encoded content.
+		int bytes = 0;
+		String page = "";
+		byte[] bytesReceived = new byte[256];
+
+		// The following will block until the page is transmitted.
+		while ((bytes = s.getInputStream().read(bytesReceived)) > 0) {
+			page += new String(bytesReceived, 0, bytes);
+		};
+
+		return page;
+	}
+	
+	public String getContainerJavascriptSrc() {
+		return configuration.getProperty(SHINDIG_URL_PROP)
+				+ "/gadgets/js/core:dynamic-height:osapi:pubsub:rpc:views:rdf:shindig-container.js?c=1"
+				+ (isDebug ? "&debug=1" : "");
+	}
+
+	public String getGadgetJavascript() {
+		String lineSeparator = System.getProperty("line.separator");
+		String gadgetScriptText = "var my = {};" + lineSeparator
+				+ "my.gadgetSpec = function(appId, name, url, secureToken, view, chrome_id, opt_params, visible_scope) {"
+				+ lineSeparator + "this.appId = appId;" + lineSeparator
+				+ "this.name = name;" + lineSeparator + "this.url = url;"
+				+ lineSeparator + "this.secureToken = secureToken;"
+				+ lineSeparator + "this.view = view || 'default';"
+				+ lineSeparator + "this.chrome_id = chrome_id;" 
+				+ lineSeparator + "this.opt_params = opt_params;" + lineSeparator
+				+ "this.visible_scope = visible_scope;" + lineSeparator + "};"
+				+ lineSeparator + "my.pubsubData = {};" + lineSeparator;
+		for (String key : getPubsubData().keySet()) {
+			gadgetScriptText += "my.pubsubData['" + key + "'] = '"
+					+ getPubsubData().get(key) + "';" + lineSeparator;
+		}
+		gadgetScriptText += "my.openSocialURL = '"
+				+ configuration.getProperty(SHINDIG_URL_PROP) + "';"
+				+ lineSeparator + "my.debug = " + (isDebug() ? "1" : "0") + ";"
+				+ lineSeparator + "my.noCache = " + (noCache() ? "1" : "0")
+				+ ";" + lineSeparator + "my.gadgets = [";
+		for (PreparedGadget gadget : getVisibleGadgets()) {
+			gadgetScriptText += "new my.gadgetSpec(" + gadget.getAppId() + ",'"
+					+ gadget.getName() + "','" + gadget.getGadgetURL() + "','"
+					+ gadget.getSecurityToken() + "','" + gadget.getView()
+					+ "','" + gadget.getChromeId() + "'," + gadget.getOptParams() + ",'"
+					+ gadget.getGadgetSpec().getVisibleScope() + "'), ";
+		}
+		gadgetScriptText = gadgetScriptText.substring(0,
+				gadgetScriptText.length() - 2)
+				+ "];"
+				+ lineSeparator;
+
+		return gadgetScriptText;
+	}
+	
+	Map<String, GadgetSpec> getAllDBGadgets(boolean useCache) throws SQLException 
+	{
+		// great place to add cache
+        // check cache first
+		Map<String, GadgetSpec> allDBGadgets = useCache ? gadgetCache : null;		
+		if (allDBGadgets == null) {
+			allDBGadgets = new HashMap<String, GadgetSpec>();
+			Connection conn = null;
+			Statement stmt = null;
+			ResultSet rset = null;
+			try {
+	
+				String sqlCommand = "select appId, name, url, channels, enabled from orng_apps";
+	
+				conn = dataSource.getConnection();
+				stmt = conn.createStatement();
+				rset = stmt.executeQuery(sqlCommand);
+	
+				while (rset.next()) {
+					String channelsStr = rset.getString(4);
+					List<String> channels = Arrays.asList(channelsStr != null && channelsStr.length() > 0 ? channelsStr.split(" ") : new String[0]);
+					GadgetSpec spec = new GadgetSpec(rset.getInt(1),
+							rset.getString(2), rset.getString(3), channels, dataSource, rset.getBoolean(5), false);
+					String gadgetFileName = getGadgetFileNameFromURL(rset.getString(3));
+	
+					allDBGadgets.put(gadgetFileName, spec);
+				}
+			} 
+			finally {
+				try {
+					rset.close();
+				} catch (Exception e) {
+				}
+				try {
+					stmt.close();
+				} catch (Exception e) {
+				}
+				try {
+					conn.close();
+				} catch (Exception e) {
+				}
+			}
+			if (useCache) {
+				gadgetCache = allDBGadgets;
+			}
+		}
+
+		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 
+		// gadget/sandbox form!
+		String openSocialGadgetURLS = (String) vreq.getSession()
+				.getAttribute(OPENSOCIAL_GADGETS);
+		String[] urls = openSocialGadgetURLS.split(System.getProperty("line.separator"));
+		for (String openSocialGadgetURL : urls) {
+			openSocialGadgetURL = openSocialGadgetURL.trim();
+			if (openSocialGadgetURL.length() == 0)
+				continue;
+			int appId = 0; // if URL matches one in the DB, use DB provided
+							// appId, otherwise generate one
+			String gadgetFileName = getGadgetFileNameFromURL(openSocialGadgetURL);
+			String name = gadgetFileName;
+			List<String> channels = new ArrayList<String>();
+			boolean unknownGadget = true;
+			if (allDBGadgets.containsKey(gadgetFileName)) {
+				appId = allDBGadgets.get(gadgetFileName).getAppId();
+				name = allDBGadgets.get(gadgetFileName).getName();
+				channels = allDBGadgets.get(gadgetFileName).getChannels();
+				unknownGadget = false;
+			} else {
+				log.warn("Could not find " + gadgetFileName + " in " + allDBGadgets.keySet());
+				appId = Math.abs(openSocialGadgetURL.hashCode());
+			}
+			// if they asked for a specific one, only let it in
+			if (requestAppId != null && Integer.parseInt(requestAppId) != appId) {
+				continue;
+			}
+			GadgetSpec gadget = new GadgetSpec(appId, name,
+					openSocialGadgetURL, channels, dataSource, true, unknownGadget);
+			// only add ones that are visible in this context!
+			int moduleId = 0;
+			if (unknownGadget
+					|| gadget.show(viewerId, ownerId, pageName, dataSource)) {
+				String securityToken = socketSendReceive(viewerId, ownerId,
+						"" + gadget.getAppId());
+				sandboxGadgets.add(new PreparedGadget(gadget, this, moduleId++,
+						securityToken));
+			}
+		}
+		return sandboxGadgets;
+		
+	}
+}
diff --git a/webapp/src/edu/ucsf/vitro/opensocial/PreparedGadget.java b/webapp/src/edu/ucsf/vitro/opensocial/PreparedGadget.java
index db13259f4..d02ac505d 100644
--- a/webapp/src/edu/ucsf/vitro/opensocial/PreparedGadget.java
+++ b/webapp/src/edu/ucsf/vitro/opensocial/PreparedGadget.java
@@ -1,111 +1,111 @@
-package edu.ucsf.vitro.opensocial;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-
-public class PreparedGadget implements Comparable<PreparedGadget> {
-	private GadgetSpec gadgetSpec;
-	private OpenSocialManager helper;
-	private int moduleId;
-	private String securityToken;
-
-	public PreparedGadget(GadgetSpec gadgetSpec, OpenSocialManager helper,
-			int moduleId, String securityToken) {
-		this.gadgetSpec = gadgetSpec;
-		this.helper = helper;
-		this.moduleId = moduleId;
-		this.securityToken = securityToken;
-	}
-
-	public int compareTo(PreparedGadget other) {
-		GadgetViewRequirements gvr1 = this.getGadgetViewRequirements();
-		GadgetViewRequirements gvr2 = other.getGadgetViewRequirements();
-		return ("" + this.getView() + (gvr1 != null ? gvr1.getDisplayOrder()
-				: Integer.MAX_VALUE)).compareTo("" + other.getView()
-				+ (gvr2 != null ? gvr2.getDisplayOrder() : Integer.MAX_VALUE));
-	}
-
-	public GadgetSpec getGadgetSpec() {
-		return gadgetSpec;
-	}
-
-	public String getSecurityToken() {
-		return securityToken;
-	}
-
-	public int getAppId() {
-		return gadgetSpec.getAppId();
-	}
-
-	public String getName() {
-		return gadgetSpec.getName();
-	}
-
-	public int getModuleId() {
-		return moduleId;
-	}
-
-	public String getGadgetURL() {
-		return gadgetSpec.getGadgetURL();
-	}
-
-	GadgetViewRequirements getGadgetViewRequirements() {
-		return gadgetSpec.getGadgetViewRequirements(helper.getPageName());
-	}
-
-	public String getView() {
-		GadgetViewRequirements reqs = getGadgetViewRequirements();
-		if (reqs != null) {
-			return reqs.getView();
-		}
-		// default behavior that will get invoked when there is no reqs. Useful
-		// for sandbox gadgets
-		else if (helper.getPageName().equals("individual-EDIT-MODE")) {
-			return "home";
-		} else if (helper.getPageName().equals("individual")) {
-			return "profile";
-		} else if (helper.getPageName().equals("gadgetDetails")) {
-			return "canvas";
-		} else if (gadgetSpec.getGadgetURL().contains("Tool")) {
-			return "small";
-		} else {
-			return null;
-		}
-	}
-
-	public String getChromeId() {
-		GadgetViewRequirements reqs = getGadgetViewRequirements();
-		if (reqs != null) {
-			return reqs.getChromeId();
-		}
-		// default behavior that will get invoked when there is no reqs. Useful
-		// for sandbox gadgets
-		else if (gadgetSpec.getGadgetURL().contains("Tool")) {
-			return "gadgets-tools";
-		} else if (helper.getPageName().equals("individual-EDIT-MODE")) {
-			return "gadgets-edit";
-		} else if (helper.getPageName().equals("individual")) {
-			return "gadgets-view";
-		} else if (helper.getPageName().equals("gadgetDetails")) {
-			return "gadgets-detail";
-		} else if (helper.getPageName().equals("search")) {
-			return "gadgets-search";
-		} else {
-			return null;
-		}
-	}
-
-	public String getOptParams() {
-		GadgetViewRequirements reqs = getGadgetViewRequirements();
-		return reqs != null ? reqs.getOptParams() : "{}";
-	}
-
-	public String getCanvasURL() throws UnsupportedEncodingException {
-		return "~/gadget?appId=" + getAppId() + "&Person="
-				+ URLEncoder.encode(helper.getOwnerId(), "UTF-8");
-	}
-
-	public String toString() {
-		return "" + this.moduleId + ", (" + this.gadgetSpec.toString() + ")";
-	}
-}
+package edu.ucsf.vitro.opensocial;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+public class PreparedGadget implements Comparable<PreparedGadget> {
+	private GadgetSpec gadgetSpec;
+	private OpenSocialManager helper;
+	private int moduleId;
+	private String securityToken;
+
+	public PreparedGadget(GadgetSpec gadgetSpec, OpenSocialManager helper,
+			int moduleId, String securityToken) {
+		this.gadgetSpec = gadgetSpec;
+		this.helper = helper;
+		this.moduleId = moduleId;
+		this.securityToken = securityToken;
+	}
+
+	public int compareTo(PreparedGadget other) {
+		GadgetViewRequirements gvr1 = this.getGadgetViewRequirements();
+		GadgetViewRequirements gvr2 = other.getGadgetViewRequirements();
+		return ("" + this.getView() + (gvr1 != null ? gvr1.getDisplayOrder()
+				: Integer.MAX_VALUE)).compareTo("" + other.getView()
+				+ (gvr2 != null ? gvr2.getDisplayOrder() : Integer.MAX_VALUE));
+	}
+
+	public GadgetSpec getGadgetSpec() {
+		return gadgetSpec;
+	}
+
+	public String getSecurityToken() {
+		return securityToken;
+	}
+
+	public int getAppId() {
+		return gadgetSpec.getAppId();
+	}
+
+	public String getName() {
+		return gadgetSpec.getName();
+	}
+
+	public int getModuleId() {
+		return moduleId;
+	}
+
+	public String getGadgetURL() {
+		return gadgetSpec.getGadgetURL();
+	}
+
+	GadgetViewRequirements getGadgetViewRequirements() {
+		return gadgetSpec.getGadgetViewRequirements(helper.getPageName());
+	}
+
+	public String getView() {
+		GadgetViewRequirements reqs = getGadgetViewRequirements();
+		if (reqs != null) {
+			return reqs.getView();
+		}
+		// default behavior that will get invoked when there is no reqs. Useful
+		// for sandbox gadgets
+		else if (helper.getPageName().equals("individual-EDIT-MODE")) {
+			return "home";
+		} else if (helper.getPageName().equals("individual")) {
+			return "profile";
+		} else if (helper.getPageName().equals("gadgetDetails")) {
+			return "canvas";
+		} else if (gadgetSpec.getGadgetURL().contains("Tool")) {
+			return "small";
+		} else {
+			return null;
+		}
+	}
+
+	public String getChromeId() {
+		GadgetViewRequirements reqs = getGadgetViewRequirements();
+		if (reqs != null) {
+			return reqs.getChromeId();
+		}
+		// default behavior that will get invoked when there is no reqs. Useful
+		// for sandbox gadgets
+		else if (gadgetSpec.getGadgetURL().contains("Tool")) {
+			return "gadgets-tools";
+		} else if (helper.getPageName().equals("individual-EDIT-MODE")) {
+			return "gadgets-edit";
+		} else if (helper.getPageName().equals("individual")) {
+			return "gadgets-view";
+		} else if (helper.getPageName().equals("gadgetDetails")) {
+			return "gadgets-detail";
+		} else if (helper.getPageName().equals("search")) {
+			return "gadgets-search";
+		} else {
+			return null;
+		}
+	}
+
+	public String getOptParams() {
+		GadgetViewRequirements reqs = getGadgetViewRequirements();
+		return reqs != null ? reqs.getOptParams() : "{}";
+	}
+
+	public String getCanvasURL() throws UnsupportedEncodingException {
+		return "~/gadget?appId=" + getAppId() + "&Person="
+				+ URLEncoder.encode(helper.getOwnerId(), "UTF-8");
+	}
+
+	public String toString() {
+		return "" + this.moduleId + ", (" + this.gadgetSpec.toString() + ")";
+	}
+}
diff --git a/webapp/test/commons-logging.properties b/webapp/test/commons-logging.properties
index e8da5f201..d529f234c 100644
--- a/webapp/test/commons-logging.properties
+++ b/webapp/test/commons-logging.properties
@@ -1,3 +1,3 @@
-# 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
+# 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/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_ActionsTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_ActionsTest.java
index d76433311..8653d713f 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_ActionsTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_ActionsTest.java
@@ -1,146 +1,146 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.policy;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.log4j.Level;
-import org.junit.Before;
-import org.junit.Test;
-
-import stubs.javax.servlet.ServletContextStub;
-import stubs.javax.servlet.http.HttpServletRequestStub;
-import stubs.javax.servlet.http.HttpSessionStub;
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-
-/**
- * Test the function of PolicyHelper in authorizing simple actions.
- */
-public class PolicyHelper_ActionsTest extends AbstractTestClass {
-	private ServletContextStub ctx;
-	private HttpSessionStub session;
-	private HttpServletRequestStub req;
-
-	@Before
-	public void setLogging() {
-		setLoggerLevel(ServletPolicyList.class, Level.WARN);
-	}
-
-	@Before
-	public void setup() {
-		ctx = new ServletContextStub();
-
-		session = new HttpSessionStub();
-		session.setServletContext(ctx);
-
-		req = new HttpServletRequestStub();
-		req.setSession(session);
-	}
-
-	// ----------------------------------------------------------------------
-	// Action-level tests
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void authorizedForActionsNull() {
-		createPolicy();
-		assertEquals("null actions", true,
-				PolicyHelper.isAuthorizedForActions(req, (Actions) null));
-	}
-
-	@Test
-	public void authorizedForActionsEmpty() {
-		createPolicy();
-		assertEquals("empty actions", true,
-				PolicyHelper.isAuthorizedForActions(req, new Actions()));
-	}
-
-	@Test
-	public void authorizedForActionsOneClausePass() {
-		createPolicy(new Action1(), new Action2());
-		assertEquals("one clause pass", true,
-				PolicyHelper.isAuthorizedForActions(req, new Actions(
-						new Action1(), new Action2())));
-	}
-
-	@Test
-	public void authorizedForActionsOneClauseFail() {
-		createPolicy(new Action2());
-		assertEquals("one clause fail", false,
-				PolicyHelper.isAuthorizedForActions(req, new Actions(
-						new Action1(), new Action2())));
-	}
-
-	@Test
-	public void authorizedForActionsMultipleClausesPass() {
-		createPolicy(new Action3());
-		assertEquals("multiple clauses pass", true,
-				PolicyHelper.isAuthorizedForActions(req, new Actions(
-						new Action1(), new Action2()).or(new Action3())));
-	}
-
-	@Test
-	public void authorizedForActionsMultipleClausesFail() {
-		createPolicy(new Action1());
-		assertEquals("multiple clauses fail", false,
-				PolicyHelper.isAuthorizedForActions(req, new Actions(
-						new Action1(), new Action2()).or(new Action3())));
-	}
-
-	// ----------------------------------------------------------------------
-	// Helper methods
-	// ----------------------------------------------------------------------
-
-	private void createPolicy(RequestedAction... authorizedActions) {
-		ServletPolicyList.addPolicy(ctx, new MySimplePolicy(authorizedActions));
-	}
-
-	// ----------------------------------------------------------------------
-	// Helper Classes
-	// ----------------------------------------------------------------------
-
-	public static class Action1 extends RequestedAction {
-		// actions must be public, with public constructor
-	}
-
-	public static class Action2 extends RequestedAction {
-		// actions must be public, with public constructor
-	}
-
-	public static class Action3 extends RequestedAction {
-		// actions must be public, with public constructor
-	}
-
-	private static class MySimplePolicy implements PolicyIface {
-		private final Set<RequestedAction> authorizedActions;
-
-		public MySimplePolicy(RequestedAction... authorizedActions) {
-			this.authorizedActions = new HashSet<RequestedAction>(
-					Arrays.asList(authorizedActions));
-		}
-
-		@Override
-		public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
-				RequestedAction whatToAuth) {
-			for (RequestedAction authorized : authorizedActions) {
-				if (authorized.getClass().equals(whatToAuth.getClass())) {
-					return new BasicPolicyDecision(Authorization.AUTHORIZED,
-							"matched " + authorized.getClass().getSimpleName());
-				}
-
-			}
-			return new BasicPolicyDecision(Authorization.INCONCLUSIVE, "nope");
-		}
-
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.log4j.Level;
+import org.junit.Before;
+import org.junit.Test;
+
+import stubs.javax.servlet.ServletContextStub;
+import stubs.javax.servlet.http.HttpServletRequestStub;
+import stubs.javax.servlet.http.HttpSessionStub;
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.Actions;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+
+/**
+ * Test the function of PolicyHelper in authorizing simple actions.
+ */
+public class PolicyHelper_ActionsTest extends AbstractTestClass {
+	private ServletContextStub ctx;
+	private HttpSessionStub session;
+	private HttpServletRequestStub req;
+
+	@Before
+	public void setLogging() {
+		setLoggerLevel(ServletPolicyList.class, Level.WARN);
+	}
+
+	@Before
+	public void setup() {
+		ctx = new ServletContextStub();
+
+		session = new HttpSessionStub();
+		session.setServletContext(ctx);
+
+		req = new HttpServletRequestStub();
+		req.setSession(session);
+	}
+
+	// ----------------------------------------------------------------------
+	// Action-level tests
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void authorizedForActionsNull() {
+		createPolicy();
+		assertEquals("null actions", true,
+				PolicyHelper.isAuthorizedForActions(req, (Actions) null));
+	}
+
+	@Test
+	public void authorizedForActionsEmpty() {
+		createPolicy();
+		assertEquals("empty actions", true,
+				PolicyHelper.isAuthorizedForActions(req, new Actions()));
+	}
+
+	@Test
+	public void authorizedForActionsOneClausePass() {
+		createPolicy(new Action1(), new Action2());
+		assertEquals("one clause pass", true,
+				PolicyHelper.isAuthorizedForActions(req, new Actions(
+						new Action1(), new Action2())));
+	}
+
+	@Test
+	public void authorizedForActionsOneClauseFail() {
+		createPolicy(new Action2());
+		assertEquals("one clause fail", false,
+				PolicyHelper.isAuthorizedForActions(req, new Actions(
+						new Action1(), new Action2())));
+	}
+
+	@Test
+	public void authorizedForActionsMultipleClausesPass() {
+		createPolicy(new Action3());
+		assertEquals("multiple clauses pass", true,
+				PolicyHelper.isAuthorizedForActions(req, new Actions(
+						new Action1(), new Action2()).or(new Action3())));
+	}
+
+	@Test
+	public void authorizedForActionsMultipleClausesFail() {
+		createPolicy(new Action1());
+		assertEquals("multiple clauses fail", false,
+				PolicyHelper.isAuthorizedForActions(req, new Actions(
+						new Action1(), new Action2()).or(new Action3())));
+	}
+
+	// ----------------------------------------------------------------------
+	// Helper methods
+	// ----------------------------------------------------------------------
+
+	private void createPolicy(RequestedAction... authorizedActions) {
+		ServletPolicyList.addPolicy(ctx, new MySimplePolicy(authorizedActions));
+	}
+
+	// ----------------------------------------------------------------------
+	// Helper Classes
+	// ----------------------------------------------------------------------
+
+	public static class Action1 extends RequestedAction {
+		// actions must be public, with public constructor
+	}
+
+	public static class Action2 extends RequestedAction {
+		// actions must be public, with public constructor
+	}
+
+	public static class Action3 extends RequestedAction {
+		// actions must be public, with public constructor
+	}
+
+	private static class MySimplePolicy implements PolicyIface {
+		private final Set<RequestedAction> authorizedActions;
+
+		public MySimplePolicy(RequestedAction... authorizedActions) {
+			this.authorizedActions = new HashSet<RequestedAction>(
+					Arrays.asList(authorizedActions));
+		}
+
+		@Override
+		public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
+				RequestedAction whatToAuth) {
+			for (RequestedAction authorized : authorizedActions) {
+				if (authorized.getClass().equals(whatToAuth.getClass())) {
+					return new BasicPolicyDecision(Authorization.AUTHORIZED,
+							"matched " + authorized.getClass().getSimpleName());
+				}
+
+			}
+			return new BasicPolicyDecision(Authorization.INCONCLUSIVE, "nope");
+		}
+
+	}
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_ModelsTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_ModelsTest.java
index e2672dc02..c7bcab13f 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_ModelsTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_ModelsTest.java
@@ -1,370 +1,370 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.policy;
-
-import static org.junit.Assert.assertEquals;
-
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.Method;
-import java.lang.reflect.Proxy;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import org.apache.log4j.Level;
-import org.junit.Before;
-import org.junit.Test;
-
-import stubs.javax.servlet.ServletContextStub;
-import stubs.javax.servlet.http.HttpServletRequestStub;
-import stubs.javax.servlet.http.HttpSessionStub;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-import com.hp.hpl.jena.util.iterator.NiceIterator;
-
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AbstractPropertyStatementAction;
-
-/**
- * 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.
- */
-public class PolicyHelper_ModelsTest extends AbstractTestClass {
-	private static final String PRIMARY_RESOURCE_URI = "http://primaryResource";
-	private static final String OTHER_RESOURCE_URI = "http://otherResource";
-	private static final String FRIEND_PREDICATE_URI = "http://friend";
-	private static final String SOME_PREDICATE_URI = "http://something";
-
-	private ServletContextStub ctx;
-	private HttpSessionStub session;
-	private HttpServletRequestStub req;
-	private OntModel ontModel = ModelFactory
-			.createOntologyModel(OntModelSpec.OWL_MEM);
-
-	private Model additions;
-	private Model retractions;
-
-	@Before
-	public void setup() {
-		ctx = new ServletContextStub();
-
-		session = new HttpSessionStub();
-		session.setServletContext(ctx);
-
-		req = new HttpServletRequestStub();
-		req.setSession(session);
-
-		setLoggerLevel(ServletPolicyList.class, Level.WARN);
-		ServletPolicyList.addPolicy(ctx, new MySimplePolicy());
-
-//		setLoggerLevel(PolicyHelper.class, Level.DEBUG);
-	}
-
-	// ----------------------------------------------------------------------
-	// The tests.
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void rejectNullRequest() {
-		setLoggerLevel(PolicyHelper.class, Level.ERROR); // suppress warning
-		req = null;
-		additions = model();
-		retractions = model();
-		assertAuthorized("reject null request", false);
-	}
-
-	@Test
-	public void rejectNullAdditions() {
-		setLoggerLevel(PolicyHelper.class, Level.ERROR); // suppress warning
-		additions = null;
-		retractions = model();
-		assertAuthorized("reject null additions", false);
-	}
-
-	@Test
-	public void rejectNullRetractions() {
-		setLoggerLevel(PolicyHelper.class, Level.ERROR); // suppress warning
-		additions = model();
-		retractions = null;
-		assertAuthorized("reject null retractions", false);
-	}
-
-	@Test
-	public void rejectNullOntModel() {
-		setLoggerLevel(PolicyHelper.class, Level.ERROR); // suppress warning
-		additions = model();
-		retractions = model();
-		ontModel = null;
-		assertAuthorized("reject null OntModel", false);
-	}
-
-	@Test
-	public void acceptEmptyChanges() {
-		additions = model();
-		retractions = model();
-		assertAuthorized("accept empty changes add", true);
-	}
-
-	@Test
-	public void acceptSimpleAdd() {
-		additions = model(dataStatement(PRIMARY_RESOURCE_URI,
-				SOME_PREDICATE_URI));
-		retractions = model();
-		assertAuthorized("accept simple add", true);
-	}
-
-	@Test
-	public void acceptSimpleDrop() {
-		additions = model();
-		retractions = model(dataStatement(PRIMARY_RESOURCE_URI,
-				SOME_PREDICATE_URI));
-		assertAuthorized("accept simple add", true);
-	}
-
-	@Test
-	public void rejectSimpleAdd() {
-		setLoggerLevel(PolicyHelper.class, Level.ERROR); // suppress warning
-		additions = model(dataStatement(OTHER_RESOURCE_URI, SOME_PREDICATE_URI));
-		retractions = model();
-		assertAuthorized("reject simple add", false);
-	}
-
-	@Test
-	public void rejectSimpleDrop() {
-		setLoggerLevel(PolicyHelper.class, Level.ERROR); // suppress warning
-		additions = model();
-		retractions = model(dataStatement(OTHER_RESOURCE_URI,
-				SOME_PREDICATE_URI));
-		assertAuthorized("reject simple drop", false);
-	}
-
-	@Test
-	public void acceptAddBecauseOfExistingStatement() {
-		ontModel.add(objectStatement(PRIMARY_RESOURCE_URI,
-				FRIEND_PREDICATE_URI, OTHER_RESOURCE_URI));
-		additions = model(dataStatement(OTHER_RESOURCE_URI, SOME_PREDICATE_URI));
-		retractions = model();
-		assertAuthorized("accept add because of existing statement", true);
-	}
-
-	@Test
-	public void acceptDropBecauseOfExistingStatement() {
-		ontModel.add(objectStatement(PRIMARY_RESOURCE_URI,
-				FRIEND_PREDICATE_URI, OTHER_RESOURCE_URI));
-		additions = model();
-		retractions = model(dataStatement(OTHER_RESOURCE_URI,
-				SOME_PREDICATE_URI));
-		assertAuthorized("accept drop because of existing statement", true);
-	}
-
-	/**
-	 * This test is the whole reason for the funky model that lists statements
-	 * in a known order. We need to know that the DataStatement is authorized
-	 * even though it relies on an ObjectStatement that appears later in the
-	 * list.
-	 */
-	@Test
-	public void acceptAddBecauseOfOtherAdd() {
-		additions = model(
-				dataStatement(OTHER_RESOURCE_URI, SOME_PREDICATE_URI),
-				objectStatement(PRIMARY_RESOURCE_URI, FRIEND_PREDICATE_URI,
-						OTHER_RESOURCE_URI));
-		retractions = model();
-		assertAuthorized("accept add because of other add", true);
-	}
-
-	@Test
-	public void acceptDropBecauseOfAdd() {
-		additions = model(objectStatement(PRIMARY_RESOURCE_URI,
-				FRIEND_PREDICATE_URI, OTHER_RESOURCE_URI));
-		retractions = model(dataStatement(OTHER_RESOURCE_URI,
-				SOME_PREDICATE_URI));
-		assertAuthorized("accept drop because of add", true);
-	}
-
-	// ----------------------------------------------------------------------
-	// Helper methods
-	// ----------------------------------------------------------------------
-
-	/** Build a data statement. */
-	private Statement dataStatement(String subjectUri, String predicateUri) {
-		Model model = ModelFactory.createDefaultModel();
-		Resource subject = model.createResource(subjectUri);
-		Property predicate = model.createProperty(predicateUri);
-		return model.createStatement(subject, predicate, "whoCares?");
-	}
-
-	/** Build an object statement. */
-	private Statement objectStatement(String subjectUri, String predicateUri,
-			String objectUri) {
-		Model model = ModelFactory.createDefaultModel();
-		Resource subject = model.createResource(subjectUri);
-		Resource object = model.createResource(objectUri);
-		Property predicate = model.createProperty(predicateUri);
-		return model.createStatement(subject, predicate, object);
-	}
-
-	/** Build a model. */
-	private Model model(Statement... stmts) {
-		Model innerModel = ModelFactory.createDefaultModel();
-		Model proxy = (Model) Proxy.newProxyInstance(
-				OrderedModelInvocationHandler.class.getClassLoader(),
-				new Class[] { Model.class }, new OrderedModelInvocationHandler(
-						innerModel));
-		proxy.add(stmts);
-		return proxy;
-	}
-
-	/**
-	 * Check whether we are authorized to make the additions and retractions to
-	 * the model.
-	 */
-	private void assertAuthorized(String message, boolean expected) {
-		boolean actual = PolicyHelper.isAuthorizedAsExpected(req, additions,
-				retractions, ontModel);
-		assertEquals(message, expected, actual);
-	}
-
-	// ----------------------------------------------------------------------
-	// Helper classes
-	// ----------------------------------------------------------------------
-
-	/**
-	 * 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
-	 * used a different method to query the model, we would not be assured of
-	 * the order of the statements from the iterator.
-	 */
-	public static class OrderedModelInvocationHandler implements
-			InvocationHandler {
-		private final Model proxied;
-		private final List<Statement> stmts = new ArrayList<Statement>();
-
-		public OrderedModelInvocationHandler(Model proxied) {
-			this.proxied = proxied;
-		}
-
-		@Override
-		public Object invoke(Object proxy, Method method, Object[] args)
-				throws Throwable {
-			if (method.getName().equals("add") && (args.length == 1)
-					&& (args[0] instanceof Statement[])) {
-				stmts.addAll(Arrays.asList((Statement[]) args[0]));
-				return method.invoke(proxied, args);
-			}
-			if (method.getName().equals("listStatements")
-					&& ((args == null) || (args.length == 0))) {
-				return new StatementListIterator(stmts);
-			}
-
-			return method.invoke(proxied, args);
-		}
-	}
-
-	/**
-	 * A StmtIterator that iterates over a list of statements.
-	 */
-	public static class StatementListIterator extends NiceIterator<Statement>
-			implements StmtIterator {
-		private final Iterator<Statement> innerIterator;
-
-		public StatementListIterator(List<Statement> stmts) {
-			this.innerIterator = new ArrayList<Statement>(stmts).iterator();
-		}
-
-		@Override
-		public Statement nextStatement() throws NoSuchElementException {
-			return next();
-		}
-
-		@Override
-		public boolean hasNext() {
-			return innerIterator.hasNext();
-		}
-
-		@Override
-		public Statement next() {
-			return innerIterator.next();
-		}
-
-	}
-
-	/**
-	 * A Policy that authorizes a statement iff (1) The subject is the primary
-	 * resource, or (2) The subject is related to the primary resource by a
-	 * "friend" property statement.
-	 */
-	private class MySimplePolicy implements PolicyIface {
-		@Override
-		public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
-				RequestedAction whatToAuth) {
-			if (!(whatToAuth instanceof AbstractPropertyStatementAction)) {
-				return inconclusive();
-			}
-
-			AbstractPropertyStatementAction action = (AbstractPropertyStatementAction) whatToAuth;
-
-			String subjectUri = action.getResourceUris()[0];
-			if (PRIMARY_RESOURCE_URI.equals(subjectUri)) {
-				return authorized();
-			}
-
-			Statement friendStmt = objectStatement(PRIMARY_RESOURCE_URI,
-					FRIEND_PREDICATE_URI, subjectUri);
-			if (statementExists(action.getOntModel(), friendStmt)) {
-				return authorized();
-			}
-
-			return inconclusive();
-		}
-
-		private boolean statementExists(OntModel oModel, Statement stmt) {
-			StmtIterator stmts = oModel.listStatements(stmt.getSubject(),
-					stmt.getPredicate(), stmt.getObject());
-			try {
-				return stmts.hasNext();
-			} finally {
-				stmts.close();
-			}
-		}
-
-		private PolicyDecision authorized() {
-			return new BasicPolicyDecision(Authorization.AUTHORIZED, "");
-		}
-
-		private PolicyDecision inconclusive() {
-			return new BasicPolicyDecision(Authorization.INCONCLUSIVE, "");
-		}
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy;
+
+import static org.junit.Assert.assertEquals;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import org.apache.log4j.Level;
+import org.junit.Before;
+import org.junit.Test;
+
+import stubs.javax.servlet.ServletContextStub;
+import stubs.javax.servlet.http.HttpServletRequestStub;
+import stubs.javax.servlet.http.HttpSessionStub;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.rdf.model.StmtIterator;
+import com.hp.hpl.jena.util.iterator.NiceIterator;
+
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AbstractPropertyStatementAction;
+
+/**
+ * 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.
+ */
+public class PolicyHelper_ModelsTest extends AbstractTestClass {
+	private static final String PRIMARY_RESOURCE_URI = "http://primaryResource";
+	private static final String OTHER_RESOURCE_URI = "http://otherResource";
+	private static final String FRIEND_PREDICATE_URI = "http://friend";
+	private static final String SOME_PREDICATE_URI = "http://something";
+
+	private ServletContextStub ctx;
+	private HttpSessionStub session;
+	private HttpServletRequestStub req;
+	private OntModel ontModel = ModelFactory
+			.createOntologyModel(OntModelSpec.OWL_MEM);
+
+	private Model additions;
+	private Model retractions;
+
+	@Before
+	public void setup() {
+		ctx = new ServletContextStub();
+
+		session = new HttpSessionStub();
+		session.setServletContext(ctx);
+
+		req = new HttpServletRequestStub();
+		req.setSession(session);
+
+		setLoggerLevel(ServletPolicyList.class, Level.WARN);
+		ServletPolicyList.addPolicy(ctx, new MySimplePolicy());
+
+//		setLoggerLevel(PolicyHelper.class, Level.DEBUG);
+	}
+
+	// ----------------------------------------------------------------------
+	// The tests.
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void rejectNullRequest() {
+		setLoggerLevel(PolicyHelper.class, Level.ERROR); // suppress warning
+		req = null;
+		additions = model();
+		retractions = model();
+		assertAuthorized("reject null request", false);
+	}
+
+	@Test
+	public void rejectNullAdditions() {
+		setLoggerLevel(PolicyHelper.class, Level.ERROR); // suppress warning
+		additions = null;
+		retractions = model();
+		assertAuthorized("reject null additions", false);
+	}
+
+	@Test
+	public void rejectNullRetractions() {
+		setLoggerLevel(PolicyHelper.class, Level.ERROR); // suppress warning
+		additions = model();
+		retractions = null;
+		assertAuthorized("reject null retractions", false);
+	}
+
+	@Test
+	public void rejectNullOntModel() {
+		setLoggerLevel(PolicyHelper.class, Level.ERROR); // suppress warning
+		additions = model();
+		retractions = model();
+		ontModel = null;
+		assertAuthorized("reject null OntModel", false);
+	}
+
+	@Test
+	public void acceptEmptyChanges() {
+		additions = model();
+		retractions = model();
+		assertAuthorized("accept empty changes add", true);
+	}
+
+	@Test
+	public void acceptSimpleAdd() {
+		additions = model(dataStatement(PRIMARY_RESOURCE_URI,
+				SOME_PREDICATE_URI));
+		retractions = model();
+		assertAuthorized("accept simple add", true);
+	}
+
+	@Test
+	public void acceptSimpleDrop() {
+		additions = model();
+		retractions = model(dataStatement(PRIMARY_RESOURCE_URI,
+				SOME_PREDICATE_URI));
+		assertAuthorized("accept simple add", true);
+	}
+
+	@Test
+	public void rejectSimpleAdd() {
+		setLoggerLevel(PolicyHelper.class, Level.ERROR); // suppress warning
+		additions = model(dataStatement(OTHER_RESOURCE_URI, SOME_PREDICATE_URI));
+		retractions = model();
+		assertAuthorized("reject simple add", false);
+	}
+
+	@Test
+	public void rejectSimpleDrop() {
+		setLoggerLevel(PolicyHelper.class, Level.ERROR); // suppress warning
+		additions = model();
+		retractions = model(dataStatement(OTHER_RESOURCE_URI,
+				SOME_PREDICATE_URI));
+		assertAuthorized("reject simple drop", false);
+	}
+
+	@Test
+	public void acceptAddBecauseOfExistingStatement() {
+		ontModel.add(objectStatement(PRIMARY_RESOURCE_URI,
+				FRIEND_PREDICATE_URI, OTHER_RESOURCE_URI));
+		additions = model(dataStatement(OTHER_RESOURCE_URI, SOME_PREDICATE_URI));
+		retractions = model();
+		assertAuthorized("accept add because of existing statement", true);
+	}
+
+	@Test
+	public void acceptDropBecauseOfExistingStatement() {
+		ontModel.add(objectStatement(PRIMARY_RESOURCE_URI,
+				FRIEND_PREDICATE_URI, OTHER_RESOURCE_URI));
+		additions = model();
+		retractions = model(dataStatement(OTHER_RESOURCE_URI,
+				SOME_PREDICATE_URI));
+		assertAuthorized("accept drop because of existing statement", true);
+	}
+
+	/**
+	 * This test is the whole reason for the funky model that lists statements
+	 * in a known order. We need to know that the DataStatement is authorized
+	 * even though it relies on an ObjectStatement that appears later in the
+	 * list.
+	 */
+	@Test
+	public void acceptAddBecauseOfOtherAdd() {
+		additions = model(
+				dataStatement(OTHER_RESOURCE_URI, SOME_PREDICATE_URI),
+				objectStatement(PRIMARY_RESOURCE_URI, FRIEND_PREDICATE_URI,
+						OTHER_RESOURCE_URI));
+		retractions = model();
+		assertAuthorized("accept add because of other add", true);
+	}
+
+	@Test
+	public void acceptDropBecauseOfAdd() {
+		additions = model(objectStatement(PRIMARY_RESOURCE_URI,
+				FRIEND_PREDICATE_URI, OTHER_RESOURCE_URI));
+		retractions = model(dataStatement(OTHER_RESOURCE_URI,
+				SOME_PREDICATE_URI));
+		assertAuthorized("accept drop because of add", true);
+	}
+
+	// ----------------------------------------------------------------------
+	// Helper methods
+	// ----------------------------------------------------------------------
+
+	/** Build a data statement. */
+	private Statement dataStatement(String subjectUri, String predicateUri) {
+		Model model = ModelFactory.createDefaultModel();
+		Resource subject = model.createResource(subjectUri);
+		Property predicate = model.createProperty(predicateUri);
+		return model.createStatement(subject, predicate, "whoCares?");
+	}
+
+	/** Build an object statement. */
+	private Statement objectStatement(String subjectUri, String predicateUri,
+			String objectUri) {
+		Model model = ModelFactory.createDefaultModel();
+		Resource subject = model.createResource(subjectUri);
+		Resource object = model.createResource(objectUri);
+		Property predicate = model.createProperty(predicateUri);
+		return model.createStatement(subject, predicate, object);
+	}
+
+	/** Build a model. */
+	private Model model(Statement... stmts) {
+		Model innerModel = ModelFactory.createDefaultModel();
+		Model proxy = (Model) Proxy.newProxyInstance(
+				OrderedModelInvocationHandler.class.getClassLoader(),
+				new Class[] { Model.class }, new OrderedModelInvocationHandler(
+						innerModel));
+		proxy.add(stmts);
+		return proxy;
+	}
+
+	/**
+	 * Check whether we are authorized to make the additions and retractions to
+	 * the model.
+	 */
+	private void assertAuthorized(String message, boolean expected) {
+		boolean actual = PolicyHelper.isAuthorizedAsExpected(req, additions,
+				retractions, ontModel);
+		assertEquals(message, expected, actual);
+	}
+
+	// ----------------------------------------------------------------------
+	// Helper classes
+	// ----------------------------------------------------------------------
+
+	/**
+	 * 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
+	 * used a different method to query the model, we would not be assured of
+	 * the order of the statements from the iterator.
+	 */
+	public static class OrderedModelInvocationHandler implements
+			InvocationHandler {
+		private final Model proxied;
+		private final List<Statement> stmts = new ArrayList<Statement>();
+
+		public OrderedModelInvocationHandler(Model proxied) {
+			this.proxied = proxied;
+		}
+
+		@Override
+		public Object invoke(Object proxy, Method method, Object[] args)
+				throws Throwable {
+			if (method.getName().equals("add") && (args.length == 1)
+					&& (args[0] instanceof Statement[])) {
+				stmts.addAll(Arrays.asList((Statement[]) args[0]));
+				return method.invoke(proxied, args);
+			}
+			if (method.getName().equals("listStatements")
+					&& ((args == null) || (args.length == 0))) {
+				return new StatementListIterator(stmts);
+			}
+
+			return method.invoke(proxied, args);
+		}
+	}
+
+	/**
+	 * A StmtIterator that iterates over a list of statements.
+	 */
+	public static class StatementListIterator extends NiceIterator<Statement>
+			implements StmtIterator {
+		private final Iterator<Statement> innerIterator;
+
+		public StatementListIterator(List<Statement> stmts) {
+			this.innerIterator = new ArrayList<Statement>(stmts).iterator();
+		}
+
+		@Override
+		public Statement nextStatement() throws NoSuchElementException {
+			return next();
+		}
+
+		@Override
+		public boolean hasNext() {
+			return innerIterator.hasNext();
+		}
+
+		@Override
+		public Statement next() {
+			return innerIterator.next();
+		}
+
+	}
+
+	/**
+	 * A Policy that authorizes a statement iff (1) The subject is the primary
+	 * resource, or (2) The subject is related to the primary resource by a
+	 * "friend" property statement.
+	 */
+	private class MySimplePolicy implements PolicyIface {
+		@Override
+		public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
+				RequestedAction whatToAuth) {
+			if (!(whatToAuth instanceof AbstractPropertyStatementAction)) {
+				return inconclusive();
+			}
+
+			AbstractPropertyStatementAction action = (AbstractPropertyStatementAction) whatToAuth;
+
+			String subjectUri = action.getResourceUris()[0];
+			if (PRIMARY_RESOURCE_URI.equals(subjectUri)) {
+				return authorized();
+			}
+
+			Statement friendStmt = objectStatement(PRIMARY_RESOURCE_URI,
+					FRIEND_PREDICATE_URI, subjectUri);
+			if (statementExists(action.getOntModel(), friendStmt)) {
+				return authorized();
+			}
+
+			return inconclusive();
+		}
+
+		private boolean statementExists(OntModel oModel, Statement stmt) {
+			StmtIterator stmts = oModel.listStatements(stmt.getSubject(),
+					stmt.getPredicate(), stmt.getObject());
+			try {
+				return stmts.hasNext();
+			} finally {
+				stmts.close();
+			}
+		}
+
+		private PolicyDecision authorized() {
+			return new BasicPolicyDecision(Authorization.AUTHORIZED, "");
+		}
+
+		private PolicyDecision inconclusive() {
+			return new BasicPolicyDecision(Authorization.INCONCLUSIVE, "");
+		}
+	}
+
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_StatementsTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_StatementsTest.java
index 946c0eafd..f81879e95 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_StatementsTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/PolicyHelper_StatementsTest.java
@@ -1,242 +1,242 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.policy;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.log4j.Level;
-import org.junit.Before;
-import org.junit.Test;
-
-import stubs.javax.servlet.ServletContextStub;
-import stubs.javax.servlet.http.HttpServletRequestStub;
-import stubs.javax.servlet.http.HttpSessionStub;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AbstractDataPropertyStatementAction;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AbstractObjectPropertyStatementAction;
-
-/**
- * Test the function of PolicyHelper in authorizing statements and models.
- */
-public class PolicyHelper_StatementsTest extends AbstractTestClass {
-	private static final String APPROVED_SUBJECT_URI = "test://approvedSubjectUri";
-	private static final String APPROVED_PREDICATE_URI = "test://approvedPredicateUri";
-	private static final String UNAPPROVED_PREDICATE_URI = "test://bogusPredicateUri";
-	private static final String APPROVED_OBJECT_URI = "test://approvedObjectUri";
-
-	private ServletContextStub ctx;
-	private HttpSessionStub session;
-	private HttpServletRequestStub req;
-	private OntModel ontModel;
-
-	@Before
-	public void setup() {
-		ctx = new ServletContextStub();
-
-		session = new HttpSessionStub();
-		session.setServletContext(ctx);
-
-		req = new HttpServletRequestStub();
-		req.setSession(session);
-
-		ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
-
-		setLoggerLevel(ServletPolicyList.class, Level.WARN);
-		ServletPolicyList.addPolicy(ctx, new MySimplePolicy());
-	}
-
-	// ----------------------------------------------------------------------
-	// The tests.
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void addNullStatement() {
-		assertEquals("null statement", false,
-				PolicyHelper.isAuthorizedToAdd(req, null, ontModel));
-	}
-
-	@Test
-	public void addStatementWithNullRequest() {
-		Statement stmt = dataStatement(APPROVED_SUBJECT_URI,
-				APPROVED_PREDICATE_URI);
-		assertEquals("null request", false,
-				PolicyHelper.isAuthorizedToAdd(null, stmt, ontModel));
-	}
-
-	@Test
-	public void addStatementToNullModel() {
-		Statement stmt = dataStatement(APPROVED_SUBJECT_URI,
-				APPROVED_PREDICATE_URI);
-		assertEquals("authorized", false,
-				PolicyHelper.isAuthorizedToAdd(req, stmt, null));
-	}
-
-	@Test
-	public void addAuthorizedDataStatement() {
-		Statement stmt = dataStatement(APPROVED_SUBJECT_URI,
-				APPROVED_PREDICATE_URI);
-		assertEquals("authorized", true,
-				PolicyHelper.isAuthorizedToAdd(req, stmt, ontModel));
-	}
-
-	@Test
-	public void addAuthorizedObjectStatement() {
-		Statement stmt = objectStatement(APPROVED_SUBJECT_URI,
-				APPROVED_PREDICATE_URI, APPROVED_OBJECT_URI);
-		assertEquals("authorized", true,
-				PolicyHelper.isAuthorizedToAdd(req, stmt, ontModel));
-	}
-
-	@Test
-	public void addUnauthorizedDataStatement() {
-		Statement stmt = dataStatement(APPROVED_SUBJECT_URI,
-				UNAPPROVED_PREDICATE_URI);
-		assertEquals("not authorized", false,
-				PolicyHelper.isAuthorizedToAdd(req, stmt, ontModel));
-	}
-
-	@Test
-	public void addUnauthorizedObjectStatement() {
-		Statement stmt = objectStatement(APPROVED_SUBJECT_URI,
-				UNAPPROVED_PREDICATE_URI, APPROVED_OBJECT_URI);
-		assertEquals("not authorized", false,
-				PolicyHelper.isAuthorizedToAdd(req, stmt, ontModel));
-	}
-
-	@Test
-	public void dropNullStatement() {
-		assertEquals("null statement", false, PolicyHelper.isAuthorizedToDrop(
-				req, (Statement) null, ontModel));
-	}
-
-	@Test
-	public void dropStatementWithNullRequest() {
-		Statement stmt = dataStatement(APPROVED_SUBJECT_URI,
-				APPROVED_PREDICATE_URI);
-		assertEquals("null request", false,
-				PolicyHelper.isAuthorizedToDrop(null, stmt, ontModel));
-	}
-
-	@Test
-	public void dropStatementFromNullModel() {
-		Statement stmt = dataStatement(APPROVED_SUBJECT_URI,
-				APPROVED_PREDICATE_URI);
-		assertEquals("authorized", false,
-				PolicyHelper.isAuthorizedToDrop(req, stmt, null));
-	}
-
-	@Test
-	public void dropAuthorizedDataStatement() {
-		Statement stmt = dataStatement(APPROVED_SUBJECT_URI,
-				APPROVED_PREDICATE_URI);
-		assertEquals("authorized", true,
-				PolicyHelper.isAuthorizedToDrop(req, stmt, ontModel));
-	}
-
-	@Test
-	public void dropAuthorizedObjectStatement() {
-		Statement stmt = objectStatement(APPROVED_SUBJECT_URI,
-				APPROVED_PREDICATE_URI, APPROVED_OBJECT_URI);
-		assertEquals("authorized", true,
-				PolicyHelper.isAuthorizedToDrop(req, stmt, ontModel));
-	}
-
-	@Test
-	public void dropUnauthorizedDataStatement() {
-		Statement stmt = dataStatement(APPROVED_SUBJECT_URI,
-				UNAPPROVED_PREDICATE_URI);
-		assertEquals("not authorized", false,
-				PolicyHelper.isAuthorizedToDrop(req, stmt, ontModel));
-	}
-
-	@Test
-	public void dropUnauthorizedObjectStatement() {
-		Statement stmt = objectStatement(APPROVED_SUBJECT_URI,
-				UNAPPROVED_PREDICATE_URI, APPROVED_OBJECT_URI);
-		assertEquals("not authorized", false,
-				PolicyHelper.isAuthorizedToDrop(req, stmt, ontModel));
-	}
-
-	// ----------------------------------------------------------------------
-	// Helper methods
-	// ----------------------------------------------------------------------
-
-	/** Build a data statement. */
-	private Statement dataStatement(String subjectUri, String predicateUri) {
-		Resource subject = ontModel.createResource(subjectUri);
-		Property predicate = ontModel.createProperty(predicateUri);
-		return ontModel.createStatement(subject, predicate, "whoCares?");
-	}
-
-	/** Build a object statement. */
-	private Statement objectStatement(String subjectUri, String predicateUri,
-			String objectUri) {
-		Resource subject = ontModel.createResource(subjectUri);
-		Resource object = ontModel.createResource(objectUri);
-		Property predicate = ontModel.createProperty(predicateUri);
-		return ontModel.createStatement(subject, predicate, object);
-	}
-
-	// ----------------------------------------------------------------------
-	// Helper classes
-	// ----------------------------------------------------------------------
-
-	private static class MySimplePolicy implements PolicyIface {
-		@Override
-		public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
-				RequestedAction whatToAuth) {
-			if (whatToAuth instanceof AbstractDataPropertyStatementAction) {
-				return isAuthorized((AbstractDataPropertyStatementAction) whatToAuth);
-			} else if (whatToAuth instanceof AbstractObjectPropertyStatementAction) {
-				return isAuthorized((AbstractObjectPropertyStatementAction) whatToAuth);
-			} else {
-				return inconclusive();
-			}
-		}
-
-		private PolicyDecision isAuthorized(
-				AbstractDataPropertyStatementAction whatToAuth) {
-			if ((APPROVED_SUBJECT_URI.equals(whatToAuth.getSubjectUri()))
-					&& (APPROVED_PREDICATE_URI.equals(whatToAuth
-							.getPredicateUri()))) {
-				return authorized();
-			} else {
-				return inconclusive();
-			}
-		}
-
-		private PolicyDecision isAuthorized(
-				AbstractObjectPropertyStatementAction whatToAuth) {
-			if ((APPROVED_SUBJECT_URI.equals(whatToAuth.getSubjectUri()))
-					&& (APPROVED_PREDICATE_URI.equals(whatToAuth
-							.getPredicateUri()))
-					&& (APPROVED_OBJECT_URI.equals(whatToAuth.getObjectUri()))) {
-				return authorized();
-			} else {
-				return inconclusive();
-			}
-		}
-
-		private PolicyDecision authorized() {
-			return new BasicPolicyDecision(Authorization.AUTHORIZED, "");
-		}
-
-		private PolicyDecision inconclusive() {
-			return new BasicPolicyDecision(Authorization.INCONCLUSIVE, "");
-		}
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.log4j.Level;
+import org.junit.Before;
+import org.junit.Test;
+
+import stubs.javax.servlet.ServletContextStub;
+import stubs.javax.servlet.http.HttpServletRequestStub;
+import stubs.javax.servlet.http.HttpSessionStub;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.Statement;
+
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyIface;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.ifaces.RequestedAction;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AbstractDataPropertyStatementAction;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AbstractObjectPropertyStatementAction;
+
+/**
+ * Test the function of PolicyHelper in authorizing statements and models.
+ */
+public class PolicyHelper_StatementsTest extends AbstractTestClass {
+	private static final String APPROVED_SUBJECT_URI = "test://approvedSubjectUri";
+	private static final String APPROVED_PREDICATE_URI = "test://approvedPredicateUri";
+	private static final String UNAPPROVED_PREDICATE_URI = "test://bogusPredicateUri";
+	private static final String APPROVED_OBJECT_URI = "test://approvedObjectUri";
+
+	private ServletContextStub ctx;
+	private HttpSessionStub session;
+	private HttpServletRequestStub req;
+	private OntModel ontModel;
+
+	@Before
+	public void setup() {
+		ctx = new ServletContextStub();
+
+		session = new HttpSessionStub();
+		session.setServletContext(ctx);
+
+		req = new HttpServletRequestStub();
+		req.setSession(session);
+
+		ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
+
+		setLoggerLevel(ServletPolicyList.class, Level.WARN);
+		ServletPolicyList.addPolicy(ctx, new MySimplePolicy());
+	}
+
+	// ----------------------------------------------------------------------
+	// The tests.
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void addNullStatement() {
+		assertEquals("null statement", false,
+				PolicyHelper.isAuthorizedToAdd(req, null, ontModel));
+	}
+
+	@Test
+	public void addStatementWithNullRequest() {
+		Statement stmt = dataStatement(APPROVED_SUBJECT_URI,
+				APPROVED_PREDICATE_URI);
+		assertEquals("null request", false,
+				PolicyHelper.isAuthorizedToAdd(null, stmt, ontModel));
+	}
+
+	@Test
+	public void addStatementToNullModel() {
+		Statement stmt = dataStatement(APPROVED_SUBJECT_URI,
+				APPROVED_PREDICATE_URI);
+		assertEquals("authorized", false,
+				PolicyHelper.isAuthorizedToAdd(req, stmt, null));
+	}
+
+	@Test
+	public void addAuthorizedDataStatement() {
+		Statement stmt = dataStatement(APPROVED_SUBJECT_URI,
+				APPROVED_PREDICATE_URI);
+		assertEquals("authorized", true,
+				PolicyHelper.isAuthorizedToAdd(req, stmt, ontModel));
+	}
+
+	@Test
+	public void addAuthorizedObjectStatement() {
+		Statement stmt = objectStatement(APPROVED_SUBJECT_URI,
+				APPROVED_PREDICATE_URI, APPROVED_OBJECT_URI);
+		assertEquals("authorized", true,
+				PolicyHelper.isAuthorizedToAdd(req, stmt, ontModel));
+	}
+
+	@Test
+	public void addUnauthorizedDataStatement() {
+		Statement stmt = dataStatement(APPROVED_SUBJECT_URI,
+				UNAPPROVED_PREDICATE_URI);
+		assertEquals("not authorized", false,
+				PolicyHelper.isAuthorizedToAdd(req, stmt, ontModel));
+	}
+
+	@Test
+	public void addUnauthorizedObjectStatement() {
+		Statement stmt = objectStatement(APPROVED_SUBJECT_URI,
+				UNAPPROVED_PREDICATE_URI, APPROVED_OBJECT_URI);
+		assertEquals("not authorized", false,
+				PolicyHelper.isAuthorizedToAdd(req, stmt, ontModel));
+	}
+
+	@Test
+	public void dropNullStatement() {
+		assertEquals("null statement", false, PolicyHelper.isAuthorizedToDrop(
+				req, (Statement) null, ontModel));
+	}
+
+	@Test
+	public void dropStatementWithNullRequest() {
+		Statement stmt = dataStatement(APPROVED_SUBJECT_URI,
+				APPROVED_PREDICATE_URI);
+		assertEquals("null request", false,
+				PolicyHelper.isAuthorizedToDrop(null, stmt, ontModel));
+	}
+
+	@Test
+	public void dropStatementFromNullModel() {
+		Statement stmt = dataStatement(APPROVED_SUBJECT_URI,
+				APPROVED_PREDICATE_URI);
+		assertEquals("authorized", false,
+				PolicyHelper.isAuthorizedToDrop(req, stmt, null));
+	}
+
+	@Test
+	public void dropAuthorizedDataStatement() {
+		Statement stmt = dataStatement(APPROVED_SUBJECT_URI,
+				APPROVED_PREDICATE_URI);
+		assertEquals("authorized", true,
+				PolicyHelper.isAuthorizedToDrop(req, stmt, ontModel));
+	}
+
+	@Test
+	public void dropAuthorizedObjectStatement() {
+		Statement stmt = objectStatement(APPROVED_SUBJECT_URI,
+				APPROVED_PREDICATE_URI, APPROVED_OBJECT_URI);
+		assertEquals("authorized", true,
+				PolicyHelper.isAuthorizedToDrop(req, stmt, ontModel));
+	}
+
+	@Test
+	public void dropUnauthorizedDataStatement() {
+		Statement stmt = dataStatement(APPROVED_SUBJECT_URI,
+				UNAPPROVED_PREDICATE_URI);
+		assertEquals("not authorized", false,
+				PolicyHelper.isAuthorizedToDrop(req, stmt, ontModel));
+	}
+
+	@Test
+	public void dropUnauthorizedObjectStatement() {
+		Statement stmt = objectStatement(APPROVED_SUBJECT_URI,
+				UNAPPROVED_PREDICATE_URI, APPROVED_OBJECT_URI);
+		assertEquals("not authorized", false,
+				PolicyHelper.isAuthorizedToDrop(req, stmt, ontModel));
+	}
+
+	// ----------------------------------------------------------------------
+	// Helper methods
+	// ----------------------------------------------------------------------
+
+	/** Build a data statement. */
+	private Statement dataStatement(String subjectUri, String predicateUri) {
+		Resource subject = ontModel.createResource(subjectUri);
+		Property predicate = ontModel.createProperty(predicateUri);
+		return ontModel.createStatement(subject, predicate, "whoCares?");
+	}
+
+	/** Build a object statement. */
+	private Statement objectStatement(String subjectUri, String predicateUri,
+			String objectUri) {
+		Resource subject = ontModel.createResource(subjectUri);
+		Resource object = ontModel.createResource(objectUri);
+		Property predicate = ontModel.createProperty(predicateUri);
+		return ontModel.createStatement(subject, predicate, object);
+	}
+
+	// ----------------------------------------------------------------------
+	// Helper classes
+	// ----------------------------------------------------------------------
+
+	private static class MySimplePolicy implements PolicyIface {
+		@Override
+		public PolicyDecision isAuthorized(IdentifierBundle whoToAuth,
+				RequestedAction whatToAuth) {
+			if (whatToAuth instanceof AbstractDataPropertyStatementAction) {
+				return isAuthorized((AbstractDataPropertyStatementAction) whatToAuth);
+			} else if (whatToAuth instanceof AbstractObjectPropertyStatementAction) {
+				return isAuthorized((AbstractObjectPropertyStatementAction) whatToAuth);
+			} else {
+				return inconclusive();
+			}
+		}
+
+		private PolicyDecision isAuthorized(
+				AbstractDataPropertyStatementAction whatToAuth) {
+			if ((APPROVED_SUBJECT_URI.equals(whatToAuth.getSubjectUri()))
+					&& (APPROVED_PREDICATE_URI.equals(whatToAuth
+							.getPredicateUri()))) {
+				return authorized();
+			} else {
+				return inconclusive();
+			}
+		}
+
+		private PolicyDecision isAuthorized(
+				AbstractObjectPropertyStatementAction whatToAuth) {
+			if ((APPROVED_SUBJECT_URI.equals(whatToAuth.getSubjectUri()))
+					&& (APPROVED_PREDICATE_URI.equals(whatToAuth
+							.getPredicateUri()))
+					&& (APPROVED_OBJECT_URI.equals(whatToAuth.getObjectUri()))) {
+				return authorized();
+			} else {
+				return inconclusive();
+			}
+		}
+
+		private PolicyDecision authorized() {
+			return new BasicPolicyDecision(Authorization.AUTHORIZED, "");
+		}
+
+		private PolicyDecision inconclusive() {
+			return new BasicPolicyDecision(Authorization.INCONCLUSIVE, "");
+		}
+	}
+
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java
index 0db89065f..0e0ebfef6 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.java
@@ -1,314 +1,314 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.policy;
-
-import java.io.InputStream;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.log4j.Level;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-import stubs.edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelperStub;
-import stubs.javax.servlet.ServletContextStub;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler;
-
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.HasProfile;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditDataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-
-public class SelfEditingPolicy_2_Test extends AbstractTestClass {
-	private static final Log log = LogFactory
-			.getLog(SelfEditingPolicy_2_Test.class);
-
-	/** We may edit objects in this arbitrary namespace. */
-	private static final String SAFE_NS = "http://test.mannlib.cornell.edu/ns/01#";
-
-	/** We are not allowed to edit objects in the administrative namespace. */
-	private static final String ADMIN_NS = VitroVocabulary.vitroURI;
-
-	/** The URI of a SelfEditor. */
-	private static final String SELFEDITOR_URI = SAFE_NS + "individual000";
-
-	/** Some things that are safe to edit. */
-	private static final String SAFE_RESOURCE = SAFE_NS + "individual123";
-	private static final String SAFE_PREDICATE = SAFE_NS + "hasHairStyle";
-
-	/** Some things that are not safe to edit. */
-	private static final String ADMIN_RESOURCE = ADMIN_NS + "individual666";
-	private static final String ADMIN_PREDICATE_1 = ADMIN_NS + "hasSuperPowers";
-	private static final String ADMIN_PREDICATE_2 = ADMIN_NS + "mayPrintMoney";
-	private static final String ADMIN_PREDICATE_3 = ADMIN_NS
-			+ "getsOutOfJailFree";
-	private static final String ADMIN_PREDICATE_4 = ADMIN_NS + "canDeleteModel";
-
-	/** The policy we are testing. */
-	SelfEditingPolicy policy;
-
-	/** A SelfEditing individual identifier. */
-	Individual seIndividual;
-
-	/** A bundle that contains a SelfEditing individual. */
-	IdentifierBundle ids;
-
-	/**
-	 * An empty model that acts as a placeholder in the requested actions. The
-	 * SelfEditingPolicy does not base its decisions on the contents of the
-	 * model.
-	 */
-	private OntModel ontModel;
-
-	
-	@Before
-	public void setUp() throws Exception {
-		InputStream is = getClass().getResourceAsStream(
-				"./SelfEditingPolicy_2_Test.xml");
-		Assert.assertNotNull(is);
-
-		// suppress the warning messages from loading the model.
-		setLoggerLevel(RDFDefaultErrorHandler.class, Level.OFF);
-
-		// TODO This doesn't appear to be used for anything. Can it go away, along with the data file?
-		OntModel model = ModelFactory.createOntologyModel();
-		model.read(is, "");
-		Assert.assertNotNull(model);
-		Assert.assertTrue(model.size() > 0);
-
-		ServletContextStub ctx = new ServletContextStub();
-		PropertyRestrictionPolicyHelper.setBean(ctx,
-				PropertyRestrictionPolicyHelperStub
-						.getInstance(new String[] { ADMIN_NS }));
-
-		policy = new SelfEditingPolicy(ctx);
-		Assert.assertNotNull(policy);
-
-		seIndividual = new IndividualImpl();
-		seIndividual.setURI(SELFEDITOR_URI);
-
-		ids = new ArrayIdentifierBundle(new HasProfile(SELFEDITOR_URI));
-
-		ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
-
-		// setLoggerLevel(SelfEditingPolicySetupTest.class, Level.DEBUG);
-	}
-
-	// ----------------------------------------------------------------------
-	// General tests
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void nullRequestedAction() {
-		PolicyDecision dec = policy.isAuthorized(ids, null);
-		Assert.assertNotNull(dec);
-		Assert.assertEquals(Authorization.INCONCLUSIVE, dec.getAuthorized());
-	}
-
-	@Test
-	public void nullIdentifierBundle() {
-		AddObjectPropertyStatement whatToAuth = new AddObjectPropertyStatement(
-				ontModel, SELFEDITOR_URI, SAFE_PREDICATE, SAFE_RESOURCE);
-		PolicyDecision dec = policy.isAuthorized(null, whatToAuth);
-		Assert.assertNotNull(dec);
-		Assert.assertEquals(Authorization.INCONCLUSIVE, dec.getAuthorized());
-	}
-
-	@Test
-	public void noSelfEditorIdentifier() {
-		ids.clear();
-		ids.add(new Identifier() { /* empty identifier */
-		});
-		assertAddObjectPropStmt(SELFEDITOR_URI, SAFE_PREDICATE, SAFE_RESOURCE,
-				Authorization.INCONCLUSIVE);
-	}
-
-	// ----------------------------------------------------------------------
-	// Tests against AddObjectPropStmt
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void addObjectPropStmtSuccess1() {
-		assertAddObjectPropStmt(SELFEDITOR_URI, SAFE_PREDICATE, SAFE_RESOURCE,
-				Authorization.AUTHORIZED);
-	}
-
-	@Test
-	public void addObjectPropStmtSuccess2() {
-		assertAddObjectPropStmt(SAFE_RESOURCE, SAFE_PREDICATE, SELFEDITOR_URI,
-				Authorization.AUTHORIZED);
-	}
-
-	@Test
-	public void addObjectPropStmtUnsafePredicate1() {
-		assertAddObjectPropStmt(SELFEDITOR_URI, ADMIN_PREDICATE_1,
-				SAFE_RESOURCE, Authorization.INCONCLUSIVE);
-	}
-
-	@Test
-	public void addObjectPropStmtUnsafePredicate2() {
-		assertAddObjectPropStmt(SAFE_RESOURCE, ADMIN_PREDICATE_1,
-				SELFEDITOR_URI, Authorization.INCONCLUSIVE);
-	}
-
-	@Test
-	public void addObjectPropStmtUnsafePredicate3() {
-		assertAddObjectPropStmt(SELFEDITOR_URI, ADMIN_PREDICATE_2,
-				SAFE_RESOURCE, Authorization.INCONCLUSIVE);
-	}
-
-	@Test
-	public void addObjectPropStmtUnsafePredicate4() {
-		assertAddObjectPropStmt(SELFEDITOR_URI, ADMIN_PREDICATE_3,
-				SAFE_RESOURCE, Authorization.INCONCLUSIVE);
-	}
-
-	@Test
-	public void addObjectPropStmtUnsafePredicate5() {
-		assertAddObjectPropStmt(SELFEDITOR_URI, ADMIN_PREDICATE_4,
-				SAFE_RESOURCE, Authorization.INCONCLUSIVE);
-	}
-
-	// ----------------------------------------------------------------------
-	// Tests against EditObjPropStmt
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void editObjectPropStmtSuccess1() {
-		assertEditObjPropStmt(SELFEDITOR_URI, SAFE_PREDICATE, SAFE_RESOURCE,
-				Authorization.AUTHORIZED);
-	}
-
-	@Test
-	public void editObjectPropStmtSuccess2() {
-		assertEditObjPropStmt(SAFE_RESOURCE, SAFE_PREDICATE, SELFEDITOR_URI,
-				Authorization.AUTHORIZED);
-	}
-
-	@Test
-	public void editObjectPropStmtEditorNotInvolved() {
-		// this is the case where the editor is not part of the stmt
-		assertEditObjPropStmt(SAFE_RESOURCE, SAFE_PREDICATE, SAFE_RESOURCE,
-				Authorization.INCONCLUSIVE);
-	}
-
-	@Test
-	public void editObjectPropStmtUnsafeResource() {
-		assertEditObjPropStmt(SELFEDITOR_URI, SAFE_PREDICATE, ADMIN_RESOURCE,
-				Authorization.INCONCLUSIVE);
-	}
-
-	@Test
-	public void editObjectPropStmtUnsafePredicate1() {
-		assertEditObjPropStmt(SELFEDITOR_URI, ADMIN_PREDICATE_4, SAFE_RESOURCE,
-				Authorization.INCONCLUSIVE);
-	}
-
-	@Test
-	public void editObjectPropStmtUnsafePredicate2() {
-		assertEditObjPropStmt(SAFE_RESOURCE, ADMIN_PREDICATE_4, SELFEDITOR_URI,
-				Authorization.INCONCLUSIVE);
-	}
-
-	@Test
-	public void editObjectPropStmtUnsafeBoth() {
-		assertEditObjPropStmt(SELFEDITOR_URI, ADMIN_PREDICATE_4,
-				ADMIN_RESOURCE, Authorization.INCONCLUSIVE);
-	}
-
-	// ----------------------------------------------------------------------
-	// Tests against EditDataPropStmt
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void editDataPropSuccess() {
-		assertEditDataPropStmt(SELFEDITOR_URI, SAFE_PREDICATE, "junk",
-				Authorization.AUTHORIZED);
-	}
-
-	@Test
-	public void editDataPropUnsafePredicate() {
-		assertEditDataPropStmt(SELFEDITOR_URI, ADMIN_PREDICATE_1, "junk",
-				Authorization.INCONCLUSIVE);
-	}
-
-	@Test
-	public void editDataPropUnsafeResource() {
-		assertEditDataPropStmt(ADMIN_RESOURCE, SAFE_PREDICATE, null,
-				Authorization.INCONCLUSIVE);
-	}
-
-	@Test
-	public void editDataPropNoCloseRelation() {
-		assertEditDataPropStmt(SAFE_RESOURCE, SAFE_PREDICATE, null,
-				Authorization.INCONCLUSIVE);
-	}
-
-	@Test
-	public void editDataPropModelProhibited() {
-		// model prohibited
-		assertEditDataPropStmt(SAFE_RESOURCE, ADMIN_PREDICATE_1, null,
-				Authorization.INCONCLUSIVE);
-	}
-
-	// ------------------------------------------------------------------------
-	// Support methods
-	// ------------------------------------------------------------------------
-
-	/**
-	 * Create an {@link AddObjectPropertyStatement}, test it, and compare to
-	 * expected results.
-	 */
-	private void assertAddObjectPropStmt(String uriOfSub, String uriOfPred,
-			String uriOfObj, Authorization expectedAuthorization) {
-		AddObjectPropertyStatement whatToAuth = new AddObjectPropertyStatement(
-				ontModel, uriOfSub, uriOfPred, uriOfObj);
-		PolicyDecision dec = policy.isAuthorized(ids, whatToAuth);
-		log.debug(dec);
-		Assert.assertNotNull(dec);
-		Assert.assertEquals(expectedAuthorization, dec.getAuthorized());
-	}
-
-	/**
-	 * Create an {@link EditObjectPropertyStatement}, test it, and compare to
-	 * expected results.
-	 */
-	private void assertEditObjPropStmt(String uriOfSub, String uriOfPred,
-			String uriOfObj, Authorization expectedAuthorization) {
-		EditObjectPropertyStatement whatToAuth = new EditObjectPropertyStatement(
-				ontModel, uriOfSub, uriOfPred, uriOfObj);
-		PolicyDecision dec = policy.isAuthorized(ids, whatToAuth);
-		log.debug(dec);
-		Assert.assertNotNull(dec);
-		Assert.assertEquals(expectedAuthorization, dec.getAuthorized());
-	}
-
-	/**
-	 * Create an {@link EditDataPropertyStatement}, test it, and compare to
-	 * expected results.
-	 */
-	private void assertEditDataPropStmt(String individualURI,
-			String datapropURI, String data, Authorization expectedAuthorization) {
-		EditDataPropertyStatement whatToAuth = new EditDataPropertyStatement(
-				ontModel, individualURI, datapropURI);
-		PolicyDecision dec = policy.isAuthorized(ids, whatToAuth);
-		log.debug(dec);
-		Assert.assertNotNull(dec);
-		Assert.assertEquals(expectedAuthorization, dec.getAuthorized());
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy;
+
+import java.io.InputStream;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Level;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import stubs.edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelperStub;
+import stubs.javax.servlet.ServletContextStub;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.impl.RDFDefaultErrorHandler;
+
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.ArrayIdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.Identifier;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.IdentifierBundle;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.common.HasProfile;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.Authorization;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ifaces.PolicyDecision;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.AddObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditDataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.auth.requestedAction.propstmt.EditObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.IndividualImpl;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+
+public class SelfEditingPolicy_2_Test extends AbstractTestClass {
+	private static final Log log = LogFactory
+			.getLog(SelfEditingPolicy_2_Test.class);
+
+	/** We may edit objects in this arbitrary namespace. */
+	private static final String SAFE_NS = "http://test.mannlib.cornell.edu/ns/01#";
+
+	/** We are not allowed to edit objects in the administrative namespace. */
+	private static final String ADMIN_NS = VitroVocabulary.vitroURI;
+
+	/** The URI of a SelfEditor. */
+	private static final String SELFEDITOR_URI = SAFE_NS + "individual000";
+
+	/** Some things that are safe to edit. */
+	private static final String SAFE_RESOURCE = SAFE_NS + "individual123";
+	private static final String SAFE_PREDICATE = SAFE_NS + "hasHairStyle";
+
+	/** Some things that are not safe to edit. */
+	private static final String ADMIN_RESOURCE = ADMIN_NS + "individual666";
+	private static final String ADMIN_PREDICATE_1 = ADMIN_NS + "hasSuperPowers";
+	private static final String ADMIN_PREDICATE_2 = ADMIN_NS + "mayPrintMoney";
+	private static final String ADMIN_PREDICATE_3 = ADMIN_NS
+			+ "getsOutOfJailFree";
+	private static final String ADMIN_PREDICATE_4 = ADMIN_NS + "canDeleteModel";
+
+	/** The policy we are testing. */
+	SelfEditingPolicy policy;
+
+	/** A SelfEditing individual identifier. */
+	Individual seIndividual;
+
+	/** A bundle that contains a SelfEditing individual. */
+	IdentifierBundle ids;
+
+	/**
+	 * An empty model that acts as a placeholder in the requested actions. The
+	 * SelfEditingPolicy does not base its decisions on the contents of the
+	 * model.
+	 */
+	private OntModel ontModel;
+
+	
+	@Before
+	public void setUp() throws Exception {
+		InputStream is = getClass().getResourceAsStream(
+				"./SelfEditingPolicy_2_Test.xml");
+		Assert.assertNotNull(is);
+
+		// suppress the warning messages from loading the model.
+		setLoggerLevel(RDFDefaultErrorHandler.class, Level.OFF);
+
+		// TODO This doesn't appear to be used for anything. Can it go away, along with the data file?
+		OntModel model = ModelFactory.createOntologyModel();
+		model.read(is, "");
+		Assert.assertNotNull(model);
+		Assert.assertTrue(model.size() > 0);
+
+		ServletContextStub ctx = new ServletContextStub();
+		PropertyRestrictionPolicyHelper.setBean(ctx,
+				PropertyRestrictionPolicyHelperStub
+						.getInstance(new String[] { ADMIN_NS }));
+
+		policy = new SelfEditingPolicy(ctx);
+		Assert.assertNotNull(policy);
+
+		seIndividual = new IndividualImpl();
+		seIndividual.setURI(SELFEDITOR_URI);
+
+		ids = new ArrayIdentifierBundle(new HasProfile(SELFEDITOR_URI));
+
+		ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_MEM);
+
+		// setLoggerLevel(SelfEditingPolicySetupTest.class, Level.DEBUG);
+	}
+
+	// ----------------------------------------------------------------------
+	// General tests
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void nullRequestedAction() {
+		PolicyDecision dec = policy.isAuthorized(ids, null);
+		Assert.assertNotNull(dec);
+		Assert.assertEquals(Authorization.INCONCLUSIVE, dec.getAuthorized());
+	}
+
+	@Test
+	public void nullIdentifierBundle() {
+		AddObjectPropertyStatement whatToAuth = new AddObjectPropertyStatement(
+				ontModel, SELFEDITOR_URI, SAFE_PREDICATE, SAFE_RESOURCE);
+		PolicyDecision dec = policy.isAuthorized(null, whatToAuth);
+		Assert.assertNotNull(dec);
+		Assert.assertEquals(Authorization.INCONCLUSIVE, dec.getAuthorized());
+	}
+
+	@Test
+	public void noSelfEditorIdentifier() {
+		ids.clear();
+		ids.add(new Identifier() { /* empty identifier */
+		});
+		assertAddObjectPropStmt(SELFEDITOR_URI, SAFE_PREDICATE, SAFE_RESOURCE,
+				Authorization.INCONCLUSIVE);
+	}
+
+	// ----------------------------------------------------------------------
+	// Tests against AddObjectPropStmt
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void addObjectPropStmtSuccess1() {
+		assertAddObjectPropStmt(SELFEDITOR_URI, SAFE_PREDICATE, SAFE_RESOURCE,
+				Authorization.AUTHORIZED);
+	}
+
+	@Test
+	public void addObjectPropStmtSuccess2() {
+		assertAddObjectPropStmt(SAFE_RESOURCE, SAFE_PREDICATE, SELFEDITOR_URI,
+				Authorization.AUTHORIZED);
+	}
+
+	@Test
+	public void addObjectPropStmtUnsafePredicate1() {
+		assertAddObjectPropStmt(SELFEDITOR_URI, ADMIN_PREDICATE_1,
+				SAFE_RESOURCE, Authorization.INCONCLUSIVE);
+	}
+
+	@Test
+	public void addObjectPropStmtUnsafePredicate2() {
+		assertAddObjectPropStmt(SAFE_RESOURCE, ADMIN_PREDICATE_1,
+				SELFEDITOR_URI, Authorization.INCONCLUSIVE);
+	}
+
+	@Test
+	public void addObjectPropStmtUnsafePredicate3() {
+		assertAddObjectPropStmt(SELFEDITOR_URI, ADMIN_PREDICATE_2,
+				SAFE_RESOURCE, Authorization.INCONCLUSIVE);
+	}
+
+	@Test
+	public void addObjectPropStmtUnsafePredicate4() {
+		assertAddObjectPropStmt(SELFEDITOR_URI, ADMIN_PREDICATE_3,
+				SAFE_RESOURCE, Authorization.INCONCLUSIVE);
+	}
+
+	@Test
+	public void addObjectPropStmtUnsafePredicate5() {
+		assertAddObjectPropStmt(SELFEDITOR_URI, ADMIN_PREDICATE_4,
+				SAFE_RESOURCE, Authorization.INCONCLUSIVE);
+	}
+
+	// ----------------------------------------------------------------------
+	// Tests against EditObjPropStmt
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void editObjectPropStmtSuccess1() {
+		assertEditObjPropStmt(SELFEDITOR_URI, SAFE_PREDICATE, SAFE_RESOURCE,
+				Authorization.AUTHORIZED);
+	}
+
+	@Test
+	public void editObjectPropStmtSuccess2() {
+		assertEditObjPropStmt(SAFE_RESOURCE, SAFE_PREDICATE, SELFEDITOR_URI,
+				Authorization.AUTHORIZED);
+	}
+
+	@Test
+	public void editObjectPropStmtEditorNotInvolved() {
+		// this is the case where the editor is not part of the stmt
+		assertEditObjPropStmt(SAFE_RESOURCE, SAFE_PREDICATE, SAFE_RESOURCE,
+				Authorization.INCONCLUSIVE);
+	}
+
+	@Test
+	public void editObjectPropStmtUnsafeResource() {
+		assertEditObjPropStmt(SELFEDITOR_URI, SAFE_PREDICATE, ADMIN_RESOURCE,
+				Authorization.INCONCLUSIVE);
+	}
+
+	@Test
+	public void editObjectPropStmtUnsafePredicate1() {
+		assertEditObjPropStmt(SELFEDITOR_URI, ADMIN_PREDICATE_4, SAFE_RESOURCE,
+				Authorization.INCONCLUSIVE);
+	}
+
+	@Test
+	public void editObjectPropStmtUnsafePredicate2() {
+		assertEditObjPropStmt(SAFE_RESOURCE, ADMIN_PREDICATE_4, SELFEDITOR_URI,
+				Authorization.INCONCLUSIVE);
+	}
+
+	@Test
+	public void editObjectPropStmtUnsafeBoth() {
+		assertEditObjPropStmt(SELFEDITOR_URI, ADMIN_PREDICATE_4,
+				ADMIN_RESOURCE, Authorization.INCONCLUSIVE);
+	}
+
+	// ----------------------------------------------------------------------
+	// Tests against EditDataPropStmt
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void editDataPropSuccess() {
+		assertEditDataPropStmt(SELFEDITOR_URI, SAFE_PREDICATE, "junk",
+				Authorization.AUTHORIZED);
+	}
+
+	@Test
+	public void editDataPropUnsafePredicate() {
+		assertEditDataPropStmt(SELFEDITOR_URI, ADMIN_PREDICATE_1, "junk",
+				Authorization.INCONCLUSIVE);
+	}
+
+	@Test
+	public void editDataPropUnsafeResource() {
+		assertEditDataPropStmt(ADMIN_RESOURCE, SAFE_PREDICATE, null,
+				Authorization.INCONCLUSIVE);
+	}
+
+	@Test
+	public void editDataPropNoCloseRelation() {
+		assertEditDataPropStmt(SAFE_RESOURCE, SAFE_PREDICATE, null,
+				Authorization.INCONCLUSIVE);
+	}
+
+	@Test
+	public void editDataPropModelProhibited() {
+		// model prohibited
+		assertEditDataPropStmt(SAFE_RESOURCE, ADMIN_PREDICATE_1, null,
+				Authorization.INCONCLUSIVE);
+	}
+
+	// ------------------------------------------------------------------------
+	// Support methods
+	// ------------------------------------------------------------------------
+
+	/**
+	 * Create an {@link AddObjectPropertyStatement}, test it, and compare to
+	 * expected results.
+	 */
+	private void assertAddObjectPropStmt(String uriOfSub, String uriOfPred,
+			String uriOfObj, Authorization expectedAuthorization) {
+		AddObjectPropertyStatement whatToAuth = new AddObjectPropertyStatement(
+				ontModel, uriOfSub, uriOfPred, uriOfObj);
+		PolicyDecision dec = policy.isAuthorized(ids, whatToAuth);
+		log.debug(dec);
+		Assert.assertNotNull(dec);
+		Assert.assertEquals(expectedAuthorization, dec.getAuthorized());
+	}
+
+	/**
+	 * Create an {@link EditObjectPropertyStatement}, test it, and compare to
+	 * expected results.
+	 */
+	private void assertEditObjPropStmt(String uriOfSub, String uriOfPred,
+			String uriOfObj, Authorization expectedAuthorization) {
+		EditObjectPropertyStatement whatToAuth = new EditObjectPropertyStatement(
+				ontModel, uriOfSub, uriOfPred, uriOfObj);
+		PolicyDecision dec = policy.isAuthorized(ids, whatToAuth);
+		log.debug(dec);
+		Assert.assertNotNull(dec);
+		Assert.assertEquals(expectedAuthorization, dec.getAuthorized());
+	}
+
+	/**
+	 * Create an {@link EditDataPropertyStatement}, test it, and compare to
+	 * expected results.
+	 */
+	private void assertEditDataPropStmt(String individualURI,
+			String datapropURI, String data, Authorization expectedAuthorization) {
+		EditDataPropertyStatement whatToAuth = new EditDataPropertyStatement(
+				ontModel, individualURI, datapropURI);
+		PolicyDecision dec = policy.isAuthorized(ids, whatToAuth);
+		log.debug(dec);
+		Assert.assertNotNull(dec);
+		Assert.assertEquals(expectedAuthorization, dec.getAuthorized());
+	}
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.xml b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.xml
index 785f73d69..c9cde7779 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.xml
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/SelfEditingPolicy_2_Test.xml
@@ -1,45 +1,45 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<rdf:RDF
-  xmlns:owl  ="http://www.w3.org/2002/07/owl#"
-  xmlns:rdf  ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns:rdfs ="http://www.w3.org/2000/01/rdf-schema#"
-  xmlns:xsd  ="http://www.w3.org/2001/XMLSchema#"
-  xmlns:vitro="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"
-  xmlns      =""
- >
-
-<owl:Ontology rdf:about="">
- <rdfs:comment>
-    An ontology with a property with a prohibited annotation for unit testing.  
- </rdfs:comment>
-</owl:Ontology>
-
-<owl:AnnotationProperty rdf:about="vitro:selfEditProhibitedAnnot"/>
-
-<owl:ObjectProperty rdf:about="vitro:hasSuperPowers">
-  <vitro:selfEditProhibitedAnnot rdf:datatype="xsd:boolean">true</vitro:selfEditProhibitedAnnot>
-</owl:ObjectProperty>
-
-<owl:ObjectProperty rdf:about="vitro:mayPrintMoney">
-  <vitro:selfEditProhibitedAnnot rdf:datatype="xsd:boolean">true</vitro:selfEditProhibitedAnnot>
-</owl:ObjectProperty>
-
-<owl:ObjectProperty rdf:about="vitro:getsOutOfJailFree">
-  <vitro:selfEditProhibitedAnnot rdf:datatype="xsd:boolean">true</vitro:selfEditProhibitedAnnot>
-</owl:ObjectProperty>
-
-<owl:ObjectProperty rdf:about="vitro:canDeleteModel">
-  <vitro:selfEditProhibitedAnnot rdf:datatype="xsd:boolean">true</vitro:selfEditProhibitedAnnot>
-</owl:ObjectProperty>
-
-
-<owl:DatatypeProperty rdf:about="vitro:felonies">
-  <vitro:selfEditProhibitedAnnot rdf:datatype="xsd:boolean">true</vitro:selfEditProhibitedAnnot>
-</owl:DatatypeProperty>
-
-
-</rdf:RDF>
-
+<?xml version='1.0' encoding='ISO-8859-1'?>
+
+<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<rdf:RDF
+  xmlns:owl  ="http://www.w3.org/2002/07/owl#"
+  xmlns:rdf  ="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns:rdfs ="http://www.w3.org/2000/01/rdf-schema#"
+  xmlns:xsd  ="http://www.w3.org/2001/XMLSchema#"
+  xmlns:vitro="http://vitro.mannlib.cornell.edu/ns/vitro/0.7#"
+  xmlns      =""
+ >
+
+<owl:Ontology rdf:about="">
+ <rdfs:comment>
+    An ontology with a property with a prohibited annotation for unit testing.  
+ </rdfs:comment>
+</owl:Ontology>
+
+<owl:AnnotationProperty rdf:about="vitro:selfEditProhibitedAnnot"/>
+
+<owl:ObjectProperty rdf:about="vitro:hasSuperPowers">
+  <vitro:selfEditProhibitedAnnot rdf:datatype="xsd:boolean">true</vitro:selfEditProhibitedAnnot>
+</owl:ObjectProperty>
+
+<owl:ObjectProperty rdf:about="vitro:mayPrintMoney">
+  <vitro:selfEditProhibitedAnnot rdf:datatype="xsd:boolean">true</vitro:selfEditProhibitedAnnot>
+</owl:ObjectProperty>
+
+<owl:ObjectProperty rdf:about="vitro:getsOutOfJailFree">
+  <vitro:selfEditProhibitedAnnot rdf:datatype="xsd:boolean">true</vitro:selfEditProhibitedAnnot>
+</owl:ObjectProperty>
+
+<owl:ObjectProperty rdf:about="vitro:canDeleteModel">
+  <vitro:selfEditProhibitedAnnot rdf:datatype="xsd:boolean">true</vitro:selfEditProhibitedAnnot>
+</owl:ObjectProperty>
+
+
+<owl:DatatypeProperty rdf:about="vitro:felonies">
+  <vitro:selfEditProhibitedAnnot rdf:datatype="xsd:boolean">true</vitro:selfEditProhibitedAnnot>
+</owl:DatatypeProperty>
+
+
+</rdf:RDF>
+
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelperTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelperTest.java
index d94efae2c..a00f136a2 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelperTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelperTest.java
@@ -1,247 +1,247 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.auth.policy.bean;
-
-import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.CURATOR;
-import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.DB_ADMIN;
-import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.EDITOR;
-import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.NOBODY;
-import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.PUBLIC;
-import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.SELF;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.log4j.Level;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
-
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean;
-import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
-import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-
-/**
- * Check that the bean gets built properly, and check that the bean works properly.
- */
-public class PropertyRestrictionPolicyHelperTest extends AbstractTestClass {
-	private static final Log log = LogFactory
-			.getLog(PropertyRestrictionPolicyHelperTest.class);
-
-	private static final String PROPERTY_DISPLAY_THRESHOLD = VitroVocabulary.HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT;
-	private static final String PROPERTY_MODIFY_THRESHOLD = VitroVocabulary.PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT;
-
-	private static final String[] PROHIBITED_NAMESPACES = new String[] {
-			VitroVocabulary.vitroURI, "" };
-
-	private static final String[] PERMITTED_EXCEPTIONS = new String[] {
-			VitroVocabulary.MONIKER };
-
-	private OntModel ontModel;
-	private ModelWrapper wrapper;
-	private PropertyRestrictionPolicyHelper bean;
-
-	@Before
-	public void setLoggingLevel() {
-//		setLoggerLevel(PropertyRestrictionPolicyHelper.class, Level.DEBUG);
-	}
-
-	@Before
-	public void createTheBean() {
-		Map<String, RoleLevel> displayLevels = new HashMap<String, BaseResourceBean.RoleLevel>();
-		displayLevels.put("http://predicates#display_self", SELF);
-		displayLevels.put("http://predicates#display_curator", CURATOR);
-		displayLevels.put("http://predicates#display_hidden", NOBODY);
-
-		Map<String, RoleLevel> modifyLevels = new HashMap<String, BaseResourceBean.RoleLevel>();
-		modifyLevels.put("http://predicates#modify_self", SELF);
-		modifyLevels.put("http://predicates#modify_curator", CURATOR);
-		modifyLevels.put("http://predicates#modify_hidden", NOBODY);
-
-		bean = new PropertyRestrictionPolicyHelper(
-				Arrays.asList(PROHIBITED_NAMESPACES),
-				Arrays.asList(PERMITTED_EXCEPTIONS), displayLevels,
-				modifyLevels, ModelFactory.createDefaultModel());
-	}
-
-	@Before
-	public void createTheModel() {
-		ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM);
-
-		wrapper = new ModelWrapper(ontModel);
-
-		wrapper.add("http://thresholds#display_public",
-				PROPERTY_DISPLAY_THRESHOLD, PUBLIC.getURI());
-		wrapper.add("http://thresholds#display_hidden",
-				PROPERTY_DISPLAY_THRESHOLD, NOBODY.getURI());
-
-		wrapper.add("http://thresholds#modify_editor",
-				PROPERTY_MODIFY_THRESHOLD, EDITOR.getURI());
-		wrapper.add("http://thresholds#modify_curator",
-				PROPERTY_MODIFY_THRESHOLD, CURATOR.getURI());
-	}
-
-	// ----------------------------------------------------------------------
-	// test the bean
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void displayResource() {
-		assertEquals("display a random resource", true,
-				bean.canDisplayResource("http://someRandom#string", null));
-	}
-
-	@Test
-	public void modifyResourceNoRestriction() {
-		assertEquals("modify a random resource", true,
-				bean.canModifyResource("http://someRandom#string", null));
-	}
-
-	@Test
-	public void modifyResourceProhibitedNamespace() {
-		assertEquals("modify a prohibited resource", false,
-				bean.canModifyResource(PROHIBITED_NAMESPACES[0] + "random",
-						null));
-	}
-
-	@Test
-	public void modifyResourcePermittedException() {
-		assertEquals("modify a exception resource", true,
-				bean.canModifyResource(PERMITTED_EXCEPTIONS[0], null));
-	}
-
-	@Test
-	public void displayPredicateNoRestriction() {
-		assertEquals("displayPredicate: open", true,
-				bean.canDisplayPredicate("http://predicates#open", PUBLIC));
-	}
-
-	@Test
-	public void displayPredicateRestrictionLower() {
-		assertEquals("displayPredicate: lower restriction", true,
-				bean.canDisplayPredicate("http://predicates#display_self",
-						CURATOR));
-	}
-
-	@Test
-	public void displayPredicateRestrictionEqual() {
-		assertEquals("displayPredicate: equal restriction", true,
-				bean.canDisplayPredicate("http://predicates#display_curator",
-						CURATOR));
-	}
-
-	@Test
-	public void displayPredicateRestrictionHigher() {
-		assertEquals("displayPredicate: higher restriction", false,
-				bean.canDisplayPredicate("http://predicates#display_hidden",
-						CURATOR));
-	}
-
-	@Test
-	public void modifyPredicateNoRestriction() {
-		assertEquals("modifyPredicate: open", true,
-				bean.canModifyPredicate("http://predicates#open", PUBLIC));
-	}
-
-	@Test
-	public void modifyPredicateRestrictionLower() {
-		assertEquals("modifyPredicate: lower restriction", true,
-				bean.canModifyPredicate("http://predicates#modify_self",
-						CURATOR));
-	}
-
-	@Test
-	public void modifyPredicateRestrictionEqual() {
-		assertEquals("modifyPredicate: equal restriction", true,
-				bean.canModifyPredicate("http://predicates#modify_curator",
-						CURATOR));
-	}
-
-	@Test
-	public void modifyPredicateRestrictionHigher() {
-		assertEquals("modifyPredicate: higher restriction", false,
-				bean.canModifyPredicate("http://predicates#modify_hidden",
-						CURATOR));
-	}
-
-	@Test
-	public void modifyPredicateProhibitedNamespace() {
-		assertEquals("modifyPredicate: prohibited namespace", false,
-				bean.canModifyPredicate(PROHIBITED_NAMESPACES[0] + "randoom",
-						DB_ADMIN));
-	}
-
-	@Test
-	public void modifyPredicatePermittedException() {
-		assertEquals("modifyPredicate: permitted exception", true,
-				bean.canModifyPredicate(PERMITTED_EXCEPTIONS[0], DB_ADMIN));
-	}
-
-	// ----------------------------------------------------------------------
-	// test the bean builder
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void buildDisplayThresholds() {
-		Map<String, RoleLevel> expectedMap = new HashMap<String, BaseResourceBean.RoleLevel>();
-		expectedMap.put("http://thresholds#display_public", PUBLIC);
-		expectedMap.put("http://thresholds#display_hidden", NOBODY);
-
-		Map<String, RoleLevel> actualMap = populateThresholdMap(PROPERTY_DISPLAY_THRESHOLD);
-		assertEquals("display thresholds", expectedMap, actualMap);
-	}
-
-	@Test
-	public void buildModifyThresholds() {
-		Map<String, RoleLevel> expectedMap = new HashMap<String, BaseResourceBean.RoleLevel>();
-		expectedMap.put("http://thresholds#modify_editor", EDITOR);
-		expectedMap.put("http://thresholds#modify_curator", CURATOR);
-
-		Map<String, RoleLevel> actualMap = populateThresholdMap(PROPERTY_MODIFY_THRESHOLD);
-		assertEquals("modify thresholds", expectedMap, actualMap);
-	}
-
-	/** Invoke the private static method "populateThresholdMap" */
-	private Map<String, RoleLevel> populateThresholdMap(String propertyUri) {
-		Map<String, RoleLevel> map = new HashMap<String, BaseResourceBean.RoleLevel>();
-		try {
-			Class<?> clazz = PropertyRestrictionPolicyHelper.class;
-			Method method = clazz.getDeclaredMethod("populateThresholdMap",
-					OntModel.class, Map.class, String.class);
-			method.setAccessible(true);
-			method.invoke(null, ontModel, map, propertyUri);
-			return map;
-		} catch (Exception e) {
-			fail("failed to populate the map: propertyUri='" + propertyUri
-					+ "', " + e);
-			return null;
-		}
-	}
-
-	private static class ModelWrapper {
-		private final OntModel model;
-
-		public ModelWrapper(OntModel model) {
-			this.model = model;
-		}
-
-		public void add(String subjectUri, String propertyUri, String objectUri) {
-			Resource subject = model.getResource(subjectUri);
-			Property property = model.getProperty(propertyUri);
-			Resource object = model.getResource(objectUri);
-			model.add(subject, property, object);
-		}
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.auth.policy.bean;
+
+import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.CURATOR;
+import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.DB_ADMIN;
+import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.EDITOR;
+import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.NOBODY;
+import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.PUBLIC;
+import static edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel.SELF;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Level;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.Resource;
+
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean;
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
+import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
+
+/**
+ * Check that the bean gets built properly, and check that the bean works properly.
+ */
+public class PropertyRestrictionPolicyHelperTest extends AbstractTestClass {
+	private static final Log log = LogFactory
+			.getLog(PropertyRestrictionPolicyHelperTest.class);
+
+	private static final String PROPERTY_DISPLAY_THRESHOLD = VitroVocabulary.HIDDEN_FROM_DISPLAY_BELOW_ROLE_LEVEL_ANNOT;
+	private static final String PROPERTY_MODIFY_THRESHOLD = VitroVocabulary.PROHIBITED_FROM_UPDATE_BELOW_ROLE_LEVEL_ANNOT;
+
+	private static final String[] PROHIBITED_NAMESPACES = new String[] {
+			VitroVocabulary.vitroURI, "" };
+
+	private static final String[] PERMITTED_EXCEPTIONS = new String[] {
+			VitroVocabulary.MONIKER };
+
+	private OntModel ontModel;
+	private ModelWrapper wrapper;
+	private PropertyRestrictionPolicyHelper bean;
+
+	@Before
+	public void setLoggingLevel() {
+//		setLoggerLevel(PropertyRestrictionPolicyHelper.class, Level.DEBUG);
+	}
+
+	@Before
+	public void createTheBean() {
+		Map<String, RoleLevel> displayLevels = new HashMap<String, BaseResourceBean.RoleLevel>();
+		displayLevels.put("http://predicates#display_self", SELF);
+		displayLevels.put("http://predicates#display_curator", CURATOR);
+		displayLevels.put("http://predicates#display_hidden", NOBODY);
+
+		Map<String, RoleLevel> modifyLevels = new HashMap<String, BaseResourceBean.RoleLevel>();
+		modifyLevels.put("http://predicates#modify_self", SELF);
+		modifyLevels.put("http://predicates#modify_curator", CURATOR);
+		modifyLevels.put("http://predicates#modify_hidden", NOBODY);
+
+		bean = new PropertyRestrictionPolicyHelper(
+				Arrays.asList(PROHIBITED_NAMESPACES),
+				Arrays.asList(PERMITTED_EXCEPTIONS), displayLevels,
+				modifyLevels, ModelFactory.createDefaultModel());
+	}
+
+	@Before
+	public void createTheModel() {
+		ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM);
+
+		wrapper = new ModelWrapper(ontModel);
+
+		wrapper.add("http://thresholds#display_public",
+				PROPERTY_DISPLAY_THRESHOLD, PUBLIC.getURI());
+		wrapper.add("http://thresholds#display_hidden",
+				PROPERTY_DISPLAY_THRESHOLD, NOBODY.getURI());
+
+		wrapper.add("http://thresholds#modify_editor",
+				PROPERTY_MODIFY_THRESHOLD, EDITOR.getURI());
+		wrapper.add("http://thresholds#modify_curator",
+				PROPERTY_MODIFY_THRESHOLD, CURATOR.getURI());
+	}
+
+	// ----------------------------------------------------------------------
+	// test the bean
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void displayResource() {
+		assertEquals("display a random resource", true,
+				bean.canDisplayResource("http://someRandom#string", null));
+	}
+
+	@Test
+	public void modifyResourceNoRestriction() {
+		assertEquals("modify a random resource", true,
+				bean.canModifyResource("http://someRandom#string", null));
+	}
+
+	@Test
+	public void modifyResourceProhibitedNamespace() {
+		assertEquals("modify a prohibited resource", false,
+				bean.canModifyResource(PROHIBITED_NAMESPACES[0] + "random",
+						null));
+	}
+
+	@Test
+	public void modifyResourcePermittedException() {
+		assertEquals("modify a exception resource", true,
+				bean.canModifyResource(PERMITTED_EXCEPTIONS[0], null));
+	}
+
+	@Test
+	public void displayPredicateNoRestriction() {
+		assertEquals("displayPredicate: open", true,
+				bean.canDisplayPredicate("http://predicates#open", PUBLIC));
+	}
+
+	@Test
+	public void displayPredicateRestrictionLower() {
+		assertEquals("displayPredicate: lower restriction", true,
+				bean.canDisplayPredicate("http://predicates#display_self",
+						CURATOR));
+	}
+
+	@Test
+	public void displayPredicateRestrictionEqual() {
+		assertEquals("displayPredicate: equal restriction", true,
+				bean.canDisplayPredicate("http://predicates#display_curator",
+						CURATOR));
+	}
+
+	@Test
+	public void displayPredicateRestrictionHigher() {
+		assertEquals("displayPredicate: higher restriction", false,
+				bean.canDisplayPredicate("http://predicates#display_hidden",
+						CURATOR));
+	}
+
+	@Test
+	public void modifyPredicateNoRestriction() {
+		assertEquals("modifyPredicate: open", true,
+				bean.canModifyPredicate("http://predicates#open", PUBLIC));
+	}
+
+	@Test
+	public void modifyPredicateRestrictionLower() {
+		assertEquals("modifyPredicate: lower restriction", true,
+				bean.canModifyPredicate("http://predicates#modify_self",
+						CURATOR));
+	}
+
+	@Test
+	public void modifyPredicateRestrictionEqual() {
+		assertEquals("modifyPredicate: equal restriction", true,
+				bean.canModifyPredicate("http://predicates#modify_curator",
+						CURATOR));
+	}
+
+	@Test
+	public void modifyPredicateRestrictionHigher() {
+		assertEquals("modifyPredicate: higher restriction", false,
+				bean.canModifyPredicate("http://predicates#modify_hidden",
+						CURATOR));
+	}
+
+	@Test
+	public void modifyPredicateProhibitedNamespace() {
+		assertEquals("modifyPredicate: prohibited namespace", false,
+				bean.canModifyPredicate(PROHIBITED_NAMESPACES[0] + "randoom",
+						DB_ADMIN));
+	}
+
+	@Test
+	public void modifyPredicatePermittedException() {
+		assertEquals("modifyPredicate: permitted exception", true,
+				bean.canModifyPredicate(PERMITTED_EXCEPTIONS[0], DB_ADMIN));
+	}
+
+	// ----------------------------------------------------------------------
+	// test the bean builder
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void buildDisplayThresholds() {
+		Map<String, RoleLevel> expectedMap = new HashMap<String, BaseResourceBean.RoleLevel>();
+		expectedMap.put("http://thresholds#display_public", PUBLIC);
+		expectedMap.put("http://thresholds#display_hidden", NOBODY);
+
+		Map<String, RoleLevel> actualMap = populateThresholdMap(PROPERTY_DISPLAY_THRESHOLD);
+		assertEquals("display thresholds", expectedMap, actualMap);
+	}
+
+	@Test
+	public void buildModifyThresholds() {
+		Map<String, RoleLevel> expectedMap = new HashMap<String, BaseResourceBean.RoleLevel>();
+		expectedMap.put("http://thresholds#modify_editor", EDITOR);
+		expectedMap.put("http://thresholds#modify_curator", CURATOR);
+
+		Map<String, RoleLevel> actualMap = populateThresholdMap(PROPERTY_MODIFY_THRESHOLD);
+		assertEquals("modify thresholds", expectedMap, actualMap);
+	}
+
+	/** Invoke the private static method "populateThresholdMap" */
+	private Map<String, RoleLevel> populateThresholdMap(String propertyUri) {
+		Map<String, RoleLevel> map = new HashMap<String, BaseResourceBean.RoleLevel>();
+		try {
+			Class<?> clazz = PropertyRestrictionPolicyHelper.class;
+			Method method = clazz.getDeclaredMethod("populateThresholdMap",
+					OntModel.class, Map.class, String.class);
+			method.setAccessible(true);
+			method.invoke(null, ontModel, map, propertyUri);
+			return map;
+		} catch (Exception e) {
+			fail("failed to populate the map: propertyUri='" + propertyUri
+					+ "', " + e);
+			return null;
+		}
+	}
+
+	private static class ModelWrapper {
+		private final OntModel model;
+
+		public ModelWrapper(OntModel model) {
+			this.model = model;
+		}
+
+		public void add(String subjectUri, String propertyUri, String objectUri) {
+			Resource subject = model.getResource(subjectUri);
+			Property property = model.getProperty(propertyUri);
+			Resource object = model.getResource(objectUri);
+			model.add(subject, property, object);
+		}
+	}
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBeanTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBeanTest.java
index f0ccc4810..0c44bafd0 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBeanTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoBeanTest.java
@@ -1,143 +1,143 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.config;
-
-import static edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean.DUMMY_BEAN;
-import static edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean.LevelRevisionInfo.DUMMY_LEVEL;
-import static junit.framework.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.Date;
-
-import javax.servlet.http.HttpSession;
-
-import org.apache.log4j.Level;
-import org.junit.Before;
-import org.junit.Test;
-
-import stubs.javax.servlet.ServletContextStub;
-import stubs.javax.servlet.http.HttpSessionStub;
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-import edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean.LevelRevisionInfo;
-
-/**
- * Tests for RevisionInfoBean
- */
-public class RevisionInfoBeanTest extends AbstractTestClass {
-	private static final Date SAMPLE_DATE = new Date();
-
-	private static final LevelRevisionInfo LEVEL_1_INFO = new LevelRevisionInfo(
-			"level1name", "level1release", "level1revision");
-	private static final LevelRevisionInfo LEVEL_2_INFO = new LevelRevisionInfo(
-			"level2name", "level2release", "level2revision");
-	private static final LevelRevisionInfo LEVEL_3_INFO = new LevelRevisionInfo(
-			"level3name", "level3release", "level3revision");
-
-	private static final RevisionInfoBean BEAN_NO_LEVEL = buildBean(SAMPLE_DATE);
-	private static final RevisionInfoBean BEAN_1_LEVEL = buildBean(SAMPLE_DATE,
-			LEVEL_1_INFO);
-	private static final RevisionInfoBean BEAN_MULTI_LEVEL = buildBean(
-			SAMPLE_DATE, LEVEL_1_INFO, LEVEL_2_INFO, LEVEL_3_INFO);
-
-	private static RevisionInfoBean buildBean(Date date,
-			LevelRevisionInfo... levels) {
-		return new RevisionInfoBean(date, Arrays.asList(levels));
-	}
-
-	private ServletContextStub context;
-	private HttpSessionStub session;
-
-	@Before
-	public void setupContext() {
-		context = new ServletContextStub();
-		session = new HttpSessionStub();
-		session.setServletContext(context);
-	}
-
-	@Before
-	public void suppressInfoMessages() {
-		setLoggerLevel(RevisionInfoBean.class, Level.WARN);
-	}
-
-	@Test
-	public void setBeanNormal() {
-		RevisionInfoBean.setBean(context, BEAN_1_LEVEL);
-		assertEquals("stored bean", BEAN_1_LEVEL,
-				RevisionInfoBean.getBean(session));
-	}
-
-	@Test
-	public void setBeanNull() {
-		RevisionInfoBean.setBean(context, null);
-		assertEquals("dummy bean", DUMMY_BEAN,
-				RevisionInfoBean.getBean(session));
-	}
-
-	@Test
-	public void getBeanNoSession() {
-		setLoggerLevel(RevisionInfoBean.class, Level.ERROR);
-
-		assertEquals("noBean", DUMMY_BEAN,
-				RevisionInfoBean.getBean((HttpSession) null));
-	}
-
-	@Test
-	public void getBeanNoAttribute() {
-		setLoggerLevel(RevisionInfoBean.class, Level.ERROR);
-
-		assertEquals("noAttribute", DUMMY_BEAN,
-				RevisionInfoBean.getBean(session));
-	}
-
-	@Test
-	public void getBeanAttributeIsWrongClass() {
-		setLoggerLevel(RevisionInfoBean.class, Level.OFF);
-
-		context.setAttribute(RevisionInfoBean.ATTRIBUTE_NAME, "A string!");
-		assertEquals("noAttribute", DUMMY_BEAN,
-				RevisionInfoBean.getBean(session));
-	}
-
-	@Test
-	public void removeBean() {
-		RevisionInfoBean.setBean(context, BEAN_1_LEVEL);
-		assertEquals("stored bean", BEAN_1_LEVEL,
-				RevisionInfoBean.getBean(session));
-
-		setLoggerLevel(RevisionInfoBean.class, Level.ERROR);
-
-		RevisionInfoBean.removeBean(context);
-		assertEquals("dummy bean", DUMMY_BEAN,
-				RevisionInfoBean.getBean(session));
-	}
-
-	@Test
-	public void getReleaseLabelOneLevel() {
-		RevisionInfoBean.setBean(context, BEAN_1_LEVEL);
-		assertEquals("1 level release", LEVEL_1_INFO.getRelease(),
-				RevisionInfoBean.getBean(session).getReleaseLabel());
-	}
-
-	@Test
-	public void getReleaseLabelManyLevels() {
-		RevisionInfoBean.setBean(context, BEAN_MULTI_LEVEL);
-		assertEquals("many level release", LEVEL_3_INFO.getRelease(),
-				RevisionInfoBean.getBean(session).getReleaseLabel());
-	}
-
-	@Test
-	public void getReleaseLabelNoLevels() {
-		RevisionInfoBean.setBean(context, BEAN_NO_LEVEL);
-		assertEquals("0 level release", DUMMY_LEVEL.getRelease(),
-				RevisionInfoBean.getBean(session).getReleaseLabel());
-	}
-
-	@Test
-	public void getReleaseLabelNoBean() {
-		setLoggerLevel(RevisionInfoBean.class, Level.ERROR);
-
-		assertEquals("no bean release", DUMMY_LEVEL.getRelease(),
-				RevisionInfoBean.getBean(session).getReleaseLabel());
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.config;
+
+import static edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean.DUMMY_BEAN;
+import static edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean.LevelRevisionInfo.DUMMY_LEVEL;
+import static junit.framework.Assert.assertEquals;
+
+import java.util.Arrays;
+import java.util.Date;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.log4j.Level;
+import org.junit.Before;
+import org.junit.Test;
+
+import stubs.javax.servlet.ServletContextStub;
+import stubs.javax.servlet.http.HttpSessionStub;
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+import edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean.LevelRevisionInfo;
+
+/**
+ * Tests for RevisionInfoBean
+ */
+public class RevisionInfoBeanTest extends AbstractTestClass {
+	private static final Date SAMPLE_DATE = new Date();
+
+	private static final LevelRevisionInfo LEVEL_1_INFO = new LevelRevisionInfo(
+			"level1name", "level1release", "level1revision");
+	private static final LevelRevisionInfo LEVEL_2_INFO = new LevelRevisionInfo(
+			"level2name", "level2release", "level2revision");
+	private static final LevelRevisionInfo LEVEL_3_INFO = new LevelRevisionInfo(
+			"level3name", "level3release", "level3revision");
+
+	private static final RevisionInfoBean BEAN_NO_LEVEL = buildBean(SAMPLE_DATE);
+	private static final RevisionInfoBean BEAN_1_LEVEL = buildBean(SAMPLE_DATE,
+			LEVEL_1_INFO);
+	private static final RevisionInfoBean BEAN_MULTI_LEVEL = buildBean(
+			SAMPLE_DATE, LEVEL_1_INFO, LEVEL_2_INFO, LEVEL_3_INFO);
+
+	private static RevisionInfoBean buildBean(Date date,
+			LevelRevisionInfo... levels) {
+		return new RevisionInfoBean(date, Arrays.asList(levels));
+	}
+
+	private ServletContextStub context;
+	private HttpSessionStub session;
+
+	@Before
+	public void setupContext() {
+		context = new ServletContextStub();
+		session = new HttpSessionStub();
+		session.setServletContext(context);
+	}
+
+	@Before
+	public void suppressInfoMessages() {
+		setLoggerLevel(RevisionInfoBean.class, Level.WARN);
+	}
+
+	@Test
+	public void setBeanNormal() {
+		RevisionInfoBean.setBean(context, BEAN_1_LEVEL);
+		assertEquals("stored bean", BEAN_1_LEVEL,
+				RevisionInfoBean.getBean(session));
+	}
+
+	@Test
+	public void setBeanNull() {
+		RevisionInfoBean.setBean(context, null);
+		assertEquals("dummy bean", DUMMY_BEAN,
+				RevisionInfoBean.getBean(session));
+	}
+
+	@Test
+	public void getBeanNoSession() {
+		setLoggerLevel(RevisionInfoBean.class, Level.ERROR);
+
+		assertEquals("noBean", DUMMY_BEAN,
+				RevisionInfoBean.getBean((HttpSession) null));
+	}
+
+	@Test
+	public void getBeanNoAttribute() {
+		setLoggerLevel(RevisionInfoBean.class, Level.ERROR);
+
+		assertEquals("noAttribute", DUMMY_BEAN,
+				RevisionInfoBean.getBean(session));
+	}
+
+	@Test
+	public void getBeanAttributeIsWrongClass() {
+		setLoggerLevel(RevisionInfoBean.class, Level.OFF);
+
+		context.setAttribute(RevisionInfoBean.ATTRIBUTE_NAME, "A string!");
+		assertEquals("noAttribute", DUMMY_BEAN,
+				RevisionInfoBean.getBean(session));
+	}
+
+	@Test
+	public void removeBean() {
+		RevisionInfoBean.setBean(context, BEAN_1_LEVEL);
+		assertEquals("stored bean", BEAN_1_LEVEL,
+				RevisionInfoBean.getBean(session));
+
+		setLoggerLevel(RevisionInfoBean.class, Level.ERROR);
+
+		RevisionInfoBean.removeBean(context);
+		assertEquals("dummy bean", DUMMY_BEAN,
+				RevisionInfoBean.getBean(session));
+	}
+
+	@Test
+	public void getReleaseLabelOneLevel() {
+		RevisionInfoBean.setBean(context, BEAN_1_LEVEL);
+		assertEquals("1 level release", LEVEL_1_INFO.getRelease(),
+				RevisionInfoBean.getBean(session).getReleaseLabel());
+	}
+
+	@Test
+	public void getReleaseLabelManyLevels() {
+		RevisionInfoBean.setBean(context, BEAN_MULTI_LEVEL);
+		assertEquals("many level release", LEVEL_3_INFO.getRelease(),
+				RevisionInfoBean.getBean(session).getReleaseLabel());
+	}
+
+	@Test
+	public void getReleaseLabelNoLevels() {
+		RevisionInfoBean.setBean(context, BEAN_NO_LEVEL);
+		assertEquals("0 level release", DUMMY_LEVEL.getRelease(),
+				RevisionInfoBean.getBean(session).getReleaseLabel());
+	}
+
+	@Test
+	public void getReleaseLabelNoBean() {
+		setLoggerLevel(RevisionInfoBean.class, Level.ERROR);
+
+		assertEquals("no bean release", DUMMY_LEVEL.getRelease(),
+				RevisionInfoBean.getBean(session).getReleaseLabel());
+	}
+
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoSetupTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoSetupTest.java
index e49600465..3dc50076d 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoSetupTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/config/RevisionInfoSetupTest.java
@@ -1,189 +1,189 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.config;
-
-import static edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean.DUMMY_BEAN;
-import static edu.cornell.mannlib.vitro.webapp.config.RevisionInfoSetup.DATE_FORMAT;
-import static org.junit.Assert.assertEquals;
-
-import java.text.ParseException;
-import java.util.Arrays;
-import java.util.Date;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.apache.log4j.Level;
-import org.junit.Before;
-import org.junit.Test;
-
-import stubs.javax.servlet.ServletContextStub;
-import stubs.javax.servlet.http.HttpSessionStub;
-
-import com.ibm.icu.text.SimpleDateFormat;
-
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-import edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean.LevelRevisionInfo;
-import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
-
-/**
- * Test for RevisionInfoSetup
- */
-public class RevisionInfoSetupTest extends AbstractTestClass {
-	private ServletContextStub context;
-	private HttpSessionStub session;
-	private ServletContextListener listener;
-	private ServletContextEvent event;
-
-	@Before
-	public void setupContext() {
-		context = new ServletContextStub();
-
-		session = new HttpSessionStub();
-		session.setServletContext(context);
-
-		event = new ServletContextEvent(context);
-	}
-
-	@Before
-	public void createContextListener() {
-		listener = new RevisionInfoSetup();
-	}
-
-	@Before
-	public void suppressInfoMessages() {
-		setLoggerLevel(RevisionInfoBean.class, Level.WARN);
-	}
-
-	@Before
-	public void suppressMessagesFromStartupStatus() {
-		setLoggerLevel(StartupStatus.class, Level.OFF);
-	}
-	
-	@Test
-	public void noResourceFile() {
-		setLoggerLevel(RevisionInfoSetup.class, Level.OFF);
-		testThisExpectedFailure("no resource", null);
-	}
-
-	@Test
-	public void resourceFileIsEmpty() {
-		setLoggerLevel(RevisionInfoSetup.class, Level.OFF);
-		testThisExpectedFailure("empty resource", "");
-	}
-
-	@Test
-	public void resourceFileHasNoSignificantLines() {
-		setLoggerLevel(RevisionInfoSetup.class, Level.OFF);
-		testThisExpectedFailure("no siginificant lines", "    \n    #   \n\n");
-	}
-
-	@Test
-	public void resourceFileHasInvalidDateLine() {
-		setLoggerLevel(RevisionInfoSetup.class, Level.OFF);
-		testThisExpectedFailure("invalid date line", "BOGUS DATE LINE\n"
-				+ "name ~ release ~ revision");
-	}
-
-	@Test
-	public void resourceFileHasInvalidLevelLine() {
-		setLoggerLevel(RevisionInfoSetup.class, Level.OFF);
-		testThisExpectedFailure("invalid level line", "2010-02-13 23:55:00\n"
-				+ "name ~ release ~revision");
-	}
-
-	@Test
-	public void simpleSingleLevel() {
-		testThisResourceFile(
-				"simple single level",
-				"2010-02-13 23:55:00\n" + "name ~ release ~ revision",
-				bean(date("2010-02-13 23:55:00"),
-						level("name", "release", "revision")));
-	}
-
-	@Test
-	public void ignoreWhiteSpaceAroundDate() {
-		testThisResourceFile(
-				"white space around date",
-				"   1999-01-01 00:00:00    \n" + "name ~ release ~ revision",
-				bean(date("1999-01-01 00:00:00"),
-						level("name", "release", "revision")));
-	}
-
-	@Test
-	public void ignoreWhiteSpaceInLevelInfo() {
-		testThisResourceFile(
-				"white space in level info",
-				"2010-02-13 23:55:00\n"
-						+ "   name   ~ release   ~   revision  ",
-				bean(date("2010-02-13 23:55:00"),
-						level("name", "release", "revision")));
-	}
-
-	@Test
-	public void ignoreBlankLinesAndComments() {
-		testThisResourceFile(
-				"ignore empty lines",
-				"2010-02-13 23:55:00\n" + "\n" + "     \n" + "   #   \n"
-						+ "name ~ release ~ revision",
-				bean(date("2010-02-13 23:55:00"),
-						level("name", "release", "revision")));
-	}
-
-	@Test
-	public void parseMultipleLevels() {
-		testThisResourceFile(
-				"multiple levels",
-				"2010-02-13 23:55:00\n" + "name ~ release ~ revision\n"
-						+ "name2 ~ release2 ~ revision2\n",
-				bean(date("2010-02-13 23:55:00"),
-						level("name", "release", "revision"),
-						level("name2", "release2", "revision2")));
-	}
-
-	@Test
-	public void parseNoLevels() {
-		testThisResourceFile("no levels", "2010-02-13 23:55:00\n",
-				bean(date("2010-02-13 23:55:00")));
-	}
-
-	// ----------------------------------------------------------------------
-	// helper methods
-	// ----------------------------------------------------------------------
-
-	private RevisionInfoBean bean(Date date, LevelRevisionInfo... levels) {
-		return new RevisionInfoBean(date, Arrays.asList(levels));
-	}
-
-	private LevelRevisionInfo level(String name, String release, String revision) {
-		return new LevelRevisionInfo(name, release, revision);
-	}
-
-	private Date date(String string) {
-		try {
-			return new SimpleDateFormat(DATE_FORMAT).parse(string);
-		} catch (ParseException e) {
-			throw new IllegalArgumentException(
-					"Can't parse this date string: '" + string + "'");
-		}
-	}
-
-	/**
-	 * Test these file contents, compare to this expected bean.
-	 */
-	private void testThisResourceFile(String message, String fileContents,
-			RevisionInfoBean expected) {
-		context.setMockResource(RevisionInfoSetup.RESOURCE_PATH, fileContents);
-
-		listener.contextInitialized(event);
-		assertEquals(message, expected, RevisionInfoBean.getBean(session));
-	}
-
-	/**
-	 * Test these file contents, expect the dummy bean as a result.
-	 */
-	private void testThisExpectedFailure(String message, String fileContents) {
-		testThisResourceFile(message, fileContents, DUMMY_BEAN);
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.config;
+
+import static edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean.DUMMY_BEAN;
+import static edu.cornell.mannlib.vitro.webapp.config.RevisionInfoSetup.DATE_FORMAT;
+import static org.junit.Assert.assertEquals;
+
+import java.text.ParseException;
+import java.util.Arrays;
+import java.util.Date;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.apache.log4j.Level;
+import org.junit.Before;
+import org.junit.Test;
+
+import stubs.javax.servlet.ServletContextStub;
+import stubs.javax.servlet.http.HttpSessionStub;
+
+import com.ibm.icu.text.SimpleDateFormat;
+
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+import edu.cornell.mannlib.vitro.webapp.config.RevisionInfoBean.LevelRevisionInfo;
+import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
+
+/**
+ * Test for RevisionInfoSetup
+ */
+public class RevisionInfoSetupTest extends AbstractTestClass {
+	private ServletContextStub context;
+	private HttpSessionStub session;
+	private ServletContextListener listener;
+	private ServletContextEvent event;
+
+	@Before
+	public void setupContext() {
+		context = new ServletContextStub();
+
+		session = new HttpSessionStub();
+		session.setServletContext(context);
+
+		event = new ServletContextEvent(context);
+	}
+
+	@Before
+	public void createContextListener() {
+		listener = new RevisionInfoSetup();
+	}
+
+	@Before
+	public void suppressInfoMessages() {
+		setLoggerLevel(RevisionInfoBean.class, Level.WARN);
+	}
+
+	@Before
+	public void suppressMessagesFromStartupStatus() {
+		setLoggerLevel(StartupStatus.class, Level.OFF);
+	}
+	
+	@Test
+	public void noResourceFile() {
+		setLoggerLevel(RevisionInfoSetup.class, Level.OFF);
+		testThisExpectedFailure("no resource", null);
+	}
+
+	@Test
+	public void resourceFileIsEmpty() {
+		setLoggerLevel(RevisionInfoSetup.class, Level.OFF);
+		testThisExpectedFailure("empty resource", "");
+	}
+
+	@Test
+	public void resourceFileHasNoSignificantLines() {
+		setLoggerLevel(RevisionInfoSetup.class, Level.OFF);
+		testThisExpectedFailure("no siginificant lines", "    \n    #   \n\n");
+	}
+
+	@Test
+	public void resourceFileHasInvalidDateLine() {
+		setLoggerLevel(RevisionInfoSetup.class, Level.OFF);
+		testThisExpectedFailure("invalid date line", "BOGUS DATE LINE\n"
+				+ "name ~ release ~ revision");
+	}
+
+	@Test
+	public void resourceFileHasInvalidLevelLine() {
+		setLoggerLevel(RevisionInfoSetup.class, Level.OFF);
+		testThisExpectedFailure("invalid level line", "2010-02-13 23:55:00\n"
+				+ "name ~ release ~revision");
+	}
+
+	@Test
+	public void simpleSingleLevel() {
+		testThisResourceFile(
+				"simple single level",
+				"2010-02-13 23:55:00\n" + "name ~ release ~ revision",
+				bean(date("2010-02-13 23:55:00"),
+						level("name", "release", "revision")));
+	}
+
+	@Test
+	public void ignoreWhiteSpaceAroundDate() {
+		testThisResourceFile(
+				"white space around date",
+				"   1999-01-01 00:00:00    \n" + "name ~ release ~ revision",
+				bean(date("1999-01-01 00:00:00"),
+						level("name", "release", "revision")));
+	}
+
+	@Test
+	public void ignoreWhiteSpaceInLevelInfo() {
+		testThisResourceFile(
+				"white space in level info",
+				"2010-02-13 23:55:00\n"
+						+ "   name   ~ release   ~   revision  ",
+				bean(date("2010-02-13 23:55:00"),
+						level("name", "release", "revision")));
+	}
+
+	@Test
+	public void ignoreBlankLinesAndComments() {
+		testThisResourceFile(
+				"ignore empty lines",
+				"2010-02-13 23:55:00\n" + "\n" + "     \n" + "   #   \n"
+						+ "name ~ release ~ revision",
+				bean(date("2010-02-13 23:55:00"),
+						level("name", "release", "revision")));
+	}
+
+	@Test
+	public void parseMultipleLevels() {
+		testThisResourceFile(
+				"multiple levels",
+				"2010-02-13 23:55:00\n" + "name ~ release ~ revision\n"
+						+ "name2 ~ release2 ~ revision2\n",
+				bean(date("2010-02-13 23:55:00"),
+						level("name", "release", "revision"),
+						level("name2", "release2", "revision2")));
+	}
+
+	@Test
+	public void parseNoLevels() {
+		testThisResourceFile("no levels", "2010-02-13 23:55:00\n",
+				bean(date("2010-02-13 23:55:00")));
+	}
+
+	// ----------------------------------------------------------------------
+	// helper methods
+	// ----------------------------------------------------------------------
+
+	private RevisionInfoBean bean(Date date, LevelRevisionInfo... levels) {
+		return new RevisionInfoBean(date, Arrays.asList(levels));
+	}
+
+	private LevelRevisionInfo level(String name, String release, String revision) {
+		return new LevelRevisionInfo(name, release, revision);
+	}
+
+	private Date date(String string) {
+		try {
+			return new SimpleDateFormat(DATE_FORMAT).parse(string);
+		} catch (ParseException e) {
+			throw new IllegalArgumentException(
+					"Can't parse this date string: '" + string + "'");
+		}
+	}
+
+	/**
+	 * Test these file contents, compare to this expected bean.
+	 */
+	private void testThisResourceFile(String message, String fileContents,
+			RevisionInfoBean expected) {
+		context.setMockResource(RevisionInfoSetup.RESOURCE_PATH, fileContents);
+
+		listener.contextInitialized(event);
+		assertEquals(message, expected, RevisionInfoBean.getBean(session));
+	}
+
+	/**
+	 * Test these file contents, expect the dummy bean as a result.
+	 */
+	private void testThisExpectedFailure(String message, String fileContents) {
+		testThisResourceFile(message, fileContents, DUMMY_BEAN);
+	}
+
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectionCriteriaTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectionCriteriaTest.java
index 6cbc0cedc..a6e55efb0 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectionCriteriaTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectionCriteriaTest.java
@@ -1,52 +1,52 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts;
-
-import static edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering.DEFAULT_ORDERING;
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsSelectionCriteria;
-
-public class UserAccountsSelectionCriteriaTest {
-	private UserAccountsSelectionCriteria criteria;
-
-	@Test(expected = IllegalArgumentException.class)
-	public void accountsPerPageOutOfRange() {
-		criteria = create(0, 10, DEFAULT_ORDERING, "role", "search");
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void pageIndexOutOfRange() {
-		criteria = create(10, -1, DEFAULT_ORDERING, "role", "search");
-	}
-
-	@Test
-	public void orderByIsNull() {
-		criteria = create(10, 1, null, "role", "search");
-		assertEquals("ordering", UserAccountsOrdering.DEFAULT_ORDERING,
-				criteria.getOrderBy());
-	}
-
-	@Test
-	public void roleFilterUriIsNull() {
-		criteria = create(10, 1, DEFAULT_ORDERING, null, "search");
-		assertEquals("roleFilter", "", criteria.getRoleFilterUri());
-	}
-
-	@Test
-	public void searchTermIsNull() {
-		criteria = create(10, 1, DEFAULT_ORDERING, "role", null);
-		assertEquals("searchTerm", "", criteria.getSearchTerm());
-	}
-
-	private UserAccountsSelectionCriteria create(int accountsPerPage,
-			int pageIndex, UserAccountsOrdering orderBy, String roleFilterUri,
-			String searchTerm) {
-		return new UserAccountsSelectionCriteria(accountsPerPage, pageIndex,
-				orderBy, roleFilterUri, searchTerm);
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts;
+
+import static edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering.DEFAULT_ORDERING;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsSelectionCriteria;
+
+public class UserAccountsSelectionCriteriaTest {
+	private UserAccountsSelectionCriteria criteria;
+
+	@Test(expected = IllegalArgumentException.class)
+	public void accountsPerPageOutOfRange() {
+		criteria = create(0, 10, DEFAULT_ORDERING, "role", "search");
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void pageIndexOutOfRange() {
+		criteria = create(10, -1, DEFAULT_ORDERING, "role", "search");
+	}
+
+	@Test
+	public void orderByIsNull() {
+		criteria = create(10, 1, null, "role", "search");
+		assertEquals("ordering", UserAccountsOrdering.DEFAULT_ORDERING,
+				criteria.getOrderBy());
+	}
+
+	@Test
+	public void roleFilterUriIsNull() {
+		criteria = create(10, 1, DEFAULT_ORDERING, null, "search");
+		assertEquals("roleFilter", "", criteria.getRoleFilterUri());
+	}
+
+	@Test
+	public void searchTermIsNull() {
+		criteria = create(10, 1, DEFAULT_ORDERING, "role", null);
+		assertEquals("searchTerm", "", criteria.getSearchTerm());
+	}
+
+	private UserAccountsSelectionCriteria create(int accountsPerPage,
+			int pageIndex, UserAccountsOrdering orderBy, String roleFilterUri,
+			String searchTerm) {
+		return new UserAccountsSelectionCriteria(accountsPerPage, pageIndex,
+				orderBy, roleFilterUri, searchTerm);
+	}
+
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java
index 6132579e3..9fba64f01 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.java
@@ -1,359 +1,359 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.accounts;
-
-import static edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering.DEFAULT_ORDERING;
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering.Direction;
-import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering.Field;
-
-public class UserAccountsSelectorTest extends AbstractTestClass {
-	/**
-	 * Where the model statements are stored for this test.
-	 */
-	private static final String N3_DATA_FILENAME = "UserAccountsSelectorTest.n3";
-
-	private static final String NS_MINE = "http://vivo.mydomain.edu/individual/";
-
-	private static OntModel ontModel;
-
-	@BeforeClass
-	public static void setupModel() throws IOException {
-		InputStream stream = UserAccountsSelectorTest.class
-				.getResourceAsStream(N3_DATA_FILENAME);
-		Model model = ModelFactory.createDefaultModel();
-		model.read(stream, null, "N3");
-		stream.close();
-
-		ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM,
-				model);
-		ontModel.prepare();
-	}
-
-	private UserAccountsSelection selection;
-	private UserAccountsSelectionCriteria criteria;
-
-	// ----------------------------------------------------------------------
-	// exceptions tests
-	// ----------------------------------------------------------------------
-
-	@Test(expected = NullPointerException.class)
-	public void modelIsNull() {
-		UserAccountsSelector.select(null,
-				criteria(10, 1, DEFAULT_ORDERING, "", ""));
-	}
-
-	@Test(expected = NullPointerException.class)
-	public void criteriaIsNull() {
-		UserAccountsSelector.select(ontModel, null);
-	}
-
-	// ----------------------------------------------------------------------
-	// fields tests
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void checkAllFields() {
-		selectOnCriteria(1, 10, DEFAULT_ORDERING, "", "");
-		assertSelectedUris(10, "user10");
-
-		UserAccount acct = selection.getUserAccounts().get(0);
-		assertEquals("uri", "http://vivo.mydomain.edu/individual/user10",
-				acct.getUri());
-		assertEquals("email", "email@jones.edu", acct.getEmailAddress());
-		assertEquals("firstName", "Bob", acct.getFirstName());
-		assertEquals("lastName", "Caruso", acct.getLastName());
-		assertEquals("password", "garbage", acct.getMd5Password());
-		assertEquals("expires", 1100234965897L, acct.getPasswordLinkExpires());
-		assertEquals("loginCount", 50, acct.getLoginCount());
-		assertEquals("lastLogin", 1020304050607080L, acct.getLastLoginTime());
-		assertEquals("status", UserAccount.Status.ACTIVE, acct.getStatus());
-		assertEqualSets(
-				"permissions",
-				Collections
-						.singleton("http://vivo.mydomain.edu/individual/role2"),
-				acct.getPermissionSetUris());
-		assertEquals("rootUser", false, acct.isRootUser());
-	}
-
-	@Test
-	public void checkFieldsForRootUser() {
-		selectOnCriteria(1, 8, DEFAULT_ORDERING, "", "");
-		assertSelectedUris(10, "user08");
-
-		UserAccount acct = selection.getUserAccounts().get(0);
-		assertEquals("uri", "http://vivo.mydomain.edu/individual/user08",
-				acct.getUri());
-		assertEquals("email", "email@henry.edu", acct.getEmailAddress());
-		assertEquals("firstName", "Mary", acct.getFirstName());
-		assertEquals("lastName", "McInerney", acct.getLastName());
-		assertEquals("password", "garbage", acct.getMd5Password());
-		assertEquals("expires", 0L, acct.getPasswordLinkExpires());
-		assertEquals("loginCount", 7, acct.getLoginCount());
-		assertEquals("lastLogin", 1122334455667788L, acct.getLastLoginTime());
-		assertEquals("status", UserAccount.Status.ACTIVE, acct.getStatus());
-		assertEqualSets("permissions", Collections.<String> emptySet(),
-				acct.getPermissionSetUris());
-		assertEquals("rootUser", true, acct.isRootUser());
-	}
-
-	// ----------------------------------------------------------------------
-	// pagination tests
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void showFirstPageOfFifteen() {
-		selectOnCriteria(15, 1, DEFAULT_ORDERING, "", "");
-		assertSelectedUris(10, "user01", "user02", "user03", "user04",
-				"user05", "user06", "user07", "user08", "user09", "user10");
-	}
-
-	@Test
-	public void showFirstPageOfOne() {
-		selectOnCriteria(1, 1, DEFAULT_ORDERING, "", "");
-		assertSelectedUris(10, "user01");
-	}
-
-	@Test
-	public void showFirstPageOfFive() {
-		selectOnCriteria(5, 1, DEFAULT_ORDERING, "", "");
-		assertSelectedUris(10, "user01", "user02", "user03", "user04", "user05");
-	}
-
-	@Test
-	public void showSecondPageOfSeven() {
-		selectOnCriteria(7, 2, DEFAULT_ORDERING, "", "");
-		assertSelectedUris(10, "user08", "user09", "user10");
-	}
-
-	@Test
-	public void showTenthPageOfThree() {
-		selectOnCriteria(3, 10, DEFAULT_ORDERING, "", "");
-		assertSelectedUris(10);
-	}
-
-	// ----------------------------------------------------------------------
-	// sorting tests
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void sortByEmailAscending() {
-		UserAccountsOrdering orderBy = new UserAccountsOrdering(Field.EMAIL,
-				Direction.ASCENDING);
-		selectOnCriteria(3, 1, orderBy, "", "");
-		assertSelectedUris(10, "user01", "user02", "user03");
-	}
-
-	@Test
-	public void sortByEmailDescending() {
-		UserAccountsOrdering orderBy = new UserAccountsOrdering(Field.EMAIL,
-				Direction.DESCENDING);
-		selectOnCriteria(3, 1, orderBy, "", "");
-		assertSelectedUris(10, "user10", "user09", "user08");
-	}
-
-	@Test
-	public void sortByFirstNameAscending() {
-		UserAccountsOrdering orderBy = new UserAccountsOrdering(
-				Field.FIRST_NAME, Direction.ASCENDING);
-		selectOnCriteria(3, 1, orderBy, "", "");
-		// user02 has no first name: collates as least value.
-		assertSelectedUris(10, "user02", "user10", "user09");
-	}
-
-	@Test
-	public void sortByFirstNameDescending() {
-		UserAccountsOrdering orderBy = new UserAccountsOrdering(
-				Field.FIRST_NAME, Direction.DESCENDING);
-		selectOnCriteria(3, 1, orderBy, "", "");
-		// user02 has no first name: collates as least value.
-		assertSelectedUris(10, "user01", "user03", "user04");
-	}
-
-	@Test
-	public void sortByLastNameAscending() {
-		UserAccountsOrdering orderBy = new UserAccountsOrdering(
-				Field.LAST_NAME, Direction.ASCENDING);
-		selectOnCriteria(3, 1, orderBy, "", "");
-		// user03 has no last name: collates as least value.
-		assertSelectedUris(10, "user03", "user05", "user09");
-	}
-
-	@Test
-	public void sortByLastNameDescending() {
-		UserAccountsOrdering orderBy = new UserAccountsOrdering(
-				Field.LAST_NAME, Direction.DESCENDING);
-		selectOnCriteria(3, 1, orderBy, "", "");
-		assertSelectedUris(10, "user06", "user07", "user01");
-	}
-
-	@Test
-	public void sortByStatusAscending() {
-		UserAccountsOrdering orderBy = new UserAccountsOrdering(Field.STATUS,
-				Direction.ASCENDING);
-		selectOnCriteria(3, 1, orderBy, "", "");
-		// user07 has no status: collates as least value.
-		assertSelectedUris(10, "user07", "user01", "user04");
-	}
-
-	@Test
-	public void sortByStatusDescending() {
-		UserAccountsOrdering orderBy = new UserAccountsOrdering(Field.STATUS,
-				Direction.DESCENDING);
-		selectOnCriteria(3, 1, orderBy, "", "");
-		assertSelectedUris(10, "user02", "user03", "user06");
-	}
-
-	@Test
-	public void sortByLoginCountAscending() {
-		UserAccountsOrdering orderBy = new UserAccountsOrdering(
-				Field.LOGIN_COUNT, Direction.ASCENDING);
-		selectOnCriteria(3, 1, orderBy, "", "");
-		// user06 has no login count: reads as 0.
-		assertSelectedUris(10, "user06", "user03", "user07");
-	}
-
-	@Test
-	public void sortByLoginCountDescending() {
-		UserAccountsOrdering orderBy = new UserAccountsOrdering(
-				Field.LOGIN_COUNT, Direction.DESCENDING);
-		selectOnCriteria(3, 1, orderBy, "", "");
-		assertSelectedUris(10, "user10", "user04", "user08");
-	}
-
-	@Test
-	public void sortByLastLoginTimeAscending() {
-		UserAccountsOrdering orderBy = new UserAccountsOrdering(
-				Field.LAST_LOGIN_TIME, Direction.ASCENDING);
-		selectOnCriteria(3, 1, orderBy, "", "");
-		// user06 has no login count: reads as 0.
-		assertSelectedUris(10, "user07", "user03", "user06");
-	}
-	
-	@Test
-	public void sortByLastLoginTimeDescending() {
-		UserAccountsOrdering orderBy = new UserAccountsOrdering(
-				Field.LAST_LOGIN_TIME, Direction.DESCENDING);
-		selectOnCriteria(3, 1, orderBy, "", "");
-		assertSelectedUris(10, "user08", "user10", "user09");
-	}
-	
-	// ----------------------------------------------------------------------
-	// filtering tests
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void filterAgainstRole1() {
-		selectOnCriteria(20, 1, DEFAULT_ORDERING, NS_MINE + "role1", "");
-		assertSelectedUris(6, "user01", "user02", "user03", "user05", "user06",
-				"user09");
-	}
-
-	@Test
-	public void filterAgainstRole2() {
-		selectOnCriteria(20, 1, DEFAULT_ORDERING, NS_MINE + "role2", "");
-		assertSelectedUris(2, "user03", "user10");
-	}
-	
-	@Test
-	public void filterAgainstNoSuchRole() {
-		selectOnCriteria(20, 1, DEFAULT_ORDERING, "BogusRole", "");
-		assertSelectedUris(0);
-	}
-
-	// ----------------------------------------------------------------------
-	// search tests
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void searchTermFoundInAllThreeFields() {
-		selectOnCriteria(20, 1, DEFAULT_ORDERING, "", "bob");
-		assertSelectedUris(3, "user02", "user05", "user10");
-	}
-
-	@Test
-	public void searchTermNotFound() {
-		selectOnCriteria(20, 1, DEFAULT_ORDERING, "", "bogus");
-		assertSelectedUris(0);
-	}
-
-	/**
-	 * If the special characters were allowed into the Regex, this would have 3
-	 * matches. If they are escaped properly, it will have none.
-	 */
-	@Test
-	public void searchTermContainsSpecialRegexCharacters() {
-		selectOnCriteria(20, 1, DEFAULT_ORDERING, "", "b.b");
-		assertSelectedUris(0);
-	}
-
-	// ----------------------------------------------------------------------
-	// combination tests
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void searchWithFilter() {
-		selectOnCriteria(20, 1, DEFAULT_ORDERING, NS_MINE + "role1", "bob");
-		assertSelectedUris(2, "user02", "user05");
-	}
-
-	@Test
-	public void searchWithFilterPaginatedWithFunkySortOrder() {
-		selectOnCriteria(1, 2, new UserAccountsOrdering(Field.STATUS,
-				Direction.ASCENDING), NS_MINE + "role1", "bob");
-		assertSelectedUris(2, "user02");
-	}
-
-	// ----------------------------------------------------------------------
-	// helper methods
-	// ----------------------------------------------------------------------
-
-	/** Create a new criteria object */
-	private UserAccountsSelectionCriteria criteria(int accountsPerPage,
-			int pageIndex, UserAccountsOrdering orderBy, String roleFilterUri,
-			String searchTerm) {
-		return new UserAccountsSelectionCriteria(accountsPerPage, pageIndex,
-				orderBy, roleFilterUri, searchTerm);
-	}
-
-	/** Create a criteria object and select against it. */
-	private void selectOnCriteria(int accountsPerPage, int pageIndex,
-			UserAccountsOrdering orderBy, String roleFilterUri,
-			String searchTerm) {
-		criteria = new UserAccountsSelectionCriteria(accountsPerPage,
-				pageIndex, orderBy, roleFilterUri, searchTerm);
-		selection = UserAccountsSelector.select(ontModel, criteria);
-	}
-
-	/** How many URIs should we expect, and which ones (local names only). */
-	private void assertSelectedUris(int resultCount, String... uris) {
-		assertEquals("result count", resultCount, selection.getResultCount());
-
-		List<String> expectedList = Arrays.asList(uris);
-		List<String> actualList = new ArrayList<String>();
-		for (UserAccount a : selection.getUserAccounts()) {
-			String[] uriParts = a.getUri().split("/");
-			actualList.add(uriParts[uriParts.length - 1]);
-		}
-		assertEquals("uris", expectedList, actualList);
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.accounts;
+
+import static edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering.DEFAULT_ORDERING;
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering.Direction;
+import edu.cornell.mannlib.vitro.webapp.controller.accounts.UserAccountsOrdering.Field;
+
+public class UserAccountsSelectorTest extends AbstractTestClass {
+	/**
+	 * Where the model statements are stored for this test.
+	 */
+	private static final String N3_DATA_FILENAME = "UserAccountsSelectorTest.n3";
+
+	private static final String NS_MINE = "http://vivo.mydomain.edu/individual/";
+
+	private static OntModel ontModel;
+
+	@BeforeClass
+	public static void setupModel() throws IOException {
+		InputStream stream = UserAccountsSelectorTest.class
+				.getResourceAsStream(N3_DATA_FILENAME);
+		Model model = ModelFactory.createDefaultModel();
+		model.read(stream, null, "N3");
+		stream.close();
+
+		ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM,
+				model);
+		ontModel.prepare();
+	}
+
+	private UserAccountsSelection selection;
+	private UserAccountsSelectionCriteria criteria;
+
+	// ----------------------------------------------------------------------
+	// exceptions tests
+	// ----------------------------------------------------------------------
+
+	@Test(expected = NullPointerException.class)
+	public void modelIsNull() {
+		UserAccountsSelector.select(null,
+				criteria(10, 1, DEFAULT_ORDERING, "", ""));
+	}
+
+	@Test(expected = NullPointerException.class)
+	public void criteriaIsNull() {
+		UserAccountsSelector.select(ontModel, null);
+	}
+
+	// ----------------------------------------------------------------------
+	// fields tests
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void checkAllFields() {
+		selectOnCriteria(1, 10, DEFAULT_ORDERING, "", "");
+		assertSelectedUris(10, "user10");
+
+		UserAccount acct = selection.getUserAccounts().get(0);
+		assertEquals("uri", "http://vivo.mydomain.edu/individual/user10",
+				acct.getUri());
+		assertEquals("email", "email@jones.edu", acct.getEmailAddress());
+		assertEquals("firstName", "Bob", acct.getFirstName());
+		assertEquals("lastName", "Caruso", acct.getLastName());
+		assertEquals("password", "garbage", acct.getMd5Password());
+		assertEquals("expires", 1100234965897L, acct.getPasswordLinkExpires());
+		assertEquals("loginCount", 50, acct.getLoginCount());
+		assertEquals("lastLogin", 1020304050607080L, acct.getLastLoginTime());
+		assertEquals("status", UserAccount.Status.ACTIVE, acct.getStatus());
+		assertEqualSets(
+				"permissions",
+				Collections
+						.singleton("http://vivo.mydomain.edu/individual/role2"),
+				acct.getPermissionSetUris());
+		assertEquals("rootUser", false, acct.isRootUser());
+	}
+
+	@Test
+	public void checkFieldsForRootUser() {
+		selectOnCriteria(1, 8, DEFAULT_ORDERING, "", "");
+		assertSelectedUris(10, "user08");
+
+		UserAccount acct = selection.getUserAccounts().get(0);
+		assertEquals("uri", "http://vivo.mydomain.edu/individual/user08",
+				acct.getUri());
+		assertEquals("email", "email@henry.edu", acct.getEmailAddress());
+		assertEquals("firstName", "Mary", acct.getFirstName());
+		assertEquals("lastName", "McInerney", acct.getLastName());
+		assertEquals("password", "garbage", acct.getMd5Password());
+		assertEquals("expires", 0L, acct.getPasswordLinkExpires());
+		assertEquals("loginCount", 7, acct.getLoginCount());
+		assertEquals("lastLogin", 1122334455667788L, acct.getLastLoginTime());
+		assertEquals("status", UserAccount.Status.ACTIVE, acct.getStatus());
+		assertEqualSets("permissions", Collections.<String> emptySet(),
+				acct.getPermissionSetUris());
+		assertEquals("rootUser", true, acct.isRootUser());
+	}
+
+	// ----------------------------------------------------------------------
+	// pagination tests
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void showFirstPageOfFifteen() {
+		selectOnCriteria(15, 1, DEFAULT_ORDERING, "", "");
+		assertSelectedUris(10, "user01", "user02", "user03", "user04",
+				"user05", "user06", "user07", "user08", "user09", "user10");
+	}
+
+	@Test
+	public void showFirstPageOfOne() {
+		selectOnCriteria(1, 1, DEFAULT_ORDERING, "", "");
+		assertSelectedUris(10, "user01");
+	}
+
+	@Test
+	public void showFirstPageOfFive() {
+		selectOnCriteria(5, 1, DEFAULT_ORDERING, "", "");
+		assertSelectedUris(10, "user01", "user02", "user03", "user04", "user05");
+	}
+
+	@Test
+	public void showSecondPageOfSeven() {
+		selectOnCriteria(7, 2, DEFAULT_ORDERING, "", "");
+		assertSelectedUris(10, "user08", "user09", "user10");
+	}
+
+	@Test
+	public void showTenthPageOfThree() {
+		selectOnCriteria(3, 10, DEFAULT_ORDERING, "", "");
+		assertSelectedUris(10);
+	}
+
+	// ----------------------------------------------------------------------
+	// sorting tests
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void sortByEmailAscending() {
+		UserAccountsOrdering orderBy = new UserAccountsOrdering(Field.EMAIL,
+				Direction.ASCENDING);
+		selectOnCriteria(3, 1, orderBy, "", "");
+		assertSelectedUris(10, "user01", "user02", "user03");
+	}
+
+	@Test
+	public void sortByEmailDescending() {
+		UserAccountsOrdering orderBy = new UserAccountsOrdering(Field.EMAIL,
+				Direction.DESCENDING);
+		selectOnCriteria(3, 1, orderBy, "", "");
+		assertSelectedUris(10, "user10", "user09", "user08");
+	}
+
+	@Test
+	public void sortByFirstNameAscending() {
+		UserAccountsOrdering orderBy = new UserAccountsOrdering(
+				Field.FIRST_NAME, Direction.ASCENDING);
+		selectOnCriteria(3, 1, orderBy, "", "");
+		// user02 has no first name: collates as least value.
+		assertSelectedUris(10, "user02", "user10", "user09");
+	}
+
+	@Test
+	public void sortByFirstNameDescending() {
+		UserAccountsOrdering orderBy = new UserAccountsOrdering(
+				Field.FIRST_NAME, Direction.DESCENDING);
+		selectOnCriteria(3, 1, orderBy, "", "");
+		// user02 has no first name: collates as least value.
+		assertSelectedUris(10, "user01", "user03", "user04");
+	}
+
+	@Test
+	public void sortByLastNameAscending() {
+		UserAccountsOrdering orderBy = new UserAccountsOrdering(
+				Field.LAST_NAME, Direction.ASCENDING);
+		selectOnCriteria(3, 1, orderBy, "", "");
+		// user03 has no last name: collates as least value.
+		assertSelectedUris(10, "user03", "user05", "user09");
+	}
+
+	@Test
+	public void sortByLastNameDescending() {
+		UserAccountsOrdering orderBy = new UserAccountsOrdering(
+				Field.LAST_NAME, Direction.DESCENDING);
+		selectOnCriteria(3, 1, orderBy, "", "");
+		assertSelectedUris(10, "user06", "user07", "user01");
+	}
+
+	@Test
+	public void sortByStatusAscending() {
+		UserAccountsOrdering orderBy = new UserAccountsOrdering(Field.STATUS,
+				Direction.ASCENDING);
+		selectOnCriteria(3, 1, orderBy, "", "");
+		// user07 has no status: collates as least value.
+		assertSelectedUris(10, "user07", "user01", "user04");
+	}
+
+	@Test
+	public void sortByStatusDescending() {
+		UserAccountsOrdering orderBy = new UserAccountsOrdering(Field.STATUS,
+				Direction.DESCENDING);
+		selectOnCriteria(3, 1, orderBy, "", "");
+		assertSelectedUris(10, "user02", "user03", "user06");
+	}
+
+	@Test
+	public void sortByLoginCountAscending() {
+		UserAccountsOrdering orderBy = new UserAccountsOrdering(
+				Field.LOGIN_COUNT, Direction.ASCENDING);
+		selectOnCriteria(3, 1, orderBy, "", "");
+		// user06 has no login count: reads as 0.
+		assertSelectedUris(10, "user06", "user03", "user07");
+	}
+
+	@Test
+	public void sortByLoginCountDescending() {
+		UserAccountsOrdering orderBy = new UserAccountsOrdering(
+				Field.LOGIN_COUNT, Direction.DESCENDING);
+		selectOnCriteria(3, 1, orderBy, "", "");
+		assertSelectedUris(10, "user10", "user04", "user08");
+	}
+
+	@Test
+	public void sortByLastLoginTimeAscending() {
+		UserAccountsOrdering orderBy = new UserAccountsOrdering(
+				Field.LAST_LOGIN_TIME, Direction.ASCENDING);
+		selectOnCriteria(3, 1, orderBy, "", "");
+		// user06 has no login count: reads as 0.
+		assertSelectedUris(10, "user07", "user03", "user06");
+	}
+	
+	@Test
+	public void sortByLastLoginTimeDescending() {
+		UserAccountsOrdering orderBy = new UserAccountsOrdering(
+				Field.LAST_LOGIN_TIME, Direction.DESCENDING);
+		selectOnCriteria(3, 1, orderBy, "", "");
+		assertSelectedUris(10, "user08", "user10", "user09");
+	}
+	
+	// ----------------------------------------------------------------------
+	// filtering tests
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void filterAgainstRole1() {
+		selectOnCriteria(20, 1, DEFAULT_ORDERING, NS_MINE + "role1", "");
+		assertSelectedUris(6, "user01", "user02", "user03", "user05", "user06",
+				"user09");
+	}
+
+	@Test
+	public void filterAgainstRole2() {
+		selectOnCriteria(20, 1, DEFAULT_ORDERING, NS_MINE + "role2", "");
+		assertSelectedUris(2, "user03", "user10");
+	}
+	
+	@Test
+	public void filterAgainstNoSuchRole() {
+		selectOnCriteria(20, 1, DEFAULT_ORDERING, "BogusRole", "");
+		assertSelectedUris(0);
+	}
+
+	// ----------------------------------------------------------------------
+	// search tests
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void searchTermFoundInAllThreeFields() {
+		selectOnCriteria(20, 1, DEFAULT_ORDERING, "", "bob");
+		assertSelectedUris(3, "user02", "user05", "user10");
+	}
+
+	@Test
+	public void searchTermNotFound() {
+		selectOnCriteria(20, 1, DEFAULT_ORDERING, "", "bogus");
+		assertSelectedUris(0);
+	}
+
+	/**
+	 * If the special characters were allowed into the Regex, this would have 3
+	 * matches. If they are escaped properly, it will have none.
+	 */
+	@Test
+	public void searchTermContainsSpecialRegexCharacters() {
+		selectOnCriteria(20, 1, DEFAULT_ORDERING, "", "b.b");
+		assertSelectedUris(0);
+	}
+
+	// ----------------------------------------------------------------------
+	// combination tests
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void searchWithFilter() {
+		selectOnCriteria(20, 1, DEFAULT_ORDERING, NS_MINE + "role1", "bob");
+		assertSelectedUris(2, "user02", "user05");
+	}
+
+	@Test
+	public void searchWithFilterPaginatedWithFunkySortOrder() {
+		selectOnCriteria(1, 2, new UserAccountsOrdering(Field.STATUS,
+				Direction.ASCENDING), NS_MINE + "role1", "bob");
+		assertSelectedUris(2, "user02");
+	}
+
+	// ----------------------------------------------------------------------
+	// helper methods
+	// ----------------------------------------------------------------------
+
+	/** Create a new criteria object */
+	private UserAccountsSelectionCriteria criteria(int accountsPerPage,
+			int pageIndex, UserAccountsOrdering orderBy, String roleFilterUri,
+			String searchTerm) {
+		return new UserAccountsSelectionCriteria(accountsPerPage, pageIndex,
+				orderBy, roleFilterUri, searchTerm);
+	}
+
+	/** Create a criteria object and select against it. */
+	private void selectOnCriteria(int accountsPerPage, int pageIndex,
+			UserAccountsOrdering orderBy, String roleFilterUri,
+			String searchTerm) {
+		criteria = new UserAccountsSelectionCriteria(accountsPerPage,
+				pageIndex, orderBy, roleFilterUri, searchTerm);
+		selection = UserAccountsSelector.select(ontModel, criteria);
+	}
+
+	/** How many URIs should we expect, and which ones (local names only). */
+	private void assertSelectedUris(int resultCount, String... uris) {
+		assertEquals("result count", resultCount, selection.getResultCount());
+
+		List<String> expectedList = Arrays.asList(uris);
+		List<String> actualList = new ArrayList<String>();
+		for (UserAccount a : selection.getUserAccounts()) {
+			String[] uriParts = a.getUri().split("/");
+			actualList.add(uriParts[uriParts.length - 1]);
+		}
+		assertEquals("uris", expectedList, actualList);
+	}
+
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.n3 b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.n3
index 15f41d4dd..6169a4283 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.n3
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/accounts/UserAccountsSelectorTest.n3
@@ -1,164 +1,164 @@
-# $This file is distributed under the terms of the license in /doc/license.txt$ 
-
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix owl: <http://www.w3.org/2002/07/owl#> .
-@prefix auth: <http://vitro.mannlib.cornell.edu/ns/vitro/authorization#> .
-@prefix mydomain: <http://vivo.mydomain.edu/individual/> .
-
-### This file is for the test UserAccountsSelectorTest.java.
-
-#
-# 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.
-#
-
-mydomain:user01
-	a auth:UserAccount ;
-	auth:emailAddress "email@able.edu" ;
-	auth:firstName "Zack" ;
-	auth:lastName "Roberts" ;
-	auth:md5password "garbage" ;
-	auth:passwordChangeExpires 0 ;
-	auth:loginCount 5 ;
-	auth:lastLoginTime 100 ;
-	auth:status "ACTIVE" ;
-	auth:hasPermissionSet mydomain:role1 ;
-	.
-	
-mydomain:user02
-	a auth:UserAccount ;
-	auth:emailAddress "email@bob.edu" ;
-#	auth:firstName NONE ;
-	auth:lastName "Cole" ;
-	auth:md5password "garbage" ;
-	auth:passwordChangeExpires 0 ;
-	auth:loginCount 5 ;
-	auth:lastLoginTime 100 ;
-	auth:status "INACTIVE" ;
-	auth:hasPermissionSet mydomain:role1 ;
-	.
-	
-mydomain:user03
-	a auth:UserAccount ;
-	auth:emailAddress "email@charlie.edu" ;
-	auth:firstName "Ralph" ;
-#	auth:lastName NONE ;
-	auth:md5password "garbage" ;
-	auth:passwordChangeExpires 0 ;
-	auth:loginCount 0 ;
-	auth:lastLoginTime 1 ;
-	auth:status "INACTIVE" ;
-	auth:hasPermissionSet mydomain:role1 ;
-	auth:hasPermissionSet mydomain:role2 ;
-	.
-	
-mydomain:user04
-	a auth:UserAccount ;
-	auth:emailAddress "email@delta.edu" ;
-	auth:firstName "Queen" ;
-	auth:lastName "Latifah" ;
-#	auth:md5password NONE ;
-	auth:passwordChangeExpires 0 ;
-	auth:loginCount 9 ;
-	auth:lastLoginTime 3 ;
-	auth:status "ACTIVE" ;
-	.
-	
-mydomain:user05
-	a auth:UserAccount ;
-	auth:emailAddress "email@echo.edu" ;
-	auth:firstName "Paul" ;
-	auth:lastName "Archibob" ;
-	auth:md5password "garbage" ;
-#	auth:passwordChangeExpires NONE ;
-	auth:loginCount 2 ;
-	auth:lastLoginTime 100 ;
-	auth:status "ACTIVE" ;
-	auth:hasPermissionSet mydomain:role1 ;
-	.
-	
-mydomain:user06
-	a auth:UserAccount ;
-	auth:emailAddress "email@foxtrot.edu" ;
-	auth:firstName "Nancy" ;
-	auth:lastName "Xavier" ;
-	auth:md5password "garbage" ;
-	auth:passwordChangeExpires 0 ;
-#	auth:loginCount NONE ;
-	auth:lastLoginTime 2 ;
-	auth:status "INACTIVE" ;
-	auth:hasPermissionSet mydomain:role1 ;
-	.
-	
-mydomain:user07
-	a auth:UserAccount ;
-	auth:emailAddress "email@golf.edu" ;
-	auth:firstName "Oprah" ;
-	auth:lastName "Winfrey" ;
-	auth:md5password "garbage" ;
-	auth:passwordChangeExpires 0 ;
-	auth:loginCount 1 ;
-#	auth:lastLoginTime NONE ;
-#	auth:status NONE ;
-	auth:hasPermissionSet mydomain:role22 ;
-	.
-	
-mydomain:user08
-	a auth:UserAccount ;
-	a auth:RootUserAccount ;
-	auth:emailAddress "email@henry.edu" ;
-	auth:firstName "Mary" ;
-	auth:lastName "McInerney" ;
-	auth:md5password "garbage" ;
-	auth:passwordChangeExpires 0 ;
-	auth:loginCount 7 ;
-	auth:lastLoginTime 1122334455667788 ;
-	auth:status "ACTIVE" ;
-	.
-	
-mydomain:user09
-	a auth:UserAccount ;
-	auth:emailAddress "email@indigo.edu" ;
-	auth:firstName "Jim" ;
-	auth:lastName "Blake" ;
-	auth:md5password "garbage" ;
-	auth:passwordChangeExpires 0 ;
-	auth:loginCount 3 ;
-	auth:lastLoginTime 1000000000000000 ;
-	auth:status "ACTIVE" ;
-	auth:hasPermissionSet mydomain:role1 ;
-	.
-	
-mydomain:user10
-	a auth:UserAccount ;
-	auth:emailAddress "email@jones.edu" ;
-	auth:firstName "Bob" ;
-	auth:lastName "Caruso" ;
-	auth:md5password "garbage" ;
-	auth:passwordChangeExpires 1100234965897 ;
-	auth:loginCount 50 ;
-	auth:lastLoginTime 1020304050607080 ;
-	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 
-#    to test that our reg-exp filters correctly.
-mydomain:role22
-	a auth:PermissionSet ;
-	rdfs:label "Role 22" ;
-	.
-	
+# $This file is distributed under the terms of the license in /doc/license.txt$ 
+
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix auth: <http://vitro.mannlib.cornell.edu/ns/vitro/authorization#> .
+@prefix mydomain: <http://vivo.mydomain.edu/individual/> .
+
+### This file is for the test UserAccountsSelectorTest.java.
+
+#
+# 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.
+#
+
+mydomain:user01
+	a auth:UserAccount ;
+	auth:emailAddress "email@able.edu" ;
+	auth:firstName "Zack" ;
+	auth:lastName "Roberts" ;
+	auth:md5password "garbage" ;
+	auth:passwordChangeExpires 0 ;
+	auth:loginCount 5 ;
+	auth:lastLoginTime 100 ;
+	auth:status "ACTIVE" ;
+	auth:hasPermissionSet mydomain:role1 ;
+	.
+	
+mydomain:user02
+	a auth:UserAccount ;
+	auth:emailAddress "email@bob.edu" ;
+#	auth:firstName NONE ;
+	auth:lastName "Cole" ;
+	auth:md5password "garbage" ;
+	auth:passwordChangeExpires 0 ;
+	auth:loginCount 5 ;
+	auth:lastLoginTime 100 ;
+	auth:status "INACTIVE" ;
+	auth:hasPermissionSet mydomain:role1 ;
+	.
+	
+mydomain:user03
+	a auth:UserAccount ;
+	auth:emailAddress "email@charlie.edu" ;
+	auth:firstName "Ralph" ;
+#	auth:lastName NONE ;
+	auth:md5password "garbage" ;
+	auth:passwordChangeExpires 0 ;
+	auth:loginCount 0 ;
+	auth:lastLoginTime 1 ;
+	auth:status "INACTIVE" ;
+	auth:hasPermissionSet mydomain:role1 ;
+	auth:hasPermissionSet mydomain:role2 ;
+	.
+	
+mydomain:user04
+	a auth:UserAccount ;
+	auth:emailAddress "email@delta.edu" ;
+	auth:firstName "Queen" ;
+	auth:lastName "Latifah" ;
+#	auth:md5password NONE ;
+	auth:passwordChangeExpires 0 ;
+	auth:loginCount 9 ;
+	auth:lastLoginTime 3 ;
+	auth:status "ACTIVE" ;
+	.
+	
+mydomain:user05
+	a auth:UserAccount ;
+	auth:emailAddress "email@echo.edu" ;
+	auth:firstName "Paul" ;
+	auth:lastName "Archibob" ;
+	auth:md5password "garbage" ;
+#	auth:passwordChangeExpires NONE ;
+	auth:loginCount 2 ;
+	auth:lastLoginTime 100 ;
+	auth:status "ACTIVE" ;
+	auth:hasPermissionSet mydomain:role1 ;
+	.
+	
+mydomain:user06
+	a auth:UserAccount ;
+	auth:emailAddress "email@foxtrot.edu" ;
+	auth:firstName "Nancy" ;
+	auth:lastName "Xavier" ;
+	auth:md5password "garbage" ;
+	auth:passwordChangeExpires 0 ;
+#	auth:loginCount NONE ;
+	auth:lastLoginTime 2 ;
+	auth:status "INACTIVE" ;
+	auth:hasPermissionSet mydomain:role1 ;
+	.
+	
+mydomain:user07
+	a auth:UserAccount ;
+	auth:emailAddress "email@golf.edu" ;
+	auth:firstName "Oprah" ;
+	auth:lastName "Winfrey" ;
+	auth:md5password "garbage" ;
+	auth:passwordChangeExpires 0 ;
+	auth:loginCount 1 ;
+#	auth:lastLoginTime NONE ;
+#	auth:status NONE ;
+	auth:hasPermissionSet mydomain:role22 ;
+	.
+	
+mydomain:user08
+	a auth:UserAccount ;
+	a auth:RootUserAccount ;
+	auth:emailAddress "email@henry.edu" ;
+	auth:firstName "Mary" ;
+	auth:lastName "McInerney" ;
+	auth:md5password "garbage" ;
+	auth:passwordChangeExpires 0 ;
+	auth:loginCount 7 ;
+	auth:lastLoginTime 1122334455667788 ;
+	auth:status "ACTIVE" ;
+	.
+	
+mydomain:user09
+	a auth:UserAccount ;
+	auth:emailAddress "email@indigo.edu" ;
+	auth:firstName "Jim" ;
+	auth:lastName "Blake" ;
+	auth:md5password "garbage" ;
+	auth:passwordChangeExpires 0 ;
+	auth:loginCount 3 ;
+	auth:lastLoginTime 1000000000000000 ;
+	auth:status "ACTIVE" ;
+	auth:hasPermissionSet mydomain:role1 ;
+	.
+	
+mydomain:user10
+	a auth:UserAccount ;
+	auth:emailAddress "email@jones.edu" ;
+	auth:firstName "Bob" ;
+	auth:lastName "Caruso" ;
+	auth:md5password "garbage" ;
+	auth:passwordChangeExpires 1100234965897 ;
+	auth:loginCount 50 ;
+	auth:lastLoginTime 1020304050607080 ;
+	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 
+#    to test that our reg-exp filters correctly.
+mydomain:role22
+	a auth:PermissionSet ;
+	rdfs:label "Role 22" ;
+	.
+	
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AuthenticatorStub.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AuthenticatorStub.java
index 65c44b184..247434ff4 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AuthenticatorStub.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/authenticate/AuthenticatorStub.java
@@ -1,168 +1,168 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-
-/**
- * A simple stub for unit tests that require an Authenticator. Call setup() to
- * put it into place.
- */
-public class AuthenticatorStub extends Authenticator {
-	public static final String FACTORY_ATTRIBUTE_NAME = AuthenticatorFactory.class
-			.getName();
-
-	// ----------------------------------------------------------------------
-	// factory - store this in the context.
-	//
-	// Creates a single instance of the stub and returns it for all requests.
-	// ----------------------------------------------------------------------
-
-	public static class Factory implements Authenticator.AuthenticatorFactory {
-		private final AuthenticatorStub instance = new AuthenticatorStub();
-
-		@Override
-		public AuthenticatorStub getInstance(HttpServletRequest request) {
-			instance.setRequest(request);
-			return instance;
-		}
-	}
-
-	// ----------------------------------------------------------------------
-	// Stub infrastructure
-	// ----------------------------------------------------------------------
-
-	private final Map<String, UserAccount> usersByEmail = new HashMap<String, UserAccount>();
-	private final Map<String, UserAccount> usersByExternalAuthId = new HashMap<String, UserAccount>();
-
-	private final Map<String, List<String>> editingPermissions = new HashMap<String, List<String>>();
-	private final Map<String, String> associatedUris = new HashMap<String, String>();
-	private final List<String> recordedLogins = new ArrayList<String>();
-	private final Map<String, String> newPasswords = new HashMap<String, String>();
-
-	private HttpServletRequest request;
-
-	private void setRequest(HttpServletRequest request) {
-		this.request = request;
-	}
-
-	public void addUser(UserAccount user) {
-		usersByEmail.put(user.getEmailAddress(), user);
-
-		String externalAuthId = user.getExternalAuthId();
-		if (!externalAuthId.isEmpty()) {
-			usersByExternalAuthId.put(user.getExternalAuthId(), user);
-		}
-	}
-
-	public void addEditingPermission(String username, String personUri) {
-		if (!editingPermissions.containsKey(username)) {
-			editingPermissions.put(username, new ArrayList<String>());
-		}
-		editingPermissions.get(username).add(personUri);
-	}
-
-	public void setAssociatedUri(String username, String individualUri) {
-		associatedUris.put(username, individualUri);
-	}
-
-	public List<String> getRecordedLoginUsernames() {
-		return recordedLogins;
-	}
-
-	public Map<String, String> getNewPasswordMap() {
-		return newPasswords;
-	}
-
-	// ----------------------------------------------------------------------
-	// Stub methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public UserAccount getAccountForInternalAuth(String emailAddress) {
-		return usersByEmail.get(emailAddress);
-	}
-
-	@Override
-	public UserAccount getAccountForExternalAuth(String externalAuthId) {
-		return usersByExternalAuthId.get(externalAuthId);
-	}
-
-	@Override
-	public boolean isUserPermittedToLogin(UserAccount userAccount) {
-		return true;
-	}
-
-	@Override
-	public boolean isCurrentPassword(UserAccount userAccount,
-			String clearTextPassword) {
-		if (userAccount == null) {
-			return false;
-		} else {
-			return userAccount.getMd5Password().equals(
-					Authenticator.applyMd5Encoding(clearTextPassword));
-		}
-	}
-
-	@Override
-	public List<String> getAssociatedIndividualUris(UserAccount userAccount) {
-		List<String> uris = new ArrayList<String>();
-
-		String emailAddress = userAccount.getEmailAddress();
-		if (associatedUris.containsKey(emailAddress)) {
-			uris.add(associatedUris.get(emailAddress));
-		}
-
-		if (editingPermissions.containsKey(emailAddress)) {
-			uris.addAll(editingPermissions.get(emailAddress));
-		}
-
-		return uris;
-	}
-
-	@Override
-	public void recordNewPassword(UserAccount userAccount,
-			String newClearTextPassword) {
-		newPasswords.put(userAccount.getEmailAddress(), newClearTextPassword);
-	}
-
-	@Override
-	public void recordLoginAgainstUserAccount(UserAccount userAccount,
-			AuthenticationSource authSource) throws LoginNotPermitted {
-		if (!isUserPermittedToLogin(userAccount)) {
-			throw new LoginNotPermitted();
-		}
-
-		recordedLogins.add(userAccount.getEmailAddress());
-
-		LoginStatusBean lsb = new LoginStatusBean(userAccount.getUri(),
-				authSource);
-		LoginStatusBean.setBean(request.getSession(), lsb);
-	}
-
-	// ----------------------------------------------------------------------
-	// Un-implemented methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public void recordUserIsLoggedOut() {
-		throw new RuntimeException(
-				"AuthenticatorStub.recordUserIsLoggedOut() not implemented.");
-	}
-
-	@Override
-	public boolean accountRequiresEditing(UserAccount userAccount) {
-		throw new RuntimeException(
-				"AuthenticatorStub.accountRequiresEditing() not implemented.");
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+
+/**
+ * A simple stub for unit tests that require an Authenticator. Call setup() to
+ * put it into place.
+ */
+public class AuthenticatorStub extends Authenticator {
+	public static final String FACTORY_ATTRIBUTE_NAME = AuthenticatorFactory.class
+			.getName();
+
+	// ----------------------------------------------------------------------
+	// factory - store this in the context.
+	//
+	// Creates a single instance of the stub and returns it for all requests.
+	// ----------------------------------------------------------------------
+
+	public static class Factory implements Authenticator.AuthenticatorFactory {
+		private final AuthenticatorStub instance = new AuthenticatorStub();
+
+		@Override
+		public AuthenticatorStub getInstance(HttpServletRequest request) {
+			instance.setRequest(request);
+			return instance;
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// Stub infrastructure
+	// ----------------------------------------------------------------------
+
+	private final Map<String, UserAccount> usersByEmail = new HashMap<String, UserAccount>();
+	private final Map<String, UserAccount> usersByExternalAuthId = new HashMap<String, UserAccount>();
+
+	private final Map<String, List<String>> editingPermissions = new HashMap<String, List<String>>();
+	private final Map<String, String> associatedUris = new HashMap<String, String>();
+	private final List<String> recordedLogins = new ArrayList<String>();
+	private final Map<String, String> newPasswords = new HashMap<String, String>();
+
+	private HttpServletRequest request;
+
+	private void setRequest(HttpServletRequest request) {
+		this.request = request;
+	}
+
+	public void addUser(UserAccount user) {
+		usersByEmail.put(user.getEmailAddress(), user);
+
+		String externalAuthId = user.getExternalAuthId();
+		if (!externalAuthId.isEmpty()) {
+			usersByExternalAuthId.put(user.getExternalAuthId(), user);
+		}
+	}
+
+	public void addEditingPermission(String username, String personUri) {
+		if (!editingPermissions.containsKey(username)) {
+			editingPermissions.put(username, new ArrayList<String>());
+		}
+		editingPermissions.get(username).add(personUri);
+	}
+
+	public void setAssociatedUri(String username, String individualUri) {
+		associatedUris.put(username, individualUri);
+	}
+
+	public List<String> getRecordedLoginUsernames() {
+		return recordedLogins;
+	}
+
+	public Map<String, String> getNewPasswordMap() {
+		return newPasswords;
+	}
+
+	// ----------------------------------------------------------------------
+	// Stub methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public UserAccount getAccountForInternalAuth(String emailAddress) {
+		return usersByEmail.get(emailAddress);
+	}
+
+	@Override
+	public UserAccount getAccountForExternalAuth(String externalAuthId) {
+		return usersByExternalAuthId.get(externalAuthId);
+	}
+
+	@Override
+	public boolean isUserPermittedToLogin(UserAccount userAccount) {
+		return true;
+	}
+
+	@Override
+	public boolean isCurrentPassword(UserAccount userAccount,
+			String clearTextPassword) {
+		if (userAccount == null) {
+			return false;
+		} else {
+			return userAccount.getMd5Password().equals(
+					Authenticator.applyMd5Encoding(clearTextPassword));
+		}
+	}
+
+	@Override
+	public List<String> getAssociatedIndividualUris(UserAccount userAccount) {
+		List<String> uris = new ArrayList<String>();
+
+		String emailAddress = userAccount.getEmailAddress();
+		if (associatedUris.containsKey(emailAddress)) {
+			uris.add(associatedUris.get(emailAddress));
+		}
+
+		if (editingPermissions.containsKey(emailAddress)) {
+			uris.addAll(editingPermissions.get(emailAddress));
+		}
+
+		return uris;
+	}
+
+	@Override
+	public void recordNewPassword(UserAccount userAccount,
+			String newClearTextPassword) {
+		newPasswords.put(userAccount.getEmailAddress(), newClearTextPassword);
+	}
+
+	@Override
+	public void recordLoginAgainstUserAccount(UserAccount userAccount,
+			AuthenticationSource authSource) throws LoginNotPermitted {
+		if (!isUserPermittedToLogin(userAccount)) {
+			throw new LoginNotPermitted();
+		}
+
+		recordedLogins.add(userAccount.getEmailAddress());
+
+		LoginStatusBean lsb = new LoginStatusBean(userAccount.getUri(),
+				authSource);
+		LoginStatusBean.setBean(request.getSession(), lsb);
+	}
+
+	// ----------------------------------------------------------------------
+	// Un-implemented methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public void recordUserIsLoggedOut() {
+		throw new RuntimeException(
+				"AuthenticatorStub.recordUserIsLoggedOut() not implemented.");
+	}
+
+	@Override
+	public boolean accountRequiresEditing(UserAccount userAccount) {
+		throw new RuntimeException(
+				"AuthenticatorStub.accountRequiresEditing() not implemented.");
+	}
+
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLoginTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLoginTest.java
index 4e2354576..8f071ee3c 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLoginTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/authenticate/ProgramLoginTest.java
@@ -1,214 +1,214 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
-
-import static edu.cornell.mannlib.vitro.webapp.controller.authenticate.ProgramLogin.ProgramLoginCore.PARAM_EMAIL_ADDRESS;
-import static edu.cornell.mannlib.vitro.webapp.controller.authenticate.ProgramLogin.ProgramLoginCore.PARAM_NEW_PASSWORD;
-import static edu.cornell.mannlib.vitro.webapp.controller.authenticate.ProgramLogin.ProgramLoginCore.PARAM_PASSWORD;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Collections;
-
-import javax.servlet.ServletException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import stubs.javax.servlet.ServletConfigStub;
-import stubs.javax.servlet.ServletContextStub;
-import stubs.javax.servlet.http.HttpServletRequestStub;
-import stubs.javax.servlet.http.HttpServletResponseStub;
-import stubs.javax.servlet.http.HttpSessionStub;
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsLoader;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-
-/**
- * Test the basic features of ProgramTest.
- */
-public class ProgramLoginTest extends AbstractTestClass {
-	private static final Log log = LogFactory.getLog(ProgramLoginTest.class);
-
-	private static final String NEW_USER_URI = "new_user_uri";
-	private static final String NEW_USER_NAME = "new_user";
-	private static final String NEW_USER_PASSWORD = "new_user_pw";
-	private static final UserAccount NEW_USER = createUserAccount(NEW_USER_URI,
-			NEW_USER_NAME, NEW_USER_PASSWORD, 0);
-
-	private static final String OLD_USER_URI = "old_user_uri";
-	private static final String OLD_USER_NAME = "old_user";
-	private static final String OLD_USER_PASSWORD = "old_user_pw";
-	private static final UserAccount OLD_USER = createUserAccount(OLD_USER_URI,
-			OLD_USER_NAME, OLD_USER_PASSWORD, 10);
-
-	private AuthenticatorStub.Factory authenticatorFactory;
-	private AuthenticatorStub authenticator;
-	private ServletContextStub servletContext;
-	private ServletConfigStub servletConfig;
-	private HttpSessionStub session;
-	private HttpServletRequestStub request;
-	private HttpServletResponseStub response;
-	private ProgramLogin servlet;
-
-	@Before
-	public void setLogging() {
-		// setLoggerLevel(this.getClass(), Level.DEBUG);
-		// setLoggerLevel(ProgramLogin.class, Level.DEBUG);
-	}
-
-	@Before
-	public void setup() throws Exception {
-		authenticatorFactory = new AuthenticatorStub.Factory();
-		authenticator = authenticatorFactory.getInstance(request);
-		authenticator.addUser(NEW_USER);
-		authenticator.addUser(OLD_USER);
-
-		servletContext = new ServletContextStub();
-		servletContext.setAttribute(AuthenticatorStub.FACTORY_ATTRIBUTE_NAME,
-				authenticatorFactory);
-
-		servletConfig = new ServletConfigStub();
-		servletConfig.setServletContext(servletContext);
-
-		servlet = new ProgramLogin();
-		servlet.init(servletConfig);
-
-		session = new HttpSessionStub();
-		session.setServletContext(servletContext);
-
-		request = new HttpServletRequestStub();
-		request.setSession(session);
-		request.setRequestUrl(new URL("http://this.that/vivo/programLogin"));
-		request.setMethod("GET");
-
-		response = new HttpServletResponseStub();
-	}
-
-	private static UserAccount createUserAccount(String uri, String name,
-			String password, int loginCount) {
-		UserAccount user = new UserAccount();
-		user.setEmailAddress(name);
-		user.setUri(uri);
-		user.setPermissionSetUris(Collections
-				.singleton(PermissionSetsLoader.URI_DBA));
-		user.setMd5Password(Authenticator.applyMd5Encoding(password));
-		user.setLoginCount(loginCount);
-		user.setPasswordChangeRequired(loginCount == 0);
-		return user;
-	}
-
-	@After
-	public void cleanup() {
-		if (servlet != null) {
-			servlet.destroy();
-		}
-	}
-
-	@Test
-	public void noUsername() {
-		executeRequest(null, null, null);
-		assert403();
-	}
-
-	@Test
-	public void noPassword() {
-		executeRequest(OLD_USER_NAME, null, null);
-		assert403();
-	}
-
-	@Test
-	public void unrecognizedUser() {
-		executeRequest("bogusUsername", "bogusPassword", null);
-		assert403();
-	}
-
-	@Test
-	public void wrongPassword() {
-		executeRequest(OLD_USER_NAME, "bogusPassword", null);
-		assert403();
-	}
-
-	@Test
-	public void success() {
-		executeRequest(OLD_USER_NAME, OLD_USER_PASSWORD, null);
-		assertSuccess();
-	}
-
-	@Test
-	public void newPasswordNotNeeded() {
-		executeRequest(OLD_USER_NAME, OLD_USER_PASSWORD, "unneededPW");
-		assert403();
-	}
-
-	@Test
-	public void newPasswordMissing() {
-		executeRequest(NEW_USER_NAME, NEW_USER_PASSWORD, null);
-		assert403();
-	}
-
-	@Test
-	public void newPasswordTooLong() {
-		executeRequest(NEW_USER_NAME, NEW_USER_PASSWORD, "reallyLongPassword");
-		assert403();
-	}
-
-	@Test
-	public void newPasswordEqualsOldPassword() {
-		executeRequest(NEW_USER_NAME, NEW_USER_PASSWORD, NEW_USER_PASSWORD);
-		assert403();
-	}
-
-	@Test
-	public void successWithNewPassword() {
-		executeRequest(NEW_USER_NAME, NEW_USER_PASSWORD, "newerBetter");
-		assertSuccess();
-	}
-
-	// ----------------------------------------------------------------------
-	// Helper methods
-	// ----------------------------------------------------------------------
-
-	private void executeRequest(String email, String password,
-			String newPassword) {
-		if (email != null) {
-			request.addParameter(PARAM_EMAIL_ADDRESS, email);
-		}
-		if (password != null) {
-			request.addParameter(PARAM_PASSWORD, password);
-		}
-		if (newPassword != null) {
-			request.addParameter(PARAM_NEW_PASSWORD, newPassword);
-		}
-
-		try {
-			servlet.doGet(request, response);
-		} catch (ServletException e) {
-			log.error(e, e);
-			fail(e.toString());
-		} catch (IOException e) {
-			log.error(e, e);
-			fail(e.toString());
-		}
-	}
-
-	private void assert403() {
-		assertEquals("status", 403, response.getStatus());
-		log.debug("Message was '" + response.getErrorMessage() + "'");
-		assertEquals("logged in", false, LoginStatusBean.getBean(session)
-				.isLoggedIn());
-	}
-
-	private void assertSuccess() {
-		assertEquals("status", 200, response.getStatus());
-		assertEquals("logged in", true, LoginStatusBean.getBean(session)
-				.isLoggedIn());
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.authenticate;
+
+import static edu.cornell.mannlib.vitro.webapp.controller.authenticate.ProgramLogin.ProgramLoginCore.PARAM_EMAIL_ADDRESS;
+import static edu.cornell.mannlib.vitro.webapp.controller.authenticate.ProgramLogin.ProgramLoginCore.PARAM_NEW_PASSWORD;
+import static edu.cornell.mannlib.vitro.webapp.controller.authenticate.ProgramLogin.ProgramLoginCore.PARAM_PASSWORD;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Collections;
+
+import javax.servlet.ServletException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import stubs.javax.servlet.ServletConfigStub;
+import stubs.javax.servlet.ServletContextStub;
+import stubs.javax.servlet.http.HttpServletRequestStub;
+import stubs.javax.servlet.http.HttpServletResponseStub;
+import stubs.javax.servlet.http.HttpSessionStub;
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsLoader;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+
+/**
+ * Test the basic features of ProgramTest.
+ */
+public class ProgramLoginTest extends AbstractTestClass {
+	private static final Log log = LogFactory.getLog(ProgramLoginTest.class);
+
+	private static final String NEW_USER_URI = "new_user_uri";
+	private static final String NEW_USER_NAME = "new_user";
+	private static final String NEW_USER_PASSWORD = "new_user_pw";
+	private static final UserAccount NEW_USER = createUserAccount(NEW_USER_URI,
+			NEW_USER_NAME, NEW_USER_PASSWORD, 0);
+
+	private static final String OLD_USER_URI = "old_user_uri";
+	private static final String OLD_USER_NAME = "old_user";
+	private static final String OLD_USER_PASSWORD = "old_user_pw";
+	private static final UserAccount OLD_USER = createUserAccount(OLD_USER_URI,
+			OLD_USER_NAME, OLD_USER_PASSWORD, 10);
+
+	private AuthenticatorStub.Factory authenticatorFactory;
+	private AuthenticatorStub authenticator;
+	private ServletContextStub servletContext;
+	private ServletConfigStub servletConfig;
+	private HttpSessionStub session;
+	private HttpServletRequestStub request;
+	private HttpServletResponseStub response;
+	private ProgramLogin servlet;
+
+	@Before
+	public void setLogging() {
+		// setLoggerLevel(this.getClass(), Level.DEBUG);
+		// setLoggerLevel(ProgramLogin.class, Level.DEBUG);
+	}
+
+	@Before
+	public void setup() throws Exception {
+		authenticatorFactory = new AuthenticatorStub.Factory();
+		authenticator = authenticatorFactory.getInstance(request);
+		authenticator.addUser(NEW_USER);
+		authenticator.addUser(OLD_USER);
+
+		servletContext = new ServletContextStub();
+		servletContext.setAttribute(AuthenticatorStub.FACTORY_ATTRIBUTE_NAME,
+				authenticatorFactory);
+
+		servletConfig = new ServletConfigStub();
+		servletConfig.setServletContext(servletContext);
+
+		servlet = new ProgramLogin();
+		servlet.init(servletConfig);
+
+		session = new HttpSessionStub();
+		session.setServletContext(servletContext);
+
+		request = new HttpServletRequestStub();
+		request.setSession(session);
+		request.setRequestUrl(new URL("http://this.that/vivo/programLogin"));
+		request.setMethod("GET");
+
+		response = new HttpServletResponseStub();
+	}
+
+	private static UserAccount createUserAccount(String uri, String name,
+			String password, int loginCount) {
+		UserAccount user = new UserAccount();
+		user.setEmailAddress(name);
+		user.setUri(uri);
+		user.setPermissionSetUris(Collections
+				.singleton(PermissionSetsLoader.URI_DBA));
+		user.setMd5Password(Authenticator.applyMd5Encoding(password));
+		user.setLoginCount(loginCount);
+		user.setPasswordChangeRequired(loginCount == 0);
+		return user;
+	}
+
+	@After
+	public void cleanup() {
+		if (servlet != null) {
+			servlet.destroy();
+		}
+	}
+
+	@Test
+	public void noUsername() {
+		executeRequest(null, null, null);
+		assert403();
+	}
+
+	@Test
+	public void noPassword() {
+		executeRequest(OLD_USER_NAME, null, null);
+		assert403();
+	}
+
+	@Test
+	public void unrecognizedUser() {
+		executeRequest("bogusUsername", "bogusPassword", null);
+		assert403();
+	}
+
+	@Test
+	public void wrongPassword() {
+		executeRequest(OLD_USER_NAME, "bogusPassword", null);
+		assert403();
+	}
+
+	@Test
+	public void success() {
+		executeRequest(OLD_USER_NAME, OLD_USER_PASSWORD, null);
+		assertSuccess();
+	}
+
+	@Test
+	public void newPasswordNotNeeded() {
+		executeRequest(OLD_USER_NAME, OLD_USER_PASSWORD, "unneededPW");
+		assert403();
+	}
+
+	@Test
+	public void newPasswordMissing() {
+		executeRequest(NEW_USER_NAME, NEW_USER_PASSWORD, null);
+		assert403();
+	}
+
+	@Test
+	public void newPasswordTooLong() {
+		executeRequest(NEW_USER_NAME, NEW_USER_PASSWORD, "reallyLongPassword");
+		assert403();
+	}
+
+	@Test
+	public void newPasswordEqualsOldPassword() {
+		executeRequest(NEW_USER_NAME, NEW_USER_PASSWORD, NEW_USER_PASSWORD);
+		assert403();
+	}
+
+	@Test
+	public void successWithNewPassword() {
+		executeRequest(NEW_USER_NAME, NEW_USER_PASSWORD, "newerBetter");
+		assertSuccess();
+	}
+
+	// ----------------------------------------------------------------------
+	// Helper methods
+	// ----------------------------------------------------------------------
+
+	private void executeRequest(String email, String password,
+			String newPassword) {
+		if (email != null) {
+			request.addParameter(PARAM_EMAIL_ADDRESS, email);
+		}
+		if (password != null) {
+			request.addParameter(PARAM_PASSWORD, password);
+		}
+		if (newPassword != null) {
+			request.addParameter(PARAM_NEW_PASSWORD, newPassword);
+		}
+
+		try {
+			servlet.doGet(request, response);
+		} catch (ServletException e) {
+			log.error(e, e);
+			fail(e.toString());
+		} catch (IOException e) {
+			log.error(e, e);
+			fail(e.toString());
+		}
+	}
+
+	private void assert403() {
+		assertEquals("status", 403, response.getStatus());
+		log.debug("Message was '" + response.getErrorMessage() + "'");
+		assertEquals("logged in", false, LoginStatusBean.getBean(session)
+				.isLoggedIn());
+	}
+
+	private void assertSuccess() {
+		assertEquals("status", 200, response.getStatus());
+		assertEquals("logged in", true, LoginStatusBean.getBean(session)
+				.isLoggedIn());
+	}
+
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java
index bd13ae520..2e98b283d 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java
@@ -1,679 +1,679 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.edit;
-
-import static edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsLoader.URI_DBA;
-import static edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsLoader.URI_SELF_EDITOR;
-import static edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State.FORCED_PASSWORD_CHANGE;
-import static edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State.LOGGING_IN;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.log4j.Level;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import stubs.edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesStub;
-import stubs.edu.cornell.mannlib.vitro.webapp.dao.IndividualDaoStub;
-import stubs.edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDaoStub;
-import stubs.edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryStub;
-import stubs.edu.cornell.mannlib.vitro.webapp.i18n.I18nStub;
-import stubs.javax.servlet.ServletConfigStub;
-import stubs.javax.servlet.ServletContextStub;
-import stubs.javax.servlet.http.HttpServletRequestStub;
-import stubs.javax.servlet.http.HttpServletResponseStub;
-import stubs.javax.servlet.http.HttpSessionStub;
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
-import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource;
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories;
-import edu.cornell.mannlib.vitro.webapp.auth.identifier.factory.HasPermissionFactory;
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionRegistry;
-import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.PermissionsPolicy;
-import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
-import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
-import edu.cornell.mannlib.vitro.webapp.controller.authenticate.AuthenticatorStub;
-import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean;
-import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State;
-import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
-
-/**
- */
-public class AuthenticateTest extends AbstractTestClass {
-	private AuthenticatorStub.Factory authenticatorFactory;
-	private AuthenticatorStub authenticator;
-	private ServletContextStub servletContext;
-	private WebappDaoFactoryStub webappDaoFactory;
-	private UserAccountsDaoStub userAccountsDao;
-	private IndividualDaoStub individualDao;
-	private ServletConfigStub servletConfig;
-	private HttpSessionStub session;
-	private HttpServletRequestStub request;
-	private HttpServletResponseStub response;
-	private Authenticate auth;
-	private LoginProcessBean initialProcessBean;
-
-	// ----------------------------------------------------------------------
-	// Setup and data
-	// ----------------------------------------------------------------------
-
-	/** A DBA who has never logged in (forces password change). */
-	private static final String NEW_DBA_NAME = "new_dba_name";
-	private static final String NEW_DBA_PW = "new_dba_pw";
-	private static final UserInfo NEW_DBA = new UserInfo(NEW_DBA_NAME,
-			"new_dba_uri", NEW_DBA_PW, URI_DBA, 0);
-
-	/** A DBA who has logged in before. */
-	private static final String OLD_DBA_NAME = "old_dba_name";
-	private static final String OLD_DBA_PW = "old_dba_pw";
-	private static final String OLD_DBA_URI = "old_dba_uri";
-	private static final UserInfo OLD_DBA = new UserInfo(OLD_DBA_NAME,
-			OLD_DBA_URI, OLD_DBA_PW, URI_DBA, 5);
-
-	/** A self-editor who has logged in before and has a profile. */
-	private static final String OLD_SELF_NAME = "old_self_name";
-	private static final String OLD_SELF_PW = "old_self_pw";
-	private static final UserInfo OLD_SELF = new UserInfo(OLD_SELF_NAME,
-			"old_self_uri", OLD_SELF_PW, URI_SELF_EDITOR, 100);
-
-	/** A self-editor who has logged in before but has no profile. */
-	private static final String OLD_STRANGER_NAME = "old_stranger_name";
-	private static final String OLD_STRANGER_PW = "stranger_pw";
-	private static final UserInfo OLD_STRANGER = new UserInfo(
-			OLD_STRANGER_NAME, "old_stranger_uri", OLD_STRANGER_PW,
-			URI_SELF_EDITOR, 20);
-
-	/** the login page */
-	private static final String URL_LOGIN = "/vivo/login";
-
-	/** some page with a login widget on it. */
-	private static final String URL_WIDGET = "/vivo/widgetPage";
-
-	/** a restricted page that forces a login. */
-	private static final String URL_RESTRICTED = "/vivo/resrictedPage";
-
-	/** a page with a login link. */
-	private static final String URL_WITH_LINK = "/vivo/linkPage";
-
-	// pages that we might end up on.
-	private static final String URL_HOME = "/vivo";
-	private static final String URL_SITE_ADMIN = "/vivo/siteAdmin";
-	private static final String URL_SELF_PROFILE = "/vivo/individual?uri=old_self_associated_uri";
-
-	// A page we will never start from or end on.
-	private static final String URL_SOMEWHERE_ELSE = "/vivo/somewhereElse";
-
-	private static final String NO_USER = "";
-	private static final String NO_MSG = "";
-
-	@Before
-	public void setup() throws Exception {
-		// Create an I18n module that has a value for any key, but the value is
-		// the key itself.
-		@SuppressWarnings("unused")
-		I18nStub i18n = new I18nStub();
-
-		authenticatorFactory = new AuthenticatorStub.Factory();
-		authenticator = authenticatorFactory.getInstance(request);
-		authenticator.addUser(createUserFromUserInfo(NEW_DBA));
-		authenticator.addUser(createUserFromUserInfo(OLD_DBA));
-		authenticator.addUser(createUserFromUserInfo(OLD_SELF));
-		authenticator.addUser(createUserFromUserInfo(OLD_STRANGER));
-		authenticator.setAssociatedUri(OLD_SELF.username,
-				"old_self_associated_uri");
-
-		PermissionSet adminPermissionSet = new PermissionSet();
-		adminPermissionSet.setUri(URI_DBA);
-		adminPermissionSet.setPermissionUris(Collections
-				.singleton(SimplePermission.SEE_SITE_ADMIN_PAGE.getUri()));
-
-		userAccountsDao = new UserAccountsDaoStub();
-		userAccountsDao.addPermissionSet(adminPermissionSet);
-		userAccountsDao.addUser(createUserFromUserInfo(NEW_DBA));
-		userAccountsDao.addUser(createUserFromUserInfo(OLD_DBA));
-		userAccountsDao.addUser(createUserFromUserInfo(OLD_SELF));
-		userAccountsDao.addUser(createUserFromUserInfo(OLD_STRANGER));
-
-		individualDao = new IndividualDaoStub();
-
-		webappDaoFactory = new WebappDaoFactoryStub();
-		webappDaoFactory.setUserAccountsDao(userAccountsDao);
-		webappDaoFactory.setIndividualDao(individualDao);
-
-		servletContext = new ServletContextStub();
-		ModelAccess.on(servletContext).setWebappDaoFactory(webappDaoFactory);
-		servletContext.setAttribute(AuthenticatorStub.FACTORY_ATTRIBUTE_NAME,
-				authenticatorFactory);
-
-		setLoggerLevel(ServletPolicyList.class, Level.WARN);
-		ServletPolicyList.addPolicy(servletContext, new PermissionsPolicy());
-		PermissionRegistry.createRegistry(servletContext,
-				Collections.singleton(SimplePermission.SEE_SITE_ADMIN_PAGE));
-
-		servletConfig = new ServletConfigStub();
-		servletConfig.setServletContext(servletContext);
-
-		session = new HttpSessionStub();
-		session.setServletContext(servletContext);
-
-		request = new HttpServletRequestStub();
-		request.setSession(session);
-		request.setRequestUrlByParts("http://this.that", "/vivo",
-				"/authenticate", null);
-		request.setMethod("POST");
-
-		response = new HttpServletResponseStub();
-
-		auth = new Authenticate();
-		auth.init(servletConfig);
-
-		setLoggerLevel(ConfigurationProperties.class, Level.WARN);
-		new ConfigurationPropertiesStub().setBean(servletContext);
-
-		ActiveIdentifierBundleFactories.addFactory(servletContext,
-				new HasPermissionFactory(servletContext));
-	}
-
-	private UserAccount createUserFromUserInfo(UserInfo userInfo) {
-		UserAccount user = new UserAccount();
-		user.setEmailAddress(userInfo.username);
-		user.setUri(userInfo.uri);
-		user.setPermissionSetUris(userInfo.permissionSetUris);
-		user.setMd5Password(Authenticator.applyMd5Encoding(userInfo.password));
-		user.setLoginCount(userInfo.loginCount);
-		user.setPasswordChangeRequired(userInfo.loginCount == 0);
-		return user;
-	}
-
-	// ----------------------------------------------------------------------
-	// ENTRY TESTS
-	// ----------------------------------------------------------------------
-
-	/** The "return" parameter is set, so we return to the referrer. */
-	@Test
-	public void enterFromALoginLink() {
-		setRequestFromLoginLink(URL_WITH_LINK);
-
-		doTheRequest();
-
-		assertProcessBean(LOGGING_IN, NO_USER, NO_MSG, NO_MSG, URL_LOGIN,
-				URL_WITH_LINK);
-		assertRedirect(URL_LOGIN);
-	}
-
-	/** The "return" parameter is set, but there is no referrer. */
-	@Test
-	public void enterFromABookmarkOfTheLoginLink() {
-		setRequestFromLoginLink(null);
-
-		doTheRequest();
-
-		assertProcessBean(LOGGING_IN, NO_USER, NO_MSG, NO_MSG, URL_LOGIN,
-				URL_LOGIN);
-		assertRedirect(URL_LOGIN);
-	}
-
-	/** The "afterLoginUrl" parameter is set, pointing to the restricted page. */
-	@Test
-	public void enterFromARestrictedPage() {
-		setRequestFromRestrictedPage(URL_RESTRICTED);
-
-		doTheRequest();
-
-		assertProcessBean(LOGGING_IN, NO_USER, NO_MSG, NO_MSG, URL_LOGIN,
-				URL_RESTRICTED);
-		assertRedirect(URL_LOGIN);
-	}
-
-	/** The user supplies username/password but there is no process bean. */
-	@Test
-	public void enterFromAWidgetPage() {
-		setRequestFromWidgetPage(URL_WIDGET);
-
-		doTheRequest();
-
-		assertProcessBean(LOGGING_IN, NO_USER, NO_MSG, NO_MSG, URL_WIDGET,
-				URL_WIDGET);
-		assertRedirect(URL_WIDGET);
-	}
-
-	/** A page with a widget, but treated specially. */
-	@Test
-	public void enterFromTheLoginPage() {
-		setRequestFromWidgetPage(URL_LOGIN);
-
-		doTheRequest();
-
-		assertProcessBean(LOGGING_IN, NO_USER, NO_MSG, NO_MSG, URL_LOGIN,
-				URL_LOGIN);
-		assertRedirect(URL_LOGIN);
-	}
-
-	// ----------------------------------------------------------------------
-	// RESTART LOGIN TESTS
-	//
-	// Each of these should "hijack" the login that was already in progress.
-	// ----------------------------------------------------------------------
-
-	/** The "return" parameter is set, so we detect the restart. */
-	@Ignore
-	@Test
-	public void restartFromALoginLink() {
-		setProcessBean(LOGGING_IN, "username", URL_LOGIN, URL_SOMEWHERE_ELSE);
-		enterFromALoginLink();
-	}
-
-	/** The "return" parameter is set, so we detect the restart. */
-	@Ignore
-	@Test
-	public void restartFromABookmarkOfTheLoginLink() {
-		setProcessBean(LOGGING_IN, "username", URL_LOGIN, URL_SOMEWHERE_ELSE);
-		enterFromABookmarkOfTheLoginLink();
-	}
-
-	/** The "afterLoginUrl" parameter is set, so we detect the restart. */
-	@Ignore
-	@Test
-	public void restartFromARestrictedPage() {
-		setProcessBean(LOGGING_IN, "username", URL_LOGIN, URL_SOMEWHERE_ELSE);
-		enterFromARestrictedPage();
-	}
-
-	/** The referrer is not the loginProcessPage, so we detect the restart. */
-	@Ignore
-	@Test
-	public void restartFromADifferentWidgetPage() {
-		setProcessBean(LOGGING_IN, "username", URL_LOGIN, URL_SOMEWHERE_ELSE);
-		enterFromAWidgetPage();
-	}
-
-	/** The referrer is not the loginProcessPage, so we detect the restart. */
-	@Ignore
-	@Test
-	public void restartFromTheLoginPageWhenWeWereUsingAWidgetPage() {
-		setProcessBean(LOGGING_IN, "username", URL_SOMEWHERE_ELSE,
-				URL_SOMEWHERE_ELSE);
-		enterFromTheLoginPage();
-	}
-
-	// ----------------------------------------------------------------------
-	// PROCESS TESTS
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void loggingInNoUsername() {
-		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_WITH_LINK);
-
-		doTheRequest();
-
-		assertProcessBean(LOGGING_IN, NO_USER, NO_MSG,
-				"error_no_email_address", URL_LOGIN, URL_WITH_LINK);
-		assertRedirectToLoginProcessPage();
-	}
-
-	@Test
-	public void loggingInUsernameNotRecognized() {
-		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_WITH_LINK);
-		setLoginNameAndPassword("unknownBozo", null);
-
-		doTheRequest();
-
-		assertProcessBean(LOGGING_IN, "unknownBozo", NO_MSG,
-				"error_incorrect_credentials", URL_LOGIN, URL_WITH_LINK);
-		assertRedirectToLoginProcessPage();
-	}
-
-	@Test
-	public void loggingInNoPassword() {
-		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_WITH_LINK);
-		setLoginNameAndPassword(NEW_DBA_NAME, null);
-
-		doTheRequest();
-
-		assertProcessBean(LOGGING_IN, NEW_DBA_NAME, NO_MSG,
-				"error_no_password", URL_LOGIN, URL_WITH_LINK);
-		assertRedirectToLoginProcessPage();
-	}
-
-	@Test
-	public void loggingInPasswordIsIncorrect() {
-		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_WITH_LINK);
-		setLoginNameAndPassword(NEW_DBA_NAME, "bogus_password");
-
-		doTheRequest();
-
-		assertProcessBean(LOGGING_IN, NEW_DBA_NAME, NO_MSG,
-				"error_incorrect_credentials", URL_LOGIN, URL_WITH_LINK);
-		assertRedirectToLoginProcessPage();
-	}
-
-	@Test
-	public void loggingInSuccessful() {
-		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_WITH_LINK);
-		setLoginNameAndPassword(OLD_DBA_NAME, OLD_DBA_PW);
-
-		doTheRequest();
-
-		assertNoProcessBean();
-		assertNewLoginSessions(OLD_DBA_NAME);
-		assertRedirectToAfterLoginPage();
-	}
-
-	@Test
-	public void loggingInForcesPasswordChange() {
-		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_WITH_LINK);
-		setLoginNameAndPassword(NEW_DBA_NAME, NEW_DBA_PW);
-
-		doTheRequest();
-
-		assertProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, NO_MSG, NO_MSG,
-				URL_LOGIN, URL_WITH_LINK);
-		assertNewLoginSessions();
-		assertRedirectToLoginProcessPage();
-	}
-
-	@Test
-	public void changingPasswordCancel() {
-		setProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, URL_LOGIN,
-				URL_WITH_LINK);
-		setCancel();
-
-		doTheRequest();
-
-		assertNoProcessBean();
-		assertNewLoginSessions();
-		assertRedirectToCancelUrl();
-	}
-
-	@Test
-	public void changingPasswordWrongLength() {
-		setProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, URL_LOGIN,
-				URL_WITH_LINK);
-		setNewPasswordAttempt("HI", "HI");
-
-		doTheRequest();
-
-		assertProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, NO_MSG,
-				"error_password_length", URL_LOGIN, URL_WITH_LINK);
-		assertRedirectToLoginProcessPage();
-	}
-
-	@Test
-	public void changingPasswordDontMatch() {
-		setProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, URL_LOGIN,
-				URL_WITH_LINK);
-		setNewPasswordAttempt("LongEnough", "DoesNotMatch");
-
-		doTheRequest();
-
-		assertProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, NO_MSG,
-				"error_passwords_dont_match", URL_LOGIN, URL_WITH_LINK);
-		assertRedirectToLoginProcessPage();
-	}
-
-	@Test
-	public void changingPasswordSameAsBefore() {
-		setProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, URL_LOGIN,
-				URL_WITH_LINK);
-		setNewPasswordAttempt(NEW_DBA_PW, NEW_DBA_PW);
-
-		doTheRequest();
-
-		assertProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, NO_MSG,
-				"error_previous_password", URL_LOGIN,
-				URL_WITH_LINK);
-		assertRedirectToLoginProcessPage();
-	}
-
-	@Test
-	public void changingPasswordSuccess() {
-		setProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, URL_LOGIN,
-				URL_WITH_LINK);
-		setNewPasswordAttempt("NewPassword", "NewPassword");
-
-		doTheRequest();
-
-		assertNoProcessBean();
-		assertNewLoginSessions(NEW_DBA_NAME);
-		assertPasswordChanges(NEW_DBA_NAME, "NewPassword");
-		assertRedirectToAfterLoginPage();
-	}
-
-	@Test
-	public void alreadyLoggedIn() {
-		LoginStatusBean statusBean = new LoginStatusBean(OLD_DBA_URI,
-				AuthenticationSource.INTERNAL);
-		LoginStatusBean.setBean(session, statusBean);
-		setRequestFromLoginLink(URL_WITH_LINK);
-
-		doTheRequest();
-
-		assertNoProcessBean();
-		assertNewLoginSessions();
-		assertRedirect(URL_WITH_LINK);
-	}
-
-	// ----------------------------------------------------------------------
-	// EXIT TESTS
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void exitSelfEditor() {
-		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_WITH_LINK);
-		setLoginNameAndPassword(OLD_SELF_NAME, OLD_SELF_PW);
-
-		doTheRequest();
-
-		assertNoProcessBean();
-		assertNewLoginSessions(OLD_SELF_NAME);
-		assertRedirect(URL_SELF_PROFILE);
-	}
-
-	@Test
-	public void exitUnrecognizedSelfEditor() {
-		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_WITH_LINK);
-		setLoginNameAndPassword(OLD_STRANGER_NAME, OLD_STRANGER_PW);
-
-		doTheRequest();
-
-		assertNoProcessBean();
-		assertNewLoginSessions(OLD_STRANGER_NAME);
-		assertRedirect(URL_HOME);
-	}
-
-	@Test
-	public void exitDbaNormal() {
-		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_RESTRICTED);
-		setLoginNameAndPassword(OLD_DBA_NAME, OLD_DBA_PW);
-
-		doTheRequest();
-
-		assertNoProcessBean();
-		assertNewLoginSessions(OLD_DBA_NAME);
-		assertRedirect(URL_RESTRICTED);
-	}
-
-	@Test
-	public void exitDbaFromLoginPage() {
-		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_LOGIN);
-		setLoginNameAndPassword(OLD_DBA_NAME, OLD_DBA_PW);
-
-		doTheRequest();
-
-		assertNoProcessBean();
-		assertNewLoginSessions(OLD_DBA_NAME);
-		assertRedirect(URL_SITE_ADMIN);
-	}
-
-	// ----------------------------------------------------------------------
-	// Helper methods
-	// ----------------------------------------------------------------------
-
-	private void setRequestFromLoginLink(String urlWithLink) {
-		request.addParameter("return", "");
-		request.setHeader("referer", urlWithLink);
-	}
-
-	private void setRequestFromRestrictedPage(String urlRestricted) {
-		request.addParameter("afterLogin", urlRestricted);
-		request.setHeader("referer", urlRestricted);
-	}
-
-	private void setRequestFromWidgetPage(String urlWidget) {
-		request.setHeader("referer", urlWidget);
-	}
-
-	/** Create a LoginProcessBean in the session, and keep a reference to it. */
-	private void setProcessBean(State state, String username,
-			String loginProcessUrl, String afterLoginUrl) {
-		LoginProcessBean bean = LoginProcessBean.getBean(request);
-		bean.setState(state);
-		bean.setUsername(username);
-		bean.setLoginPageUrl(loginProcessUrl);
-		bean.setAfterLoginUrl(afterLoginUrl);
-
-		initialProcessBean = bean;
-	}
-
-	private void setLoginNameAndPassword(String loginName, String password) {
-		request.addParameter("loginName", loginName);
-		request.addParameter("loginPassword", password);
-	}
-
-	private void setCancel() {
-		request.addParameter("cancel", "true");
-	}
-
-	private void setNewPasswordAttempt(String newPassword,
-			String confirmPassword) {
-		request.addParameter("newPassword", newPassword);
-		request.addParameter("confirmPassword", confirmPassword);
-	}
-
-	private void doTheRequest() {
-		auth.doPost(request, response);
-	}
-
-	private void assertNoProcessBean() {
-		if (LoginProcessBean.isBean(request)) {
-			fail("Process bean: expected <null>, but was <"
-					+ LoginProcessBean.getBean(request) + ">");
-		}
-	}
-
-	private void assertProcessBean(State state, String username,
-			String infoMessage, String errorMessage, String loginProcessUrl,
-			String afterLoginUrl) {
-		if (!LoginProcessBean.isBean(request)) {
-			fail("login process bean is null");
-		}
-		LoginProcessBean bean = LoginProcessBean.getBean(request);
-
-		assertEquals("state", state, bean.getState());
-		assertEquals("username", username, bean.getUsername());
-
-		assertEquals("info message", infoMessage, bean.getInfoMessageAndClear());
-		assertEquals("error message", errorMessage,
-				bean.getErrorMessageAndClear());
-
-		assertEquals("login process URL", loginProcessUrl,
-				bean.getLoginPageUrl());
-		assertEquals("after login URL", afterLoginUrl, bean.getAfterLoginUrl());
-	}
-
-	private void assertRedirect(String path) {
-		if (path.startsWith("http://")) {
-			assertEquals("absolute redirect", path,
-					response.getRedirectLocation());
-		} else {
-			assertEquals("relative redirect", path,
-					response.getRedirectLocation());
-		}
-	}
-
-	private void assertRedirectToLoginProcessPage() {
-		assertRedirect(LoginProcessBean.getBean(request).getLoginPageUrl());
-	}
-
-	private void assertRedirectToAfterLoginPage() {
-		assertNotNull("No reference to the initial LoginProcessBean",
-				initialProcessBean);
-		assertRedirect(initialProcessBean.getAfterLoginUrl());
-	}
-
-	private void assertRedirectToCancelUrl() {
-		String afterLoginUrl = initialProcessBean.getAfterLoginUrl();
-		if ((afterLoginUrl == null) || (afterLoginUrl.equals(URL_LOGIN))) {
-			assertRedirect(URL_HOME);
-		} else {
-			assertRedirect(afterLoginUrl);
-		}
-	}
-
-	/** What logins were completed in this test? */
-	private void assertNewLoginSessions(String... usernames) {
-		Set<String> expected = new HashSet<String>(Arrays.asList(usernames));
-
-		Set<String> actualRecorded = new HashSet<String>(
-				authenticator.getRecordedLoginUsernames());
-		assertEquals("recorded logins", expected, actualRecorded);
-	}
-
-	/** What passwords were changed in this test? */
-	private void assertPasswordChanges(String... strings) {
-		if ((strings.length % 2) != 0) {
-			throw new RuntimeException(
-					"supply even number of args: username and password");
-		}
-
-		Map<String, String> expected = new HashMap<String, String>();
-		for (int i = 0; i < strings.length; i += 2) {
-			expected.put(strings[i], strings[i + 1]);
-		}
-
-		assertEquals("password changes", expected,
-				authenticator.getNewPasswordMap());
-	}
-
-	// ----------------------------------------------------------------------
-	// Helper classes
-	// ----------------------------------------------------------------------
-
-	private static class UserInfo {
-		final String username;
-		final String uri;
-		final String password;
-		final Set<String> permissionSetUris;
-		final int loginCount;
-
-		public UserInfo(String username, String uri, String password,
-				String roleUri, int loginCount) {
-			this.username = username;
-			this.uri = uri;
-			this.password = password;
-			this.permissionSetUris = Collections.singleton(roleUri);
-			this.loginCount = loginCount;
-		}
-
-		@Override
-		public String toString() {
-			return "UserInfo[username=" + username + ", uri=" + uri
-					+ ", password=" + password + ", roleUri="
-					+ permissionSetUris + ", loginCount=" + loginCount + "]";
-		}
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.edit;
+
+import static edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsLoader.URI_DBA;
+import static edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsLoader.URI_SELF_EDITOR;
+import static edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State.FORCED_PASSWORD_CHANGE;
+import static edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State.LOGGING_IN;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.log4j.Level;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import stubs.edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesStub;
+import stubs.edu.cornell.mannlib.vitro.webapp.dao.IndividualDaoStub;
+import stubs.edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDaoStub;
+import stubs.edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactoryStub;
+import stubs.edu.cornell.mannlib.vitro.webapp.i18n.I18nStub;
+import stubs.javax.servlet.ServletConfigStub;
+import stubs.javax.servlet.ServletContextStub;
+import stubs.javax.servlet.http.HttpServletRequestStub;
+import stubs.javax.servlet.http.HttpServletResponseStub;
+import stubs.javax.servlet.http.HttpSessionStub;
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean;
+import edu.cornell.mannlib.vedit.beans.LoginStatusBean.AuthenticationSource;
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.ActiveIdentifierBundleFactories;
+import edu.cornell.mannlib.vitro.webapp.auth.identifier.factory.HasPermissionFactory;
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionRegistry;
+import edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.PermissionsPolicy;
+import edu.cornell.mannlib.vitro.webapp.auth.policy.ServletPolicyList;
+import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.Authenticator;
+import edu.cornell.mannlib.vitro.webapp.controller.authenticate.AuthenticatorStub;
+import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean;
+import edu.cornell.mannlib.vitro.webapp.controller.login.LoginProcessBean.State;
+import edu.cornell.mannlib.vitro.webapp.dao.ModelAccess;
+
+/**
+ */
+public class AuthenticateTest extends AbstractTestClass {
+	private AuthenticatorStub.Factory authenticatorFactory;
+	private AuthenticatorStub authenticator;
+	private ServletContextStub servletContext;
+	private WebappDaoFactoryStub webappDaoFactory;
+	private UserAccountsDaoStub userAccountsDao;
+	private IndividualDaoStub individualDao;
+	private ServletConfigStub servletConfig;
+	private HttpSessionStub session;
+	private HttpServletRequestStub request;
+	private HttpServletResponseStub response;
+	private Authenticate auth;
+	private LoginProcessBean initialProcessBean;
+
+	// ----------------------------------------------------------------------
+	// Setup and data
+	// ----------------------------------------------------------------------
+
+	/** A DBA who has never logged in (forces password change). */
+	private static final String NEW_DBA_NAME = "new_dba_name";
+	private static final String NEW_DBA_PW = "new_dba_pw";
+	private static final UserInfo NEW_DBA = new UserInfo(NEW_DBA_NAME,
+			"new_dba_uri", NEW_DBA_PW, URI_DBA, 0);
+
+	/** A DBA who has logged in before. */
+	private static final String OLD_DBA_NAME = "old_dba_name";
+	private static final String OLD_DBA_PW = "old_dba_pw";
+	private static final String OLD_DBA_URI = "old_dba_uri";
+	private static final UserInfo OLD_DBA = new UserInfo(OLD_DBA_NAME,
+			OLD_DBA_URI, OLD_DBA_PW, URI_DBA, 5);
+
+	/** A self-editor who has logged in before and has a profile. */
+	private static final String OLD_SELF_NAME = "old_self_name";
+	private static final String OLD_SELF_PW = "old_self_pw";
+	private static final UserInfo OLD_SELF = new UserInfo(OLD_SELF_NAME,
+			"old_self_uri", OLD_SELF_PW, URI_SELF_EDITOR, 100);
+
+	/** A self-editor who has logged in before but has no profile. */
+	private static final String OLD_STRANGER_NAME = "old_stranger_name";
+	private static final String OLD_STRANGER_PW = "stranger_pw";
+	private static final UserInfo OLD_STRANGER = new UserInfo(
+			OLD_STRANGER_NAME, "old_stranger_uri", OLD_STRANGER_PW,
+			URI_SELF_EDITOR, 20);
+
+	/** the login page */
+	private static final String URL_LOGIN = "/vivo/login";
+
+	/** some page with a login widget on it. */
+	private static final String URL_WIDGET = "/vivo/widgetPage";
+
+	/** a restricted page that forces a login. */
+	private static final String URL_RESTRICTED = "/vivo/resrictedPage";
+
+	/** a page with a login link. */
+	private static final String URL_WITH_LINK = "/vivo/linkPage";
+
+	// pages that we might end up on.
+	private static final String URL_HOME = "/vivo";
+	private static final String URL_SITE_ADMIN = "/vivo/siteAdmin";
+	private static final String URL_SELF_PROFILE = "/vivo/individual?uri=old_self_associated_uri";
+
+	// A page we will never start from or end on.
+	private static final String URL_SOMEWHERE_ELSE = "/vivo/somewhereElse";
+
+	private static final String NO_USER = "";
+	private static final String NO_MSG = "";
+
+	@Before
+	public void setup() throws Exception {
+		// Create an I18n module that has a value for any key, but the value is
+		// the key itself.
+		@SuppressWarnings("unused")
+		I18nStub i18n = new I18nStub();
+
+		authenticatorFactory = new AuthenticatorStub.Factory();
+		authenticator = authenticatorFactory.getInstance(request);
+		authenticator.addUser(createUserFromUserInfo(NEW_DBA));
+		authenticator.addUser(createUserFromUserInfo(OLD_DBA));
+		authenticator.addUser(createUserFromUserInfo(OLD_SELF));
+		authenticator.addUser(createUserFromUserInfo(OLD_STRANGER));
+		authenticator.setAssociatedUri(OLD_SELF.username,
+				"old_self_associated_uri");
+
+		PermissionSet adminPermissionSet = new PermissionSet();
+		adminPermissionSet.setUri(URI_DBA);
+		adminPermissionSet.setPermissionUris(Collections
+				.singleton(SimplePermission.SEE_SITE_ADMIN_PAGE.getUri()));
+
+		userAccountsDao = new UserAccountsDaoStub();
+		userAccountsDao.addPermissionSet(adminPermissionSet);
+		userAccountsDao.addUser(createUserFromUserInfo(NEW_DBA));
+		userAccountsDao.addUser(createUserFromUserInfo(OLD_DBA));
+		userAccountsDao.addUser(createUserFromUserInfo(OLD_SELF));
+		userAccountsDao.addUser(createUserFromUserInfo(OLD_STRANGER));
+
+		individualDao = new IndividualDaoStub();
+
+		webappDaoFactory = new WebappDaoFactoryStub();
+		webappDaoFactory.setUserAccountsDao(userAccountsDao);
+		webappDaoFactory.setIndividualDao(individualDao);
+
+		servletContext = new ServletContextStub();
+		ModelAccess.on(servletContext).setWebappDaoFactory(webappDaoFactory);
+		servletContext.setAttribute(AuthenticatorStub.FACTORY_ATTRIBUTE_NAME,
+				authenticatorFactory);
+
+		setLoggerLevel(ServletPolicyList.class, Level.WARN);
+		ServletPolicyList.addPolicy(servletContext, new PermissionsPolicy());
+		PermissionRegistry.createRegistry(servletContext,
+				Collections.singleton(SimplePermission.SEE_SITE_ADMIN_PAGE));
+
+		servletConfig = new ServletConfigStub();
+		servletConfig.setServletContext(servletContext);
+
+		session = new HttpSessionStub();
+		session.setServletContext(servletContext);
+
+		request = new HttpServletRequestStub();
+		request.setSession(session);
+		request.setRequestUrlByParts("http://this.that", "/vivo",
+				"/authenticate", null);
+		request.setMethod("POST");
+
+		response = new HttpServletResponseStub();
+
+		auth = new Authenticate();
+		auth.init(servletConfig);
+
+		setLoggerLevel(ConfigurationProperties.class, Level.WARN);
+		new ConfigurationPropertiesStub().setBean(servletContext);
+
+		ActiveIdentifierBundleFactories.addFactory(servletContext,
+				new HasPermissionFactory(servletContext));
+	}
+
+	private UserAccount createUserFromUserInfo(UserInfo userInfo) {
+		UserAccount user = new UserAccount();
+		user.setEmailAddress(userInfo.username);
+		user.setUri(userInfo.uri);
+		user.setPermissionSetUris(userInfo.permissionSetUris);
+		user.setMd5Password(Authenticator.applyMd5Encoding(userInfo.password));
+		user.setLoginCount(userInfo.loginCount);
+		user.setPasswordChangeRequired(userInfo.loginCount == 0);
+		return user;
+	}
+
+	// ----------------------------------------------------------------------
+	// ENTRY TESTS
+	// ----------------------------------------------------------------------
+
+	/** The "return" parameter is set, so we return to the referrer. */
+	@Test
+	public void enterFromALoginLink() {
+		setRequestFromLoginLink(URL_WITH_LINK);
+
+		doTheRequest();
+
+		assertProcessBean(LOGGING_IN, NO_USER, NO_MSG, NO_MSG, URL_LOGIN,
+				URL_WITH_LINK);
+		assertRedirect(URL_LOGIN);
+	}
+
+	/** The "return" parameter is set, but there is no referrer. */
+	@Test
+	public void enterFromABookmarkOfTheLoginLink() {
+		setRequestFromLoginLink(null);
+
+		doTheRequest();
+
+		assertProcessBean(LOGGING_IN, NO_USER, NO_MSG, NO_MSG, URL_LOGIN,
+				URL_LOGIN);
+		assertRedirect(URL_LOGIN);
+	}
+
+	/** The "afterLoginUrl" parameter is set, pointing to the restricted page. */
+	@Test
+	public void enterFromARestrictedPage() {
+		setRequestFromRestrictedPage(URL_RESTRICTED);
+
+		doTheRequest();
+
+		assertProcessBean(LOGGING_IN, NO_USER, NO_MSG, NO_MSG, URL_LOGIN,
+				URL_RESTRICTED);
+		assertRedirect(URL_LOGIN);
+	}
+
+	/** The user supplies username/password but there is no process bean. */
+	@Test
+	public void enterFromAWidgetPage() {
+		setRequestFromWidgetPage(URL_WIDGET);
+
+		doTheRequest();
+
+		assertProcessBean(LOGGING_IN, NO_USER, NO_MSG, NO_MSG, URL_WIDGET,
+				URL_WIDGET);
+		assertRedirect(URL_WIDGET);
+	}
+
+	/** A page with a widget, but treated specially. */
+	@Test
+	public void enterFromTheLoginPage() {
+		setRequestFromWidgetPage(URL_LOGIN);
+
+		doTheRequest();
+
+		assertProcessBean(LOGGING_IN, NO_USER, NO_MSG, NO_MSG, URL_LOGIN,
+				URL_LOGIN);
+		assertRedirect(URL_LOGIN);
+	}
+
+	// ----------------------------------------------------------------------
+	// RESTART LOGIN TESTS
+	//
+	// Each of these should "hijack" the login that was already in progress.
+	// ----------------------------------------------------------------------
+
+	/** The "return" parameter is set, so we detect the restart. */
+	@Ignore
+	@Test
+	public void restartFromALoginLink() {
+		setProcessBean(LOGGING_IN, "username", URL_LOGIN, URL_SOMEWHERE_ELSE);
+		enterFromALoginLink();
+	}
+
+	/** The "return" parameter is set, so we detect the restart. */
+	@Ignore
+	@Test
+	public void restartFromABookmarkOfTheLoginLink() {
+		setProcessBean(LOGGING_IN, "username", URL_LOGIN, URL_SOMEWHERE_ELSE);
+		enterFromABookmarkOfTheLoginLink();
+	}
+
+	/** The "afterLoginUrl" parameter is set, so we detect the restart. */
+	@Ignore
+	@Test
+	public void restartFromARestrictedPage() {
+		setProcessBean(LOGGING_IN, "username", URL_LOGIN, URL_SOMEWHERE_ELSE);
+		enterFromARestrictedPage();
+	}
+
+	/** The referrer is not the loginProcessPage, so we detect the restart. */
+	@Ignore
+	@Test
+	public void restartFromADifferentWidgetPage() {
+		setProcessBean(LOGGING_IN, "username", URL_LOGIN, URL_SOMEWHERE_ELSE);
+		enterFromAWidgetPage();
+	}
+
+	/** The referrer is not the loginProcessPage, so we detect the restart. */
+	@Ignore
+	@Test
+	public void restartFromTheLoginPageWhenWeWereUsingAWidgetPage() {
+		setProcessBean(LOGGING_IN, "username", URL_SOMEWHERE_ELSE,
+				URL_SOMEWHERE_ELSE);
+		enterFromTheLoginPage();
+	}
+
+	// ----------------------------------------------------------------------
+	// PROCESS TESTS
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void loggingInNoUsername() {
+		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_WITH_LINK);
+
+		doTheRequest();
+
+		assertProcessBean(LOGGING_IN, NO_USER, NO_MSG,
+				"error_no_email_address", URL_LOGIN, URL_WITH_LINK);
+		assertRedirectToLoginProcessPage();
+	}
+
+	@Test
+	public void loggingInUsernameNotRecognized() {
+		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_WITH_LINK);
+		setLoginNameAndPassword("unknownBozo", null);
+
+		doTheRequest();
+
+		assertProcessBean(LOGGING_IN, "unknownBozo", NO_MSG,
+				"error_incorrect_credentials", URL_LOGIN, URL_WITH_LINK);
+		assertRedirectToLoginProcessPage();
+	}
+
+	@Test
+	public void loggingInNoPassword() {
+		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_WITH_LINK);
+		setLoginNameAndPassword(NEW_DBA_NAME, null);
+
+		doTheRequest();
+
+		assertProcessBean(LOGGING_IN, NEW_DBA_NAME, NO_MSG,
+				"error_no_password", URL_LOGIN, URL_WITH_LINK);
+		assertRedirectToLoginProcessPage();
+	}
+
+	@Test
+	public void loggingInPasswordIsIncorrect() {
+		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_WITH_LINK);
+		setLoginNameAndPassword(NEW_DBA_NAME, "bogus_password");
+
+		doTheRequest();
+
+		assertProcessBean(LOGGING_IN, NEW_DBA_NAME, NO_MSG,
+				"error_incorrect_credentials", URL_LOGIN, URL_WITH_LINK);
+		assertRedirectToLoginProcessPage();
+	}
+
+	@Test
+	public void loggingInSuccessful() {
+		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_WITH_LINK);
+		setLoginNameAndPassword(OLD_DBA_NAME, OLD_DBA_PW);
+
+		doTheRequest();
+
+		assertNoProcessBean();
+		assertNewLoginSessions(OLD_DBA_NAME);
+		assertRedirectToAfterLoginPage();
+	}
+
+	@Test
+	public void loggingInForcesPasswordChange() {
+		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_WITH_LINK);
+		setLoginNameAndPassword(NEW_DBA_NAME, NEW_DBA_PW);
+
+		doTheRequest();
+
+		assertProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, NO_MSG, NO_MSG,
+				URL_LOGIN, URL_WITH_LINK);
+		assertNewLoginSessions();
+		assertRedirectToLoginProcessPage();
+	}
+
+	@Test
+	public void changingPasswordCancel() {
+		setProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, URL_LOGIN,
+				URL_WITH_LINK);
+		setCancel();
+
+		doTheRequest();
+
+		assertNoProcessBean();
+		assertNewLoginSessions();
+		assertRedirectToCancelUrl();
+	}
+
+	@Test
+	public void changingPasswordWrongLength() {
+		setProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, URL_LOGIN,
+				URL_WITH_LINK);
+		setNewPasswordAttempt("HI", "HI");
+
+		doTheRequest();
+
+		assertProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, NO_MSG,
+				"error_password_length", URL_LOGIN, URL_WITH_LINK);
+		assertRedirectToLoginProcessPage();
+	}
+
+	@Test
+	public void changingPasswordDontMatch() {
+		setProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, URL_LOGIN,
+				URL_WITH_LINK);
+		setNewPasswordAttempt("LongEnough", "DoesNotMatch");
+
+		doTheRequest();
+
+		assertProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, NO_MSG,
+				"error_passwords_dont_match", URL_LOGIN, URL_WITH_LINK);
+		assertRedirectToLoginProcessPage();
+	}
+
+	@Test
+	public void changingPasswordSameAsBefore() {
+		setProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, URL_LOGIN,
+				URL_WITH_LINK);
+		setNewPasswordAttempt(NEW_DBA_PW, NEW_DBA_PW);
+
+		doTheRequest();
+
+		assertProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, NO_MSG,
+				"error_previous_password", URL_LOGIN,
+				URL_WITH_LINK);
+		assertRedirectToLoginProcessPage();
+	}
+
+	@Test
+	public void changingPasswordSuccess() {
+		setProcessBean(FORCED_PASSWORD_CHANGE, NEW_DBA_NAME, URL_LOGIN,
+				URL_WITH_LINK);
+		setNewPasswordAttempt("NewPassword", "NewPassword");
+
+		doTheRequest();
+
+		assertNoProcessBean();
+		assertNewLoginSessions(NEW_DBA_NAME);
+		assertPasswordChanges(NEW_DBA_NAME, "NewPassword");
+		assertRedirectToAfterLoginPage();
+	}
+
+	@Test
+	public void alreadyLoggedIn() {
+		LoginStatusBean statusBean = new LoginStatusBean(OLD_DBA_URI,
+				AuthenticationSource.INTERNAL);
+		LoginStatusBean.setBean(session, statusBean);
+		setRequestFromLoginLink(URL_WITH_LINK);
+
+		doTheRequest();
+
+		assertNoProcessBean();
+		assertNewLoginSessions();
+		assertRedirect(URL_WITH_LINK);
+	}
+
+	// ----------------------------------------------------------------------
+	// EXIT TESTS
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void exitSelfEditor() {
+		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_WITH_LINK);
+		setLoginNameAndPassword(OLD_SELF_NAME, OLD_SELF_PW);
+
+		doTheRequest();
+
+		assertNoProcessBean();
+		assertNewLoginSessions(OLD_SELF_NAME);
+		assertRedirect(URL_SELF_PROFILE);
+	}
+
+	@Test
+	public void exitUnrecognizedSelfEditor() {
+		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_WITH_LINK);
+		setLoginNameAndPassword(OLD_STRANGER_NAME, OLD_STRANGER_PW);
+
+		doTheRequest();
+
+		assertNoProcessBean();
+		assertNewLoginSessions(OLD_STRANGER_NAME);
+		assertRedirect(URL_HOME);
+	}
+
+	@Test
+	public void exitDbaNormal() {
+		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_RESTRICTED);
+		setLoginNameAndPassword(OLD_DBA_NAME, OLD_DBA_PW);
+
+		doTheRequest();
+
+		assertNoProcessBean();
+		assertNewLoginSessions(OLD_DBA_NAME);
+		assertRedirect(URL_RESTRICTED);
+	}
+
+	@Test
+	public void exitDbaFromLoginPage() {
+		setProcessBean(LOGGING_IN, NO_USER, URL_LOGIN, URL_LOGIN);
+		setLoginNameAndPassword(OLD_DBA_NAME, OLD_DBA_PW);
+
+		doTheRequest();
+
+		assertNoProcessBean();
+		assertNewLoginSessions(OLD_DBA_NAME);
+		assertRedirect(URL_SITE_ADMIN);
+	}
+
+	// ----------------------------------------------------------------------
+	// Helper methods
+	// ----------------------------------------------------------------------
+
+	private void setRequestFromLoginLink(String urlWithLink) {
+		request.addParameter("return", "");
+		request.setHeader("referer", urlWithLink);
+	}
+
+	private void setRequestFromRestrictedPage(String urlRestricted) {
+		request.addParameter("afterLogin", urlRestricted);
+		request.setHeader("referer", urlRestricted);
+	}
+
+	private void setRequestFromWidgetPage(String urlWidget) {
+		request.setHeader("referer", urlWidget);
+	}
+
+	/** Create a LoginProcessBean in the session, and keep a reference to it. */
+	private void setProcessBean(State state, String username,
+			String loginProcessUrl, String afterLoginUrl) {
+		LoginProcessBean bean = LoginProcessBean.getBean(request);
+		bean.setState(state);
+		bean.setUsername(username);
+		bean.setLoginPageUrl(loginProcessUrl);
+		bean.setAfterLoginUrl(afterLoginUrl);
+
+		initialProcessBean = bean;
+	}
+
+	private void setLoginNameAndPassword(String loginName, String password) {
+		request.addParameter("loginName", loginName);
+		request.addParameter("loginPassword", password);
+	}
+
+	private void setCancel() {
+		request.addParameter("cancel", "true");
+	}
+
+	private void setNewPasswordAttempt(String newPassword,
+			String confirmPassword) {
+		request.addParameter("newPassword", newPassword);
+		request.addParameter("confirmPassword", confirmPassword);
+	}
+
+	private void doTheRequest() {
+		auth.doPost(request, response);
+	}
+
+	private void assertNoProcessBean() {
+		if (LoginProcessBean.isBean(request)) {
+			fail("Process bean: expected <null>, but was <"
+					+ LoginProcessBean.getBean(request) + ">");
+		}
+	}
+
+	private void assertProcessBean(State state, String username,
+			String infoMessage, String errorMessage, String loginProcessUrl,
+			String afterLoginUrl) {
+		if (!LoginProcessBean.isBean(request)) {
+			fail("login process bean is null");
+		}
+		LoginProcessBean bean = LoginProcessBean.getBean(request);
+
+		assertEquals("state", state, bean.getState());
+		assertEquals("username", username, bean.getUsername());
+
+		assertEquals("info message", infoMessage, bean.getInfoMessageAndClear());
+		assertEquals("error message", errorMessage,
+				bean.getErrorMessageAndClear());
+
+		assertEquals("login process URL", loginProcessUrl,
+				bean.getLoginPageUrl());
+		assertEquals("after login URL", afterLoginUrl, bean.getAfterLoginUrl());
+	}
+
+	private void assertRedirect(String path) {
+		if (path.startsWith("http://")) {
+			assertEquals("absolute redirect", path,
+					response.getRedirectLocation());
+		} else {
+			assertEquals("relative redirect", path,
+					response.getRedirectLocation());
+		}
+	}
+
+	private void assertRedirectToLoginProcessPage() {
+		assertRedirect(LoginProcessBean.getBean(request).getLoginPageUrl());
+	}
+
+	private void assertRedirectToAfterLoginPage() {
+		assertNotNull("No reference to the initial LoginProcessBean",
+				initialProcessBean);
+		assertRedirect(initialProcessBean.getAfterLoginUrl());
+	}
+
+	private void assertRedirectToCancelUrl() {
+		String afterLoginUrl = initialProcessBean.getAfterLoginUrl();
+		if ((afterLoginUrl == null) || (afterLoginUrl.equals(URL_LOGIN))) {
+			assertRedirect(URL_HOME);
+		} else {
+			assertRedirect(afterLoginUrl);
+		}
+	}
+
+	/** What logins were completed in this test? */
+	private void assertNewLoginSessions(String... usernames) {
+		Set<String> expected = new HashSet<String>(Arrays.asList(usernames));
+
+		Set<String> actualRecorded = new HashSet<String>(
+				authenticator.getRecordedLoginUsernames());
+		assertEquals("recorded logins", expected, actualRecorded);
+	}
+
+	/** What passwords were changed in this test? */
+	private void assertPasswordChanges(String... strings) {
+		if ((strings.length % 2) != 0) {
+			throw new RuntimeException(
+					"supply even number of args: username and password");
+		}
+
+		Map<String, String> expected = new HashMap<String, String>();
+		for (int i = 0; i < strings.length; i += 2) {
+			expected.put(strings[i], strings[i + 1]);
+		}
+
+		assertEquals("password changes", expected,
+				authenticator.getNewPasswordMap());
+	}
+
+	// ----------------------------------------------------------------------
+	// Helper classes
+	// ----------------------------------------------------------------------
+
+	private static class UserInfo {
+		final String username;
+		final String uri;
+		final String password;
+		final Set<String> permissionSetUris;
+		final int loginCount;
+
+		public UserInfo(String username, String uri, String password,
+				String roleUri, int loginCount) {
+			this.username = username;
+			this.uri = uri;
+			this.password = password;
+			this.permissionSetUris = Collections.singleton(roleUri);
+			this.loginCount = loginCount;
+		}
+
+		@Override
+		public String toString() {
+			return "UserInfo[username=" + username + ", uri=" + uri
+					+ ", password=" + password + ", roleUri="
+					+ permissionSetUris + ", loginCount=" + loginCount + "]";
+		}
+	}
+
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FlatteningTemplateLoaderTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FlatteningTemplateLoaderTest.java
index 59d1f9eba..60f6c5af6 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FlatteningTemplateLoaderTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FlatteningTemplateLoaderTest.java
@@ -1,183 +1,183 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.text.SimpleDateFormat;
-
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-
-/**
- * Test the methods of {@link FlatteningTemplateLoader}.
- */
-public class FlatteningTemplateLoaderTest extends AbstractTestClass {
-	/**
-	 * TODO test plan
-	 * 
-	 * <pre>
-	 * findTemplateSource
-	 *   null arg
-	 *   not found
-	 *   found in top level
-	 *   found in lower level
-	 *   with path
-	 *   
-	 * getReader
-	 *   get it, read it, check it, close it.
-	 *   
-	 * getLastModified
-	 * 	 check the create date within a range
-	 *   modify it and check again.
-	 * 
-	 * </pre>
-	 */
-	// ----------------------------------------------------------------------
-	// setup and teardown
-	// ----------------------------------------------------------------------
-
-	private static final String SUBDIRECTORY_NAME = "sub";
-
-	private static final String TEMPLATE_NAME_UPPER = "template.ftl";
-	private static final String TEMPLATE_NAME_UPPER_WITH_PATH = "path/template.ftl";
-	private static final String TEMPLATE_UPPER_CONTENTS = "The contents of the file.";
-
-	private static final String TEMPLATE_NAME_LOWER = "another.ftl";
-	private static final String TEMPLATE_LOWER_CONTENTS = "Another template file.";
-
-	private static File tempDir;
-	private static File notADirectory;
-	private static File upperTemplate;
-	private static File lowerTemplate;
-
-	private FlatteningTemplateLoader loader;
-
-	@BeforeClass
-	public static void setUpFiles() throws IOException {
-		notADirectory = File.createTempFile(
-				FlatteningTemplateLoader.class.getSimpleName(), "");
-
-		tempDir = createTempDirectory(FlatteningTemplateLoader.class
-				.getSimpleName());
-		upperTemplate = createFile(tempDir, TEMPLATE_NAME_UPPER,
-				TEMPLATE_UPPER_CONTENTS);
-
-		File subdirectory = new File(tempDir, SUBDIRECTORY_NAME);
-		subdirectory.mkdir();
-		lowerTemplate = createFile(subdirectory, TEMPLATE_NAME_LOWER,
-				TEMPLATE_LOWER_CONTENTS);
-	}
-
-	@Before
-	public void initializeLoader() {
-		loader = new FlatteningTemplateLoader(tempDir);
-	}
-
-	@AfterClass
-	public static void cleanUpFiles() throws IOException {
-		purgeDirectoryRecursively(tempDir);
-	}
-
-	// ----------------------------------------------------------------------
-	// the tests
-	// ----------------------------------------------------------------------
-
-	@Test(expected = NullPointerException.class)
-	public void constructorNull() {
-		new FlatteningTemplateLoader(null);
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void constructorNonExistent() {
-		new FlatteningTemplateLoader(new File("bogusDirName"));
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void constructorNotADirectory() {
-		new FlatteningTemplateLoader(notADirectory);
-	}
-
-	@Test
-	public void findNull() throws IOException {
-		Object source = loader.findTemplateSource(null);
-		assertNull("find null", source);
-	}
-
-	@Test
-	public void findNotFound() throws IOException {
-		Object source = loader.findTemplateSource("bogus");
-		assertNull("not found", source);
-	}
-
-	@Test
-	public void findInTopLevel() throws IOException {
-		Object source = loader.findTemplateSource(TEMPLATE_NAME_UPPER);
-		assertEquals("top level", upperTemplate, source);
-	}
-
-	@Test
-	public void findInLowerLevel() throws IOException {
-		Object source = loader.findTemplateSource(TEMPLATE_NAME_LOWER);
-		assertEquals("lower level", lowerTemplate, source);
-	}
-
-	@Test
-	public void findIgnoringPath() throws IOException {
-		Object source = loader
-				.findTemplateSource(TEMPLATE_NAME_UPPER_WITH_PATH);
-		assertEquals("top level", upperTemplate, source);
-	}
-
-	@Test
-	public void checkTheReader() throws IOException {
-		Object source = loader.findTemplateSource(TEMPLATE_NAME_UPPER);
-		Reader reader = loader.getReader(source, "UTF-8");
-		String contents = readAll(reader);
-		assertEquals("read the contents", contents, TEMPLATE_UPPER_CONTENTS);
-	}
-
-	/**
-	 * Some systems only record last-modified times to the nearest second, so we
-	 * can't rely on them changing during the course of the test. Force the
-	 * change, and test for it.
-	 */
-	@Test
-	public void teplateLastModified() throws IOException {
-		Object source = loader.findTemplateSource(TEMPLATE_NAME_UPPER);
-		long modified = loader.getLastModified(source);
-		long now = System.currentTimeMillis();
-		assertTrue("near to now: modified=" + formatTimeStamp(modified)
-				+ ", now=" + formatTimeStamp(now),
-				2000 > Math.abs(modified - now));
-
-		upperTemplate.setLastModified(5000);
-		assertEquals("modified modified", 5000, loader.getLastModified(source));
-	}
-
-	@Test
-	public void closeDoesntCrash() throws IOException {
-		Object source = loader.findTemplateSource(TEMPLATE_NAME_UPPER);
-		loader.closeTemplateSource(source);
-	}
-
-	// ----------------------------------------------------------------------
-	// helper methods
-	// ----------------------------------------------------------------------
-
-	private String formatTimeStamp(long time) {
-		SimpleDateFormat formatter = new SimpleDateFormat(
-				"yyyy-MM-dd HH:mm:ss.SSS");
-		return formatter.format(time);
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Reader;
+import java.text.SimpleDateFormat;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+
+/**
+ * Test the methods of {@link FlatteningTemplateLoader}.
+ */
+public class FlatteningTemplateLoaderTest extends AbstractTestClass {
+	/**
+	 * TODO test plan
+	 * 
+	 * <pre>
+	 * findTemplateSource
+	 *   null arg
+	 *   not found
+	 *   found in top level
+	 *   found in lower level
+	 *   with path
+	 *   
+	 * getReader
+	 *   get it, read it, check it, close it.
+	 *   
+	 * getLastModified
+	 * 	 check the create date within a range
+	 *   modify it and check again.
+	 * 
+	 * </pre>
+	 */
+	// ----------------------------------------------------------------------
+	// setup and teardown
+	// ----------------------------------------------------------------------
+
+	private static final String SUBDIRECTORY_NAME = "sub";
+
+	private static final String TEMPLATE_NAME_UPPER = "template.ftl";
+	private static final String TEMPLATE_NAME_UPPER_WITH_PATH = "path/template.ftl";
+	private static final String TEMPLATE_UPPER_CONTENTS = "The contents of the file.";
+
+	private static final String TEMPLATE_NAME_LOWER = "another.ftl";
+	private static final String TEMPLATE_LOWER_CONTENTS = "Another template file.";
+
+	private static File tempDir;
+	private static File notADirectory;
+	private static File upperTemplate;
+	private static File lowerTemplate;
+
+	private FlatteningTemplateLoader loader;
+
+	@BeforeClass
+	public static void setUpFiles() throws IOException {
+		notADirectory = File.createTempFile(
+				FlatteningTemplateLoader.class.getSimpleName(), "");
+
+		tempDir = createTempDirectory(FlatteningTemplateLoader.class
+				.getSimpleName());
+		upperTemplate = createFile(tempDir, TEMPLATE_NAME_UPPER,
+				TEMPLATE_UPPER_CONTENTS);
+
+		File subdirectory = new File(tempDir, SUBDIRECTORY_NAME);
+		subdirectory.mkdir();
+		lowerTemplate = createFile(subdirectory, TEMPLATE_NAME_LOWER,
+				TEMPLATE_LOWER_CONTENTS);
+	}
+
+	@Before
+	public void initializeLoader() {
+		loader = new FlatteningTemplateLoader(tempDir);
+	}
+
+	@AfterClass
+	public static void cleanUpFiles() throws IOException {
+		purgeDirectoryRecursively(tempDir);
+	}
+
+	// ----------------------------------------------------------------------
+	// the tests
+	// ----------------------------------------------------------------------
+
+	@Test(expected = NullPointerException.class)
+	public void constructorNull() {
+		new FlatteningTemplateLoader(null);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNonExistent() {
+		new FlatteningTemplateLoader(new File("bogusDirName"));
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void constructorNotADirectory() {
+		new FlatteningTemplateLoader(notADirectory);
+	}
+
+	@Test
+	public void findNull() throws IOException {
+		Object source = loader.findTemplateSource(null);
+		assertNull("find null", source);
+	}
+
+	@Test
+	public void findNotFound() throws IOException {
+		Object source = loader.findTemplateSource("bogus");
+		assertNull("not found", source);
+	}
+
+	@Test
+	public void findInTopLevel() throws IOException {
+		Object source = loader.findTemplateSource(TEMPLATE_NAME_UPPER);
+		assertEquals("top level", upperTemplate, source);
+	}
+
+	@Test
+	public void findInLowerLevel() throws IOException {
+		Object source = loader.findTemplateSource(TEMPLATE_NAME_LOWER);
+		assertEquals("lower level", lowerTemplate, source);
+	}
+
+	@Test
+	public void findIgnoringPath() throws IOException {
+		Object source = loader
+				.findTemplateSource(TEMPLATE_NAME_UPPER_WITH_PATH);
+		assertEquals("top level", upperTemplate, source);
+	}
+
+	@Test
+	public void checkTheReader() throws IOException {
+		Object source = loader.findTemplateSource(TEMPLATE_NAME_UPPER);
+		Reader reader = loader.getReader(source, "UTF-8");
+		String contents = readAll(reader);
+		assertEquals("read the contents", contents, TEMPLATE_UPPER_CONTENTS);
+	}
+
+	/**
+	 * Some systems only record last-modified times to the nearest second, so we
+	 * can't rely on them changing during the course of the test. Force the
+	 * change, and test for it.
+	 */
+	@Test
+	public void teplateLastModified() throws IOException {
+		Object source = loader.findTemplateSource(TEMPLATE_NAME_UPPER);
+		long modified = loader.getLastModified(source);
+		long now = System.currentTimeMillis();
+		assertTrue("near to now: modified=" + formatTimeStamp(modified)
+				+ ", now=" + formatTimeStamp(now),
+				2000 > Math.abs(modified - now));
+
+		upperTemplate.setLastModified(5000);
+		assertEquals("modified modified", 5000, loader.getLastModified(source));
+	}
+
+	@Test
+	public void closeDoesntCrash() throws IOException {
+		Object source = loader.findTemplateSource(TEMPLATE_NAME_UPPER);
+		loader.closeTemplateSource(source);
+	}
+
+	// ----------------------------------------------------------------------
+	// helper methods
+	// ----------------------------------------------------------------------
+
+	private String formatTimeStamp(long time) {
+		SimpleDateFormat formatter = new SimpleDateFormat(
+				"yyyy-MM-dd HH:mm:ss.SSS");
+		return formatter.format(time);
+	}
+
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploaderThumbnailerTester.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploaderThumbnailerTester.java
index 6fb184a1e..b51b1db35 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploaderThumbnailerTester.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploaderThumbnailerTester.java
@@ -1,135 +1,135 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
-
-import static edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.THUMBNAIL_HEIGHT;
-import static edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.THUMBNAIL_WIDTH;
-
-import java.awt.Frame;
-import java.awt.GridLayout;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import javax.media.jai.JAI;
-import javax.media.jai.RenderedOp;
-import javax.media.jai.operator.StreamDescriptor;
-
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-
-import com.sun.media.jai.codec.MemoryCacheSeekableStream;
-
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadHelper.NonNoisyImagingListener;
-
-/**
- * This is not a unit test, so it is not named BlahBlahTest.
- * 
- * Instead, it's a test harness that creates thumbnails and writes them to
- * files, while also displaying them in a window on the screen. It takes human
- * intervention to evaluate.
- * 
- * This is especially true because the images on the screen look color-correct,
- * but when viewed in the browser, they might not be.
- */
-public class ImageUploaderThumbnailerTester extends Frame {
-	static {
-		JAI.getDefaultInstance().setImagingListener(
-				new NonNoisyImagingListener());
-	}
-
-	/** Big enough to hold the JPEG file, certainly. */
-	private final static int BUFFER_SIZE = 200 * 200 * 4;
-
-	private final static ImageCropData[] THUMBNAIL_DATA = new ImageCropData[] {
-			new ImageCropData("/Users/jeb228/Pictures/JimBlake_20010915.jpg",
-					50, 50, 115),
-			new ImageCropData("/Users/jeb228/Pictures/brazil_collab.png", 600,
-					250, 400),
-			new ImageCropData("/Users/jeb228/Pictures/wheel.png", 0, 0, 195),
-			new ImageCropData("/Users/jeb228/Pictures/DSC04203w-trans.gif",
-					400, 1200, 800) };
-
-	private final ImageUploadThumbnailer thumbnailer = new ImageUploadThumbnailer(
-			THUMBNAIL_HEIGHT, THUMBNAIL_WIDTH);
-
-	@SuppressWarnings("deprecation")
-	private ImageUploaderThumbnailerTester() {
-		setTitle("Alpha Killer Test");
-		addWindowListener(new CloseWindowListener());
-		setLayout(createLayout());
-		for (ImageCropData icd : THUMBNAIL_DATA) {
-			try {
-				InputStream mainStream = new FileInputStream(icd.filename);
-				File thumbFile = writeToTempFile(thumbnailer.cropAndScale(
-						mainStream, icd.crop));
-				System.out.println(thumbFile.getAbsolutePath());
-
-				MemoryCacheSeekableStream thumbFileStream = new MemoryCacheSeekableStream(
-						new FileInputStream(thumbFile));
-				RenderedOp thumbImage = StreamDescriptor.create(
-						thumbFileStream, null, null);
-				add(new javax.media.jai.widget.ImageCanvas(thumbImage));
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-		pack();
-		setVisible(true);
-	}
-
-	/**
-	 * @param thumbStream
-	 * @return
-	 * @throws IOException
-	 * @throws FileNotFoundException
-	 */
-	private File writeToTempFile(InputStream thumbStream) throws IOException,
-			FileNotFoundException {
-		File thumbFile = File.createTempFile("ImageUploaderThumbnailerTester",
-				"");
-		OutputStream imageOutputStream = new FileOutputStream(thumbFile);
-		byte[] buffer = new byte[BUFFER_SIZE];
-		int howMany = thumbStream.read(buffer);
-		imageOutputStream.write(buffer, 0, howMany);
-		imageOutputStream.close();
-		return thumbFile;
-	}
-
-	private GridLayout createLayout() {
-		GridLayout layout = new GridLayout(1, THUMBNAIL_DATA.length);
-		layout.setHgap(10);
-		return layout;
-	}
-
-	public static void main(String[] args) {
-		Logger.getLogger(ImageUploadThumbnailer.class).setLevel(Level.DEBUG);
-		new ImageUploaderThumbnailerTester();
-	}
-
-	private static class ImageCropData {
-		final String filename;
-		final ImageUploadController.CropRectangle crop;
-
-		ImageCropData(String filename, int x, int y, int size) {
-			this.filename = filename;
-			this.crop = new ImageUploadController.CropRectangle(x, y, size,
-					size);
-		}
-	}
-
-	private class CloseWindowListener extends WindowAdapter {
-		@Override
-		public void windowClosing(WindowEvent e) {
-			setVisible(false);
-			dispose();
-			System.exit(0);
-		}
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
+
+import static edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.THUMBNAIL_HEIGHT;
+import static edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.THUMBNAIL_WIDTH;
+
+import java.awt.Frame;
+import java.awt.GridLayout;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import javax.media.jai.JAI;
+import javax.media.jai.RenderedOp;
+import javax.media.jai.operator.StreamDescriptor;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+
+import com.sun.media.jai.codec.MemoryCacheSeekableStream;
+
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadHelper.NonNoisyImagingListener;
+
+/**
+ * This is not a unit test, so it is not named BlahBlahTest.
+ * 
+ * Instead, it's a test harness that creates thumbnails and writes them to
+ * files, while also displaying them in a window on the screen. It takes human
+ * intervention to evaluate.
+ * 
+ * This is especially true because the images on the screen look color-correct,
+ * but when viewed in the browser, they might not be.
+ */
+public class ImageUploaderThumbnailerTester extends Frame {
+	static {
+		JAI.getDefaultInstance().setImagingListener(
+				new NonNoisyImagingListener());
+	}
+
+	/** Big enough to hold the JPEG file, certainly. */
+	private final static int BUFFER_SIZE = 200 * 200 * 4;
+
+	private final static ImageCropData[] THUMBNAIL_DATA = new ImageCropData[] {
+			new ImageCropData("/Users/jeb228/Pictures/JimBlake_20010915.jpg",
+					50, 50, 115),
+			new ImageCropData("/Users/jeb228/Pictures/brazil_collab.png", 600,
+					250, 400),
+			new ImageCropData("/Users/jeb228/Pictures/wheel.png", 0, 0, 195),
+			new ImageCropData("/Users/jeb228/Pictures/DSC04203w-trans.gif",
+					400, 1200, 800) };
+
+	private final ImageUploadThumbnailer thumbnailer = new ImageUploadThumbnailer(
+			THUMBNAIL_HEIGHT, THUMBNAIL_WIDTH);
+
+	@SuppressWarnings("deprecation")
+	private ImageUploaderThumbnailerTester() {
+		setTitle("Alpha Killer Test");
+		addWindowListener(new CloseWindowListener());
+		setLayout(createLayout());
+		for (ImageCropData icd : THUMBNAIL_DATA) {
+			try {
+				InputStream mainStream = new FileInputStream(icd.filename);
+				File thumbFile = writeToTempFile(thumbnailer.cropAndScale(
+						mainStream, icd.crop));
+				System.out.println(thumbFile.getAbsolutePath());
+
+				MemoryCacheSeekableStream thumbFileStream = new MemoryCacheSeekableStream(
+						new FileInputStream(thumbFile));
+				RenderedOp thumbImage = StreamDescriptor.create(
+						thumbFileStream, null, null);
+				add(new javax.media.jai.widget.ImageCanvas(thumbImage));
+			} catch (Exception e) {
+				e.printStackTrace();
+			}
+		}
+		pack();
+		setVisible(true);
+	}
+
+	/**
+	 * @param thumbStream
+	 * @return
+	 * @throws IOException
+	 * @throws FileNotFoundException
+	 */
+	private File writeToTempFile(InputStream thumbStream) throws IOException,
+			FileNotFoundException {
+		File thumbFile = File.createTempFile("ImageUploaderThumbnailerTester",
+				"");
+		OutputStream imageOutputStream = new FileOutputStream(thumbFile);
+		byte[] buffer = new byte[BUFFER_SIZE];
+		int howMany = thumbStream.read(buffer);
+		imageOutputStream.write(buffer, 0, howMany);
+		imageOutputStream.close();
+		return thumbFile;
+	}
+
+	private GridLayout createLayout() {
+		GridLayout layout = new GridLayout(1, THUMBNAIL_DATA.length);
+		layout.setHgap(10);
+		return layout;
+	}
+
+	public static void main(String[] args) {
+		Logger.getLogger(ImageUploadThumbnailer.class).setLevel(Level.DEBUG);
+		new ImageUploaderThumbnailerTester();
+	}
+
+	private static class ImageCropData {
+		final String filename;
+		final ImageUploadController.CropRectangle crop;
+
+		ImageCropData(String filename, int x, int y, int size) {
+			this.filename = filename;
+			this.crop = new ImageUploadController.CropRectangle(x, y, size,
+					size);
+		}
+	}
+
+	private class CloseWindowListener extends WindowAdapter {
+		@Override
+		public void windowClosing(WindowEvent e) {
+			setVisible(false);
+			dispose();
+			System.exit(0);
+		}
+	}
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploaderThumbnailerTester_2.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploaderThumbnailerTester_2.java
index b25663147..2a2314999 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploaderThumbnailerTester_2.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ImageUploaderThumbnailerTester_2.java
@@ -1,269 +1,269 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-import java.awt.Component;
-import java.awt.Frame;
-import java.awt.GridLayout;
-import java.awt.Label;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.awt.image.Raster;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.media.jai.JAI;
-import javax.media.jai.RenderedOp;
-import javax.media.jai.operator.StreamDescriptor;
-import javax.media.jai.widget.ImageCanvas;
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.log4j.Appender;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PatternLayout;
-
-import com.sun.media.jai.codec.MemoryCacheSeekableStream;
-
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.CropRectangle;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadHelper.NonNoisyImagingListener;
-import edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploaderThumbnailerTester_2.CropDataSet.CropData;
-
-/**
- * This is not a unit test, so it is not named BlahBlahTest.
- * 
- * Instead, it's a test harness that creates thumbnails and displays them in a
- * window on the screen. It takes human intervention to evaluate.
- * 
- * The goal here is to see whether differences in crop dimensions might cause
- * one or more black edges on the thumbnails.
- */
-@SuppressWarnings("deprecation")
-public class ImageUploaderThumbnailerTester_2 extends Frame {
-	private static final Log log = LogFactory
-			.getLog(ImageUploaderThumbnailerTester_2.class);
-
-	private static final int ROWS = 6;
-	private static final int COLUMNS = 9;
-
-	private static final int EDGE_THRESHOLD = 6000;
-
-	/** Keep things quiet. */
-	static {
-		JAI.getDefaultInstance().setImagingListener(
-				new NonNoisyImagingListener());
-	}
-
-	private final String imagePath;
-	private final ImageUploadThumbnailer thumbnailer;
-
-	public ImageUploaderThumbnailerTester_2(String imagePath,
-			CropDataSet cropDataSet) {
-		this.imagePath = imagePath;
-		this.thumbnailer = new ImageUploadThumbnailer(200, 200);
-
-		setTitle("Cropping edging test");
-		addWindowListener(new CloseWindowListener());
-		setLayout(new GridLayout(ROWS, COLUMNS));
-
-		for (CropData cropData : cropDataSet.crops()) {
-			add(createImagePanel(cropData));
-		}
-
-		pack();
-		setVisible(true);
-	}
-
-	private Component createImagePanel(CropData cropData) {
-		RenderedOp image = createCroppedImage(cropData);
-
-
-		Set<String> blackSides = checkBlackEdges(image);
-		if (!blackSides.isEmpty()) {
-			log.warn("edges  at " + cropData + ", " + blackSides);
-		}
-
-		String legend = "left=" + cropData.left + ", top=" + cropData.top
-				+ ", size=" + cropData.size;
-		Label l = new Label();
-		l.setAlignment(Label.CENTER);
-		if (!blackSides.isEmpty()) {
-			l.setBackground(new Color(0xFFDDDD));
-			legend += " " + blackSides;
-		}
-		l.setText(legend);
-
-		JPanel p = new JPanel();
-		p.setLayout(new BorderLayout());
-		p.add("South", l);
-		p.add("Center", new ImageCanvas(image));
-		p.setBackground(new Color(0xFFFFFF));
-		p.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-
-		return p;
-	}
-
-	private RenderedOp createCroppedImage(CropData cropData) {
-		try {
-			InputStream mainStream = new FileInputStream(imagePath);
-			CropRectangle rectangle = new CropRectangle(cropData.left,
-					cropData.top, cropData.size, cropData.size);
-			InputStream thumbnailStream = thumbnailer.cropAndScale(mainStream,
-					rectangle);
-
-			return StreamDescriptor.create(new MemoryCacheSeekableStream(
-					thumbnailStream), null, null);
-		} catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private Set<String> checkBlackEdges(RenderedOp image) {
-		Raster imageData = image.getData();
-
-		int minX = imageData.getMinX();
-		int minY = imageData.getMinY();
-		int maxX = minX + imageData.getWidth() - 1;
-		int maxY = minY + imageData.getHeight() - 1;
-
-		Set<String> blackSides = new HashSet<String>();
-		if (isBlackEdge(minX, minX, minY, maxY, imageData)) {
-			blackSides.add("left");
-		}
-		if (isBlackEdge(minX, maxX, minY, minY, imageData)) {
-			blackSides.add("top");
-		}
-		if (isBlackEdge(maxX, maxX, minY, maxY, imageData)) {
-			blackSides.add("right");
-		}
-		if (isBlackEdge(minX, maxX, maxY, maxY, imageData)) {
-			blackSides.add("bottom");
-		}
-		return blackSides;
-	}
-
-	private boolean isBlackEdge(int fromX, int toX, int fromY, int toY,
-			Raster imageData) {
-		int edgeTotal = 0;
-		try {
-			for (int col = fromX; col <= toX; col++) {
-				for (int row = fromY; row <= toY; row++) {
-					edgeTotal += sumPixel(imageData, col, row);
-				}
-			}
-		} catch (Exception e) {
-			log.error("can't sum edge: fromX=" + fromX + ", toX=" + toX
-					+ ", fromY=" + fromY + ", toY=" + toY + ", imageWidth="
-					+ imageData.getWidth() + ", imageHeight="
-					+ imageData.getHeight() + ": " + e);
-		}
-
-		log.debug("edge total = " + edgeTotal);
-		return edgeTotal < EDGE_THRESHOLD;
-	}
-
-	private int sumPixel(Raster imageData, int col, int row) {
-		int pixelSum = 0;
-		int[] pixel = imageData.getPixel(col, row, new int[0]);
-		for (int value : pixel) {
-			pixelSum += value;
-		}
-		return pixelSum;
-	}
-
-	/**
-	 * <pre>
-	 * The plan:
-	 * 
-	 * Provide the path to an image file.
-	 * Figure how many images can fit on the screen.
-	 * Crop in increments, starting at 0,0 and varying the size of the crop.
-	 * Crop in increments, incrementing from 0,0 downward, and varying the size of the crop.
-	 * 
-	 * Start by creating 4 x 4 images in a window, and incrementing from 201 to 216.
-	 * </pre>
-	 */
-
-	public static void main(String[] args) {
-		Logger rootLogger = Logger.getRootLogger();
-		Appender appender = (Appender) rootLogger.getAllAppenders()
-				.nextElement();
-		appender.setLayout(new PatternLayout("%-5p [%c{1}] %m%n"));
-
-		Logger.getLogger(ImageUploadThumbnailer.class).setLevel(Level.DEBUG);
-		Logger.getLogger(ImageUploaderThumbnailerTester_2.class).setLevel(
-				Level.INFO);
-
-		CropDataSet cropDataSet = new CropDataSet();
-		for (int i = 0; i < ROWS * COLUMNS; i++) {
-//			cropDataSet.add(i, i, 201 + i);
-			cropDataSet.add(0, 0, 201 + i);
-		}
-
-		new ImageUploaderThumbnailerTester_2(
-				"C:/Users/jeb228/Pictures/wheel.png", cropDataSet);
-
-//		new ImageUploaderThumbnailerTester_2(
-//				"C:/Users/jeb228/Pictures/DSC04203w-trans.jpg", cropDataSet);
-
-		//		new ImageUploaderThumbnailerTester_2(
-//				"C:/Development/JIRA issues/NIHVIVO-2477 Black borders on thumbnails/"
-//				+ "images from Alex/uploads/file_storage_root/a~n/411/9/"
-//				+ "De^20Bartolome^2c^20Charles^20A^20M_100037581.jpg",
-//				cropDataSet);
-	}
-
-	// ----------------------------------------------------------------------
-	// helper classes
-	// ----------------------------------------------------------------------
-
-	private class CloseWindowListener extends WindowAdapter {
-		@Override
-		public void windowClosing(WindowEvent e) {
-			setVisible(false);
-			dispose();
-			System.exit(0);
-		}
-	}
-
-	public static class CropDataSet {
-		private final List<CropData> crops = new ArrayList<CropData>();
-
-		CropDataSet add(int left, int top, int size) {
-			crops.add(new CropData(left, top, size));
-			return this;
-		}
-
-		Collection<CropData> crops() {
-			return Collections.unmodifiableCollection(crops);
-		}
-
-		public static class CropData {
-			final int left;
-			final int top;
-			final int size;
-
-			CropData(int left, int top, int size) {
-				this.left = left;
-				this.top = top;
-				this.size = size;
-			}
-
-			@Override
-			public String toString() {
-				return "CropData[" + left + ", " + top + ", " + size + "]";
-			}
-		}
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.controller.freemarker;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Frame;
+import java.awt.GridLayout;
+import java.awt.Label;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.awt.image.Raster;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.media.jai.JAI;
+import javax.media.jai.RenderedOp;
+import javax.media.jai.operator.StreamDescriptor;
+import javax.media.jai.widget.ImageCanvas;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Appender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+
+import com.sun.media.jai.codec.MemoryCacheSeekableStream;
+
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadController.CropRectangle;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploadHelper.NonNoisyImagingListener;
+import edu.cornell.mannlib.vitro.webapp.controller.freemarker.ImageUploaderThumbnailerTester_2.CropDataSet.CropData;
+
+/**
+ * This is not a unit test, so it is not named BlahBlahTest.
+ * 
+ * Instead, it's a test harness that creates thumbnails and displays them in a
+ * window on the screen. It takes human intervention to evaluate.
+ * 
+ * The goal here is to see whether differences in crop dimensions might cause
+ * one or more black edges on the thumbnails.
+ */
+@SuppressWarnings("deprecation")
+public class ImageUploaderThumbnailerTester_2 extends Frame {
+	private static final Log log = LogFactory
+			.getLog(ImageUploaderThumbnailerTester_2.class);
+
+	private static final int ROWS = 6;
+	private static final int COLUMNS = 9;
+
+	private static final int EDGE_THRESHOLD = 6000;
+
+	/** Keep things quiet. */
+	static {
+		JAI.getDefaultInstance().setImagingListener(
+				new NonNoisyImagingListener());
+	}
+
+	private final String imagePath;
+	private final ImageUploadThumbnailer thumbnailer;
+
+	public ImageUploaderThumbnailerTester_2(String imagePath,
+			CropDataSet cropDataSet) {
+		this.imagePath = imagePath;
+		this.thumbnailer = new ImageUploadThumbnailer(200, 200);
+
+		setTitle("Cropping edging test");
+		addWindowListener(new CloseWindowListener());
+		setLayout(new GridLayout(ROWS, COLUMNS));
+
+		for (CropData cropData : cropDataSet.crops()) {
+			add(createImagePanel(cropData));
+		}
+
+		pack();
+		setVisible(true);
+	}
+
+	private Component createImagePanel(CropData cropData) {
+		RenderedOp image = createCroppedImage(cropData);
+
+
+		Set<String> blackSides = checkBlackEdges(image);
+		if (!blackSides.isEmpty()) {
+			log.warn("edges  at " + cropData + ", " + blackSides);
+		}
+
+		String legend = "left=" + cropData.left + ", top=" + cropData.top
+				+ ", size=" + cropData.size;
+		Label l = new Label();
+		l.setAlignment(Label.CENTER);
+		if (!blackSides.isEmpty()) {
+			l.setBackground(new Color(0xFFDDDD));
+			legend += " " + blackSides;
+		}
+		l.setText(legend);
+
+		JPanel p = new JPanel();
+		p.setLayout(new BorderLayout());
+		p.add("South", l);
+		p.add("Center", new ImageCanvas(image));
+		p.setBackground(new Color(0xFFFFFF));
+		p.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+
+		return p;
+	}
+
+	private RenderedOp createCroppedImage(CropData cropData) {
+		try {
+			InputStream mainStream = new FileInputStream(imagePath);
+			CropRectangle rectangle = new CropRectangle(cropData.left,
+					cropData.top, cropData.size, cropData.size);
+			InputStream thumbnailStream = thumbnailer.cropAndScale(mainStream,
+					rectangle);
+
+			return StreamDescriptor.create(new MemoryCacheSeekableStream(
+					thumbnailStream), null, null);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	private Set<String> checkBlackEdges(RenderedOp image) {
+		Raster imageData = image.getData();
+
+		int minX = imageData.getMinX();
+		int minY = imageData.getMinY();
+		int maxX = minX + imageData.getWidth() - 1;
+		int maxY = minY + imageData.getHeight() - 1;
+
+		Set<String> blackSides = new HashSet<String>();
+		if (isBlackEdge(minX, minX, minY, maxY, imageData)) {
+			blackSides.add("left");
+		}
+		if (isBlackEdge(minX, maxX, minY, minY, imageData)) {
+			blackSides.add("top");
+		}
+		if (isBlackEdge(maxX, maxX, minY, maxY, imageData)) {
+			blackSides.add("right");
+		}
+		if (isBlackEdge(minX, maxX, maxY, maxY, imageData)) {
+			blackSides.add("bottom");
+		}
+		return blackSides;
+	}
+
+	private boolean isBlackEdge(int fromX, int toX, int fromY, int toY,
+			Raster imageData) {
+		int edgeTotal = 0;
+		try {
+			for (int col = fromX; col <= toX; col++) {
+				for (int row = fromY; row <= toY; row++) {
+					edgeTotal += sumPixel(imageData, col, row);
+				}
+			}
+		} catch (Exception e) {
+			log.error("can't sum edge: fromX=" + fromX + ", toX=" + toX
+					+ ", fromY=" + fromY + ", toY=" + toY + ", imageWidth="
+					+ imageData.getWidth() + ", imageHeight="
+					+ imageData.getHeight() + ": " + e);
+		}
+
+		log.debug("edge total = " + edgeTotal);
+		return edgeTotal < EDGE_THRESHOLD;
+	}
+
+	private int sumPixel(Raster imageData, int col, int row) {
+		int pixelSum = 0;
+		int[] pixel = imageData.getPixel(col, row, new int[0]);
+		for (int value : pixel) {
+			pixelSum += value;
+		}
+		return pixelSum;
+	}
+
+	/**
+	 * <pre>
+	 * The plan:
+	 * 
+	 * Provide the path to an image file.
+	 * Figure how many images can fit on the screen.
+	 * Crop in increments, starting at 0,0 and varying the size of the crop.
+	 * Crop in increments, incrementing from 0,0 downward, and varying the size of the crop.
+	 * 
+	 * Start by creating 4 x 4 images in a window, and incrementing from 201 to 216.
+	 * </pre>
+	 */
+
+	public static void main(String[] args) {
+		Logger rootLogger = Logger.getRootLogger();
+		Appender appender = (Appender) rootLogger.getAllAppenders()
+				.nextElement();
+		appender.setLayout(new PatternLayout("%-5p [%c{1}] %m%n"));
+
+		Logger.getLogger(ImageUploadThumbnailer.class).setLevel(Level.DEBUG);
+		Logger.getLogger(ImageUploaderThumbnailerTester_2.class).setLevel(
+				Level.INFO);
+
+		CropDataSet cropDataSet = new CropDataSet();
+		for (int i = 0; i < ROWS * COLUMNS; i++) {
+//			cropDataSet.add(i, i, 201 + i);
+			cropDataSet.add(0, 0, 201 + i);
+		}
+
+		new ImageUploaderThumbnailerTester_2(
+				"C:/Users/jeb228/Pictures/wheel.png", cropDataSet);
+
+//		new ImageUploaderThumbnailerTester_2(
+//				"C:/Users/jeb228/Pictures/DSC04203w-trans.jpg", cropDataSet);
+
+		//		new ImageUploaderThumbnailerTester_2(
+//				"C:/Development/JIRA issues/NIHVIVO-2477 Black borders on thumbnails/"
+//				+ "images from Alex/uploads/file_storage_root/a~n/411/9/"
+//				+ "De^20Bartolome^2c^20Charles^20A^20M_100037581.jpg",
+//				cropDataSet);
+	}
+
+	// ----------------------------------------------------------------------
+	// helper classes
+	// ----------------------------------------------------------------------
+
+	private class CloseWindowListener extends WindowAdapter {
+		@Override
+		public void windowClosing(WindowEvent e) {
+			setVisible(false);
+			dispose();
+			System.exit(0);
+		}
+	}
+
+	public static class CropDataSet {
+		private final List<CropData> crops = new ArrayList<CropData>();
+
+		CropDataSet add(int left, int top, int size) {
+			crops.add(new CropData(left, top, size));
+			return this;
+		}
+
+		Collection<CropData> crops() {
+			return Collections.unmodifiableCollection(crops);
+		}
+
+		public static class CropData {
+			final int left;
+			final int top;
+			final int size;
+
+			CropData(int left, int top, int size) {
+				this.left = left;
+				this.top = top;
+				this.size = size;
+			}
+
+			@Override
+			public String toString() {
+				return "CropData[" + left + ", " + top + ", " + size + "]";
+			}
+		}
+	}
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitroTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitroTest.java
index 4893d359c..e5bae17fe 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitroTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/NewURIMakerVitroTest.java
@@ -1,111 +1,111 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-package edu.cornell.mannlib.vitro.webapp.dao;
-
-import static org.junit.Assert.*;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.junit.Test;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.vocabulary.OWL;
-import com.hp.hpl.jena.vocabulary.RDF;
-
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.SimpleOntModelSelector;
-import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena;
-
-public class NewURIMakerVitroTest extends AbstractTestClass{
-
-	@Test
-	public void testMultipleNewURIs() {
-		//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", 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>();       
-		try {
-			for (String key : newResources.keySet()) {
-	           String prefix = newResources.get(key);
-	           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>();       
-		try {
-			for (String key : newResources.keySet()) {
-	           String prefix = newResources.get(key);
-	           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.add(
-				ontModel.createResource(defaultNamespace + "n234"),
-				RDF.type, 
-				OWL.Thing);
-		ontModel.add(
-				ontModel.createResource(testNamespace + "n234"),
-				RDF.type, 
-				OWL.Thing);
-		OntModelSelector selector = new SimpleOntModelSelector(ontModel);
-		//Set up default namespace somewhere?
-		WebappDaoFactoryConfig config = new WebappDaoFactoryConfig();
-        config.setDefaultNamespace(defaultNamespace);
-		//Set up some test uris
-		WebappDaoFactoryJena wadf = new WebappDaoFactoryJena(selector, config);
-		return wadf;
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+package edu.cornell.mannlib.vitro.webapp.dao;
+
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.junit.Test;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.vocabulary.OWL;
+import com.hp.hpl.jena.vocabulary.RDF;
+
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.OntModelSelector;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.SimpleOntModelSelector;
+import edu.cornell.mannlib.vitro.webapp.dao.jena.WebappDaoFactoryJena;
+
+public class NewURIMakerVitroTest extends AbstractTestClass{
+
+	@Test
+	public void testMultipleNewURIs() {
+		//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", 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>();       
+		try {
+			for (String key : newResources.keySet()) {
+	           String prefix = newResources.get(key);
+	           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>();       
+		try {
+			for (String key : newResources.keySet()) {
+	           String prefix = newResources.get(key);
+	           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.add(
+				ontModel.createResource(defaultNamespace + "n234"),
+				RDF.type, 
+				OWL.Thing);
+		ontModel.add(
+				ontModel.createResource(testNamespace + "n234"),
+				RDF.type, 
+				OWL.Thing);
+		OntModelSelector selector = new SimpleOntModelSelector(ontModel);
+		//Set up default namespace somewhere?
+		WebappDaoFactoryConfig config = new WebappDaoFactoryConfig();
+        config.setDefaultNamespace(defaultNamespace);
+		//Set up some test uris
+		WebappDaoFactoryJena wadf = new WebappDaoFactoryJena(selector, config);
+		return wadf;
+	}
+
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringByStatementTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringByStatementTest.java
index b1a765f38..fa9d35530 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringByStatementTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/filtering/IndividualFilteringByStatementTest.java
@@ -1,800 +1,800 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.dao.filtering;
-
-import static junit.framework.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import net.sf.jga.fn.UnaryFunctor;
-
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import stubs.edu.cornell.mannlib.vitro.webapp.beans.IndividualStub;
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
-import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
-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
- *    DATA_VISIBLE -- always approved
- *    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. 
- *    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.
- */
-public class IndividualFilteringByStatementTest extends AbstractTestClass {
-	private static final String URI_INDIVIDUAL_SPECIAL = "specialUri";
-	private static final String URI_SUBJECT = "subject";
-
-	private static final String PROPERTY_DATA_HIDDEN = "hiddenDataProperty";
-	private static final String PROPERTY_DATA_VISIBLE = "visibleDataProperty";
-	private static final String PROPERTY_DATA_MAYBE = "maybeDataProperty";
-
-	private static final String PROPERTY_OBJECT_HIDDEN = "hiddenObjectProperty";
-	private static final String PROPERTY_OBJECT_VISIBLE = "visibleObjectProperty";
-	private static final String PROPERTY_OBJECT_MAYBE = "maybeObjectProperty";
-
-	private static final String VALUE_HIDDEN_DATA_SPECIAL = "hidden data on special";
-	private static final String VALUE_VISIBLE_DATA_SPECIAL = "visible data on special";
-	private static final String VALUE_MAYBE_DATA_SPECIAL = "maybe data on special";
-
-	private static final String URI_HIDDEN_OBJECT_SPECIAL = "object://hidden_on_special";
-	private static final String URI_VISIBLE_OBJECT_SPECIAL = "object://visible_on_special";
-	private static final String URI_MAYBE_OBJECT_SPECIAL = "object://maybe_on_special";
-
-	private static final String VALUE_HIDDEN_DATA_ORDINARY = "hidden data on ordinary";
-	private static final String VALUE_VISIBLE_DATA_ORDINARY = "visible data on ordinary";
-	private static final String VALUE_MAYBE_DATA_ORDINARY = "maybe data on ordinary";
-
-	private static final String URI_HIDDEN_OBJECT_ORDINARY = "object://hidden_on_ordinary";
-	private static final String URI_VISIBLE_OBJECT_ORDINARY = "object://visible_on_ordinary";
-	private static final String URI_MAYBE_OBJECT_ORDINARY = "object://maybe_on_ordinary";
-
-	private Individual filteredSpecial;
-	private Individual filteredOrdinary;
-
-	@Before
-	public void createIndividuals() {
-		IndividualStub indSpecial = new IndividualStub(URI_INDIVIDUAL_SPECIAL);
-
-		indSpecial.addDataPropertyStatement(PROPERTY_DATA_HIDDEN,
-				VALUE_HIDDEN_DATA_SPECIAL);
-		indSpecial.addDataPropertyStatement(PROPERTY_DATA_VISIBLE,
-				VALUE_VISIBLE_DATA_SPECIAL);
-		indSpecial.addDataPropertyStatement(PROPERTY_DATA_MAYBE,
-				VALUE_MAYBE_DATA_SPECIAL);
-
-		indSpecial.addObjectPropertyStatement(PROPERTY_OBJECT_HIDDEN,
-				URI_HIDDEN_OBJECT_SPECIAL);
-		indSpecial.addObjectPropertyStatement(PROPERTY_OBJECT_VISIBLE,
-				URI_VISIBLE_OBJECT_SPECIAL);
-		indSpecial.addObjectPropertyStatement(PROPERTY_OBJECT_MAYBE,
-				URI_MAYBE_OBJECT_SPECIAL);
-
-		filteredSpecial = new IndividualFiltering(indSpecial,
-				new IndividualBasedFilter());
-
-		IndividualStub indOrdinary = new IndividualStub("someOtherUri");
-
-		indOrdinary.addDataPropertyStatement(PROPERTY_DATA_HIDDEN,
-				VALUE_HIDDEN_DATA_ORDINARY);
-		indOrdinary.addDataPropertyStatement(PROPERTY_DATA_VISIBLE,
-				VALUE_VISIBLE_DATA_ORDINARY);
-		indOrdinary.addDataPropertyStatement(PROPERTY_DATA_MAYBE,
-				VALUE_MAYBE_DATA_ORDINARY);
-
-		indOrdinary.addObjectPropertyStatement(PROPERTY_OBJECT_HIDDEN,
-				URI_HIDDEN_OBJECT_ORDINARY);
-		indOrdinary.addObjectPropertyStatement(PROPERTY_OBJECT_VISIBLE,
-				URI_VISIBLE_OBJECT_ORDINARY);
-		indOrdinary.addObjectPropertyStatement(PROPERTY_OBJECT_MAYBE,
-				URI_MAYBE_OBJECT_ORDINARY);
-
-		filteredOrdinary = new IndividualFiltering(indOrdinary,
-				new IndividualBasedFilter());
-	}
-
-	// ----------------------------------------------------------------------
-	// Tests on data properties
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void onSpecial_getDataPropertyStatements() {
-		List<DataPropertyStatement> expected = dpsList(filteredSpecial,
-				dps(PROPERTY_DATA_MAYBE, VALUE_MAYBE_DATA_SPECIAL),
-				dps(PROPERTY_DATA_VISIBLE, VALUE_VISIBLE_DATA_SPECIAL));
-		List<DataPropertyStatement> actual = filteredSpecial
-				.getDataPropertyStatements();
-		assertEquivalentDpsList("data property statements", expected, actual);
-	}
-
-	@Test
-	public void onOrdinary_getDataPropertyStatements() {
-		List<DataPropertyStatement> expected = dpsList(filteredOrdinary,
-				dps(PROPERTY_DATA_VISIBLE, VALUE_VISIBLE_DATA_ORDINARY));
-		List<DataPropertyStatement> actual = filteredOrdinary
-				.getDataPropertyStatements();
-		assertEquivalentDpsList("data property statements", expected, actual);
-	}
-
-	@Test
-	public void onSpecial_getDataPropertyStatementsByProperty() {
-		List<DataPropertyStatement> visibleExpected = dpsList(filteredSpecial,
-				dps(PROPERTY_DATA_VISIBLE, VALUE_VISIBLE_DATA_SPECIAL));
-		List<DataPropertyStatement> visibleActual = filteredSpecial
-				.getDataPropertyStatements(PROPERTY_DATA_VISIBLE);
-		assertEquivalentDpsList("visible", visibleExpected, visibleActual);
-
-		List<DataPropertyStatement> hiddenExpected = Collections.emptyList();
-		List<DataPropertyStatement> hiddenActual = filteredSpecial
-				.getDataPropertyStatements(PROPERTY_DATA_HIDDEN);
-		assertEquivalentDpsList("hidden", hiddenExpected, hiddenActual);
-
-		List<DataPropertyStatement> maybeExpected = dpsList(filteredSpecial,
-				dps(PROPERTY_DATA_MAYBE, VALUE_MAYBE_DATA_SPECIAL));
-		List<DataPropertyStatement> maybeActual = filteredSpecial
-				.getDataPropertyStatements(PROPERTY_DATA_MAYBE);
-		assertEquivalentDpsList("maybe", maybeExpected, maybeActual);
-	}
-
-	@Test
-	public void onOrdinary_getDataPropertyStatementsByProperty() {
-		List<DataPropertyStatement> visibleExpected = dpsList(filteredOrdinary,
-				dps(PROPERTY_DATA_VISIBLE, VALUE_VISIBLE_DATA_ORDINARY));
-		List<DataPropertyStatement> visibleActual = filteredOrdinary
-				.getDataPropertyStatements(PROPERTY_DATA_VISIBLE);
-		assertEquivalentDpsList("visible", visibleExpected, visibleActual);
-
-		List<DataPropertyStatement> hiddenExpected = Collections.emptyList();
-		List<DataPropertyStatement> hiddenActual = filteredOrdinary
-				.getDataPropertyStatements(PROPERTY_DATA_HIDDEN);
-		assertEquivalentDpsList("hidden", hiddenExpected, hiddenActual);
-
-		List<DataPropertyStatement> maybeExpected = Collections.emptyList();
-		List<DataPropertyStatement> maybeActual = filteredOrdinary
-				.getDataPropertyStatements(PROPERTY_DATA_MAYBE);
-		assertEquivalentDpsList("maybe", maybeExpected, maybeActual);
-	}
-
-	@Test
-	public void onSpecial_getDataPropertyStatement() {
-		DataPropertyStatement visibleExpected = dps(filteredSpecial.getURI(),
-				PROPERTY_DATA_VISIBLE, VALUE_VISIBLE_DATA_SPECIAL);
-		DataPropertyStatement visibleActual = filteredSpecial
-				.getDataPropertyStatement(PROPERTY_DATA_VISIBLE);
-		assertEquivalentDps("visible", visibleExpected, visibleActual);
-
-		DataPropertyStatement hiddenExpected = null;
-		DataPropertyStatement hiddenActual = filteredSpecial
-				.getDataPropertyStatement(PROPERTY_DATA_HIDDEN);
-		assertEquivalentDps("hidden", hiddenExpected, hiddenActual);
-
-		DataPropertyStatement maybeExpected = dps(filteredSpecial.getURI(),
-				PROPERTY_DATA_MAYBE, VALUE_MAYBE_DATA_SPECIAL);
-		DataPropertyStatement maybeActual = filteredSpecial
-				.getDataPropertyStatement(PROPERTY_DATA_MAYBE);
-		assertEquivalentDps("maybe", maybeExpected, maybeActual);
-	}
-
-	@Test
-	public void onOrdinary_getDataPropertyStatement() {
-		DataPropertyStatement visibleExpected = dps(filteredOrdinary.getURI(),
-				PROPERTY_DATA_VISIBLE, VALUE_VISIBLE_DATA_ORDINARY);
-		DataPropertyStatement visibleActual = filteredOrdinary
-				.getDataPropertyStatement(PROPERTY_DATA_VISIBLE);
-		assertEquivalentDps("visible", visibleExpected, visibleActual);
-
-		DataPropertyStatement hiddenExpected = null;
-		DataPropertyStatement hiddenActual = filteredOrdinary
-				.getDataPropertyStatement(PROPERTY_DATA_HIDDEN);
-		assertEquivalentDps("hidden", hiddenExpected, hiddenActual);
-
-		DataPropertyStatement maybeExpected = null;
-		DataPropertyStatement maybeActual = filteredOrdinary
-				.getDataPropertyStatement(PROPERTY_DATA_MAYBE);
-		assertEquivalentDps("maybe", maybeExpected, maybeActual);
-	}
-
-	@Ignore
-	@Test
-	public void onSpecial_getDataPropertyList() {
-		fail("onSpecial_getDataPropertyList not implemented");
-	}
-
-	@Ignore
-	@Test
-	public void onOrdinary_getDataPropertyList() {
-		fail("onOrdinary_getDataPropertyList not implemented");
-	}
-
-	@Ignore
-	@Test
-	public void onSpecial_getPopulatedDataPropertyList() {
-		fail("onSpecial_getPopulatedDataPropertyList not implemented");
-	}
-
-	@Ignore
-	@Test
-	public void onOrdinary_getPopulatedDataPropertyList() {
-		fail("onOrdinary_getPopulatedDataPropertyList not implemented");
-	}
-
-	@Ignore
-	@Test
-	public void onSpecial_getDataPropertyMap() {
-		fail("onSpecial_getDataPropertyMap not implemented");
-	}
-
-	@Ignore
-	@Test
-	public void onOrdinary_getDataPropertyMap() {
-		fail("onOrdinary_getDataPropertyMap not implemented");
-	}
-
-	// ----------------------------------------------------------------------
-	// Tests on object properties
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void onSpecial_getObjectPropertyStatementsByProperty() {
-		List<ObjectPropertyStatement> visibleExpected = opsList(
-				filteredSpecial,
-				ops(PROPERTY_OBJECT_VISIBLE, URI_VISIBLE_OBJECT_SPECIAL));
-		List<ObjectPropertyStatement> visibleActual = filteredSpecial
-				.getObjectPropertyStatements(PROPERTY_OBJECT_VISIBLE);
-		assertEquivalentOpsList("visible", visibleExpected, visibleActual);
-
-		List<ObjectPropertyStatement> hiddenExpected = Collections.emptyList();
-		List<ObjectPropertyStatement> hiddenActual = filteredSpecial
-				.getObjectPropertyStatements(PROPERTY_OBJECT_HIDDEN);
-		assertEquivalentOpsList("hidden", hiddenExpected, hiddenActual);
-
-		List<ObjectPropertyStatement> maybeExpected = opsList(filteredSpecial,
-				ops(PROPERTY_OBJECT_MAYBE, URI_MAYBE_OBJECT_SPECIAL));
-		List<ObjectPropertyStatement> maybeActual = filteredSpecial
-				.getObjectPropertyStatements(PROPERTY_OBJECT_MAYBE);
-		assertEquivalentOpsList("maybe", maybeExpected, maybeActual);
-	}
-
-	@Test
-	public void onOrdinary_getObjectPropertyStatementsByProperty() {
-		List<ObjectPropertyStatement> visibleExpected = opsList(
-				filteredOrdinary,
-				ops(PROPERTY_OBJECT_VISIBLE, URI_VISIBLE_OBJECT_ORDINARY));
-		List<ObjectPropertyStatement> visibleActual = filteredOrdinary
-				.getObjectPropertyStatements(PROPERTY_OBJECT_VISIBLE);
-		assertEquivalentOpsList("visible", visibleExpected, visibleActual);
-
-		List<ObjectPropertyStatement> hiddenExpected = Collections.emptyList();
-		List<ObjectPropertyStatement> hiddenActual = filteredOrdinary
-				.getObjectPropertyStatements(PROPERTY_OBJECT_HIDDEN);
-		assertEquivalentOpsList("hidden", hiddenExpected, hiddenActual);
-
-		List<ObjectPropertyStatement> maybeExpected = Collections.emptyList();
-		List<ObjectPropertyStatement> maybeActual = filteredOrdinary
-				.getObjectPropertyStatements(PROPERTY_OBJECT_MAYBE);
-		assertEquivalentOpsList("maybe", maybeExpected, maybeActual);
-	}
-
-	@Test
-	public void onSpecial_getObjectPropertyStatements() {
-		List<ObjectPropertyStatement> expected = opsList(filteredSpecial,
-				ops(PROPERTY_OBJECT_MAYBE, URI_MAYBE_OBJECT_SPECIAL),
-				ops(PROPERTY_OBJECT_VISIBLE, URI_VISIBLE_OBJECT_SPECIAL));
-		List<ObjectPropertyStatement> actual = filteredSpecial
-				.getObjectPropertyStatements();
-		assertEquivalentOpsList("object property statements", expected, actual);
-	}
-
-	@Test
-	public void onOrdinary_getObjectPropertyStatements() {
-		List<ObjectPropertyStatement> expected = opsList(filteredOrdinary,
-				ops(PROPERTY_OBJECT_VISIBLE, URI_VISIBLE_OBJECT_ORDINARY));
-		List<ObjectPropertyStatement> actual = filteredOrdinary
-				.getObjectPropertyStatements();
-		assertEquivalentOpsList("object property statements", expected, actual);
-	}
-
-	@Ignore
-	@Test
-	public void onSpecial_getObjectPropertyMap() {
-		fail("onSpecial_getObjectPropertyMap not implemented");
-	}
-
-	@Ignore
-	@Test
-	public void onOrdinary_getObjectPropertyMap() {
-		fail("onOrdinary_getObjectPropertyMap not implemented");
-	}
-
-	@Ignore
-	@Test
-	public void onSpecial_getObjectPropertyList() {
-		fail("onSpecial_getObjectPropertyList not implemented");
-	}
-
-	@Ignore
-	@Test
-	public void onOrdinary_getObjectPropertyList() {
-		fail("onOrdinary_getObjectPropertyList not implemented");
-	}
-
-	@Ignore
-	@Test
-	public void onSpecial_getPopulatedObjectPropertyList() {
-		fail("onSpecial_getPopulatedObjectPropertyList not implemented");
-	}
-
-	@Ignore
-	@Test
-	public void onOrdinary_getPopulatedObjectPropertyList() {
-		fail("onOrdinary_getPopulatedObjectPropertyList not implemented");
-	}
-
-	// ----------------------------------------------------------------------
-	// Helper methods
-	// ----------------------------------------------------------------------
-
-	private DataPropertyStatement dps(String propertyUri, String value) {
-		return dps("", propertyUri, value);
-	}
-
-	private DataPropertyStatement dps(String subjectUri, String propertyUri,
-			String value) {
-		return new DPS(subjectUri, propertyUri, value);
-	}
-
-	private List<DataPropertyStatement> dpsList(Individual ind,
-			DataPropertyStatement... dpsArray) {
-		List<DataPropertyStatement> list = new ArrayList<DataPropertyStatement>();
-		for (DataPropertyStatement dps : dpsArray) {
-			list.add(new DPS(ind.getURI(), dps.getDatapropURI(), dps.getData()));
-		}
-		return list;
-	}
-
-	private void assertEquivalentDpsList(String label,
-			Collection<DataPropertyStatement> expected,
-			Collection<DataPropertyStatement> actual) {
-		Set<DPS> expectedSet = new HashSet<DPS>();
-		for (DataPropertyStatement dps : expected) {
-			expectedSet.add(new DPS(dps));
-		}
-
-		Set<DPS> actualSet = new HashSet<DPS>();
-		for (DataPropertyStatement dps : actual) {
-			actualSet.add(new DPS(dps));
-		}
-
-		assertEquals(label, expectedSet, actualSet);
-	}
-
-	private void assertEquivalentDps(String label,
-			DataPropertyStatement expected, DataPropertyStatement actual) {
-		DPS expectedDps = (expected == null) ? null : new DPS(expected);
-		DPS actualDps = (actual == null) ? null : new DPS(actual);
-		assertEquals(label, expectedDps, actualDps);
-	}
-
-	private ObjectPropertyStatement ops(String propertyUri, String objectUri) {
-		return ops("", propertyUri, objectUri);
-	}
-
-	private ObjectPropertyStatement ops(String subjectUri, String propertyUri,
-			String objectUri) {
-		return new OPS(subjectUri, propertyUri, objectUri);
-	}
-
-	private List<ObjectPropertyStatement> opsList(Individual ind,
-			ObjectPropertyStatement... opsArray) {
-		List<ObjectPropertyStatement> list = new ArrayList<ObjectPropertyStatement>();
-		for (ObjectPropertyStatement ops : opsArray) {
-			list.add(new OPS(ind.getURI(), ops.getPropertyURI(), ops
-					.getObjectURI()));
-		}
-		return list;
-	}
-
-	private void assertEquivalentOpsList(String label,
-			Collection<ObjectPropertyStatement> expected,
-			Collection<ObjectPropertyStatement> actual) {
-		Set<OPS> expectedSet = new HashSet<OPS>();
-		for (ObjectPropertyStatement ops : expected) {
-			expectedSet.add(new OPS(ops));
-		}
-		Set<OPS> actualSet = new HashSet<OPS>();
-		for (ObjectPropertyStatement ops : actual) {
-			actualSet.add(new OPS(ops));
-		}
-
-		assertEquals(label, expectedSet, actualSet);
-	}
-
-	// ----------------------------------------------------------------------
-	// Helper classes
-	// ----------------------------------------------------------------------
-
-	private static class DPS implements DataPropertyStatement {
-		// ----------------------------------------------------------------------
-		// Stub infrastructure
-		// ----------------------------------------------------------------------
-
-		private final String subjectUri;
-		private final String predicateUri;
-		private final String value;
-
-		public DPS(String subjectUri, String predicateUri, String value) {
-			this.subjectUri = subjectUri;
-			this.predicateUri = predicateUri;
-			this.value = value;
-		}
-
-		public DPS(DataPropertyStatement dps) {
-			this(dps.getIndividualURI(), dps.getDatapropURI(), dps.getData());
-		}
-
-		// ----------------------------------------------------------------------
-		// Stub methods
-		// ----------------------------------------------------------------------
-
-		@Override
-		public String getIndividualURI() {
-			return subjectUri;
-		}
-
-		@Override
-		public String getDatapropURI() {
-			return predicateUri;
-		}
-
-		@Override
-		public String getData() {
-			return value;
-		}
-
-		@Override
-		public int hashCode() {
-			return subjectUri.hashCode() ^ predicateUri.hashCode()
-					^ value.hashCode();
-		}
-
-		@Override
-		public boolean equals(Object obj) {
-			if (!(obj instanceof DPS)) {
-				return false;
-			}
-			DPS that = (DPS) obj;
-			return this.subjectUri.equals(that.subjectUri)
-					&& this.predicateUri.equals(that.predicateUri)
-					&& this.value.equals(that.value);
-		}
-
-		@Override
-		public String toString() {
-			return "DPS[" + subjectUri + ", " + predicateUri + ", " + value
-					+ "]";
-		}
-
-		// ----------------------------------------------------------------------
-		// Un-implemented methods
-		// ----------------------------------------------------------------------
-
-		@Override
-		public Individual getIndividual() {
-			throw new RuntimeException(
-					"DataPropertyStatement.getIndividual() not implemented.");
-		}
-
-		@Override
-		public void setIndividual(Individual individual) {
-			throw new RuntimeException(
-					"DataPropertyStatement.setIndividual() not implemented.");
-		}
-
-		@Override
-		public void setIndividualURI(String individualURI) {
-			throw new RuntimeException(
-					"DataPropertyStatement.setIndividualURI() not implemented.");
-		}
-
-		@Override
-		public void setData(String data) {
-			throw new RuntimeException(
-					"DataPropertyStatement.setData() not implemented.");
-		}
-
-		@Override
-		public void setDatapropURI(String propertyURI) {
-			throw new RuntimeException(
-					"DataPropertyStatement.setDatapropURI() not implemented.");
-		}
-
-		@Override
-		public String getDatatypeURI() {
-			throw new RuntimeException(
-					"DataPropertyStatement.getDatatypeURI() not implemented.");
-		}
-
-		@Override
-		public void setDatatypeURI(String datatypeURI) {
-			throw new RuntimeException(
-					"DataPropertyStatement.setDatatypeURI() not implemented.");
-		}
-
-		@Override
-		public String getLanguage() {
-			throw new RuntimeException(
-					"DataPropertyStatement.getLanguage() not implemented.");
-		}
-
-		@Override
-		public void setLanguage(String language) {
-			throw new RuntimeException(
-					"DataPropertyStatement.setLanguage() not implemented.");
-		}
-
-		@Override
-		public String getString() {
-			throw new RuntimeException(
-					"DataPropertyStatement.getString() not implemented.");
-		}
-
-	}
-
-	private static class OPS implements ObjectPropertyStatement {
-		// ----------------------------------------------------------------------
-		// Stub infrastructure
-		// ----------------------------------------------------------------------
-
-		private final String subjectUri;
-		private final String predicateUri;
-		private final String objectUri;
-
-		public OPS(String subjectUri, String predicateUri, String objectUri) {
-			this.subjectUri = subjectUri;
-			this.predicateUri = predicateUri;
-			this.objectUri = objectUri;
-		}
-
-		public OPS(ObjectPropertyStatement ops) {
-			this(ops.getSubjectURI(), ops.getPropertyURI(), ops.getObjectURI());
-		}
-
-		// ----------------------------------------------------------------------
-		// Stub methods
-		// ----------------------------------------------------------------------
-
-		@Override
-		public String getSubjectURI() {
-			return subjectUri;
-		}
-
-		@Override
-		public String getPropertyURI() {
-			return predicateUri;
-		}
-
-		@Override
-		public String getObjectURI() {
-			return objectUri;
-		}
-
-		@Override
-		public int hashCode() {
-			return subjectUri.hashCode() ^ predicateUri.hashCode()
-					^ objectUri.hashCode();
-		}
-
-		@Override
-		public boolean equals(Object obj) {
-			if (!(obj instanceof OPS)) {
-				return false;
-			}
-			OPS that = (OPS) obj;
-			return this.subjectUri.equals(that.subjectUri)
-					&& this.predicateUri.equals(that.predicateUri)
-					&& this.objectUri.equals(that.objectUri);
-		}
-
-		@Override
-		public String toString() {
-			return "OPS[" + subjectUri + ", " + predicateUri + ", " + objectUri
-					+ "]";
-		}
-
-		// ----------------------------------------------------------------------
-		// Un-implemented methods
-		// ----------------------------------------------------------------------
-
-		@Override
-		public void setSubjectURI(String subjectURI) {
-			throw new RuntimeException(
-					"ObjectPropertyStatement.setSubjectURI() not implemented.");
-		}
-
-		@Override
-		public void setObjectURI(String objectURI) {
-			throw new RuntimeException(
-					"ObjectPropertyStatement.setObjectURI() not implemented.");
-		}
-
-		@Override
-		public Individual getSubject() {
-			throw new RuntimeException(
-					"ObjectPropertyStatement.getSubject() not implemented.");
-		}
-
-		@Override
-		public void setSubject(Individual subject) {
-			throw new RuntimeException(
-					"ObjectPropertyStatement.setSubject() not implemented.");
-		}
-
-		@Override
-		public ObjectProperty getProperty() {
-			throw new RuntimeException(
-					"ObjectPropertyStatement.getProperty() not implemented.");
-		}
-
-		@Override
-		public void setProperty(ObjectProperty property) {
-			throw new RuntimeException(
-					"ObjectPropertyStatement.setProperty() not implemented.");
-		}
-
-		@Override
-		public Individual getObject() {
-			throw new RuntimeException(
-					"ObjectPropertyStatement.getObject() not implemented.");
-		}
-
-		@Override
-		public void setObject(Individual object) {
-			throw new RuntimeException(
-					"ObjectPropertyStatement.setObject() not implemented.");
-		}
-
-		@Override
-		public void setPropertyURI(String URI) {
-			throw new RuntimeException(
-					"ObjectPropertyStatement.setPropertyURI() not implemented.");
-		}
-
-		@Override
-		public PropertyInstance toPropertyInstance() {
-			throw new RuntimeException(
-					"ObjectPropertyStatement.toPropertyInstance() not implemented.");
-		}
-
-	}
-
-	private static class IndividualBasedFilter implements VitroFilters {
-		// ----------------------------------------------------------------------
-		// Stub infrastructure
-		// ----------------------------------------------------------------------
-
-		private static class DataPropertyStatementFilter extends
-				UnaryFunctor<DataPropertyStatement, Boolean> {
-			@Override
-			public Boolean fn(DataPropertyStatement dps) {
-				if (PROPERTY_DATA_VISIBLE.equals(dps.getDatapropURI())) {
-					return true;
-				}
-				if (PROPERTY_DATA_MAYBE.equals(dps.getDatapropURI())
-						&& URI_INDIVIDUAL_SPECIAL
-								.equals(dps.getIndividualURI())) {
-					return true;
-				}
-				return false;
-			}
-		}
-
-		private static class ObjectPropertyStatementFilter extends
-				UnaryFunctor<ObjectPropertyStatement, Boolean> {
-			@Override
-			public Boolean fn(ObjectPropertyStatement ops) {
-				if (PROPERTY_OBJECT_VISIBLE.equals(ops.getPropertyURI())) {
-					return true;
-				}
-				if (PROPERTY_OBJECT_MAYBE.equals(ops.getPropertyURI())
-						&& URI_INDIVIDUAL_SPECIAL.equals(ops.getSubjectURI())) {
-					return true;
-				}
-				return false;
-			}
-		}
-
-		// ----------------------------------------------------------------------
-		// Stub methods
-		// ----------------------------------------------------------------------
-
-		@Override
-		public UnaryFunctor<DataPropertyStatement, Boolean> getDataPropertyStatementFilter() {
-			return new DataPropertyStatementFilter();
-		}
-
-		@Override
-		public UnaryFunctor<ObjectPropertyStatement, Boolean> getObjectPropertyStatementFilter() {
-			return new ObjectPropertyStatementFilter();
-		}
-
-		// ----------------------------------------------------------------------
-		// Un-implemented methods
-		// ----------------------------------------------------------------------
-
-		@Override
-		public VitroFilters and(VitroFilters other) {
-			throw new RuntimeException("VitroFilters.and() not implemented.");
-		}
-
-		@Override
-		public UnaryFunctor<Individual, Boolean> getIndividualFilter() {
-			throw new RuntimeException(
-					"VitroFilters.getIndividualFilter() not implemented.");
-		}
-
-		@Override
-		public UnaryFunctor<DataProperty, Boolean> getDataPropertyFilter() {
-			throw new RuntimeException(
-					"VitroFilters.getDataPropertyFilter() not implemented.");
-		}
-
-		@Override
-		public UnaryFunctor<ObjectProperty, Boolean> getObjectPropertyFilter() {
-			throw new RuntimeException(
-					"VitroFilters.getObjectPropertyFilter() not implemented.");
-		}
-
-		@Override
-		public UnaryFunctor<VClass, Boolean> getClassFilter() {
-			throw new RuntimeException(
-					"VitroFilters.getClassFilter() not implemented.");
-		}
-
-		@Override
-		public UnaryFunctor<VClassGroup, Boolean> getVClassGroupFilter() {
-			throw new RuntimeException(
-					"VitroFilters.getVClassGroupFilter() not implemented.");
-		}
-
-		@Override
-		public UnaryFunctor<PropertyGroup, Boolean> getPropertyGroupFilter() {
-			throw new RuntimeException(
-					"VitroFilters.getPropertyGroupFilter() not implemented.");
-		}
-
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao.filtering;
+
+import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import net.sf.jga.fn.UnaryFunctor;
+
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import stubs.edu.cornell.mannlib.vitro.webapp.beans.IndividualStub;
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.PropertyGroup;
+import edu.cornell.mannlib.vitro.webapp.beans.PropertyInstance;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
+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
+ *    DATA_VISIBLE -- always approved
+ *    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. 
+ *    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.
+ */
+public class IndividualFilteringByStatementTest extends AbstractTestClass {
+	private static final String URI_INDIVIDUAL_SPECIAL = "specialUri";
+	private static final String URI_SUBJECT = "subject";
+
+	private static final String PROPERTY_DATA_HIDDEN = "hiddenDataProperty";
+	private static final String PROPERTY_DATA_VISIBLE = "visibleDataProperty";
+	private static final String PROPERTY_DATA_MAYBE = "maybeDataProperty";
+
+	private static final String PROPERTY_OBJECT_HIDDEN = "hiddenObjectProperty";
+	private static final String PROPERTY_OBJECT_VISIBLE = "visibleObjectProperty";
+	private static final String PROPERTY_OBJECT_MAYBE = "maybeObjectProperty";
+
+	private static final String VALUE_HIDDEN_DATA_SPECIAL = "hidden data on special";
+	private static final String VALUE_VISIBLE_DATA_SPECIAL = "visible data on special";
+	private static final String VALUE_MAYBE_DATA_SPECIAL = "maybe data on special";
+
+	private static final String URI_HIDDEN_OBJECT_SPECIAL = "object://hidden_on_special";
+	private static final String URI_VISIBLE_OBJECT_SPECIAL = "object://visible_on_special";
+	private static final String URI_MAYBE_OBJECT_SPECIAL = "object://maybe_on_special";
+
+	private static final String VALUE_HIDDEN_DATA_ORDINARY = "hidden data on ordinary";
+	private static final String VALUE_VISIBLE_DATA_ORDINARY = "visible data on ordinary";
+	private static final String VALUE_MAYBE_DATA_ORDINARY = "maybe data on ordinary";
+
+	private static final String URI_HIDDEN_OBJECT_ORDINARY = "object://hidden_on_ordinary";
+	private static final String URI_VISIBLE_OBJECT_ORDINARY = "object://visible_on_ordinary";
+	private static final String URI_MAYBE_OBJECT_ORDINARY = "object://maybe_on_ordinary";
+
+	private Individual filteredSpecial;
+	private Individual filteredOrdinary;
+
+	@Before
+	public void createIndividuals() {
+		IndividualStub indSpecial = new IndividualStub(URI_INDIVIDUAL_SPECIAL);
+
+		indSpecial.addDataPropertyStatement(PROPERTY_DATA_HIDDEN,
+				VALUE_HIDDEN_DATA_SPECIAL);
+		indSpecial.addDataPropertyStatement(PROPERTY_DATA_VISIBLE,
+				VALUE_VISIBLE_DATA_SPECIAL);
+		indSpecial.addDataPropertyStatement(PROPERTY_DATA_MAYBE,
+				VALUE_MAYBE_DATA_SPECIAL);
+
+		indSpecial.addObjectPropertyStatement(PROPERTY_OBJECT_HIDDEN,
+				URI_HIDDEN_OBJECT_SPECIAL);
+		indSpecial.addObjectPropertyStatement(PROPERTY_OBJECT_VISIBLE,
+				URI_VISIBLE_OBJECT_SPECIAL);
+		indSpecial.addObjectPropertyStatement(PROPERTY_OBJECT_MAYBE,
+				URI_MAYBE_OBJECT_SPECIAL);
+
+		filteredSpecial = new IndividualFiltering(indSpecial,
+				new IndividualBasedFilter());
+
+		IndividualStub indOrdinary = new IndividualStub("someOtherUri");
+
+		indOrdinary.addDataPropertyStatement(PROPERTY_DATA_HIDDEN,
+				VALUE_HIDDEN_DATA_ORDINARY);
+		indOrdinary.addDataPropertyStatement(PROPERTY_DATA_VISIBLE,
+				VALUE_VISIBLE_DATA_ORDINARY);
+		indOrdinary.addDataPropertyStatement(PROPERTY_DATA_MAYBE,
+				VALUE_MAYBE_DATA_ORDINARY);
+
+		indOrdinary.addObjectPropertyStatement(PROPERTY_OBJECT_HIDDEN,
+				URI_HIDDEN_OBJECT_ORDINARY);
+		indOrdinary.addObjectPropertyStatement(PROPERTY_OBJECT_VISIBLE,
+				URI_VISIBLE_OBJECT_ORDINARY);
+		indOrdinary.addObjectPropertyStatement(PROPERTY_OBJECT_MAYBE,
+				URI_MAYBE_OBJECT_ORDINARY);
+
+		filteredOrdinary = new IndividualFiltering(indOrdinary,
+				new IndividualBasedFilter());
+	}
+
+	// ----------------------------------------------------------------------
+	// Tests on data properties
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void onSpecial_getDataPropertyStatements() {
+		List<DataPropertyStatement> expected = dpsList(filteredSpecial,
+				dps(PROPERTY_DATA_MAYBE, VALUE_MAYBE_DATA_SPECIAL),
+				dps(PROPERTY_DATA_VISIBLE, VALUE_VISIBLE_DATA_SPECIAL));
+		List<DataPropertyStatement> actual = filteredSpecial
+				.getDataPropertyStatements();
+		assertEquivalentDpsList("data property statements", expected, actual);
+	}
+
+	@Test
+	public void onOrdinary_getDataPropertyStatements() {
+		List<DataPropertyStatement> expected = dpsList(filteredOrdinary,
+				dps(PROPERTY_DATA_VISIBLE, VALUE_VISIBLE_DATA_ORDINARY));
+		List<DataPropertyStatement> actual = filteredOrdinary
+				.getDataPropertyStatements();
+		assertEquivalentDpsList("data property statements", expected, actual);
+	}
+
+	@Test
+	public void onSpecial_getDataPropertyStatementsByProperty() {
+		List<DataPropertyStatement> visibleExpected = dpsList(filteredSpecial,
+				dps(PROPERTY_DATA_VISIBLE, VALUE_VISIBLE_DATA_SPECIAL));
+		List<DataPropertyStatement> visibleActual = filteredSpecial
+				.getDataPropertyStatements(PROPERTY_DATA_VISIBLE);
+		assertEquivalentDpsList("visible", visibleExpected, visibleActual);
+
+		List<DataPropertyStatement> hiddenExpected = Collections.emptyList();
+		List<DataPropertyStatement> hiddenActual = filteredSpecial
+				.getDataPropertyStatements(PROPERTY_DATA_HIDDEN);
+		assertEquivalentDpsList("hidden", hiddenExpected, hiddenActual);
+
+		List<DataPropertyStatement> maybeExpected = dpsList(filteredSpecial,
+				dps(PROPERTY_DATA_MAYBE, VALUE_MAYBE_DATA_SPECIAL));
+		List<DataPropertyStatement> maybeActual = filteredSpecial
+				.getDataPropertyStatements(PROPERTY_DATA_MAYBE);
+		assertEquivalentDpsList("maybe", maybeExpected, maybeActual);
+	}
+
+	@Test
+	public void onOrdinary_getDataPropertyStatementsByProperty() {
+		List<DataPropertyStatement> visibleExpected = dpsList(filteredOrdinary,
+				dps(PROPERTY_DATA_VISIBLE, VALUE_VISIBLE_DATA_ORDINARY));
+		List<DataPropertyStatement> visibleActual = filteredOrdinary
+				.getDataPropertyStatements(PROPERTY_DATA_VISIBLE);
+		assertEquivalentDpsList("visible", visibleExpected, visibleActual);
+
+		List<DataPropertyStatement> hiddenExpected = Collections.emptyList();
+		List<DataPropertyStatement> hiddenActual = filteredOrdinary
+				.getDataPropertyStatements(PROPERTY_DATA_HIDDEN);
+		assertEquivalentDpsList("hidden", hiddenExpected, hiddenActual);
+
+		List<DataPropertyStatement> maybeExpected = Collections.emptyList();
+		List<DataPropertyStatement> maybeActual = filteredOrdinary
+				.getDataPropertyStatements(PROPERTY_DATA_MAYBE);
+		assertEquivalentDpsList("maybe", maybeExpected, maybeActual);
+	}
+
+	@Test
+	public void onSpecial_getDataPropertyStatement() {
+		DataPropertyStatement visibleExpected = dps(filteredSpecial.getURI(),
+				PROPERTY_DATA_VISIBLE, VALUE_VISIBLE_DATA_SPECIAL);
+		DataPropertyStatement visibleActual = filteredSpecial
+				.getDataPropertyStatement(PROPERTY_DATA_VISIBLE);
+		assertEquivalentDps("visible", visibleExpected, visibleActual);
+
+		DataPropertyStatement hiddenExpected = null;
+		DataPropertyStatement hiddenActual = filteredSpecial
+				.getDataPropertyStatement(PROPERTY_DATA_HIDDEN);
+		assertEquivalentDps("hidden", hiddenExpected, hiddenActual);
+
+		DataPropertyStatement maybeExpected = dps(filteredSpecial.getURI(),
+				PROPERTY_DATA_MAYBE, VALUE_MAYBE_DATA_SPECIAL);
+		DataPropertyStatement maybeActual = filteredSpecial
+				.getDataPropertyStatement(PROPERTY_DATA_MAYBE);
+		assertEquivalentDps("maybe", maybeExpected, maybeActual);
+	}
+
+	@Test
+	public void onOrdinary_getDataPropertyStatement() {
+		DataPropertyStatement visibleExpected = dps(filteredOrdinary.getURI(),
+				PROPERTY_DATA_VISIBLE, VALUE_VISIBLE_DATA_ORDINARY);
+		DataPropertyStatement visibleActual = filteredOrdinary
+				.getDataPropertyStatement(PROPERTY_DATA_VISIBLE);
+		assertEquivalentDps("visible", visibleExpected, visibleActual);
+
+		DataPropertyStatement hiddenExpected = null;
+		DataPropertyStatement hiddenActual = filteredOrdinary
+				.getDataPropertyStatement(PROPERTY_DATA_HIDDEN);
+		assertEquivalentDps("hidden", hiddenExpected, hiddenActual);
+
+		DataPropertyStatement maybeExpected = null;
+		DataPropertyStatement maybeActual = filteredOrdinary
+				.getDataPropertyStatement(PROPERTY_DATA_MAYBE);
+		assertEquivalentDps("maybe", maybeExpected, maybeActual);
+	}
+
+	@Ignore
+	@Test
+	public void onSpecial_getDataPropertyList() {
+		fail("onSpecial_getDataPropertyList not implemented");
+	}
+
+	@Ignore
+	@Test
+	public void onOrdinary_getDataPropertyList() {
+		fail("onOrdinary_getDataPropertyList not implemented");
+	}
+
+	@Ignore
+	@Test
+	public void onSpecial_getPopulatedDataPropertyList() {
+		fail("onSpecial_getPopulatedDataPropertyList not implemented");
+	}
+
+	@Ignore
+	@Test
+	public void onOrdinary_getPopulatedDataPropertyList() {
+		fail("onOrdinary_getPopulatedDataPropertyList not implemented");
+	}
+
+	@Ignore
+	@Test
+	public void onSpecial_getDataPropertyMap() {
+		fail("onSpecial_getDataPropertyMap not implemented");
+	}
+
+	@Ignore
+	@Test
+	public void onOrdinary_getDataPropertyMap() {
+		fail("onOrdinary_getDataPropertyMap not implemented");
+	}
+
+	// ----------------------------------------------------------------------
+	// Tests on object properties
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void onSpecial_getObjectPropertyStatementsByProperty() {
+		List<ObjectPropertyStatement> visibleExpected = opsList(
+				filteredSpecial,
+				ops(PROPERTY_OBJECT_VISIBLE, URI_VISIBLE_OBJECT_SPECIAL));
+		List<ObjectPropertyStatement> visibleActual = filteredSpecial
+				.getObjectPropertyStatements(PROPERTY_OBJECT_VISIBLE);
+		assertEquivalentOpsList("visible", visibleExpected, visibleActual);
+
+		List<ObjectPropertyStatement> hiddenExpected = Collections.emptyList();
+		List<ObjectPropertyStatement> hiddenActual = filteredSpecial
+				.getObjectPropertyStatements(PROPERTY_OBJECT_HIDDEN);
+		assertEquivalentOpsList("hidden", hiddenExpected, hiddenActual);
+
+		List<ObjectPropertyStatement> maybeExpected = opsList(filteredSpecial,
+				ops(PROPERTY_OBJECT_MAYBE, URI_MAYBE_OBJECT_SPECIAL));
+		List<ObjectPropertyStatement> maybeActual = filteredSpecial
+				.getObjectPropertyStatements(PROPERTY_OBJECT_MAYBE);
+		assertEquivalentOpsList("maybe", maybeExpected, maybeActual);
+	}
+
+	@Test
+	public void onOrdinary_getObjectPropertyStatementsByProperty() {
+		List<ObjectPropertyStatement> visibleExpected = opsList(
+				filteredOrdinary,
+				ops(PROPERTY_OBJECT_VISIBLE, URI_VISIBLE_OBJECT_ORDINARY));
+		List<ObjectPropertyStatement> visibleActual = filteredOrdinary
+				.getObjectPropertyStatements(PROPERTY_OBJECT_VISIBLE);
+		assertEquivalentOpsList("visible", visibleExpected, visibleActual);
+
+		List<ObjectPropertyStatement> hiddenExpected = Collections.emptyList();
+		List<ObjectPropertyStatement> hiddenActual = filteredOrdinary
+				.getObjectPropertyStatements(PROPERTY_OBJECT_HIDDEN);
+		assertEquivalentOpsList("hidden", hiddenExpected, hiddenActual);
+
+		List<ObjectPropertyStatement> maybeExpected = Collections.emptyList();
+		List<ObjectPropertyStatement> maybeActual = filteredOrdinary
+				.getObjectPropertyStatements(PROPERTY_OBJECT_MAYBE);
+		assertEquivalentOpsList("maybe", maybeExpected, maybeActual);
+	}
+
+	@Test
+	public void onSpecial_getObjectPropertyStatements() {
+		List<ObjectPropertyStatement> expected = opsList(filteredSpecial,
+				ops(PROPERTY_OBJECT_MAYBE, URI_MAYBE_OBJECT_SPECIAL),
+				ops(PROPERTY_OBJECT_VISIBLE, URI_VISIBLE_OBJECT_SPECIAL));
+		List<ObjectPropertyStatement> actual = filteredSpecial
+				.getObjectPropertyStatements();
+		assertEquivalentOpsList("object property statements", expected, actual);
+	}
+
+	@Test
+	public void onOrdinary_getObjectPropertyStatements() {
+		List<ObjectPropertyStatement> expected = opsList(filteredOrdinary,
+				ops(PROPERTY_OBJECT_VISIBLE, URI_VISIBLE_OBJECT_ORDINARY));
+		List<ObjectPropertyStatement> actual = filteredOrdinary
+				.getObjectPropertyStatements();
+		assertEquivalentOpsList("object property statements", expected, actual);
+	}
+
+	@Ignore
+	@Test
+	public void onSpecial_getObjectPropertyMap() {
+		fail("onSpecial_getObjectPropertyMap not implemented");
+	}
+
+	@Ignore
+	@Test
+	public void onOrdinary_getObjectPropertyMap() {
+		fail("onOrdinary_getObjectPropertyMap not implemented");
+	}
+
+	@Ignore
+	@Test
+	public void onSpecial_getObjectPropertyList() {
+		fail("onSpecial_getObjectPropertyList not implemented");
+	}
+
+	@Ignore
+	@Test
+	public void onOrdinary_getObjectPropertyList() {
+		fail("onOrdinary_getObjectPropertyList not implemented");
+	}
+
+	@Ignore
+	@Test
+	public void onSpecial_getPopulatedObjectPropertyList() {
+		fail("onSpecial_getPopulatedObjectPropertyList not implemented");
+	}
+
+	@Ignore
+	@Test
+	public void onOrdinary_getPopulatedObjectPropertyList() {
+		fail("onOrdinary_getPopulatedObjectPropertyList not implemented");
+	}
+
+	// ----------------------------------------------------------------------
+	// Helper methods
+	// ----------------------------------------------------------------------
+
+	private DataPropertyStatement dps(String propertyUri, String value) {
+		return dps("", propertyUri, value);
+	}
+
+	private DataPropertyStatement dps(String subjectUri, String propertyUri,
+			String value) {
+		return new DPS(subjectUri, propertyUri, value);
+	}
+
+	private List<DataPropertyStatement> dpsList(Individual ind,
+			DataPropertyStatement... dpsArray) {
+		List<DataPropertyStatement> list = new ArrayList<DataPropertyStatement>();
+		for (DataPropertyStatement dps : dpsArray) {
+			list.add(new DPS(ind.getURI(), dps.getDatapropURI(), dps.getData()));
+		}
+		return list;
+	}
+
+	private void assertEquivalentDpsList(String label,
+			Collection<DataPropertyStatement> expected,
+			Collection<DataPropertyStatement> actual) {
+		Set<DPS> expectedSet = new HashSet<DPS>();
+		for (DataPropertyStatement dps : expected) {
+			expectedSet.add(new DPS(dps));
+		}
+
+		Set<DPS> actualSet = new HashSet<DPS>();
+		for (DataPropertyStatement dps : actual) {
+			actualSet.add(new DPS(dps));
+		}
+
+		assertEquals(label, expectedSet, actualSet);
+	}
+
+	private void assertEquivalentDps(String label,
+			DataPropertyStatement expected, DataPropertyStatement actual) {
+		DPS expectedDps = (expected == null) ? null : new DPS(expected);
+		DPS actualDps = (actual == null) ? null : new DPS(actual);
+		assertEquals(label, expectedDps, actualDps);
+	}
+
+	private ObjectPropertyStatement ops(String propertyUri, String objectUri) {
+		return ops("", propertyUri, objectUri);
+	}
+
+	private ObjectPropertyStatement ops(String subjectUri, String propertyUri,
+			String objectUri) {
+		return new OPS(subjectUri, propertyUri, objectUri);
+	}
+
+	private List<ObjectPropertyStatement> opsList(Individual ind,
+			ObjectPropertyStatement... opsArray) {
+		List<ObjectPropertyStatement> list = new ArrayList<ObjectPropertyStatement>();
+		for (ObjectPropertyStatement ops : opsArray) {
+			list.add(new OPS(ind.getURI(), ops.getPropertyURI(), ops
+					.getObjectURI()));
+		}
+		return list;
+	}
+
+	private void assertEquivalentOpsList(String label,
+			Collection<ObjectPropertyStatement> expected,
+			Collection<ObjectPropertyStatement> actual) {
+		Set<OPS> expectedSet = new HashSet<OPS>();
+		for (ObjectPropertyStatement ops : expected) {
+			expectedSet.add(new OPS(ops));
+		}
+		Set<OPS> actualSet = new HashSet<OPS>();
+		for (ObjectPropertyStatement ops : actual) {
+			actualSet.add(new OPS(ops));
+		}
+
+		assertEquals(label, expectedSet, actualSet);
+	}
+
+	// ----------------------------------------------------------------------
+	// Helper classes
+	// ----------------------------------------------------------------------
+
+	private static class DPS implements DataPropertyStatement {
+		// ----------------------------------------------------------------------
+		// Stub infrastructure
+		// ----------------------------------------------------------------------
+
+		private final String subjectUri;
+		private final String predicateUri;
+		private final String value;
+
+		public DPS(String subjectUri, String predicateUri, String value) {
+			this.subjectUri = subjectUri;
+			this.predicateUri = predicateUri;
+			this.value = value;
+		}
+
+		public DPS(DataPropertyStatement dps) {
+			this(dps.getIndividualURI(), dps.getDatapropURI(), dps.getData());
+		}
+
+		// ----------------------------------------------------------------------
+		// Stub methods
+		// ----------------------------------------------------------------------
+
+		@Override
+		public String getIndividualURI() {
+			return subjectUri;
+		}
+
+		@Override
+		public String getDatapropURI() {
+			return predicateUri;
+		}
+
+		@Override
+		public String getData() {
+			return value;
+		}
+
+		@Override
+		public int hashCode() {
+			return subjectUri.hashCode() ^ predicateUri.hashCode()
+					^ value.hashCode();
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (!(obj instanceof DPS)) {
+				return false;
+			}
+			DPS that = (DPS) obj;
+			return this.subjectUri.equals(that.subjectUri)
+					&& this.predicateUri.equals(that.predicateUri)
+					&& this.value.equals(that.value);
+		}
+
+		@Override
+		public String toString() {
+			return "DPS[" + subjectUri + ", " + predicateUri + ", " + value
+					+ "]";
+		}
+
+		// ----------------------------------------------------------------------
+		// Un-implemented methods
+		// ----------------------------------------------------------------------
+
+		@Override
+		public Individual getIndividual() {
+			throw new RuntimeException(
+					"DataPropertyStatement.getIndividual() not implemented.");
+		}
+
+		@Override
+		public void setIndividual(Individual individual) {
+			throw new RuntimeException(
+					"DataPropertyStatement.setIndividual() not implemented.");
+		}
+
+		@Override
+		public void setIndividualURI(String individualURI) {
+			throw new RuntimeException(
+					"DataPropertyStatement.setIndividualURI() not implemented.");
+		}
+
+		@Override
+		public void setData(String data) {
+			throw new RuntimeException(
+					"DataPropertyStatement.setData() not implemented.");
+		}
+
+		@Override
+		public void setDatapropURI(String propertyURI) {
+			throw new RuntimeException(
+					"DataPropertyStatement.setDatapropURI() not implemented.");
+		}
+
+		@Override
+		public String getDatatypeURI() {
+			throw new RuntimeException(
+					"DataPropertyStatement.getDatatypeURI() not implemented.");
+		}
+
+		@Override
+		public void setDatatypeURI(String datatypeURI) {
+			throw new RuntimeException(
+					"DataPropertyStatement.setDatatypeURI() not implemented.");
+		}
+
+		@Override
+		public String getLanguage() {
+			throw new RuntimeException(
+					"DataPropertyStatement.getLanguage() not implemented.");
+		}
+
+		@Override
+		public void setLanguage(String language) {
+			throw new RuntimeException(
+					"DataPropertyStatement.setLanguage() not implemented.");
+		}
+
+		@Override
+		public String getString() {
+			throw new RuntimeException(
+					"DataPropertyStatement.getString() not implemented.");
+		}
+
+	}
+
+	private static class OPS implements ObjectPropertyStatement {
+		// ----------------------------------------------------------------------
+		// Stub infrastructure
+		// ----------------------------------------------------------------------
+
+		private final String subjectUri;
+		private final String predicateUri;
+		private final String objectUri;
+
+		public OPS(String subjectUri, String predicateUri, String objectUri) {
+			this.subjectUri = subjectUri;
+			this.predicateUri = predicateUri;
+			this.objectUri = objectUri;
+		}
+
+		public OPS(ObjectPropertyStatement ops) {
+			this(ops.getSubjectURI(), ops.getPropertyURI(), ops.getObjectURI());
+		}
+
+		// ----------------------------------------------------------------------
+		// Stub methods
+		// ----------------------------------------------------------------------
+
+		@Override
+		public String getSubjectURI() {
+			return subjectUri;
+		}
+
+		@Override
+		public String getPropertyURI() {
+			return predicateUri;
+		}
+
+		@Override
+		public String getObjectURI() {
+			return objectUri;
+		}
+
+		@Override
+		public int hashCode() {
+			return subjectUri.hashCode() ^ predicateUri.hashCode()
+					^ objectUri.hashCode();
+		}
+
+		@Override
+		public boolean equals(Object obj) {
+			if (!(obj instanceof OPS)) {
+				return false;
+			}
+			OPS that = (OPS) obj;
+			return this.subjectUri.equals(that.subjectUri)
+					&& this.predicateUri.equals(that.predicateUri)
+					&& this.objectUri.equals(that.objectUri);
+		}
+
+		@Override
+		public String toString() {
+			return "OPS[" + subjectUri + ", " + predicateUri + ", " + objectUri
+					+ "]";
+		}
+
+		// ----------------------------------------------------------------------
+		// Un-implemented methods
+		// ----------------------------------------------------------------------
+
+		@Override
+		public void setSubjectURI(String subjectURI) {
+			throw new RuntimeException(
+					"ObjectPropertyStatement.setSubjectURI() not implemented.");
+		}
+
+		@Override
+		public void setObjectURI(String objectURI) {
+			throw new RuntimeException(
+					"ObjectPropertyStatement.setObjectURI() not implemented.");
+		}
+
+		@Override
+		public Individual getSubject() {
+			throw new RuntimeException(
+					"ObjectPropertyStatement.getSubject() not implemented.");
+		}
+
+		@Override
+		public void setSubject(Individual subject) {
+			throw new RuntimeException(
+					"ObjectPropertyStatement.setSubject() not implemented.");
+		}
+
+		@Override
+		public ObjectProperty getProperty() {
+			throw new RuntimeException(
+					"ObjectPropertyStatement.getProperty() not implemented.");
+		}
+
+		@Override
+		public void setProperty(ObjectProperty property) {
+			throw new RuntimeException(
+					"ObjectPropertyStatement.setProperty() not implemented.");
+		}
+
+		@Override
+		public Individual getObject() {
+			throw new RuntimeException(
+					"ObjectPropertyStatement.getObject() not implemented.");
+		}
+
+		@Override
+		public void setObject(Individual object) {
+			throw new RuntimeException(
+					"ObjectPropertyStatement.setObject() not implemented.");
+		}
+
+		@Override
+		public void setPropertyURI(String URI) {
+			throw new RuntimeException(
+					"ObjectPropertyStatement.setPropertyURI() not implemented.");
+		}
+
+		@Override
+		public PropertyInstance toPropertyInstance() {
+			throw new RuntimeException(
+					"ObjectPropertyStatement.toPropertyInstance() not implemented.");
+		}
+
+	}
+
+	private static class IndividualBasedFilter implements VitroFilters {
+		// ----------------------------------------------------------------------
+		// Stub infrastructure
+		// ----------------------------------------------------------------------
+
+		private static class DataPropertyStatementFilter extends
+				UnaryFunctor<DataPropertyStatement, Boolean> {
+			@Override
+			public Boolean fn(DataPropertyStatement dps) {
+				if (PROPERTY_DATA_VISIBLE.equals(dps.getDatapropURI())) {
+					return true;
+				}
+				if (PROPERTY_DATA_MAYBE.equals(dps.getDatapropURI())
+						&& URI_INDIVIDUAL_SPECIAL
+								.equals(dps.getIndividualURI())) {
+					return true;
+				}
+				return false;
+			}
+		}
+
+		private static class ObjectPropertyStatementFilter extends
+				UnaryFunctor<ObjectPropertyStatement, Boolean> {
+			@Override
+			public Boolean fn(ObjectPropertyStatement ops) {
+				if (PROPERTY_OBJECT_VISIBLE.equals(ops.getPropertyURI())) {
+					return true;
+				}
+				if (PROPERTY_OBJECT_MAYBE.equals(ops.getPropertyURI())
+						&& URI_INDIVIDUAL_SPECIAL.equals(ops.getSubjectURI())) {
+					return true;
+				}
+				return false;
+			}
+		}
+
+		// ----------------------------------------------------------------------
+		// Stub methods
+		// ----------------------------------------------------------------------
+
+		@Override
+		public UnaryFunctor<DataPropertyStatement, Boolean> getDataPropertyStatementFilter() {
+			return new DataPropertyStatementFilter();
+		}
+
+		@Override
+		public UnaryFunctor<ObjectPropertyStatement, Boolean> getObjectPropertyStatementFilter() {
+			return new ObjectPropertyStatementFilter();
+		}
+
+		// ----------------------------------------------------------------------
+		// Un-implemented methods
+		// ----------------------------------------------------------------------
+
+		@Override
+		public VitroFilters and(VitroFilters other) {
+			throw new RuntimeException("VitroFilters.and() not implemented.");
+		}
+
+		@Override
+		public UnaryFunctor<Individual, Boolean> getIndividualFilter() {
+			throw new RuntimeException(
+					"VitroFilters.getIndividualFilter() not implemented.");
+		}
+
+		@Override
+		public UnaryFunctor<DataProperty, Boolean> getDataPropertyFilter() {
+			throw new RuntimeException(
+					"VitroFilters.getDataPropertyFilter() not implemented.");
+		}
+
+		@Override
+		public UnaryFunctor<ObjectProperty, Boolean> getObjectPropertyFilter() {
+			throw new RuntimeException(
+					"VitroFilters.getObjectPropertyFilter() not implemented.");
+		}
+
+		@Override
+		public UnaryFunctor<VClass, Boolean> getClassFilter() {
+			throw new RuntimeException(
+					"VitroFilters.getClassFilter() not implemented.");
+		}
+
+		@Override
+		public UnaryFunctor<VClassGroup, Boolean> getVClassGroupFilter() {
+			throw new RuntimeException(
+					"VitroFilters.getVClassGroupFilter() not implemented.");
+		}
+
+		@Override
+		public UnaryFunctor<PropertyGroup, Boolean> getPropertyGroupFilter() {
+			throw new RuntimeException(
+					"VitroFilters.getPropertyGroupFilter() not implemented.");
+		}
+
+	}
+
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao_2_Test.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao_2_Test.java
index a49ad273b..4b00a1028 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao_2_Test.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDao_2_Test.java
@@ -1,138 +1,138 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.dao.jena;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.log4j.Level;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-
-/**
- * Another set of tests for JenaBaseDao.
- */
-public class JenaBaseDao_2_Test extends AbstractTestClass {
-	private static final String NS_MINE = "http://my.namespace.edu/";
-
-	private static final String EMPTY_RESOURCE_URI = NS_MINE + "emptyResource";
-	private static final String FULL_RESOURCE_URI = NS_MINE + "fullResource";
-
-	private static final String OLD_URI_1 = NS_MINE + "oldUri1";
-	private static final String OLD_URI_2 = NS_MINE + "oldUri2";
-	private static final String NEW_URI_1 = NS_MINE + "newUri1";
-	private static final String NEW_URI_2 = NS_MINE + "newUri2";
-	private static final String BOGUS_URI = "bogusUri";
-
-	private OntModel ontModel;
-
-	private Property prop1;
-
-	private Resource emptyResource;
-	private Resource fullResource;
-
-	private JenaBaseDao dao;
-
-	@Before
-	public void initializeThings() {
-		ontModel = ModelFactory.createOntologyModel();
-
-		prop1 = ontModel.createProperty("property1");
-
-		emptyResource = ontModel.createResource(EMPTY_RESOURCE_URI);
-
-		fullResource = ontModel.createResource(FULL_RESOURCE_URI);
-		ontModel.createStatement(fullResource, prop1,
-				ontModel.createResource(OLD_URI_1));
-		ontModel.createStatement(fullResource, prop1,
-				ontModel.createResource(OLD_URI_2));
-
-		WebappDaoFactoryJena wdfj = new WebappDaoFactoryJena(ontModel);
-		dao = new JenaBaseDao(wdfj);
-	}
-
-	// ----------------------------------------------------------------------
-	// tests of updatePropertyResourceURIValues()
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void updatePropertyResourceURIValuesFromNothing() {
-		updateAndConfirm(emptyResource, prop1,
-				buildSet(NEW_URI_1, NEW_URI_2));
-	}
-
-	@Test
-	public void updatePropertyResourceURIValuesToNothing() {
-		updateAndConfirm(fullResource, prop1, Collections.<String>emptySet());
-	}
-
-	@Test
-	public void updatePropertyResourceURIValuesNoChange() {
-		updateAndConfirm(fullResource, prop1,
-				buildSet(OLD_URI_1, OLD_URI_2));
-	}
-
-	@Test
-	public void updatePropertyResourceURIValuesReplaceSome() {
-		updateAndConfirm(fullResource, prop1,
-				buildSet(OLD_URI_1, NEW_URI_2));
-	}
-
-	@Test
-	public void updatePropertyResourceURIValuesReplaceAll() {
-		updateAndConfirm(fullResource, prop1, buildSet(NEW_URI_1));
-	}
-
-	@Test
-	public void updatePropertyResourceURIValuesTryToAddEmptyURI() {
-		Set<String> uris = buildSet("");
-		dao.updatePropertyResourceURIValues(emptyResource, prop1, uris,
-				ontModel);
-		assertExpectedUriValues("update URIs", emptyResource, prop1,
-				Collections.<String> emptySet());
-	}
-
-	@Test
-	public void updatePropertyResourceURIValuesTryToAddInvalidURI() {
-		setLoggerLevel(JenaBaseDao.class, Level.ERROR);
-		Set<String> uris = buildSet(BOGUS_URI);
-		dao.updatePropertyResourceURIValues(emptyResource, prop1, uris,
-				ontModel);
-		assertExpectedUriValues("update URIs", emptyResource, prop1,
-				Collections.<String> emptySet());
-	}
-
-	// ----------------------------------------------------------------------
-	// helper methods
-	// ----------------------------------------------------------------------
-
-	private void updateAndConfirm(Resource res, Property prop, Set<String> uris) {
-		dao.updatePropertyResourceURIValues(res, prop, uris, ontModel);
-		assertExpectedUriValues("update URIs", res, prop, uris);
-	}
-
-	private void assertExpectedUriValues(String message, Resource res,
-			Property prop, Set<String> expectedUris) {
-		Set<String> actualUris = new HashSet<String>();
-		StmtIterator stmts = ontModel.listStatements(res, prop, (RDFNode) null);
-		while (stmts.hasNext()) {
-			Statement stmt = stmts.next();
-			actualUris.add(stmt.getObject().asResource().getURI());
-		}
-
-		assertEquals(message, expectedUris, actualUris);
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao.jena;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.log4j.Level;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.rdf.model.StmtIterator;
+
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+
+/**
+ * Another set of tests for JenaBaseDao.
+ */
+public class JenaBaseDao_2_Test extends AbstractTestClass {
+	private static final String NS_MINE = "http://my.namespace.edu/";
+
+	private static final String EMPTY_RESOURCE_URI = NS_MINE + "emptyResource";
+	private static final String FULL_RESOURCE_URI = NS_MINE + "fullResource";
+
+	private static final String OLD_URI_1 = NS_MINE + "oldUri1";
+	private static final String OLD_URI_2 = NS_MINE + "oldUri2";
+	private static final String NEW_URI_1 = NS_MINE + "newUri1";
+	private static final String NEW_URI_2 = NS_MINE + "newUri2";
+	private static final String BOGUS_URI = "bogusUri";
+
+	private OntModel ontModel;
+
+	private Property prop1;
+
+	private Resource emptyResource;
+	private Resource fullResource;
+
+	private JenaBaseDao dao;
+
+	@Before
+	public void initializeThings() {
+		ontModel = ModelFactory.createOntologyModel();
+
+		prop1 = ontModel.createProperty("property1");
+
+		emptyResource = ontModel.createResource(EMPTY_RESOURCE_URI);
+
+		fullResource = ontModel.createResource(FULL_RESOURCE_URI);
+		ontModel.createStatement(fullResource, prop1,
+				ontModel.createResource(OLD_URI_1));
+		ontModel.createStatement(fullResource, prop1,
+				ontModel.createResource(OLD_URI_2));
+
+		WebappDaoFactoryJena wdfj = new WebappDaoFactoryJena(ontModel);
+		dao = new JenaBaseDao(wdfj);
+	}
+
+	// ----------------------------------------------------------------------
+	// tests of updatePropertyResourceURIValues()
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void updatePropertyResourceURIValuesFromNothing() {
+		updateAndConfirm(emptyResource, prop1,
+				buildSet(NEW_URI_1, NEW_URI_2));
+	}
+
+	@Test
+	public void updatePropertyResourceURIValuesToNothing() {
+		updateAndConfirm(fullResource, prop1, Collections.<String>emptySet());
+	}
+
+	@Test
+	public void updatePropertyResourceURIValuesNoChange() {
+		updateAndConfirm(fullResource, prop1,
+				buildSet(OLD_URI_1, OLD_URI_2));
+	}
+
+	@Test
+	public void updatePropertyResourceURIValuesReplaceSome() {
+		updateAndConfirm(fullResource, prop1,
+				buildSet(OLD_URI_1, NEW_URI_2));
+	}
+
+	@Test
+	public void updatePropertyResourceURIValuesReplaceAll() {
+		updateAndConfirm(fullResource, prop1, buildSet(NEW_URI_1));
+	}
+
+	@Test
+	public void updatePropertyResourceURIValuesTryToAddEmptyURI() {
+		Set<String> uris = buildSet("");
+		dao.updatePropertyResourceURIValues(emptyResource, prop1, uris,
+				ontModel);
+		assertExpectedUriValues("update URIs", emptyResource, prop1,
+				Collections.<String> emptySet());
+	}
+
+	@Test
+	public void updatePropertyResourceURIValuesTryToAddInvalidURI() {
+		setLoggerLevel(JenaBaseDao.class, Level.ERROR);
+		Set<String> uris = buildSet(BOGUS_URI);
+		dao.updatePropertyResourceURIValues(emptyResource, prop1, uris,
+				ontModel);
+		assertExpectedUriValues("update URIs", emptyResource, prop1,
+				Collections.<String> emptySet());
+	}
+
+	// ----------------------------------------------------------------------
+	// helper methods
+	// ----------------------------------------------------------------------
+
+	private void updateAndConfirm(Resource res, Property prop, Set<String> uris) {
+		dao.updatePropertyResourceURIValues(res, prop, uris, ontModel);
+		assertExpectedUriValues("update URIs", res, prop, uris);
+	}
+
+	private void assertExpectedUriValues(String message, Resource res,
+			Property prop, Set<String> expectedUris) {
+		Set<String> actualUris = new HashSet<String>();
+		StmtIterator stmts = ontModel.listStatements(res, prop, (RDFNode) null);
+		while (stmts.hasNext()) {
+			Statement stmt = stmts.next();
+			actualUris.add(stmt.getObject().asResource().getURI());
+		}
+
+		assertEquals(message, expectedUris, actualUris);
+	}
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java
index 60483298a..9fb85e73b 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/UserAccountsDaoJenaTest.java
@@ -1,518 +1,518 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.dao.jena;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.log4j.Level;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.RDFNode;
-import com.hp.hpl.jena.rdf.model.Statement;
-import com.hp.hpl.jena.rdf.model.StmtIterator;
-
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
-
-/**
- * TODO
- */
-public class UserAccountsDaoJenaTest extends AbstractTestClass {
-
-	private static final Set<String> EMPTY = Collections.<String> emptySet();
-
-	/**
-	 * Where the model statements are stored for this test.
-	 */
-	private static final String N3_DATA_FILENAME = "resources/UserAccountsDaoJenaTest.n3";
-
-	private static final String NS_MINE = "http://vivo.mydomain.edu/individual/";
-
-	private static final String URI_USER1 = NS_MINE + "user01";
-	private static final String URI_NO_SUCH_USER = NS_MINE + "bogusUser";
-
-	private static final String EMAIL_USER1 = "email@able.edu";
-	private static final String EMAIL_NO_SUCH_USER = NS_MINE
-			+ "bogus@email.com";
-
-	private static final String URI_ROLE1 = NS_MINE + "role1";
-	private static final String URI_ROLE2 = NS_MINE + "role2";
-	private static final String URI_ROLE3 = NS_MINE + "role3";
-
-	private static final String URI_PROFILE1 = NS_MINE + "profile1";
-	private static final String URI_PROFILE2 = NS_MINE + "profile2";
-
-	private OntModel ontModel;
-	private WebappDaoFactoryJena wadf;
-	private UserAccountsDaoJena dao;
-
-	private UserAccount user1;
-	private UserAccount userNew;
-
-	private UserAccount userA;
-	private UserAccount userB;
-	private UserAccount userC;
-
-	@Before
-	public void setup() throws IOException {
-		InputStream stream = UserAccountsDaoJenaTest.class
-				.getResourceAsStream(N3_DATA_FILENAME);
-		Model model = ModelFactory.createDefaultModel();
-		model.read(stream, null, "N3");
-		stream.close();
-
-		ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM,
-				model);
-		ontModel.prepare();
-
-		wadf = new WebappDaoFactoryJena(ontModel);
-		dao = new UserAccountsDaoJena(wadf);
-	}
-
-	@Before
-	public void createUserAccountValues() {
-		user1 = userAccount(URI_USER1, "email@able.edu", "Zack", "Roberts",
-				"garbage", "", 0L, false, 5, 12345678L, Status.ACTIVE, "user1",
-				false, collection(URI_ROLE1), false, EMPTY);
-		userNew = userAccount("", "email@here", "Joe", "Blow", "XXXX", "YYYY",
-				0L, false, 1, 0L, Status.ACTIVE, "jblow", false, EMPTY, false,
-				EMPTY);
-
-		userA = userAccount("", "aahern@here", "Alf", "Ahern", "XXXX", "YYYY",
-				0L, false, 1, 0L, Status.ACTIVE, "aahern", false, EMPTY, false,
-				collection(URI_PROFILE1));
-		userB = userAccount("", "email@here", "Betty", "Boop", "XXXX", "YYYY",
-				0L, false, 1, 0L, Status.ACTIVE, "bboop", false, EMPTY, false,
-				collection(URI_PROFILE1, URI_PROFILE2));
-		userC = userAccount("", "ccallas@here", "Charlie", "Callas", "XXXX",
-				"YYYY", 0L, false, 1, 0L, Status.ACTIVE, "ccallas", false,
-				EMPTY, false, collection(URI_PROFILE2));
-	}
-
-	// ----------------------------------------------------------------------
-	// Tests for UserAccount methods.
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void getUserAccountByUriSuccess() {
-		UserAccount u = dao.getUserAccountByUri(URI_USER1);
-		assertEqualAccounts(user1, u);
-	}
-
-	@Test
-	public void getUserAccountByUriNull() {
-		UserAccount u = dao.getUserAccountByUri(null);
-		assertNull("null result", u);
-	}
-
-	@Test
-	public void getUserAccountByUriNotFound() {
-		UserAccount u = dao.getUserAccountByUri("bogusUri");
-		assertNull("null result", u);
-	}
-
-	@Test
-	public void getUserAccountByUriWrongType() {
-		UserAccount u = dao.getUserAccountByUri(URI_ROLE1);
-		// System.out.println(u);
-		assertNull("null result", u);
-	}
-
-	@Test
-	public void getUserAccountByEmailSuccess() {
-		UserAccount u = dao.getUserAccountByEmail(EMAIL_USER1);
-		assertEquals("uri", URI_USER1, u.getUri());
-	}
-
-	@Test
-	public void getUserAccountByEmailNull() {
-		UserAccount u = dao.getUserAccountByEmail(null);
-		assertEquals("uri", null, u);
-	}
-
-	@Test
-	public void getUserAccountByEmailNotFound() {
-		UserAccount u = dao.getUserAccountByEmail(EMAIL_NO_SUCH_USER);
-		assertEquals("uri", null, u);
-	}
-
-	@Test
-	public void insertUserAccountSuccess() {
-		UserAccount raw = userAccount(userNew);
-		String uri = dao.insertUserAccount(raw);
-		UserAccount processed = dao.getUserAccountByUri(uri);
-		assertEqualAccounts(raw, processed);
-	}
-
-	@Test(expected = NullPointerException.class)
-	public void insertUserAccountNullUserAccount() {
-		dao.insertUserAccount(null);
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void insertUserAccountUriIsNotEmpty() {
-		UserAccount in = new UserAccount();
-		in.setUri(NS_MINE + "XXXXXX");
-
-		dao.insertUserAccount(in);
-	}
-
-	@Test
-	public void updateUserAccountSuccess() {
-		UserAccount orig = userAccount(URI_USER1, "updatedEmail@able.edu",
-				"Ezekiel", "Roberts", "differentHash", "oldHash", 1L, false,
-				43, 1020304050607080L, Status.ACTIVE, "updatedUser1", false,
-				collection(URI_ROLE1, URI_ROLE3), false, EMPTY);
-
-		dao.updateUserAccount(orig);
-
-		UserAccount updated = dao.getUserAccountByUri(URI_USER1);
-		assertEqualAccounts(orig, updated);
-	}
-
-	@Test(expected = NullPointerException.class)
-	public void updateUserAccountNullUserAccount() {
-		dao.updateUserAccount(null);
-	}
-
-	@Test(expected = IllegalArgumentException.class)
-	public void updateUserAccountDoesNotExist() {
-		UserAccount up = new UserAccount();
-		up.setUri(NS_MINE + "XXXXXX");
-
-		dao.updateUserAccount(up);
-	}
-
-	@Test
-	public void deleteUserAccountSuccess() {
-		dao.deleteUserAccount(URI_USER1);
-		StmtIterator stmts = ontModel.listStatements(
-				ontModel.getResource(URI_USER1), null, (RDFNode) null);
-		if (stmts.hasNext()) {
-			String message = "Expecting no statements to remain in the model, but found:\n";
-			while (stmts.hasNext()) {
-				message += "   " + formatStatement(stmts.next()) + "\n";
-			}
-			fail(message);
-		}
-	}
-
-	@Test
-	public void deleteUserAccountNullUri() {
-		// no complaint, no action.
-		dao.deleteUserAccount(null);
-	}
-
-	@Test
-	public void deleteUserAccountDoesNotExist() {
-		// no complaint, no action.
-		dao.deleteUserAccount(URI_NO_SUCH_USER);
-	}
-
-	@Test
-	public void insertUserAccountWithProxies() {
-		userNew.setProxiedIndividualUris(collection(
-				NS_MINE + "userNewProxyOne", NS_MINE + "userNewProxyTwo"));
-		String userUri = dao.insertUserAccount(userNew);
-
-		UserAccount inserted = dao.getUserAccountByUri(userUri);
-		assertEqualAccounts(userNew, inserted);
-	}
-
-	@Test
-	public void updateUserAccountWithProxies() {
-		UserAccount beforeAccount = dao.getUserAccountByUri(URI_USER1);
-		user1.setProxiedIndividualUris(collection(NS_MINE + "newProxyForUser1"));
-
-		dao.updateUserAccount(user1);
-
-		UserAccount updated = dao.getUserAccountByUri(URI_USER1);
-		assertEqualAccounts(user1, updated);
-	}
-
-	// ----------------------------------------------------------------------
-	// Tests for proxy-related methods
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void getProxyEditorsFirst() {
-		String profileOne = NS_MINE + "userNewProxyOne";
-		String profileTwo = NS_MINE + "userNewProxyTwo";
-		userNew.setProxiedIndividualUris(collection(profileOne, profileTwo));
-
-		String userUri = dao.insertUserAccount(userNew);
-		UserAccount user = dao.getUserAccountByUri(userUri);
-
-		assertExpectedAccountUris("proxy for profile one",
-				Collections.singleton(user),
-				dao.getUserAccountsWhoProxyForPage(profileOne));
-	}
-
-	@Test
-	public void getProxyEditorsSecond() {
-		String profileOne = NS_MINE + "userNewProxyOne";
-		String profileTwo = NS_MINE + "userNewProxyTwo";
-		userNew.setProxiedIndividualUris(collection(profileOne, profileTwo));
-
-		String userUri = dao.insertUserAccount(userNew);
-		UserAccount user = dao.getUserAccountByUri(userUri);
-
-		assertExpectedAccountUris("proxy for profile two",
-				Collections.singleton(user),
-				dao.getUserAccountsWhoProxyForPage(profileTwo));
-	}
-
-	@Test
-	public void getProxyEditorsBogus() {
-		String profileOne = NS_MINE + "userNewProxyOne";
-		String profileTwo = NS_MINE + "userNewProxyTwo";
-		String bogusProfile = NS_MINE + "bogus";
-		userNew.setProxiedIndividualUris(collection(profileOne, profileTwo));
-
-		dao.insertUserAccount(userNew);
-
-		assertExpectedAccountUris("proxy for bogus profile",
-				Collections.<UserAccount> emptySet(),
-				dao.getUserAccountsWhoProxyForPage(bogusProfile));
-	}
-
-	@Test
-	public void setProxyEditorsOnProfile() {
-		String uriA = dao.insertUserAccount(userA);
-		String uriB = dao.insertUserAccount(userB);
-		String uriC = dao.insertUserAccount(userC);
-
-		dao.setProxyAccountsOnProfile(URI_PROFILE1, collection(uriB, uriC));
-
-		assertExpectedProxies("userA", collection(),
-				dao.getUserAccountByUri(uriA).getProxiedIndividualUris());
-		assertExpectedProxies("userB", collection(URI_PROFILE1, URI_PROFILE2),
-				dao.getUserAccountByUri(uriB).getProxiedIndividualUris());
-		assertExpectedProxies("userC", collection(URI_PROFILE1, URI_PROFILE2),
-				dao.getUserAccountByUri(uriC).getProxiedIndividualUris());
-	}
-
-	// ----------------------------------------------------------------------
-	// Tests for PermissionSet methods
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void getPermissionSetByUriSuccess() {
-		PermissionSet ps = dao.getPermissionSetByUri(URI_ROLE1);
-		assertEquals("uri", URI_ROLE1, ps.getUri());
-		assertEquals("label", "Role 1", ps.getLabel());
-		assertEquals("permissionUris",
-				Collections.singleton(NS_MINE + "permissionA"),
-				ps.getPermissionUris());
-	}
-
-	@Test
-	public void getPermissionSetByUriNull() {
-		PermissionSet ps = dao.getPermissionSetByUri(null);
-		assertNull("null result", ps);
-	}
-
-	@Test
-	public void getPermissionSetByUriNotFound() {
-		PermissionSet ps = dao.getPermissionSetByUri("bogusUri");
-		assertNull("null result", ps);
-	}
-
-	@Test
-	public void getPermissionSetByUriWrongType() {
-		PermissionSet ps = dao.getPermissionSetByUri(URI_USER1);
-		assertNull("null result", ps);
-	}
-
-	@Test
-	public void getAllPermissionSets() {
-		setLoggerLevel(JenaBaseDao.class, Level.DEBUG);
-
-		Set<PermissionSet> expected = new HashSet<PermissionSet>();
-
-		PermissionSet ps1 = new PermissionSet();
-		ps1.setUri(URI_ROLE1);
-		ps1.setLabel("Role 1");
-		ps1.setPermissionUris(Collections.singleton(NS_MINE + "permissionA"));
-		expected.add(ps1);
-
-		PermissionSet ps2 = new PermissionSet();
-		ps2.setUri(URI_ROLE2);
-		ps2.setLabel("Role 2");
-		ps2.setForNewUsers(true);
-		expected.add(ps2);
-
-		PermissionSet ps3 = new PermissionSet();
-		ps3.setUri(URI_ROLE3);
-		ps3.setLabel("Role 3");
-		ps3.setForPublic(true);
-		expected.add(ps3);
-		
-		assertCorrectPermissionSets(expected, dao.getAllPermissionSets());
-	}
-
-	// ----------------------------------------------------------------------
-	// helper methods
-	// ----------------------------------------------------------------------
-
-	private Collection<String> collection(String... args) {
-		return Arrays.asList(args);
-	}
-
-	private UserAccount userAccount(String uri, String emailAddress,
-			String firstName, String lastName, String md5Password,
-			String oldPassword, long passwordLinkExpires,
-			boolean passwordChangeRequired, int loginCount, long lastLoginTime,
-			Status status, String externalAuthId, boolean externalAuthOnly,
-			Collection<String> permissionSetUris, boolean rootUser,
-			Collection<String> proxiedIndividualUris) {
-		UserAccount ua = new UserAccount();
-		ua.setUri(uri);
-		ua.setEmailAddress(emailAddress);
-		ua.setFirstName(firstName);
-		ua.setLastName(lastName);
-		ua.setMd5Password(md5Password);
-		ua.setOldPassword(oldPassword);
-		ua.setPasswordLinkExpires(passwordLinkExpires);
-		ua.setPasswordChangeRequired(passwordChangeRequired);
-		ua.setLoginCount(loginCount);
-		ua.setLastLoginTime(lastLoginTime);
-		ua.setStatus(status);
-		ua.setExternalAuthId(externalAuthId);
-		ua.setExternalAuthOnly(externalAuthOnly);
-		ua.setPermissionSetUris(permissionSetUris);
-		ua.setRootUser(rootUser);
-		ua.setProxiedIndividualUris(proxiedIndividualUris);
-		return ua;
-	}
-
-	private UserAccount userAccount(UserAccount in) {
-		UserAccount out = new UserAccount();
-		out.setUri(in.getUri());
-		out.setEmailAddress(in.getEmailAddress());
-		out.setFirstName(in.getFirstName());
-		out.setLastName(in.getLastName());
-		out.setMd5Password(in.getMd5Password());
-		out.setOldPassword(in.getOldPassword());
-		out.setPasswordLinkExpires(in.getPasswordLinkExpires());
-		out.setPasswordChangeRequired(in.isPasswordChangeRequired());
-		out.setLoginCount(in.getLoginCount());
-		out.setLastLoginTime(in.getLastLoginTime());
-		out.setStatus(in.getStatus());
-		out.setExternalAuthId(in.getExternalAuthId());
-		out.setExternalAuthOnly(in.isExternalAuthOnly());
-		out.setPermissionSetUris(in.getPermissionSetUris());
-		out.setRootUser(in.isRootUser());
-		out.setProxiedIndividualUris(in.getProxiedIndividualUris());
-		return out;
-	}
-
-	private void assertEqualAccounts(UserAccount e, UserAccount a) {
-		if (!e.getUri().equals("")) {
-			assertEquals("uri", e.getUri(), a.getUri());
-		}
-		assertEquals("email", e.getEmailAddress(), a.getEmailAddress());
-		assertEquals("first name", e.getFirstName(), a.getFirstName());
-		assertEquals("last name", e.getLastName(), a.getLastName());
-		assertEquals("password", e.getMd5Password(), a.getMd5Password());
-		assertEquals("old password", e.getOldPassword(), a.getOldPassword());
-		assertEquals("link expires", e.getPasswordLinkExpires(),
-				a.getPasswordLinkExpires());
-		assertEquals("password change", e.isPasswordChangeRequired(),
-				a.isPasswordChangeRequired());
-		assertEquals("login count", e.getLoginCount(), a.getLoginCount());
-		assertEquals("last login", e.getLastLoginTime(), a.getLastLoginTime());
-		assertEquals("status", e.getStatus(), a.getStatus());
-		assertEquals("external ID", e.getExternalAuthId(),
-				a.getExternalAuthId());
-		assertEquals("external only", e.isExternalAuthOnly(),
-				a.isExternalAuthOnly());
-		assertEquals("permission sets", e.getPermissionSetUris(),
-				a.getPermissionSetUris());
-		assertEquals("root user", e.isRootUser(), a.isRootUser());
-		assertEquals("proxied URIs", e.getProxiedIndividualUris(),
-				a.getProxiedIndividualUris());
-	}
-
-	private void assertCorrectPermissionSets(Set<PermissionSet> expected,
-			Collection<PermissionSet> actual) {
-		Set<Map<String, Object>> expectedMaps = new HashSet<Map<String, Object>>();
-		for (PermissionSet ps : expected) {
-			expectedMaps.add(buildMapFromPermissionSet(ps));
-		}
-
-		Set<Map<String, Object>> actualMaps = new HashSet<Map<String, Object>>();
-		for (PermissionSet ps : actual) {
-			actualMaps.add(buildMapFromPermissionSet(ps));
-		}
-
-		assertEquals("all permission sets", expectedMaps, actualMaps);
-	}
-
-	private Map<String, Object> buildMapFromPermissionSet(PermissionSet ps) {
-		Map<String, Object> map = new HashMap<String, Object>();
-		map.put("uri", ps.getUri());
-		map.put("label", ps.getLabel());
-		map.put("permissions", ps.getPermissionUris());
-		map.put("forNewUsers", ps.isForNewUsers());
-		map.put("forPublic", ps.isForPublic());
-		return map;
-	}
-
-	private void assertExpectedAccountUris(String label,
-			Set<UserAccount> expectedUserAccounts,
-			Collection<UserAccount> actualUserAccounts) {
-		Set<String> expectedUris = new HashSet<String>();
-		for (UserAccount ua : expectedUserAccounts) {
-			expectedUris.add(ua.getUri());
-		}
-
-		Set<String> actualUris = new HashSet<String>();
-		for (UserAccount ua : actualUserAccounts) {
-			actualUris.add(ua.getUri());
-		}
-
-		assertEqualSets(label, expectedUris, actualUris);
-	}
-
-	private void assertExpectedProxies(String label,
-			Collection<String> expected, Set<String> actual) {
-		Set<String> expectedSet = new HashSet<String>(expected);
-		assertEqualSets(label, expectedSet, actual);
-	}
-
-	@SuppressWarnings("unused")
-	private void dumpModelStatements() {
-		StmtIterator stmts = ontModel.listStatements();
-		while (stmts.hasNext()) {
-			Statement stmt = stmts.next();
-			// System.out.println(formatStatement(stmt));
-		}
-	}
-
-	private String formatStatement(Statement stmt) {
-		return stmt.getSubject().getURI() + " ==> "
-				+ stmt.getPredicate().getURI() + " ==> "
-				+ stmt.getObject().toString();
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.dao.jena;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.log4j.Level;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.RDFNode;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.rdf.model.StmtIterator;
+
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount.Status;
+
+/**
+ * TODO
+ */
+public class UserAccountsDaoJenaTest extends AbstractTestClass {
+
+	private static final Set<String> EMPTY = Collections.<String> emptySet();
+
+	/**
+	 * Where the model statements are stored for this test.
+	 */
+	private static final String N3_DATA_FILENAME = "resources/UserAccountsDaoJenaTest.n3";
+
+	private static final String NS_MINE = "http://vivo.mydomain.edu/individual/";
+
+	private static final String URI_USER1 = NS_MINE + "user01";
+	private static final String URI_NO_SUCH_USER = NS_MINE + "bogusUser";
+
+	private static final String EMAIL_USER1 = "email@able.edu";
+	private static final String EMAIL_NO_SUCH_USER = NS_MINE
+			+ "bogus@email.com";
+
+	private static final String URI_ROLE1 = NS_MINE + "role1";
+	private static final String URI_ROLE2 = NS_MINE + "role2";
+	private static final String URI_ROLE3 = NS_MINE + "role3";
+
+	private static final String URI_PROFILE1 = NS_MINE + "profile1";
+	private static final String URI_PROFILE2 = NS_MINE + "profile2";
+
+	private OntModel ontModel;
+	private WebappDaoFactoryJena wadf;
+	private UserAccountsDaoJena dao;
+
+	private UserAccount user1;
+	private UserAccount userNew;
+
+	private UserAccount userA;
+	private UserAccount userB;
+	private UserAccount userC;
+
+	@Before
+	public void setup() throws IOException {
+		InputStream stream = UserAccountsDaoJenaTest.class
+				.getResourceAsStream(N3_DATA_FILENAME);
+		Model model = ModelFactory.createDefaultModel();
+		model.read(stream, null, "N3");
+		stream.close();
+
+		ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM,
+				model);
+		ontModel.prepare();
+
+		wadf = new WebappDaoFactoryJena(ontModel);
+		dao = new UserAccountsDaoJena(wadf);
+	}
+
+	@Before
+	public void createUserAccountValues() {
+		user1 = userAccount(URI_USER1, "email@able.edu", "Zack", "Roberts",
+				"garbage", "", 0L, false, 5, 12345678L, Status.ACTIVE, "user1",
+				false, collection(URI_ROLE1), false, EMPTY);
+		userNew = userAccount("", "email@here", "Joe", "Blow", "XXXX", "YYYY",
+				0L, false, 1, 0L, Status.ACTIVE, "jblow", false, EMPTY, false,
+				EMPTY);
+
+		userA = userAccount("", "aahern@here", "Alf", "Ahern", "XXXX", "YYYY",
+				0L, false, 1, 0L, Status.ACTIVE, "aahern", false, EMPTY, false,
+				collection(URI_PROFILE1));
+		userB = userAccount("", "email@here", "Betty", "Boop", "XXXX", "YYYY",
+				0L, false, 1, 0L, Status.ACTIVE, "bboop", false, EMPTY, false,
+				collection(URI_PROFILE1, URI_PROFILE2));
+		userC = userAccount("", "ccallas@here", "Charlie", "Callas", "XXXX",
+				"YYYY", 0L, false, 1, 0L, Status.ACTIVE, "ccallas", false,
+				EMPTY, false, collection(URI_PROFILE2));
+	}
+
+	// ----------------------------------------------------------------------
+	// Tests for UserAccount methods.
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void getUserAccountByUriSuccess() {
+		UserAccount u = dao.getUserAccountByUri(URI_USER1);
+		assertEqualAccounts(user1, u);
+	}
+
+	@Test
+	public void getUserAccountByUriNull() {
+		UserAccount u = dao.getUserAccountByUri(null);
+		assertNull("null result", u);
+	}
+
+	@Test
+	public void getUserAccountByUriNotFound() {
+		UserAccount u = dao.getUserAccountByUri("bogusUri");
+		assertNull("null result", u);
+	}
+
+	@Test
+	public void getUserAccountByUriWrongType() {
+		UserAccount u = dao.getUserAccountByUri(URI_ROLE1);
+		// System.out.println(u);
+		assertNull("null result", u);
+	}
+
+	@Test
+	public void getUserAccountByEmailSuccess() {
+		UserAccount u = dao.getUserAccountByEmail(EMAIL_USER1);
+		assertEquals("uri", URI_USER1, u.getUri());
+	}
+
+	@Test
+	public void getUserAccountByEmailNull() {
+		UserAccount u = dao.getUserAccountByEmail(null);
+		assertEquals("uri", null, u);
+	}
+
+	@Test
+	public void getUserAccountByEmailNotFound() {
+		UserAccount u = dao.getUserAccountByEmail(EMAIL_NO_SUCH_USER);
+		assertEquals("uri", null, u);
+	}
+
+	@Test
+	public void insertUserAccountSuccess() {
+		UserAccount raw = userAccount(userNew);
+		String uri = dao.insertUserAccount(raw);
+		UserAccount processed = dao.getUserAccountByUri(uri);
+		assertEqualAccounts(raw, processed);
+	}
+
+	@Test(expected = NullPointerException.class)
+	public void insertUserAccountNullUserAccount() {
+		dao.insertUserAccount(null);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void insertUserAccountUriIsNotEmpty() {
+		UserAccount in = new UserAccount();
+		in.setUri(NS_MINE + "XXXXXX");
+
+		dao.insertUserAccount(in);
+	}
+
+	@Test
+	public void updateUserAccountSuccess() {
+		UserAccount orig = userAccount(URI_USER1, "updatedEmail@able.edu",
+				"Ezekiel", "Roberts", "differentHash", "oldHash", 1L, false,
+				43, 1020304050607080L, Status.ACTIVE, "updatedUser1", false,
+				collection(URI_ROLE1, URI_ROLE3), false, EMPTY);
+
+		dao.updateUserAccount(orig);
+
+		UserAccount updated = dao.getUserAccountByUri(URI_USER1);
+		assertEqualAccounts(orig, updated);
+	}
+
+	@Test(expected = NullPointerException.class)
+	public void updateUserAccountNullUserAccount() {
+		dao.updateUserAccount(null);
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void updateUserAccountDoesNotExist() {
+		UserAccount up = new UserAccount();
+		up.setUri(NS_MINE + "XXXXXX");
+
+		dao.updateUserAccount(up);
+	}
+
+	@Test
+	public void deleteUserAccountSuccess() {
+		dao.deleteUserAccount(URI_USER1);
+		StmtIterator stmts = ontModel.listStatements(
+				ontModel.getResource(URI_USER1), null, (RDFNode) null);
+		if (stmts.hasNext()) {
+			String message = "Expecting no statements to remain in the model, but found:\n";
+			while (stmts.hasNext()) {
+				message += "   " + formatStatement(stmts.next()) + "\n";
+			}
+			fail(message);
+		}
+	}
+
+	@Test
+	public void deleteUserAccountNullUri() {
+		// no complaint, no action.
+		dao.deleteUserAccount(null);
+	}
+
+	@Test
+	public void deleteUserAccountDoesNotExist() {
+		// no complaint, no action.
+		dao.deleteUserAccount(URI_NO_SUCH_USER);
+	}
+
+	@Test
+	public void insertUserAccountWithProxies() {
+		userNew.setProxiedIndividualUris(collection(
+				NS_MINE + "userNewProxyOne", NS_MINE + "userNewProxyTwo"));
+		String userUri = dao.insertUserAccount(userNew);
+
+		UserAccount inserted = dao.getUserAccountByUri(userUri);
+		assertEqualAccounts(userNew, inserted);
+	}
+
+	@Test
+	public void updateUserAccountWithProxies() {
+		UserAccount beforeAccount = dao.getUserAccountByUri(URI_USER1);
+		user1.setProxiedIndividualUris(collection(NS_MINE + "newProxyForUser1"));
+
+		dao.updateUserAccount(user1);
+
+		UserAccount updated = dao.getUserAccountByUri(URI_USER1);
+		assertEqualAccounts(user1, updated);
+	}
+
+	// ----------------------------------------------------------------------
+	// Tests for proxy-related methods
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void getProxyEditorsFirst() {
+		String profileOne = NS_MINE + "userNewProxyOne";
+		String profileTwo = NS_MINE + "userNewProxyTwo";
+		userNew.setProxiedIndividualUris(collection(profileOne, profileTwo));
+
+		String userUri = dao.insertUserAccount(userNew);
+		UserAccount user = dao.getUserAccountByUri(userUri);
+
+		assertExpectedAccountUris("proxy for profile one",
+				Collections.singleton(user),
+				dao.getUserAccountsWhoProxyForPage(profileOne));
+	}
+
+	@Test
+	public void getProxyEditorsSecond() {
+		String profileOne = NS_MINE + "userNewProxyOne";
+		String profileTwo = NS_MINE + "userNewProxyTwo";
+		userNew.setProxiedIndividualUris(collection(profileOne, profileTwo));
+
+		String userUri = dao.insertUserAccount(userNew);
+		UserAccount user = dao.getUserAccountByUri(userUri);
+
+		assertExpectedAccountUris("proxy for profile two",
+				Collections.singleton(user),
+				dao.getUserAccountsWhoProxyForPage(profileTwo));
+	}
+
+	@Test
+	public void getProxyEditorsBogus() {
+		String profileOne = NS_MINE + "userNewProxyOne";
+		String profileTwo = NS_MINE + "userNewProxyTwo";
+		String bogusProfile = NS_MINE + "bogus";
+		userNew.setProxiedIndividualUris(collection(profileOne, profileTwo));
+
+		dao.insertUserAccount(userNew);
+
+		assertExpectedAccountUris("proxy for bogus profile",
+				Collections.<UserAccount> emptySet(),
+				dao.getUserAccountsWhoProxyForPage(bogusProfile));
+	}
+
+	@Test
+	public void setProxyEditorsOnProfile() {
+		String uriA = dao.insertUserAccount(userA);
+		String uriB = dao.insertUserAccount(userB);
+		String uriC = dao.insertUserAccount(userC);
+
+		dao.setProxyAccountsOnProfile(URI_PROFILE1, collection(uriB, uriC));
+
+		assertExpectedProxies("userA", collection(),
+				dao.getUserAccountByUri(uriA).getProxiedIndividualUris());
+		assertExpectedProxies("userB", collection(URI_PROFILE1, URI_PROFILE2),
+				dao.getUserAccountByUri(uriB).getProxiedIndividualUris());
+		assertExpectedProxies("userC", collection(URI_PROFILE1, URI_PROFILE2),
+				dao.getUserAccountByUri(uriC).getProxiedIndividualUris());
+	}
+
+	// ----------------------------------------------------------------------
+	// Tests for PermissionSet methods
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void getPermissionSetByUriSuccess() {
+		PermissionSet ps = dao.getPermissionSetByUri(URI_ROLE1);
+		assertEquals("uri", URI_ROLE1, ps.getUri());
+		assertEquals("label", "Role 1", ps.getLabel());
+		assertEquals("permissionUris",
+				Collections.singleton(NS_MINE + "permissionA"),
+				ps.getPermissionUris());
+	}
+
+	@Test
+	public void getPermissionSetByUriNull() {
+		PermissionSet ps = dao.getPermissionSetByUri(null);
+		assertNull("null result", ps);
+	}
+
+	@Test
+	public void getPermissionSetByUriNotFound() {
+		PermissionSet ps = dao.getPermissionSetByUri("bogusUri");
+		assertNull("null result", ps);
+	}
+
+	@Test
+	public void getPermissionSetByUriWrongType() {
+		PermissionSet ps = dao.getPermissionSetByUri(URI_USER1);
+		assertNull("null result", ps);
+	}
+
+	@Test
+	public void getAllPermissionSets() {
+		setLoggerLevel(JenaBaseDao.class, Level.DEBUG);
+
+		Set<PermissionSet> expected = new HashSet<PermissionSet>();
+
+		PermissionSet ps1 = new PermissionSet();
+		ps1.setUri(URI_ROLE1);
+		ps1.setLabel("Role 1");
+		ps1.setPermissionUris(Collections.singleton(NS_MINE + "permissionA"));
+		expected.add(ps1);
+
+		PermissionSet ps2 = new PermissionSet();
+		ps2.setUri(URI_ROLE2);
+		ps2.setLabel("Role 2");
+		ps2.setForNewUsers(true);
+		expected.add(ps2);
+
+		PermissionSet ps3 = new PermissionSet();
+		ps3.setUri(URI_ROLE3);
+		ps3.setLabel("Role 3");
+		ps3.setForPublic(true);
+		expected.add(ps3);
+		
+		assertCorrectPermissionSets(expected, dao.getAllPermissionSets());
+	}
+
+	// ----------------------------------------------------------------------
+	// helper methods
+	// ----------------------------------------------------------------------
+
+	private Collection<String> collection(String... args) {
+		return Arrays.asList(args);
+	}
+
+	private UserAccount userAccount(String uri, String emailAddress,
+			String firstName, String lastName, String md5Password,
+			String oldPassword, long passwordLinkExpires,
+			boolean passwordChangeRequired, int loginCount, long lastLoginTime,
+			Status status, String externalAuthId, boolean externalAuthOnly,
+			Collection<String> permissionSetUris, boolean rootUser,
+			Collection<String> proxiedIndividualUris) {
+		UserAccount ua = new UserAccount();
+		ua.setUri(uri);
+		ua.setEmailAddress(emailAddress);
+		ua.setFirstName(firstName);
+		ua.setLastName(lastName);
+		ua.setMd5Password(md5Password);
+		ua.setOldPassword(oldPassword);
+		ua.setPasswordLinkExpires(passwordLinkExpires);
+		ua.setPasswordChangeRequired(passwordChangeRequired);
+		ua.setLoginCount(loginCount);
+		ua.setLastLoginTime(lastLoginTime);
+		ua.setStatus(status);
+		ua.setExternalAuthId(externalAuthId);
+		ua.setExternalAuthOnly(externalAuthOnly);
+		ua.setPermissionSetUris(permissionSetUris);
+		ua.setRootUser(rootUser);
+		ua.setProxiedIndividualUris(proxiedIndividualUris);
+		return ua;
+	}
+
+	private UserAccount userAccount(UserAccount in) {
+		UserAccount out = new UserAccount();
+		out.setUri(in.getUri());
+		out.setEmailAddress(in.getEmailAddress());
+		out.setFirstName(in.getFirstName());
+		out.setLastName(in.getLastName());
+		out.setMd5Password(in.getMd5Password());
+		out.setOldPassword(in.getOldPassword());
+		out.setPasswordLinkExpires(in.getPasswordLinkExpires());
+		out.setPasswordChangeRequired(in.isPasswordChangeRequired());
+		out.setLoginCount(in.getLoginCount());
+		out.setLastLoginTime(in.getLastLoginTime());
+		out.setStatus(in.getStatus());
+		out.setExternalAuthId(in.getExternalAuthId());
+		out.setExternalAuthOnly(in.isExternalAuthOnly());
+		out.setPermissionSetUris(in.getPermissionSetUris());
+		out.setRootUser(in.isRootUser());
+		out.setProxiedIndividualUris(in.getProxiedIndividualUris());
+		return out;
+	}
+
+	private void assertEqualAccounts(UserAccount e, UserAccount a) {
+		if (!e.getUri().equals("")) {
+			assertEquals("uri", e.getUri(), a.getUri());
+		}
+		assertEquals("email", e.getEmailAddress(), a.getEmailAddress());
+		assertEquals("first name", e.getFirstName(), a.getFirstName());
+		assertEquals("last name", e.getLastName(), a.getLastName());
+		assertEquals("password", e.getMd5Password(), a.getMd5Password());
+		assertEquals("old password", e.getOldPassword(), a.getOldPassword());
+		assertEquals("link expires", e.getPasswordLinkExpires(),
+				a.getPasswordLinkExpires());
+		assertEquals("password change", e.isPasswordChangeRequired(),
+				a.isPasswordChangeRequired());
+		assertEquals("login count", e.getLoginCount(), a.getLoginCount());
+		assertEquals("last login", e.getLastLoginTime(), a.getLastLoginTime());
+		assertEquals("status", e.getStatus(), a.getStatus());
+		assertEquals("external ID", e.getExternalAuthId(),
+				a.getExternalAuthId());
+		assertEquals("external only", e.isExternalAuthOnly(),
+				a.isExternalAuthOnly());
+		assertEquals("permission sets", e.getPermissionSetUris(),
+				a.getPermissionSetUris());
+		assertEquals("root user", e.isRootUser(), a.isRootUser());
+		assertEquals("proxied URIs", e.getProxiedIndividualUris(),
+				a.getProxiedIndividualUris());
+	}
+
+	private void assertCorrectPermissionSets(Set<PermissionSet> expected,
+			Collection<PermissionSet> actual) {
+		Set<Map<String, Object>> expectedMaps = new HashSet<Map<String, Object>>();
+		for (PermissionSet ps : expected) {
+			expectedMaps.add(buildMapFromPermissionSet(ps));
+		}
+
+		Set<Map<String, Object>> actualMaps = new HashSet<Map<String, Object>>();
+		for (PermissionSet ps : actual) {
+			actualMaps.add(buildMapFromPermissionSet(ps));
+		}
+
+		assertEquals("all permission sets", expectedMaps, actualMaps);
+	}
+
+	private Map<String, Object> buildMapFromPermissionSet(PermissionSet ps) {
+		Map<String, Object> map = new HashMap<String, Object>();
+		map.put("uri", ps.getUri());
+		map.put("label", ps.getLabel());
+		map.put("permissions", ps.getPermissionUris());
+		map.put("forNewUsers", ps.isForNewUsers());
+		map.put("forPublic", ps.isForPublic());
+		return map;
+	}
+
+	private void assertExpectedAccountUris(String label,
+			Set<UserAccount> expectedUserAccounts,
+			Collection<UserAccount> actualUserAccounts) {
+		Set<String> expectedUris = new HashSet<String>();
+		for (UserAccount ua : expectedUserAccounts) {
+			expectedUris.add(ua.getUri());
+		}
+
+		Set<String> actualUris = new HashSet<String>();
+		for (UserAccount ua : actualUserAccounts) {
+			actualUris.add(ua.getUri());
+		}
+
+		assertEqualSets(label, expectedUris, actualUris);
+	}
+
+	private void assertExpectedProxies(String label,
+			Collection<String> expected, Set<String> actual) {
+		Set<String> expectedSet = new HashSet<String>(expected);
+		assertEqualSets(label, expectedSet, actual);
+	}
+
+	@SuppressWarnings("unused")
+	private void dumpModelStatements() {
+		StmtIterator stmts = ontModel.listStatements();
+		while (stmts.hasNext()) {
+			Statement stmt = stmts.next();
+			// System.out.println(formatStatement(stmt));
+		}
+	}
+
+	private String formatStatement(Statement stmt) {
+		return stmt.getSubject().getURI() + " ==> "
+				+ stmt.getPredicate().getURI() + " ==> "
+				+ stmt.getObject().toString();
+	}
+
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/resources/UserAccountsDaoJenaTest.n3 b/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/resources/UserAccountsDaoJenaTest.n3
index 605ed33ae..ffdd24e38 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/resources/UserAccountsDaoJenaTest.n3
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/dao/jena/resources/UserAccountsDaoJenaTest.n3
@@ -1,48 +1,48 @@
-# $This file is distributed under the terms of the license in /doc/license.txt$ 
-
-@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
-@prefix owl: <http://www.w3.org/2002/07/owl#> .
-@prefix auth: <http://vitro.mannlib.cornell.edu/ns/vitro/authorization#> .
-@prefix mydomain: <http://vivo.mydomain.edu/individual/> .
-
-### This file is for the test UserAccountsSelectorTest.java.
-
-mydomain:user01
-	a auth:UserAccount ;
-	auth:emailAddress "email@able.edu" ;
-	auth:firstName "Zack" ;
-	auth:lastName "Roberts" ;
-	auth:md5password "garbage" ;
-	auth:passwordChangeExpires 0 ;
-	auth:loginCount 5 ;
-	auth:lastLoginTime 12345678 ;
-	auth:status "ACTIVE" ;
-	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" ;
-    .
+# $This file is distributed under the terms of the license in /doc/license.txt$ 
+
+@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
+@prefix owl: <http://www.w3.org/2002/07/owl#> .
+@prefix auth: <http://vitro.mannlib.cornell.edu/ns/vitro/authorization#> .
+@prefix mydomain: <http://vivo.mydomain.edu/individual/> .
+
+### This file is for the test UserAccountsSelectorTest.java.
+
+mydomain:user01
+	a auth:UserAccount ;
+	auth:emailAddress "email@able.edu" ;
+	auth:firstName "Zack" ;
+	auth:lastName "Roberts" ;
+	auth:md5password "garbage" ;
+	auth:passwordChangeExpires 0 ;
+	auth:loginCount 5 ;
+	auth:lastLoginTime 12345678 ;
+	auth:status "ACTIVE" ;
+	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/webapp/test/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwoTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwoTest.java
index d498b6ef5..ce2a700c5 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwoTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/edit/n3editing/VTwo/EditN3GeneratorVTwoTest.java
@@ -1,276 +1,276 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
-
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.hp.hpl.jena.rdf.model.Literal;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.ResourceFactory;
-
-import edu.cornell.mannlib.vitro.webapp.edit.EditLiteral;
-
-
-public class EditN3GeneratorVTwoTest {
-    static EditN3GeneratorVTwo gen = new EditN3GeneratorVTwo();
-    
-    @Test
-    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>>();        
-        keyToValues.put("var", Arrays.asList("ABC"));
-        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>>();        
-        keyToLiterals.put("var", Arrays.asList( ResourceFactory.createTypedLiteral("String")));
-        keyToLiterals.put("var2", Arrays.asList( (Literal)null));
-        /* test for exception */
-        gen.subInMultiLiterals(keyToLiterals, targets);
-        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>>();        
-        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));                      
-    }
-    
-    @Test
-    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));                   
-    }
-    
-    @Test
-    public void testLiterlasWithDatatypes(){
-        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();           
-        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 "); 
-                                                
-        String value = "ABC";
-        String datatype = null;
-        String lang = "XYZ";
-        String expected = '"' + value + '"' + "@" + lang + "";
-        
-        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));
-        Assert.assertEquals(expected + ",", targets.get(3));
-        Assert.assertEquals(expected , targets.get(4));
-        Assert.assertEquals(" " + expected + " ", targets.get(5));
-    }
-    
-    
-    @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);       
-        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 = "<>";        
-        Assert.assertTrue("must not sub in <>", !not_expected.equals(resultN3));
-        
-        Assert.assertEquals("?varXYZ", resultN3);
-    }
-    
-    @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("");       
-        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.assertEquals("?varXYZ", resultN3);
-    }
-    
-    @Test 
-    public void testSubInUrisNull(){
-        String n3 = " ?varXYZ " ;
-        List<String> targets = new ArrayList<String>();
-        targets.add(n3);
-        
-        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.assertEquals(" <xyzURI> ", resultN3);
-        
-        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);        
-        Assert.assertNotNull(resultN3);
-        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 .] 
-
-     */
-
-    //{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>();               
-        values.add("http://a.com/2");
-        values.add("http://b.com/ont#2");
-        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);        
-        
-        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);
-        StringReader resultReader = new StringReader(strs.get(0));
-        expectedModel.read(expectedReader, null, "N3");
-        Model resultModel = ModelFactory.createDefaultModel();
-        resultModel.read(resultReader, null, "N3");
-        Assert.assertTrue(expectedModel.isIsomorphicWith(resultModel));
-    }
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo;
+
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.hp.hpl.jena.rdf.model.Literal;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.ResourceFactory;
+
+import edu.cornell.mannlib.vitro.webapp.edit.EditLiteral;
+
+
+public class EditN3GeneratorVTwoTest {
+    static EditN3GeneratorVTwo gen = new EditN3GeneratorVTwo();
+    
+    @Test
+    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>>();        
+        keyToValues.put("var", Arrays.asList("ABC"));
+        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>>();        
+        keyToLiterals.put("var", Arrays.asList( ResourceFactory.createTypedLiteral("String")));
+        keyToLiterals.put("var2", Arrays.asList( (Literal)null));
+        /* test for exception */
+        gen.subInMultiLiterals(keyToLiterals, targets);
+        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>>();        
+        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));                      
+    }
+    
+    @Test
+    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));                   
+    }
+    
+    @Test
+    public void testLiterlasWithDatatypes(){
+        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();           
+        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 "); 
+                                                
+        String value = "ABC";
+        String datatype = null;
+        String lang = "XYZ";
+        String expected = '"' + value + '"' + "@" + lang + "";
+        
+        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));
+        Assert.assertEquals(expected + ",", targets.get(3));
+        Assert.assertEquals(expected , targets.get(4));
+        Assert.assertEquals(" " + expected + " ", targets.get(5));
+    }
+    
+    
+    @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);       
+        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 = "<>";        
+        Assert.assertTrue("must not sub in <>", !not_expected.equals(resultN3));
+        
+        Assert.assertEquals("?varXYZ", resultN3);
+    }
+    
+    @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("");       
+        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.assertEquals("?varXYZ", resultN3);
+    }
+    
+    @Test 
+    public void testSubInUrisNull(){
+        String n3 = " ?varXYZ " ;
+        List<String> targets = new ArrayList<String>();
+        targets.add(n3);
+        
+        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.assertEquals(" <xyzURI> ", resultN3);
+        
+        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);        
+        Assert.assertNotNull(resultN3);
+        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 .] 
+
+     */
+
+    //{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>();               
+        values.add("http://a.com/2");
+        values.add("http://b.com/ont#2");
+        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);        
+        
+        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);
+        StringReader resultReader = new StringReader(strs.get(0));
+        expectedModel.read(expectedReader, null, "N3");
+        Model resultModel = ModelFactory.createDefaultModel();
+        resultModel.read(resultReader, null, "N3");
+        Assert.assertTrue(expectedModel.isIsomorphicWith(resultModel));
+    }
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/FileServingHelperTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/FileServingHelperTest.java
index 7c253efb2..b3e322944 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/FileServingHelperTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/FileServingHelperTest.java
@@ -1,87 +1,87 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.log4j.Level;
-import org.junit.Before;
-import org.junit.Test;
-
-import stubs.edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesStub;
-import stubs.javax.servlet.ServletContextStub;
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
-import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageSetup;
-
-/**
- */
-public class FileServingHelperTest extends AbstractTestClass {
-	private static final String DEFAULT_NAMESPACE = "http://some.crazy.domain/individual/";
-
-	// ----------------------------------------------------------------------
-	// framework
-	// ----------------------------------------------------------------------
-
-	private ServletContextStub ctx;
-
-	/**
-	 * Set the desired default namespace into the ConfigurationProperties.
-	 */
-	@Before
-	public void createConfigurationProperties() throws Exception {
-		setLoggerLevel(ConfigurationProperties.class, Level.WARN);
-		
-		ctx = new ServletContextStub();
-
-		ConfigurationPropertiesStub props = new ConfigurationPropertiesStub();
-		props.setProperty(FileStorageSetup.PROPERTY_DEFAULT_NAMESPACE,
-				DEFAULT_NAMESPACE);
-		props.setBean(ctx);
-	}
-
-	// ----------------------------------------------------------------------
-	// tests
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void nullUri() {
-		assertCorrectUrl(null, "somefilename.ext", null);
-	}
-
-	@Test
-	public void nullFilename() {
-		assertCorrectUrl("http://some.crazy.domain/individual/n4324", null,
-				null);
-	}
-
-	@Test
-	public void notInDefaultNamespace() {
-		setLoggerLevel(FileServingHelper.class, Level.ERROR);
-		assertCorrectUrl("notInTheNamespace", "somefilename.ext",
-				"notInTheNamespace");
-	}
-
-	@Test
-	public void inDefaultNamespaceNoTrailingSlash() {
-		assertCorrectUrl("http://some.crazy.domain/individual/n4324",
-				"somefilename.ext", "/file/n4324/somefilename.ext");
-	}
-
-	@Test
-	public void inDefaultNamespaceTrailingSlash() {
-		assertCorrectUrl("http://some.crazy.domain/individual/n4324/",
-				"somefilename.ext", "/file/n4324/somefilename.ext");
-	}
-
-	// ----------------------------------------------------------------------
-	// Helper methods
-	// ----------------------------------------------------------------------
-
-	private void assertCorrectUrl(String uri, String filename, String expected) {
-		String actual = FileServingHelper.getBytestreamAliasUrl(uri, filename,
-				ctx);
-		assertEquals("url", expected, actual);
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.log4j.Level;
+import org.junit.Before;
+import org.junit.Test;
+
+import stubs.edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesStub;
+import stubs.javax.servlet.ServletContextStub;
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
+import edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageSetup;
+
+/**
+ */
+public class FileServingHelperTest extends AbstractTestClass {
+	private static final String DEFAULT_NAMESPACE = "http://some.crazy.domain/individual/";
+
+	// ----------------------------------------------------------------------
+	// framework
+	// ----------------------------------------------------------------------
+
+	private ServletContextStub ctx;
+
+	/**
+	 * Set the desired default namespace into the ConfigurationProperties.
+	 */
+	@Before
+	public void createConfigurationProperties() throws Exception {
+		setLoggerLevel(ConfigurationProperties.class, Level.WARN);
+		
+		ctx = new ServletContextStub();
+
+		ConfigurationPropertiesStub props = new ConfigurationPropertiesStub();
+		props.setProperty(FileStorageSetup.PROPERTY_DEFAULT_NAMESPACE,
+				DEFAULT_NAMESPACE);
+		props.setBean(ctx);
+	}
+
+	// ----------------------------------------------------------------------
+	// tests
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void nullUri() {
+		assertCorrectUrl(null, "somefilename.ext", null);
+	}
+
+	@Test
+	public void nullFilename() {
+		assertCorrectUrl("http://some.crazy.domain/individual/n4324", null,
+				null);
+	}
+
+	@Test
+	public void notInDefaultNamespace() {
+		setLoggerLevel(FileServingHelper.class, Level.ERROR);
+		assertCorrectUrl("notInTheNamespace", "somefilename.ext",
+				"notInTheNamespace");
+	}
+
+	@Test
+	public void inDefaultNamespaceNoTrailingSlash() {
+		assertCorrectUrl("http://some.crazy.domain/individual/n4324",
+				"somefilename.ext", "/file/n4324/somefilename.ext");
+	}
+
+	@Test
+	public void inDefaultNamespaceTrailingSlash() {
+		assertCorrectUrl("http://some.crazy.domain/individual/n4324/",
+				"somefilename.ext", "/file/n4324/somefilename.ext");
+	}
+
+	// ----------------------------------------------------------------------
+	// Helper methods
+	// ----------------------------------------------------------------------
+
+	private void assertCorrectUrl(String uri, String filename, String expected) {
+		String actual = FileServingHelper.getBytestreamAliasUrl(uri, filename,
+				ctx);
+		assertEquals("url", expected, actual);
+	}
+
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageHelperTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageHelperTest.java
index 098adcc1d..b421ee2d9 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageHelperTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageHelperTest.java
@@ -1,225 +1,225 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage.backend;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.Test;
-
-/**
- * 
- */
-public class FileStorageHelperTest {
-	private static String RAW_NAME_1 = "simpleName";
-	private static String ENCODED_NAME_1 = "simpleName";
-	private static String RAW_NAME_2 = "common:/Chars.pdf";
-	private static String ENCODED_NAME_2 = "common+=Chars.pdf";
-	private static String RAW_NAME_3 = "rare\"+~chars";
-	private static String ENCODED_NAME_3 = "rare^22^2b^7echars";
-	private static String RAW_NAME_4 = "combination+<of^:both";
-	private static String ENCODED_NAME_4 = "combination^2b^3cof^5e+both";
-	private static String RAW_NAME_5 = " invisibles\u0001\u007f";
-	private static String ENCODED_NAME_5 = "^20invisibles^01^7f";
-	private static String RAW_NAME_6 = "out of range\u0101";
-
-	private static String ID_1 = "simpleName";
-	private static String RELATIVE_PATH_1 = "sim/ple/Nam/e";
-	private static String ID_2 = "combination+<of^:both";
-	private static String RELATIVE_PATH_2 = "com/bin/ati/on^/2b^/3co/f^5/e+b/oth";
-	private static String ID_3 = "http://vivo.myDomain.edu/file/n3234";
-	private static String RELATIVE_PATH_3 = "htt/p+=/=vi/vo,/myD/oma/in,/edu/=fi/le=/n32/34";
-	private static String RELATIVE_PREFIXED_PATH_3 = "b~n/323/4";
-
-	private static File ROOT_DIR_1 = new File("/root");
-	private static File ABSOLUTE_PATH_1 = new File("/root/sim/ple/Nam/e");
-	private static File ROOT_DIR_2 = new File("/this/that/slash/");
-	private static File ABSOLUTE_PATH_2 = new File(
-			"/this/that/slash/sim/ple/Nam/e");
-
-	private static String FULL_NAME = "myPhoto.jpg";
-	private static String FULL_ID = "http://vivo.myDomain.edu/file/n3234.XXX";
-	private static File FULL_ROOT = new File(
-			"/usr/local/vivo/uploads/file_storage_root");
-	private static File FULL_RESULT_PATH = new File(
-			"/usr/local/vivo/uploads/file_storage_root/b~n/323/4,X/XX/myPhoto.jpg");
-
-	private static Map<Character, String> WINDOWS_PREFIX_MAP = initWindowsPrefixMap();
-	/** This reserved word will be modified. */
-	private static String WINDOWS_NAME = "lpT8";
-	/** This ID would translate to a path with a reserved word. */
-	private static String WINDOWS_ID = "prefix:createdConflict";
-	/** Not allowed to change the root, even if it contains reserved words. */
-	private static File WINDOWS_ROOT = new File("/usr/aux/root/");
-	private static File WINDOWS_FULL_PATH = new File(
-			"/usr/aux/root/a~c/rea/ted/~Con/fli/ct/~lpT8");
-
-	private static Map<Character, String> EMPTY_NAMESPACES = Collections
-			.emptyMap();
-	private static Map<Character, String> NAMESPACES = initPrefixMap();
-
-	private static Map<Character, String> initPrefixMap() {
-		Map<Character, String> map = new HashMap<Character, String>();
-		map.put('a', "junk");
-		map.put('b', "http://vivo.myDomain.edu/file/");
-		return map;
-	}
-
-	private static Map<Character, String> initWindowsPrefixMap() {
-		Map<Character, String> map = new HashMap<Character, String>();
-		map.put('a', "prefix:");
-		return map;
-	}
-
-	// ----------------------------------------------------------------------
-	// encodeName
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void encodeName1() {
-		assertNameEncoding(RAW_NAME_1, ENCODED_NAME_1);
-	}
-
-	@Test
-	public void encodeName2() {
-		assertNameEncoding(RAW_NAME_2, ENCODED_NAME_2);
-	}
-
-	@Test
-	public void encodeName3() {
-		assertNameEncoding(RAW_NAME_3, ENCODED_NAME_3);
-	}
-
-	@Test
-	public void encodeName4() {
-		assertNameEncoding(RAW_NAME_4, ENCODED_NAME_4);
-	}
-
-	@Test
-	public void encodeName5() {
-		assertNameEncoding(RAW_NAME_5, ENCODED_NAME_5);
-	}
-
-	@Test(expected = InvalidCharacterException.class)
-	public void encodeName6() {
-		FileStorageHelper.encodeName(RAW_NAME_6);
-	}
-
-	private void assertNameEncoding(String rawName, String expected) {
-		String encoded = FileStorageHelper.encodeName(rawName);
-		assertEquals("encoded name", expected, encoded);
-	}
-
-	// ----------------------------------------------------------------------
-	// decodeName
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void decodeName1() {
-		assertNameDecoding(ENCODED_NAME_1, RAW_NAME_1);
-	}
-
-	@Test
-	public void decodeName2() {
-		assertNameDecoding(ENCODED_NAME_2, RAW_NAME_2);
-	}
-
-	@Test
-	public void decodeName3() {
-		assertNameDecoding(ENCODED_NAME_3, RAW_NAME_3);
-	}
-
-	@Test
-	public void decodeName4() {
-		assertNameDecoding(ENCODED_NAME_4, RAW_NAME_4);
-	}
-
-	@Test
-	public void decodeName5() {
-		assertNameDecoding(ENCODED_NAME_5, RAW_NAME_5);
-	}
-
-	private void assertNameDecoding(String encodedName, String expected) {
-		String decoded = FileStorageHelper.decodeName(encodedName);
-		assertEquals("decodedName", expected, decoded);
-	}
-
-	// ----------------------------------------------------------------------
-	// idToPath
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void idToPath1() {
-		assertIdToPath(ID_1, EMPTY_NAMESPACES, RELATIVE_PATH_1);
-	}
-
-	@Test
-	public void idToPath2() {
-		assertIdToPath(ID_2, EMPTY_NAMESPACES, RELATIVE_PATH_2);
-	}
-
-	@Test
-	public void idToPath3() {
-		assertIdToPath(ID_3, EMPTY_NAMESPACES, RELATIVE_PATH_3);
-	}
-
-	@Test
-	public void idToPath3WithNamespace() {
-		assertIdToPath(ID_3, NAMESPACES, RELATIVE_PREFIXED_PATH_3);
-	}
-
-	private void assertIdToPath(String id, Map<Character, String> namespaces,
-			String expected) {
-		String adjustedExpected = expected.replace('/', File.separatorChar);
-		String relativePath = FileStorageHelper.id2Path(id, namespaces);
-		assertEquals("idToPath", adjustedExpected, relativePath);
-	}
-
-	// ----------------------------------------------------------------------
-	// getPathToIdDirectory
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void getPathToIdDirectory1() {
-		assertPathToIdDirectory(ID_1, EMPTY_NAMESPACES, ROOT_DIR_1,
-				ABSOLUTE_PATH_1);
-	}
-
-	@Test
-	public void getPathToIdDirectory2() {
-		assertPathToIdDirectory(ID_1, EMPTY_NAMESPACES, ROOT_DIR_2,
-				ABSOLUTE_PATH_2);
-	}
-
-	private void assertPathToIdDirectory(String id,
-			Map<Character, String> namespaces, File rootDir, File expected) {
-		File actual = FileStorageHelper.getPathToIdDirectory(id, namespaces,
-				rootDir);
-		File adjustedExpected = new File(expected.getPath().replace('/',
-				File.separatorChar));
-		assertEquals("pathToIdDirectory", adjustedExpected, actual);
-	}
-
-	// ----------------------------------------------------------------------
-	// getFullPath
-	// ----------------------------------------------------------------------
-
-	@Test
-	public void getFullPath() {
-		File actual = FileStorageHelper.getFullPath(FULL_ROOT, FULL_ID,
-				FULL_NAME, NAMESPACES);
-		assertEquals("fullPath", FULL_RESULT_PATH, actual);
-	}
-
-	@Test
-	public void checkWindowsExclusions() {
-		File actual = FileStorageHelper.getFullPath(WINDOWS_ROOT, WINDOWS_ID,
-				WINDOWS_NAME, WINDOWS_PREFIX_MAP);
-		assertEquals("windows exclusion", WINDOWS_FULL_PATH, actual);
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage.backend;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+
+/**
+ * 
+ */
+public class FileStorageHelperTest {
+	private static String RAW_NAME_1 = "simpleName";
+	private static String ENCODED_NAME_1 = "simpleName";
+	private static String RAW_NAME_2 = "common:/Chars.pdf";
+	private static String ENCODED_NAME_2 = "common+=Chars.pdf";
+	private static String RAW_NAME_3 = "rare\"+~chars";
+	private static String ENCODED_NAME_3 = "rare^22^2b^7echars";
+	private static String RAW_NAME_4 = "combination+<of^:both";
+	private static String ENCODED_NAME_4 = "combination^2b^3cof^5e+both";
+	private static String RAW_NAME_5 = " invisibles\u0001\u007f";
+	private static String ENCODED_NAME_5 = "^20invisibles^01^7f";
+	private static String RAW_NAME_6 = "out of range\u0101";
+
+	private static String ID_1 = "simpleName";
+	private static String RELATIVE_PATH_1 = "sim/ple/Nam/e";
+	private static String ID_2 = "combination+<of^:both";
+	private static String RELATIVE_PATH_2 = "com/bin/ati/on^/2b^/3co/f^5/e+b/oth";
+	private static String ID_3 = "http://vivo.myDomain.edu/file/n3234";
+	private static String RELATIVE_PATH_3 = "htt/p+=/=vi/vo,/myD/oma/in,/edu/=fi/le=/n32/34";
+	private static String RELATIVE_PREFIXED_PATH_3 = "b~n/323/4";
+
+	private static File ROOT_DIR_1 = new File("/root");
+	private static File ABSOLUTE_PATH_1 = new File("/root/sim/ple/Nam/e");
+	private static File ROOT_DIR_2 = new File("/this/that/slash/");
+	private static File ABSOLUTE_PATH_2 = new File(
+			"/this/that/slash/sim/ple/Nam/e");
+
+	private static String FULL_NAME = "myPhoto.jpg";
+	private static String FULL_ID = "http://vivo.myDomain.edu/file/n3234.XXX";
+	private static File FULL_ROOT = new File(
+			"/usr/local/vivo/uploads/file_storage_root");
+	private static File FULL_RESULT_PATH = new File(
+			"/usr/local/vivo/uploads/file_storage_root/b~n/323/4,X/XX/myPhoto.jpg");
+
+	private static Map<Character, String> WINDOWS_PREFIX_MAP = initWindowsPrefixMap();
+	/** This reserved word will be modified. */
+	private static String WINDOWS_NAME = "lpT8";
+	/** This ID would translate to a path with a reserved word. */
+	private static String WINDOWS_ID = "prefix:createdConflict";
+	/** Not allowed to change the root, even if it contains reserved words. */
+	private static File WINDOWS_ROOT = new File("/usr/aux/root/");
+	private static File WINDOWS_FULL_PATH = new File(
+			"/usr/aux/root/a~c/rea/ted/~Con/fli/ct/~lpT8");
+
+	private static Map<Character, String> EMPTY_NAMESPACES = Collections
+			.emptyMap();
+	private static Map<Character, String> NAMESPACES = initPrefixMap();
+
+	private static Map<Character, String> initPrefixMap() {
+		Map<Character, String> map = new HashMap<Character, String>();
+		map.put('a', "junk");
+		map.put('b', "http://vivo.myDomain.edu/file/");
+		return map;
+	}
+
+	private static Map<Character, String> initWindowsPrefixMap() {
+		Map<Character, String> map = new HashMap<Character, String>();
+		map.put('a', "prefix:");
+		return map;
+	}
+
+	// ----------------------------------------------------------------------
+	// encodeName
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void encodeName1() {
+		assertNameEncoding(RAW_NAME_1, ENCODED_NAME_1);
+	}
+
+	@Test
+	public void encodeName2() {
+		assertNameEncoding(RAW_NAME_2, ENCODED_NAME_2);
+	}
+
+	@Test
+	public void encodeName3() {
+		assertNameEncoding(RAW_NAME_3, ENCODED_NAME_3);
+	}
+
+	@Test
+	public void encodeName4() {
+		assertNameEncoding(RAW_NAME_4, ENCODED_NAME_4);
+	}
+
+	@Test
+	public void encodeName5() {
+		assertNameEncoding(RAW_NAME_5, ENCODED_NAME_5);
+	}
+
+	@Test(expected = InvalidCharacterException.class)
+	public void encodeName6() {
+		FileStorageHelper.encodeName(RAW_NAME_6);
+	}
+
+	private void assertNameEncoding(String rawName, String expected) {
+		String encoded = FileStorageHelper.encodeName(rawName);
+		assertEquals("encoded name", expected, encoded);
+	}
+
+	// ----------------------------------------------------------------------
+	// decodeName
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void decodeName1() {
+		assertNameDecoding(ENCODED_NAME_1, RAW_NAME_1);
+	}
+
+	@Test
+	public void decodeName2() {
+		assertNameDecoding(ENCODED_NAME_2, RAW_NAME_2);
+	}
+
+	@Test
+	public void decodeName3() {
+		assertNameDecoding(ENCODED_NAME_3, RAW_NAME_3);
+	}
+
+	@Test
+	public void decodeName4() {
+		assertNameDecoding(ENCODED_NAME_4, RAW_NAME_4);
+	}
+
+	@Test
+	public void decodeName5() {
+		assertNameDecoding(ENCODED_NAME_5, RAW_NAME_5);
+	}
+
+	private void assertNameDecoding(String encodedName, String expected) {
+		String decoded = FileStorageHelper.decodeName(encodedName);
+		assertEquals("decodedName", expected, decoded);
+	}
+
+	// ----------------------------------------------------------------------
+	// idToPath
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void idToPath1() {
+		assertIdToPath(ID_1, EMPTY_NAMESPACES, RELATIVE_PATH_1);
+	}
+
+	@Test
+	public void idToPath2() {
+		assertIdToPath(ID_2, EMPTY_NAMESPACES, RELATIVE_PATH_2);
+	}
+
+	@Test
+	public void idToPath3() {
+		assertIdToPath(ID_3, EMPTY_NAMESPACES, RELATIVE_PATH_3);
+	}
+
+	@Test
+	public void idToPath3WithNamespace() {
+		assertIdToPath(ID_3, NAMESPACES, RELATIVE_PREFIXED_PATH_3);
+	}
+
+	private void assertIdToPath(String id, Map<Character, String> namespaces,
+			String expected) {
+		String adjustedExpected = expected.replace('/', File.separatorChar);
+		String relativePath = FileStorageHelper.id2Path(id, namespaces);
+		assertEquals("idToPath", adjustedExpected, relativePath);
+	}
+
+	// ----------------------------------------------------------------------
+	// getPathToIdDirectory
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void getPathToIdDirectory1() {
+		assertPathToIdDirectory(ID_1, EMPTY_NAMESPACES, ROOT_DIR_1,
+				ABSOLUTE_PATH_1);
+	}
+
+	@Test
+	public void getPathToIdDirectory2() {
+		assertPathToIdDirectory(ID_1, EMPTY_NAMESPACES, ROOT_DIR_2,
+				ABSOLUTE_PATH_2);
+	}
+
+	private void assertPathToIdDirectory(String id,
+			Map<Character, String> namespaces, File rootDir, File expected) {
+		File actual = FileStorageHelper.getPathToIdDirectory(id, namespaces,
+				rootDir);
+		File adjustedExpected = new File(expected.getPath().replace('/',
+				File.separatorChar));
+		assertEquals("pathToIdDirectory", adjustedExpected, actual);
+	}
+
+	// ----------------------------------------------------------------------
+	// getFullPath
+	// ----------------------------------------------------------------------
+
+	@Test
+	public void getFullPath() {
+		File actual = FileStorageHelper.getFullPath(FULL_ROOT, FULL_ID,
+				FULL_NAME, NAMESPACES);
+		assertEquals("fullPath", FULL_RESULT_PATH, actual);
+	}
+
+	@Test
+	public void checkWindowsExclusions() {
+		File actual = FileStorageHelper.getFullPath(WINDOWS_ROOT, WINDOWS_ID,
+				WINDOWS_NAME, WINDOWS_PREFIX_MAP);
+		assertEquals("windows exclusion", WINDOWS_FULL_PATH, actual);
+	}
+
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageImplTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageImplTest.java
index 592019475..7c41aef63 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageImplTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageImplTest.java
@@ -1,289 +1,289 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.filestorage.backend;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.log4j.Level;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-
-/**
- * Test the FileStorage methods. The zero-argument constructor was tested in
- * {@link FileStorageFactoryTest}.
- */
-public class FileStorageImplTest extends AbstractTestClass {
-	private static final List<String> EMPTY_NAMESPACES = Collections
-			.emptyList();
-
-	private static File tempDir;
-	private static FileStorageImpl generalFs;
-
-	@BeforeClass
-	public static void createSomeDirectories() throws IOException {
-		tempDir = createTempDirectory(FileStorageImplTest.class.getSimpleName());
-		generalFs = createFileStorage("general");
-	}
-
-	@AfterClass
-	public static void cleanUp() {
-		if (tempDir != null) {
-			purgeDirectoryRecursively(tempDir);
-		}
-	}
-
-	// ----------------------------------------------------------------------
-	// tests
-	// ----------------------------------------------------------------------
-
-	@Test(expected = IllegalArgumentException.class)
-	public void baseDirDoesntExist() throws IOException {
-		File baseDir = new File(tempDir, "doesntExist");
-		new FileStorageImpl(baseDir, EMPTY_NAMESPACES);
-	}
-
-	@Test(expected = IllegalStateException.class)
-	public void partialInitializationRoot() throws IOException {
-		File baseDir = new File(tempDir, "partialWithRoot");
-		baseDir.mkdir();
-		new File(baseDir, FileStorage.FILE_STORAGE_ROOT).mkdir();
-
-		new FileStorageImpl(baseDir, EMPTY_NAMESPACES);
-	}
-
-	@Test(expected = IllegalStateException.class)
-	public void partialInitializationNamespaces() throws IOException {
-		File baseDir = new File(tempDir, "partialWithNamespaces");
-		baseDir.mkdir();
-		new File(baseDir, FileStorage.FILE_STORAGE_NAMESPACES_PROPERTIES)
-				.createNewFile();
-
-		new FileStorageImpl(baseDir, EMPTY_NAMESPACES);
-	}
-
-	@Test
-	public void notInitializedNoNamespaces() throws IOException {
-		File baseDir = new File(tempDir, "emptyNoNamespaces");
-		baseDir.mkdir();
-
-		FileStorageImpl fs = new FileStorageImpl(baseDir,
-				new ArrayList<String>());
-		assertEquals("baseDir", baseDir, fs.getBaseDir());
-		assertEqualSets("namespaces", new String[0], fs.getNamespaces()
-				.values());
-	}
-
-	@Test
-	public void notInitializedNamespaces() throws IOException {
-		String[] namespaces = new String[] { "ns1", "ns2" };
-		String dirName = "emptyWithNamespaces";
-
-		FileStorageImpl fs = createFileStorage(dirName, namespaces);
-
-		assertEquals("baseDir", new File(tempDir, dirName), fs.getBaseDir());
-		assertEqualSets("namespaces", namespaces, fs.getNamespaces().values());
-	}
-
-	@Test
-	public void initializedOK() throws IOException {
-		createFileStorage("initializeTwiceTheSame", "ns1", "ns2");
-		createFileStorage("initializeTwiceTheSame", "ns2", "ns1");
-	}
-
-	@Test
-	public void namespaceDisappears() throws IOException {
-		createFileStorage("namespaceDisappears", "ns1", "ns2");
-		FileStorageImpl fs = createFileStorage("namespaceDisappears", "ns2");
-		assertEqualSets("namespaces", new String[] { "ns1", "ns2" }, fs
-				.getNamespaces().values());
-	}
-
-	@Test
-	public void namespaceChanged() throws IOException {
-		setLoggerLevel(FileStorageImpl.class, Level.ERROR);
-		createFileStorage("namespaceChanges", "ns1", "ns2");
-		FileStorageImpl fs = createFileStorage("namespaceChanges", "ns3", "ns1");
-		assertEqualSets("namespaces", new String[] { "ns1", "ns2", "ns3" }, fs
-				.getNamespaces().values());
-	}
-
-	@Test
-	public void createFileOriginal() throws IOException {
-		String id = "createOriginal";
-		String filename = "someName.txt";
-		String contents = "these contents";
-		InputStream bytes = new ByteArrayInputStream(contents.getBytes());
-
-		generalFs.createFile(id, filename, bytes);
-
-		assertFileContents(generalFs, id, filename, contents);
-	}
-
-	@Test
-	public void createFileOverwrite() throws IOException {
-		String id = "createOverwrite";
-		String filename = "someName.txt";
-
-		String contents1 = "these contents";
-		InputStream bytes1 = new ByteArrayInputStream(contents1.getBytes());
-
-		String contents2 = "a different string";
-		InputStream bytes2 = new ByteArrayInputStream(contents2.getBytes());
-
-		generalFs.createFile(id, filename, bytes1);
-		generalFs.createFile(id, filename, bytes2);
-
-		assertFileContents(generalFs, id, filename, contents2);
-	}
-
-	@Test
-	public void createFileConflictingName() throws IOException {
-		String id = "createConflict";
-		String filename1 = "someName.txt";
-		String filename2 = "secondFileName.txt";
-		String contents = "these contents";
-		InputStream bytes = new ByteArrayInputStream(contents.getBytes());
-
-		generalFs.createFile(id, filename1, bytes);
-		try {
-			generalFs.createFile(id, filename2, bytes);
-			fail("Expected FileAlreadyExistsException.");
-		} catch (FileAlreadyExistsException e) {
-			// expected it.
-		}
-	}
-
-	@Test
-	public void getFilenameExists() throws IOException {
-		String id = "filenameExists";
-		String filename = "theName.txt";
-		String contents = "the contents";
-		InputStream bytes = new ByteArrayInputStream(contents.getBytes());
-
-		generalFs.createFile(id, filename, bytes);
-
-		assertEquals("filename", filename, generalFs.getFilename(id));
-	}
-
-	@Test
-	public void getFilenameDoesntExist() throws IOException {
-		assertNull("null filename", generalFs.getFilename("neverHeardOfIt"));
-	}
-
-	@Test
-	public void getInputStreamFound() throws IOException {
-		String id = "inputStreamExists";
-		String filename = "myFile";
-		String contents = "Some stuff to put into my file.";
-		InputStream bytes = new ByteArrayInputStream(contents.getBytes());
-
-		generalFs.createFile(id, filename, bytes);
-
-		assertFileContents(generalFs, id, filename, contents);
-		assertEquals("getInputStream", contents,
-				readAll(generalFs.getInputStream(id, filename)));
-	}
-
-	@Test(expected = FileNotFoundException.class)
-	public void getInputStreamNotFound() throws IOException {
-		generalFs.getInputStream("notFound", "nothing");
-	}
-
-	@Test
-	public void deleteFileExists() throws IOException {
-		String id = "deleteMe";
-		String filename = "deadFile";
-		String contents = "Some stuff to put into my file.";
-		InputStream bytes = new ByteArrayInputStream(contents.getBytes());
-
-		generalFs.createFile(id, filename, bytes);
-		generalFs.deleteFile(id);
-		assertNull("deleted filename", generalFs.getFilename(id));
-	}
-
-	@Test
-	public void deleteFileDoesntExist() throws IOException {
-		generalFs.deleteFile("totallyBogus");
-	}
-
-	@Test
-	public void exerciseWindowsExclusions() throws FileAlreadyExistsException,
-			IOException {
-		// setLoggerLevel(FileStorageHelper.class, Level.DEBUG);
-		String id = "nul";
-		String filename = "COM1";
-		String contents = "Windows doesn't like certain names.";
-		InputStream bytes = new ByteArrayInputStream(contents.getBytes());
-
-		generalFs.createFile(id, filename, bytes);
-
-		assertFileContents(generalFs, id, filename, contents);
-		assertEquals("filename", filename, generalFs.getFilename(id));
-		assertEquals("getInputStream", contents,
-				readAll(generalFs.getInputStream(id, filename)));
-	}
-
-	// ----------------------------------------------------------------------
-	// helper methods
-	// ----------------------------------------------------------------------
-
-	private static FileStorageImpl createFileStorage(String dirName,
-			String... namespaces) throws IOException {
-		File baseDir = new File(tempDir, dirName);
-		baseDir.mkdir();
-		return new FileStorageImpl(baseDir, Arrays.asList(namespaces));
-	}
-
-	private <T> void assertEqualSets(String message, T[] expected,
-			Collection<T> actual) {
-		Set<T> expectedSet = new HashSet<T>(Arrays.asList(expected));
-		if (expectedSet.size() != expected.length) {
-			fail("message: expected array contains duplicate elements: "
-					+ Arrays.deepToString(expected));
-		}
-
-		Set<T> actualSet = new HashSet<T>(actual);
-		if (actualSet.size() != actual.size()) {
-			fail("message: actual collection contains duplicate elements: "
-					+ actual);
-		}
-
-		assertEquals(message, expectedSet, actualSet);
-	}
-
-	/**
-	 * This file storage should contain a file with this ID and this name, and
-	 * it should have these contents.
-	 */
-	private void assertFileContents(FileStorageImpl fs, String id,
-			String filename, String expectedContents) throws IOException {
-		File rootDir = new File(fs.getBaseDir(), FileStorage.FILE_STORAGE_ROOT);
-		File path = FileStorageHelper.getFullPath(rootDir, id, filename,
-				fs.getNamespaces());
-
-		assertTrue("file exists: " + path, path.exists());
-
-		String actualContents = readFile(path);
-
-		assertEquals("file contents", expectedContents, actualContents);
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.filestorage.backend;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.log4j.Level;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+
+/**
+ * Test the FileStorage methods. The zero-argument constructor was tested in
+ * {@link FileStorageFactoryTest}.
+ */
+public class FileStorageImplTest extends AbstractTestClass {
+	private static final List<String> EMPTY_NAMESPACES = Collections
+			.emptyList();
+
+	private static File tempDir;
+	private static FileStorageImpl generalFs;
+
+	@BeforeClass
+	public static void createSomeDirectories() throws IOException {
+		tempDir = createTempDirectory(FileStorageImplTest.class.getSimpleName());
+		generalFs = createFileStorage("general");
+	}
+
+	@AfterClass
+	public static void cleanUp() {
+		if (tempDir != null) {
+			purgeDirectoryRecursively(tempDir);
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// tests
+	// ----------------------------------------------------------------------
+
+	@Test(expected = IllegalArgumentException.class)
+	public void baseDirDoesntExist() throws IOException {
+		File baseDir = new File(tempDir, "doesntExist");
+		new FileStorageImpl(baseDir, EMPTY_NAMESPACES);
+	}
+
+	@Test(expected = IllegalStateException.class)
+	public void partialInitializationRoot() throws IOException {
+		File baseDir = new File(tempDir, "partialWithRoot");
+		baseDir.mkdir();
+		new File(baseDir, FileStorage.FILE_STORAGE_ROOT).mkdir();
+
+		new FileStorageImpl(baseDir, EMPTY_NAMESPACES);
+	}
+
+	@Test(expected = IllegalStateException.class)
+	public void partialInitializationNamespaces() throws IOException {
+		File baseDir = new File(tempDir, "partialWithNamespaces");
+		baseDir.mkdir();
+		new File(baseDir, FileStorage.FILE_STORAGE_NAMESPACES_PROPERTIES)
+				.createNewFile();
+
+		new FileStorageImpl(baseDir, EMPTY_NAMESPACES);
+	}
+
+	@Test
+	public void notInitializedNoNamespaces() throws IOException {
+		File baseDir = new File(tempDir, "emptyNoNamespaces");
+		baseDir.mkdir();
+
+		FileStorageImpl fs = new FileStorageImpl(baseDir,
+				new ArrayList<String>());
+		assertEquals("baseDir", baseDir, fs.getBaseDir());
+		assertEqualSets("namespaces", new String[0], fs.getNamespaces()
+				.values());
+	}
+
+	@Test
+	public void notInitializedNamespaces() throws IOException {
+		String[] namespaces = new String[] { "ns1", "ns2" };
+		String dirName = "emptyWithNamespaces";
+
+		FileStorageImpl fs = createFileStorage(dirName, namespaces);
+
+		assertEquals("baseDir", new File(tempDir, dirName), fs.getBaseDir());
+		assertEqualSets("namespaces", namespaces, fs.getNamespaces().values());
+	}
+
+	@Test
+	public void initializedOK() throws IOException {
+		createFileStorage("initializeTwiceTheSame", "ns1", "ns2");
+		createFileStorage("initializeTwiceTheSame", "ns2", "ns1");
+	}
+
+	@Test
+	public void namespaceDisappears() throws IOException {
+		createFileStorage("namespaceDisappears", "ns1", "ns2");
+		FileStorageImpl fs = createFileStorage("namespaceDisappears", "ns2");
+		assertEqualSets("namespaces", new String[] { "ns1", "ns2" }, fs
+				.getNamespaces().values());
+	}
+
+	@Test
+	public void namespaceChanged() throws IOException {
+		setLoggerLevel(FileStorageImpl.class, Level.ERROR);
+		createFileStorage("namespaceChanges", "ns1", "ns2");
+		FileStorageImpl fs = createFileStorage("namespaceChanges", "ns3", "ns1");
+		assertEqualSets("namespaces", new String[] { "ns1", "ns2", "ns3" }, fs
+				.getNamespaces().values());
+	}
+
+	@Test
+	public void createFileOriginal() throws IOException {
+		String id = "createOriginal";
+		String filename = "someName.txt";
+		String contents = "these contents";
+		InputStream bytes = new ByteArrayInputStream(contents.getBytes());
+
+		generalFs.createFile(id, filename, bytes);
+
+		assertFileContents(generalFs, id, filename, contents);
+	}
+
+	@Test
+	public void createFileOverwrite() throws IOException {
+		String id = "createOverwrite";
+		String filename = "someName.txt";
+
+		String contents1 = "these contents";
+		InputStream bytes1 = new ByteArrayInputStream(contents1.getBytes());
+
+		String contents2 = "a different string";
+		InputStream bytes2 = new ByteArrayInputStream(contents2.getBytes());
+
+		generalFs.createFile(id, filename, bytes1);
+		generalFs.createFile(id, filename, bytes2);
+
+		assertFileContents(generalFs, id, filename, contents2);
+	}
+
+	@Test
+	public void createFileConflictingName() throws IOException {
+		String id = "createConflict";
+		String filename1 = "someName.txt";
+		String filename2 = "secondFileName.txt";
+		String contents = "these contents";
+		InputStream bytes = new ByteArrayInputStream(contents.getBytes());
+
+		generalFs.createFile(id, filename1, bytes);
+		try {
+			generalFs.createFile(id, filename2, bytes);
+			fail("Expected FileAlreadyExistsException.");
+		} catch (FileAlreadyExistsException e) {
+			// expected it.
+		}
+	}
+
+	@Test
+	public void getFilenameExists() throws IOException {
+		String id = "filenameExists";
+		String filename = "theName.txt";
+		String contents = "the contents";
+		InputStream bytes = new ByteArrayInputStream(contents.getBytes());
+
+		generalFs.createFile(id, filename, bytes);
+
+		assertEquals("filename", filename, generalFs.getFilename(id));
+	}
+
+	@Test
+	public void getFilenameDoesntExist() throws IOException {
+		assertNull("null filename", generalFs.getFilename("neverHeardOfIt"));
+	}
+
+	@Test
+	public void getInputStreamFound() throws IOException {
+		String id = "inputStreamExists";
+		String filename = "myFile";
+		String contents = "Some stuff to put into my file.";
+		InputStream bytes = new ByteArrayInputStream(contents.getBytes());
+
+		generalFs.createFile(id, filename, bytes);
+
+		assertFileContents(generalFs, id, filename, contents);
+		assertEquals("getInputStream", contents,
+				readAll(generalFs.getInputStream(id, filename)));
+	}
+
+	@Test(expected = FileNotFoundException.class)
+	public void getInputStreamNotFound() throws IOException {
+		generalFs.getInputStream("notFound", "nothing");
+	}
+
+	@Test
+	public void deleteFileExists() throws IOException {
+		String id = "deleteMe";
+		String filename = "deadFile";
+		String contents = "Some stuff to put into my file.";
+		InputStream bytes = new ByteArrayInputStream(contents.getBytes());
+
+		generalFs.createFile(id, filename, bytes);
+		generalFs.deleteFile(id);
+		assertNull("deleted filename", generalFs.getFilename(id));
+	}
+
+	@Test
+	public void deleteFileDoesntExist() throws IOException {
+		generalFs.deleteFile("totallyBogus");
+	}
+
+	@Test
+	public void exerciseWindowsExclusions() throws FileAlreadyExistsException,
+			IOException {
+		// setLoggerLevel(FileStorageHelper.class, Level.DEBUG);
+		String id = "nul";
+		String filename = "COM1";
+		String contents = "Windows doesn't like certain names.";
+		InputStream bytes = new ByteArrayInputStream(contents.getBytes());
+
+		generalFs.createFile(id, filename, bytes);
+
+		assertFileContents(generalFs, id, filename, contents);
+		assertEquals("filename", filename, generalFs.getFilename(id));
+		assertEquals("getInputStream", contents,
+				readAll(generalFs.getInputStream(id, filename)));
+	}
+
+	// ----------------------------------------------------------------------
+	// helper methods
+	// ----------------------------------------------------------------------
+
+	private static FileStorageImpl createFileStorage(String dirName,
+			String... namespaces) throws IOException {
+		File baseDir = new File(tempDir, dirName);
+		baseDir.mkdir();
+		return new FileStorageImpl(baseDir, Arrays.asList(namespaces));
+	}
+
+	private <T> void assertEqualSets(String message, T[] expected,
+			Collection<T> actual) {
+		Set<T> expectedSet = new HashSet<T>(Arrays.asList(expected));
+		if (expectedSet.size() != expected.length) {
+			fail("message: expected array contains duplicate elements: "
+					+ Arrays.deepToString(expected));
+		}
+
+		Set<T> actualSet = new HashSet<T>(actual);
+		if (actualSet.size() != actual.size()) {
+			fail("message: actual collection contains duplicate elements: "
+					+ actual);
+		}
+
+		assertEquals(message, expectedSet, actualSet);
+	}
+
+	/**
+	 * This file storage should contain a file with this ID and this name, and
+	 * it should have these contents.
+	 */
+	private void assertFileContents(FileStorageImpl fs, String id,
+			String filename, String expectedContents) throws IOException {
+		File rootDir = new File(fs.getBaseDir(), FileStorage.FILE_STORAGE_ROOT);
+		File path = FileStorageHelper.getFullPath(rootDir, id, filename,
+				fs.getNamespaces());
+
+		assertTrue("file exists: " + path, path.exists());
+
+		String actualContents = readFile(path);
+
+		assertEquals("file contents", expectedContents, actualContents);
+	}
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/startup/StartupManagerTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/startup/StartupManagerTest.java
index 931fca289..4b2a8adb8 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/startup/StartupManagerTest.java
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/startup/StartupManagerTest.java
@@ -1,319 +1,319 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package edu.cornell.mannlib.vitro.webapp.startup;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.List;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.log4j.Level;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import stubs.javax.servlet.ServletContextStub;
-import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
-import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus.StatusItem;
-
-/**
- * TODO
- */
-public class StartupManagerTest extends AbstractTestClass {
-	private static final Log log = LogFactory.getLog(StartupManagerTest.class);
-
-	private ServletContextStub ctx;
-	private ServletContextEvent sce;
-
-	private StartupManager sm;
-	private StartupStatus ss;
-
-	@Before
-	public void setup() {
-		ctx = new ServletContextStub();
-		sce = new ServletContextEvent(ctx);
-
-		sm = new StartupManager();
-		ss = StartupStatus.getBean(ctx);
-
-		// setLoggerLevel(this.getClass(), Level.DEBUG);
-		setLoggerLevel(StartupStatus.class, Level.OFF);
-		setLoggerLevel(StartupManager.class, Level.OFF);
-	}
-
-	@After
-	public void dumpForDebug() {
-		if (log.isDebugEnabled()) {
-			dumpStatus();
-		}
-	}
-
-	@Test
-	public void noSuchFile() {
-		assertStartupFails((String) null);
-	}
-
-	@Test
-	public void emptyFile() {
-		assertStartupSucceeds();
-	}
-
-	@Test
-	public void blankLine() {
-		assertStartupSucceeds("    \n");
-	}
-
-	@Test
-	public void commentLines() {
-		assertStartupSucceeds("# comment line    \n"
-				+ "    # comment line starting with spaces\n");
-	}
-
-	@Test
-	public void classDoesNotExist() {
-		assertStartupFails("no.such.class\n");
-	}
-
-	@Test
-	public void classThrowsExceptionWhenLoading() {
-		assertStartupFails(ThrowsExceptionWhenLoading.class);
-	}
-
-	@Test
-	public void classIsPrivate() {
-		assertStartupFails(PrivateClass.class);
-	}
-
-	@Test
-	public void noDefaultConstructor() {
-		assertStartupFails(NoDefaultConstructor.class);
-	}
-
-	@Test
-	public void constructorIsPrivate() {
-		assertStartupFails(PrivateConstructor.class);
-	}
-
-	@Test
-	public void constructorThrowsException() {
-		assertStartupFails(ConstructorThrowsException.class);
-	}
-
-	@Test
-	public void notAServletContextListener() {
-		assertStartupFails(NotAListener.class);
-	}
-
-	@Test
-	public void listenerThrowsException() {
-		assertStartupFails(InitThrowsException.class);
-	}
-
-	@Test
-	public void listenerSetsFatalStatus() {
-		assertStartupFails(InitSetsFatalStatus.class);
-	}
-
-	@Test
-	public void success() {
-		String listener1Name = SucceedsWithInfo.class.getName();
-		String listener2Name = SucceedsWithWarning.class.getName();
-
-		assertStartupSucceeds(SucceedsWithInfo.class, SucceedsWithWarning.class);
-
-		// Did they initialize in the correct order?
-		List<StatusItem> items = ss.getStatusItems();
-		assertEquals("how many", 2, items.size());
-		assertEquals("init order 1", listener1Name, items.get(0)
-				.getSourceName());
-		assertEquals("init order 2", listener2Name, items.get(1)
-				.getSourceName());
-
-		sm.contextDestroyed(sce);
-
-		// Did they destroy in reverse order?
-		items = ss.getStatusItems();
-		assertEquals("how many", 4, items.size());
-		assertEquals("destroy order 1", listener2Name, items.get(2)
-				.getSourceName());
-		assertEquals("destroy order 2", listener1Name, items.get(3)
-				.getSourceName());
-	}
-
-	@Test
-	public void duplicateListeners() {
-		assertStartupFails(SucceedsWithInfo.class, SucceedsWithWarning.class,
-				SucceedsWithInfo.class);
-	}
-
-	@Test
-	public void dontExecuteAfterFailure() {
-		assertStartupFails(InitThrowsException.class, SucceedsWithInfo.class);
-
-		for (StatusItem item : ss.getStatusItems()) {
-			if (item.getSourceName().equals(SucceedsWithInfo.class.getName())
-					&& (item.getLevel() == StatusItem.Level.NOT_EXECUTED)) {
-				return;
-			}
-		}
-		fail("'" + SucceedsWithInfo.class.getName()
-				+ "' should not have been run after '"
-				+ PrivateConstructor.class.getName() + "' failed.");
-	}
-
-	// ----------------------------------------------------------------------
-	// Helper classes
-	// ----------------------------------------------------------------------
-
-	public static class BasicListener implements ServletContextListener {
-		@Override
-		public void contextDestroyed(ServletContextEvent sce) {
-			// does nothing
-		}
-
-		@Override
-		public void contextInitialized(ServletContextEvent sce) {
-			// does nothing
-		}
-	}
-
-	public static class ThrowsExceptionWhenLoading extends BasicListener {
-		static {
-			if (true) {
-				throw new IllegalStateException("can't load me.");
-			}
-		}
-	}
-
-	private static class PrivateClass extends BasicListener {
-		// no methods
-	}
-
-	public static class NoDefaultConstructor extends BasicListener {
-		public NoDefaultConstructor(String bogus) {
-			bogus.length();
-		}
-	}
-
-	public static class PrivateConstructor extends BasicListener {
-		private PrivateConstructor() {
-			// does nothing
-		}
-	}
-
-	public static class ConstructorThrowsException extends BasicListener {
-		public ConstructorThrowsException() {
-			if (true) {
-				throw new IllegalStateException("can't load me.");
-			}
-		}
-	}
-
-	public static class NotAListener {
-		// no methods
-	}
-
-	public static class InitThrowsException extends BasicListener {
-		@Override
-		public void contextInitialized(ServletContextEvent sce) {
-			throw new IllegalStateException("Initialization failed.");
-		}
-	}
-
-	public static class InitSetsFatalStatus extends BasicListener {
-		@Override
-		public void contextInitialized(ServletContextEvent sce) {
-			StartupStatus.getBean(sce.getServletContext()).fatal(this,
-					"Set fatal status");
-		}
-	}
-
-	public static class SucceedsWithInfo implements ServletContextListener {
-		@Override
-		public void contextInitialized(ServletContextEvent sce) {
-			StartupStatus.getBean(sce.getServletContext()).info(this,
-					"Set info message on init.");
-		}
-
-		@Override
-		public void contextDestroyed(ServletContextEvent sce) {
-			StartupStatus.getBean(sce.getServletContext()).info(this,
-					"Set info message on destroy.");
-		}
-	}
-
-	public static class SucceedsWithWarning implements ServletContextListener {
-		@Override
-		public void contextInitialized(ServletContextEvent sce) {
-			StartupStatus.getBean(sce.getServletContext()).warning(this,
-					"Set warning message on init.");
-		}
-
-		@Override
-		public void contextDestroyed(ServletContextEvent sce) {
-			StartupStatus.getBean(sce.getServletContext()).warning(this,
-					"Set warning message on destroy.");
-		}
-	}
-
-	// ----------------------------------------------------------------------
-	// Helper methods
-	// ----------------------------------------------------------------------
-
-	private void assertStartupFails(String fileContents) {
-		if (fileContents != null) {
-			ctx.setMockResource(StartupManager.FILE_OF_STARTUP_LISTENERS,
-					fileContents);
-		}
-		sm.contextInitialized(sce);
-		assertTrue("expecting abort", ss.isStartupAborted());
-	}
-
-	private void assertStartupFails(Class<?>... classes) {
-		assertStartupFails(joinClassNames(classes));
-	}
-
-	private void assertStartupSucceeds(String fileContents) {
-		if (fileContents != null) {
-			ctx.setMockResource(StartupManager.FILE_OF_STARTUP_LISTENERS,
-					fileContents);
-		}
-		sm.contextInitialized(sce);
-		assertFalse("expecting success", ss.isStartupAborted());
-	}
-
-	private void assertStartupSucceeds(Class<?>... classes) {
-		assertStartupSucceeds(joinClassNames(classes));
-	}
-
-	private String joinClassNames(Class<?>[] classes) {
-		if (classes == null) {
-			return null;
-		}
-		if (classes.length == 0) {
-			return "";
-		}
-		StringBuilder result = new StringBuilder();
-		for (int i = 0; i < classes.length; i++) {
-			result.append(classes[i].getName()).append('\n');
-		}
-		return result.toString();
-	}
-
-	private void dumpStatus() {
-		List<StatusItem> items = ss.getStatusItems();
-		log.debug("-------------- " + items.size() + " items");
-		for (StatusItem item : items) {
-			log.debug(String.format("%8s %s \n  %s \n  %s", item.getLevel(),
-					item.getSourceName(), item.getMessage(), item.getCause()));
-		}
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package edu.cornell.mannlib.vitro.webapp.startup;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.List;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.log4j.Level;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import stubs.javax.servlet.ServletContextStub;
+import edu.cornell.mannlib.vitro.testing.AbstractTestClass;
+import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus.StatusItem;
+
+/**
+ * TODO
+ */
+public class StartupManagerTest extends AbstractTestClass {
+	private static final Log log = LogFactory.getLog(StartupManagerTest.class);
+
+	private ServletContextStub ctx;
+	private ServletContextEvent sce;
+
+	private StartupManager sm;
+	private StartupStatus ss;
+
+	@Before
+	public void setup() {
+		ctx = new ServletContextStub();
+		sce = new ServletContextEvent(ctx);
+
+		sm = new StartupManager();
+		ss = StartupStatus.getBean(ctx);
+
+		// setLoggerLevel(this.getClass(), Level.DEBUG);
+		setLoggerLevel(StartupStatus.class, Level.OFF);
+		setLoggerLevel(StartupManager.class, Level.OFF);
+	}
+
+	@After
+	public void dumpForDebug() {
+		if (log.isDebugEnabled()) {
+			dumpStatus();
+		}
+	}
+
+	@Test
+	public void noSuchFile() {
+		assertStartupFails((String) null);
+	}
+
+	@Test
+	public void emptyFile() {
+		assertStartupSucceeds();
+	}
+
+	@Test
+	public void blankLine() {
+		assertStartupSucceeds("    \n");
+	}
+
+	@Test
+	public void commentLines() {
+		assertStartupSucceeds("# comment line    \n"
+				+ "    # comment line starting with spaces\n");
+	}
+
+	@Test
+	public void classDoesNotExist() {
+		assertStartupFails("no.such.class\n");
+	}
+
+	@Test
+	public void classThrowsExceptionWhenLoading() {
+		assertStartupFails(ThrowsExceptionWhenLoading.class);
+	}
+
+	@Test
+	public void classIsPrivate() {
+		assertStartupFails(PrivateClass.class);
+	}
+
+	@Test
+	public void noDefaultConstructor() {
+		assertStartupFails(NoDefaultConstructor.class);
+	}
+
+	@Test
+	public void constructorIsPrivate() {
+		assertStartupFails(PrivateConstructor.class);
+	}
+
+	@Test
+	public void constructorThrowsException() {
+		assertStartupFails(ConstructorThrowsException.class);
+	}
+
+	@Test
+	public void notAServletContextListener() {
+		assertStartupFails(NotAListener.class);
+	}
+
+	@Test
+	public void listenerThrowsException() {
+		assertStartupFails(InitThrowsException.class);
+	}
+
+	@Test
+	public void listenerSetsFatalStatus() {
+		assertStartupFails(InitSetsFatalStatus.class);
+	}
+
+	@Test
+	public void success() {
+		String listener1Name = SucceedsWithInfo.class.getName();
+		String listener2Name = SucceedsWithWarning.class.getName();
+
+		assertStartupSucceeds(SucceedsWithInfo.class, SucceedsWithWarning.class);
+
+		// Did they initialize in the correct order?
+		List<StatusItem> items = ss.getStatusItems();
+		assertEquals("how many", 2, items.size());
+		assertEquals("init order 1", listener1Name, items.get(0)
+				.getSourceName());
+		assertEquals("init order 2", listener2Name, items.get(1)
+				.getSourceName());
+
+		sm.contextDestroyed(sce);
+
+		// Did they destroy in reverse order?
+		items = ss.getStatusItems();
+		assertEquals("how many", 4, items.size());
+		assertEquals("destroy order 1", listener2Name, items.get(2)
+				.getSourceName());
+		assertEquals("destroy order 2", listener1Name, items.get(3)
+				.getSourceName());
+	}
+
+	@Test
+	public void duplicateListeners() {
+		assertStartupFails(SucceedsWithInfo.class, SucceedsWithWarning.class,
+				SucceedsWithInfo.class);
+	}
+
+	@Test
+	public void dontExecuteAfterFailure() {
+		assertStartupFails(InitThrowsException.class, SucceedsWithInfo.class);
+
+		for (StatusItem item : ss.getStatusItems()) {
+			if (item.getSourceName().equals(SucceedsWithInfo.class.getName())
+					&& (item.getLevel() == StatusItem.Level.NOT_EXECUTED)) {
+				return;
+			}
+		}
+		fail("'" + SucceedsWithInfo.class.getName()
+				+ "' should not have been run after '"
+				+ PrivateConstructor.class.getName() + "' failed.");
+	}
+
+	// ----------------------------------------------------------------------
+	// Helper classes
+	// ----------------------------------------------------------------------
+
+	public static class BasicListener implements ServletContextListener {
+		@Override
+		public void contextDestroyed(ServletContextEvent sce) {
+			// does nothing
+		}
+
+		@Override
+		public void contextInitialized(ServletContextEvent sce) {
+			// does nothing
+		}
+	}
+
+	public static class ThrowsExceptionWhenLoading extends BasicListener {
+		static {
+			if (true) {
+				throw new IllegalStateException("can't load me.");
+			}
+		}
+	}
+
+	private static class PrivateClass extends BasicListener {
+		// no methods
+	}
+
+	public static class NoDefaultConstructor extends BasicListener {
+		public NoDefaultConstructor(String bogus) {
+			bogus.length();
+		}
+	}
+
+	public static class PrivateConstructor extends BasicListener {
+		private PrivateConstructor() {
+			// does nothing
+		}
+	}
+
+	public static class ConstructorThrowsException extends BasicListener {
+		public ConstructorThrowsException() {
+			if (true) {
+				throw new IllegalStateException("can't load me.");
+			}
+		}
+	}
+
+	public static class NotAListener {
+		// no methods
+	}
+
+	public static class InitThrowsException extends BasicListener {
+		@Override
+		public void contextInitialized(ServletContextEvent sce) {
+			throw new IllegalStateException("Initialization failed.");
+		}
+	}
+
+	public static class InitSetsFatalStatus extends BasicListener {
+		@Override
+		public void contextInitialized(ServletContextEvent sce) {
+			StartupStatus.getBean(sce.getServletContext()).fatal(this,
+					"Set fatal status");
+		}
+	}
+
+	public static class SucceedsWithInfo implements ServletContextListener {
+		@Override
+		public void contextInitialized(ServletContextEvent sce) {
+			StartupStatus.getBean(sce.getServletContext()).info(this,
+					"Set info message on init.");
+		}
+
+		@Override
+		public void contextDestroyed(ServletContextEvent sce) {
+			StartupStatus.getBean(sce.getServletContext()).info(this,
+					"Set info message on destroy.");
+		}
+	}
+
+	public static class SucceedsWithWarning implements ServletContextListener {
+		@Override
+		public void contextInitialized(ServletContextEvent sce) {
+			StartupStatus.getBean(sce.getServletContext()).warning(this,
+					"Set warning message on init.");
+		}
+
+		@Override
+		public void contextDestroyed(ServletContextEvent sce) {
+			StartupStatus.getBean(sce.getServletContext()).warning(this,
+					"Set warning message on destroy.");
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// Helper methods
+	// ----------------------------------------------------------------------
+
+	private void assertStartupFails(String fileContents) {
+		if (fileContents != null) {
+			ctx.setMockResource(StartupManager.FILE_OF_STARTUP_LISTENERS,
+					fileContents);
+		}
+		sm.contextInitialized(sce);
+		assertTrue("expecting abort", ss.isStartupAborted());
+	}
+
+	private void assertStartupFails(Class<?>... classes) {
+		assertStartupFails(joinClassNames(classes));
+	}
+
+	private void assertStartupSucceeds(String fileContents) {
+		if (fileContents != null) {
+			ctx.setMockResource(StartupManager.FILE_OF_STARTUP_LISTENERS,
+					fileContents);
+		}
+		sm.contextInitialized(sce);
+		assertFalse("expecting success", ss.isStartupAborted());
+	}
+
+	private void assertStartupSucceeds(Class<?>... classes) {
+		assertStartupSucceeds(joinClassNames(classes));
+	}
+
+	private String joinClassNames(Class<?>[] classes) {
+		if (classes == null) {
+			return null;
+		}
+		if (classes.length == 0) {
+			return "";
+		}
+		StringBuilder result = new StringBuilder();
+		for (int i = 0; i < classes.length; i++) {
+			result.append(classes[i].getName()).append('\n');
+		}
+		return result.toString();
+	}
+
+	private void dumpStatus() {
+		List<StatusItem> items = ss.getStatusItems();
+		log.debug("-------------- " + items.size() + " items");
+		for (StatusItem item : items) {
+			log.debug(String.format("%8s %s \n  %s \n  %s", item.getLevel(),
+					item.getSourceName(), item.getMessage(), item.getCause()));
+		}
+	}
+
+}
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/test_config.properties b/webapp/test/edu/cornell/mannlib/vitro/webapp/test_config.properties
index 05b3cca1a..adda2c74b 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/test_config.properties
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/test_config.properties
@@ -1,4 +1,4 @@
-#
-# This is a data file for ConfigurationPropertiesTest.
-#
-whichfile = test_config
+#
+# This is a data file for ConfigurationPropertiesTest.
+#
+whichfile = test_config
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/test_config_default.properties b/webapp/test/edu/cornell/mannlib/vitro/webapp/test_config_default.properties
index c89a1868a..ace1e0ba1 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/test_config_default.properties
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/test_config_default.properties
@@ -1,7 +1,7 @@
-#
-# This is a data file for ConfigurationPropertiesTest.
-#
-whichfile = test_config_default
-
-# This ends with a blank, in order to test the removal of whitespace
-trimmed = whitespace_test\u0020
+#
+# This is a data file for ConfigurationPropertiesTest.
+#
+whichfile = test_config_default
+
+# This ends with a blank, in order to test the removal of whitespace
+trimmed = whitespace_test\u0020
diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/test_config_invalid.properties b/webapp/test/edu/cornell/mannlib/vitro/webapp/test_config_invalid.properties
index 9b0bdfc89..fe5a50166 100644
--- a/webapp/test/edu/cornell/mannlib/vitro/webapp/test_config_invalid.properties
+++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/test_config_invalid.properties
@@ -1,5 +1,5 @@
-#
-# This is a data file for ConfigurationPropertiesTest.
-#
-whichfile = test_config_invalid
-source = bad Unicode constant \uu1045
+#
+# This is a data file for ConfigurationPropertiesTest.
+#
+whichfile = test_config_invalid
+source = bad Unicode constant \uu1045
diff --git a/webapp/test/log4j.properties b/webapp/test/log4j.properties
index 0c2af8aff..91c6e1872 100644
--- a/webapp/test/log4j.properties
+++ b/webapp/test/log4j.properties
@@ -1,10 +1,10 @@
-#
-# A simple Log4J configuration for unit tests. 
-#
-# It's not very important, because the tests themselves will override this 
-# configuration in AbstractTestClass.initializeLogging().
-#
-log4j.rootLogger=WARN, AllAppender 
-log4j.appender.AllAppender=org.apache.log4j.ConsoleAppender 
-log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout 
-log4j.appender.AllAppender.layout.ConversionPattern=%p %t %c - %m%n 
+#
+# A simple Log4J configuration for unit tests. 
+#
+# It's not very important, because the tests themselves will override this 
+# configuration in AbstractTestClass.initializeLogging().
+#
+log4j.rootLogger=WARN, AllAppender 
+log4j.appender.AllAppender=org.apache.log4j.ConsoleAppender 
+log4j.appender.AllAppender.layout=org.apache.log4j.PatternLayout 
+log4j.appender.AllAppender.layout.ConversionPattern=%p %t %c - %m%n 
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelperStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelperStub.java
index 0bd259d9f..365ef82d0 100644
--- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelperStub.java
+++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/auth/policy/bean/PropertyRestrictionPolicyHelperStub.java
@@ -1,66 +1,66 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package stubs.edu.cornell.mannlib.vitro.webapp.auth.policy.bean;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-
-import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
-import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
-
-/**
- * Allow the unit test to specify a variety of restrictions
- */
-public class PropertyRestrictionPolicyHelperStub extends
-		PropertyRestrictionPolicyHelper {
-
-	/** Don't prohibit or restrict anything. */
-	public static PropertyRestrictionPolicyHelper getInstance() {
-		return getInstance(null, null);
-	}
-
-
-	/** Prohibit some namespaces. */
-	public static PropertyRestrictionPolicyHelperStub getInstance(
-			String[] restrictedNamespaces) {
-		return getInstance(restrictedNamespaces, null);
-	}
-
-	/**
-	 * Prohibit some namespaces and restrict some properties from modification
-	 * by anybody.
-	 */
-	public static PropertyRestrictionPolicyHelperStub getInstance(
-			String[] restrictedNamespaces, String[] restrictedProperties) {
-		Set<String> namespaceSet = new HashSet<String>();
-		if (restrictedNamespaces != null) {
-			namespaceSet.addAll(Arrays.asList(restrictedNamespaces));
-		}
-		
-		Map<String, RoleLevel> thresholdMap = new HashMap<String, RoleLevel>();
-		if (restrictedProperties != null) {
-			for (String prop : restrictedProperties) {
-				thresholdMap.put(prop, RoleLevel.NOBODY);
-			}
-		}
-		
-		return new PropertyRestrictionPolicyHelperStub(namespaceSet, null,
-				null, thresholdMap);
-	}
-
-	private PropertyRestrictionPolicyHelperStub(
-			Set<String> modifyRestrictedNamespaces,
-			Set<String> modifyPermittedExceptions,
-			Map<String, RoleLevel> displayThresholds,
-			Map<String, RoleLevel> modifyThresholds) {
-		super(modifyRestrictedNamespaces, modifyPermittedExceptions,
-				displayThresholds, modifyThresholds, ModelFactory.createDefaultModel());
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package stubs.edu.cornell.mannlib.vitro.webapp.auth.policy.bean;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+
+import edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper;
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
+
+/**
+ * Allow the unit test to specify a variety of restrictions
+ */
+public class PropertyRestrictionPolicyHelperStub extends
+		PropertyRestrictionPolicyHelper {
+
+	/** Don't prohibit or restrict anything. */
+	public static PropertyRestrictionPolicyHelper getInstance() {
+		return getInstance(null, null);
+	}
+
+
+	/** Prohibit some namespaces. */
+	public static PropertyRestrictionPolicyHelperStub getInstance(
+			String[] restrictedNamespaces) {
+		return getInstance(restrictedNamespaces, null);
+	}
+
+	/**
+	 * Prohibit some namespaces and restrict some properties from modification
+	 * by anybody.
+	 */
+	public static PropertyRestrictionPolicyHelperStub getInstance(
+			String[] restrictedNamespaces, String[] restrictedProperties) {
+		Set<String> namespaceSet = new HashSet<String>();
+		if (restrictedNamespaces != null) {
+			namespaceSet.addAll(Arrays.asList(restrictedNamespaces));
+		}
+		
+		Map<String, RoleLevel> thresholdMap = new HashMap<String, RoleLevel>();
+		if (restrictedProperties != null) {
+			for (String prop : restrictedProperties) {
+				thresholdMap.put(prop, RoleLevel.NOBODY);
+			}
+		}
+		
+		return new PropertyRestrictionPolicyHelperStub(namespaceSet, null,
+				null, thresholdMap);
+	}
+
+	private PropertyRestrictionPolicyHelperStub(
+			Set<String> modifyRestrictedNamespaces,
+			Set<String> modifyPermittedExceptions,
+			Map<String, RoleLevel> displayThresholds,
+			Map<String, RoleLevel> modifyThresholds) {
+		super(modifyRestrictedNamespaces, modifyPermittedExceptions,
+				displayThresholds, modifyThresholds, ModelFactory.createDefaultModel());
+	}
+
+}
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/beans/IndividualStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/beans/IndividualStub.java
index 07ab426c3..b999b8b1f 100644
--- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/beans/IndividualStub.java
+++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/beans/IndividualStub.java
@@ -1,466 +1,466 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package stubs.edu.cornell.mannlib.vitro.webapp.beans;
-
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
-import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatementImpl;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-
-/**
- * Mock the basic functions of Individual for unit tests.
- */
-public class IndividualStub implements Individual {
-	// ----------------------------------------------------------------------
-	// Stub infrastructure
-	// ----------------------------------------------------------------------
-
-	private final String uri;
-
-	private final Set<DataPropertyStatement> dpsSet = new HashSet<DataPropertyStatement>();
-	private final Set<ObjectPropertyStatement> opsSet = new HashSet<ObjectPropertyStatement>();
-	private final Set<VClass> vClasses = new HashSet<VClass>();
-
-	private String name = "NoName";
-
-	public IndividualStub(String uri) {
-		this.uri = uri;
-	}
-
-	public void addDataPropertyStatement(String predicateUri, String object) {
-		dpsSet.add(new DataPropertyStatementImpl(this.uri, predicateUri, object));
-	}
-
-	public void addObjectPropertyStatement(String predicateUri, String objectUri) {
-		opsSet.add(new ObjectPropertyStatementImpl(this.uri, predicateUri,
-				objectUri));
-	}
-
-	public void addPopulatedObjectPropertyStatement(String predicateUri,
-			String objectUri, Individual object) {
-		ObjectPropertyStatementImpl stmt = new ObjectPropertyStatementImpl(
-				this.uri, predicateUri, objectUri);
-		stmt.setObject(object);
-		opsSet.add(stmt);
-	}
-
-	public void addVclass(String namespace, String localname, String vClassName) {
-		vClasses.add(new VClass(namespace, localname, vClassName));
-	}
-
-	// ----------------------------------------------------------------------
-	// Stub methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public String getURI() {
-		return uri;
-	}
-
-	@Override
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	@Override
-	public String getName() {
-		return name;
-	}
-
-	@Override
-	public List<DataPropertyStatement> getDataPropertyStatements() {
-		return new ArrayList<DataPropertyStatement>(dpsSet);
-	}
-
-	@Override
-	public List<DataPropertyStatement> getDataPropertyStatements(
-			String propertyUri) {
-		List<DataPropertyStatement> list = new ArrayList<DataPropertyStatement>();
-		for (DataPropertyStatement dps : dpsSet) {
-			if (dps.getDatapropURI().equals(propertyUri)) {
-				list.add(dps);
-			}
-		}
-		return list;
-	}
-
-	@Override
-	public String getDataValue(String propertyUri) {
-		for (DataPropertyStatement dps : dpsSet) {
-			if (dps.getDatapropURI().equals(propertyUri)) {
-				return dps.getData();
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public List<ObjectPropertyStatement> getObjectPropertyStatements() {
-		return new ArrayList<ObjectPropertyStatement>(opsSet);
-	}
-
-	@Override
-	public List<ObjectPropertyStatement> getObjectPropertyStatements(
-			String propertyUri) {
-		List<ObjectPropertyStatement> list = new ArrayList<ObjectPropertyStatement>();
-		for (ObjectPropertyStatement ops : opsSet) {
-			if (ops.getPropertyURI().equals(propertyUri)) {
-				list.add(ops);
-			}
-		}
-		return list;
-	}
-
-	@Override
-	public Individual getRelatedIndividual(String propertyUri) {
-		for (ObjectPropertyStatement ops : opsSet) {
-			if (ops.getPropertyURI().equals(propertyUri)) {
-				return ops.getObject();
-			}
-		}
-		return null;
-	}
-
-
-	@Override
-	public boolean isVClass(String vclassUri) {
-		for (VClass vc : vClasses) {
-			if (vc.getURI().equals(vclassUri)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	@Override
-	public List<VClass> getVClasses(boolean direct) {
-		return new ArrayList<VClass>(vClasses);
-	}
-
-	@Override
-	public void sortForDisplay() {
-		// does nothing.
-	}
-
-	@Override
-	public String getLocalName() {
-		// Useless for now.
-		return "BOGUS Local Name";
-	}
-
-	@Override
-	public VClass getVClass() {
-		for (VClass vc : vClasses) {
-			return vc;
-		}
-		return null;
-	}
-
-	@Override
-	public String getVClassURI() {
-		for (VClass vc : vClasses) {
-			return vc.getURI();
-		}
-		return null;
-	}
-
-	@Override
-	public List<VClass> getVClasses() {
-		return new ArrayList<VClass>(vClasses);
-	}
-
-	// ----------------------------------------------------------------------
-	// Un-implemented methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public boolean isAnonymous() {
-		throw new RuntimeException(
-				"ResourceBean.isAnonymous() not implemented.");
-	}
-
-	@Override
-	public void setURI(String URI) {
-		throw new RuntimeException("ResourceBean.setURI() not implemented.");
-	}
-
-	@Override
-	public String getNamespace() {
-		throw new RuntimeException(
-				"ResourceBean.getNamespace() not implemented.");
-	}
-
-	@Override
-	public void setNamespace(String namespace) {
-		throw new RuntimeException(
-				"ResourceBean.setNamespace() not implemented.");
-	}
-
-	@Override
-	public void setLocalName(String localName) {
-		throw new RuntimeException(
-				"ResourceBean.setLocalName() not implemented.");
-	}
-
-	@Override
-	public RoleLevel getHiddenFromDisplayBelowRoleLevel() {
-		throw new RuntimeException(
-				"ResourceBean.getHiddenFromDisplayBelowRoleLevel() not implemented.");
-	}
-
-	@Override
-	public void setHiddenFromDisplayBelowRoleLevel(RoleLevel eR) {
-		throw new RuntimeException(
-				"ResourceBean.setHiddenFromDisplayBelowRoleLevel() not implemented.");
-	}
-
-	@Override
-	public void setHiddenFromDisplayBelowRoleLevelUsingRoleUri(String roleUri) {
-		throw new RuntimeException(
-				"ResourceBean.setHiddenFromDisplayBelowRoleLevelUsingRoleUri() not implemented.");
-	}
-
-	@Override
-	public RoleLevel getProhibitedFromUpdateBelowRoleLevel() {
-		throw new RuntimeException(
-				"ResourceBean.getProhibitedFromUpdateBelowRoleLevel() not implemented.");
-	}
-
-	@Override
-	public void setProhibitedFromUpdateBelowRoleLevel(RoleLevel eR) {
-		throw new RuntimeException(
-				"ResourceBean.setProhibitedFromUpdateBelowRoleLevel() not implemented.");
-	}
-
-	@Override
-	public void setProhibitedFromUpdateBelowRoleLevelUsingRoleUri(String roleUri) {
-		throw new RuntimeException(
-				"ResourceBean.setProhibitedFromUpdateBelowRoleLevelUsingRoleUri() not implemented.");
-	}
-
-	@Override
-	public int compareTo(Individual o) {
-		throw new RuntimeException(
-				"Comparable<Individual>.compareTo() not implemented.");
-	}
-
-	@Override
-	public List<String> getMostSpecificTypeURIs() {
-	    throw new RuntimeException("Individual.getMostSpecificTypeURIs() not implemented.");
-	}
-	
-	@Override
-	public String getRdfsLabel() {
-		throw new RuntimeException("Individual.getRdfsLabel() not implemented.");
-	}
-
-	@Override
-	public void setVClassURI(String in) {
-		throw new RuntimeException("Individual.setVClassURI() not implemented.");
-	}
-
-	@Override
-	public Timestamp getModTime() {
-		throw new RuntimeException("Individual.getModTime() not implemented.");
-	}
-
-	@Override
-	public void setModTime(Timestamp in) {
-		throw new RuntimeException("Individual.setModTime() not implemented.");
-	}
-
-	@Override
-	public List<ObjectProperty> getObjectPropertyList() {
-		throw new RuntimeException(
-				"Individual.getObjectPropertyList() not implemented.");
-	}
-
-	@Override
-	public void setPropertyList(List<ObjectProperty> propertyList) {
-		throw new RuntimeException(
-				"Individual.setPropertyList() not implemented.");
-	}
-
-	@Override
-	public List<ObjectProperty> getPopulatedObjectPropertyList() {
-		throw new RuntimeException(
-				"Individual.getPopulatedObjectPropertyList() not implemented.");
-	}
-
-	@Override
-	public void setPopulatedObjectPropertyList(List<ObjectProperty> propertyList) {
-		throw new RuntimeException(
-				"Individual.setPopulatedObjectPropertyList() not implemented.");
-	}
-
-	@Override
-	public Map<String, ObjectProperty> getObjectPropertyMap() {
-		throw new RuntimeException(
-				"Individual.getObjectPropertyMap() not implemented.");
-	}
-
-	@Override
-	public void setObjectPropertyMap(Map<String, ObjectProperty> propertyMap) {
-		throw new RuntimeException(
-				"Individual.setObjectPropertyMap() not implemented.");
-	}
-
-	@Override
-	public List<DataProperty> getDataPropertyList() {
-		throw new RuntimeException(
-				"Individual.getDataPropertyList() not implemented.");
-	}
-
-	@Override
-	public void setDatatypePropertyList(List<DataProperty> datatypePropertyList) {
-		throw new RuntimeException(
-				"Individual.setDatatypePropertyList() not implemented.");
-	}
-
-	@Override
-	public List<DataProperty> getPopulatedDataPropertyList() {
-		throw new RuntimeException(
-				"Individual.getPopulatedDataPropertyList() not implemented.");
-	}
-
-	@Override
-	public void setPopulatedDataPropertyList(List<DataProperty> dataPropertyList) {
-		throw new RuntimeException(
-				"Individual.setPopulatedDataPropertyList() not implemented.");
-	}
-
-	@Override
-	public Map<String, DataProperty> getDataPropertyMap() {
-		throw new RuntimeException(
-				"Individual.getDataPropertyMap() not implemented.");
-	}
-
-	@Override
-	public void setDataPropertyMap(Map<String, DataProperty> propertyMap) {
-		throw new RuntimeException(
-				"Individual.setDataPropertyMap() not implemented.");
-	}
-
-	@Override
-	public void setDataPropertyStatements(List<DataPropertyStatement> list) {
-		throw new RuntimeException(
-				"Individual.setDataPropertyStatements() not implemented.");
-	}
-
-	@Override
-	public DataPropertyStatement getDataPropertyStatement(String propertyUri) {
-		throw new RuntimeException(
-				"Individual.getDataPropertyStatement() not implemented.");
-	}
-
-	@Override
-	public List<String> getDataValues(String propertyUri) {
-		throw new RuntimeException(
-				"Individual.getDataValues() not implemented.");
-	}
-
-	@Override
-	public void setVClass(VClass class1) {
-		throw new RuntimeException("Individual.setVClass() not implemented.");
-	}
-
-	@Override
-	public void setVClasses(List<VClass> vClassList, boolean direct) {
-		throw new RuntimeException("Individual.setVClasses() not implemented.");
-	}
-
-	@Override
-	public void setObjectPropertyStatements(List<ObjectPropertyStatement> list) {
-		throw new RuntimeException(
-				"Individual.setObjectPropertyStatements() not implemented.");
-	}
-
-	@Override
-	public List<Individual> getRelatedIndividuals(String propertyUri) {
-		throw new RuntimeException(
-				"Individual.getRelatedIndividuals() not implemented.");
-	}
-
-	@Override
-	public List<DataPropertyStatement> getExternalIds() {
-		throw new RuntimeException(
-				"Individual.getExternalIds() not implemented.");
-	}
-
-	@Override
-	public void setExternalIds(List<DataPropertyStatement> externalIds) {
-		throw new RuntimeException(
-				"Individual.setExternalIds() not implemented.");
-	}
-
-	@Override
-	public void setMainImageUri(String mainImageUri) {
-		throw new RuntimeException(
-				"Individual.setMainImageUri() not implemented.");
-	}
-
-	@Override
-	public String getMainImageUri() {
-		throw new RuntimeException(
-				"Individual.getMainImageUri() not implemented.");
-	}
-
-	@Override
-	public String getImageUrl() {
-		throw new RuntimeException("Individual.getImageUrl() not implemented.");
-	}
-
-	@Override
-	public String getThumbUrl() {
-		throw new RuntimeException("Individual.getThumbUrl() not implemented.");
-	}
-
-	@Override
-	public boolean hasThumb() {
-		throw new RuntimeException("Individual.hasThumb() not implemented.");
-	}
-
-	@Override
-	public JSONObject toJSON() throws JSONException {
-		throw new RuntimeException("Individual.toJSON() not implemented.");
-	}
-
-	@Override
-	public Float getSearchBoost() {
-		throw new RuntimeException(
-				"Individual.getSearchBoost() not implemented.");
-	}
-
-	@Override
-	public void setSearchBoost(Float boost) {
-		throw new RuntimeException(
-				"Individual.setSearchBoost() not implemented.");
-	}
-
-	@Override
-	public String getSearchSnippet() {
-		throw new RuntimeException(
-				"Individual.getSearchSnippet() not implemented.");
-	}
-
-	@Override
-	public void setSearchSnippet(String snippet) {
-		throw new RuntimeException(
-				"Individual.setSearchSnippet() not implemented.");
-	}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package stubs.edu.cornell.mannlib.vitro.webapp.beans;
+
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import edu.cornell.mannlib.vitro.webapp.beans.BaseResourceBean.RoleLevel;
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatementImpl;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatementImpl;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+
+/**
+ * Mock the basic functions of Individual for unit tests.
+ */
+public class IndividualStub implements Individual {
+	// ----------------------------------------------------------------------
+	// Stub infrastructure
+	// ----------------------------------------------------------------------
+
+	private final String uri;
+
+	private final Set<DataPropertyStatement> dpsSet = new HashSet<DataPropertyStatement>();
+	private final Set<ObjectPropertyStatement> opsSet = new HashSet<ObjectPropertyStatement>();
+	private final Set<VClass> vClasses = new HashSet<VClass>();
+
+	private String name = "NoName";
+
+	public IndividualStub(String uri) {
+		this.uri = uri;
+	}
+
+	public void addDataPropertyStatement(String predicateUri, String object) {
+		dpsSet.add(new DataPropertyStatementImpl(this.uri, predicateUri, object));
+	}
+
+	public void addObjectPropertyStatement(String predicateUri, String objectUri) {
+		opsSet.add(new ObjectPropertyStatementImpl(this.uri, predicateUri,
+				objectUri));
+	}
+
+	public void addPopulatedObjectPropertyStatement(String predicateUri,
+			String objectUri, Individual object) {
+		ObjectPropertyStatementImpl stmt = new ObjectPropertyStatementImpl(
+				this.uri, predicateUri, objectUri);
+		stmt.setObject(object);
+		opsSet.add(stmt);
+	}
+
+	public void addVclass(String namespace, String localname, String vClassName) {
+		vClasses.add(new VClass(namespace, localname, vClassName));
+	}
+
+	// ----------------------------------------------------------------------
+	// Stub methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public String getURI() {
+		return uri;
+	}
+
+	@Override
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	@Override
+	public List<DataPropertyStatement> getDataPropertyStatements() {
+		return new ArrayList<DataPropertyStatement>(dpsSet);
+	}
+
+	@Override
+	public List<DataPropertyStatement> getDataPropertyStatements(
+			String propertyUri) {
+		List<DataPropertyStatement> list = new ArrayList<DataPropertyStatement>();
+		for (DataPropertyStatement dps : dpsSet) {
+			if (dps.getDatapropURI().equals(propertyUri)) {
+				list.add(dps);
+			}
+		}
+		return list;
+	}
+
+	@Override
+	public String getDataValue(String propertyUri) {
+		for (DataPropertyStatement dps : dpsSet) {
+			if (dps.getDatapropURI().equals(propertyUri)) {
+				return dps.getData();
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public List<ObjectPropertyStatement> getObjectPropertyStatements() {
+		return new ArrayList<ObjectPropertyStatement>(opsSet);
+	}
+
+	@Override
+	public List<ObjectPropertyStatement> getObjectPropertyStatements(
+			String propertyUri) {
+		List<ObjectPropertyStatement> list = new ArrayList<ObjectPropertyStatement>();
+		for (ObjectPropertyStatement ops : opsSet) {
+			if (ops.getPropertyURI().equals(propertyUri)) {
+				list.add(ops);
+			}
+		}
+		return list;
+	}
+
+	@Override
+	public Individual getRelatedIndividual(String propertyUri) {
+		for (ObjectPropertyStatement ops : opsSet) {
+			if (ops.getPropertyURI().equals(propertyUri)) {
+				return ops.getObject();
+			}
+		}
+		return null;
+	}
+
+
+	@Override
+	public boolean isVClass(String vclassUri) {
+		for (VClass vc : vClasses) {
+			if (vc.getURI().equals(vclassUri)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public List<VClass> getVClasses(boolean direct) {
+		return new ArrayList<VClass>(vClasses);
+	}
+
+	@Override
+	public void sortForDisplay() {
+		// does nothing.
+	}
+
+	@Override
+	public String getLocalName() {
+		// Useless for now.
+		return "BOGUS Local Name";
+	}
+
+	@Override
+	public VClass getVClass() {
+		for (VClass vc : vClasses) {
+			return vc;
+		}
+		return null;
+	}
+
+	@Override
+	public String getVClassURI() {
+		for (VClass vc : vClasses) {
+			return vc.getURI();
+		}
+		return null;
+	}
+
+	@Override
+	public List<VClass> getVClasses() {
+		return new ArrayList<VClass>(vClasses);
+	}
+
+	// ----------------------------------------------------------------------
+	// Un-implemented methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public boolean isAnonymous() {
+		throw new RuntimeException(
+				"ResourceBean.isAnonymous() not implemented.");
+	}
+
+	@Override
+	public void setURI(String URI) {
+		throw new RuntimeException("ResourceBean.setURI() not implemented.");
+	}
+
+	@Override
+	public String getNamespace() {
+		throw new RuntimeException(
+				"ResourceBean.getNamespace() not implemented.");
+	}
+
+	@Override
+	public void setNamespace(String namespace) {
+		throw new RuntimeException(
+				"ResourceBean.setNamespace() not implemented.");
+	}
+
+	@Override
+	public void setLocalName(String localName) {
+		throw new RuntimeException(
+				"ResourceBean.setLocalName() not implemented.");
+	}
+
+	@Override
+	public RoleLevel getHiddenFromDisplayBelowRoleLevel() {
+		throw new RuntimeException(
+				"ResourceBean.getHiddenFromDisplayBelowRoleLevel() not implemented.");
+	}
+
+	@Override
+	public void setHiddenFromDisplayBelowRoleLevel(RoleLevel eR) {
+		throw new RuntimeException(
+				"ResourceBean.setHiddenFromDisplayBelowRoleLevel() not implemented.");
+	}
+
+	@Override
+	public void setHiddenFromDisplayBelowRoleLevelUsingRoleUri(String roleUri) {
+		throw new RuntimeException(
+				"ResourceBean.setHiddenFromDisplayBelowRoleLevelUsingRoleUri() not implemented.");
+	}
+
+	@Override
+	public RoleLevel getProhibitedFromUpdateBelowRoleLevel() {
+		throw new RuntimeException(
+				"ResourceBean.getProhibitedFromUpdateBelowRoleLevel() not implemented.");
+	}
+
+	@Override
+	public void setProhibitedFromUpdateBelowRoleLevel(RoleLevel eR) {
+		throw new RuntimeException(
+				"ResourceBean.setProhibitedFromUpdateBelowRoleLevel() not implemented.");
+	}
+
+	@Override
+	public void setProhibitedFromUpdateBelowRoleLevelUsingRoleUri(String roleUri) {
+		throw new RuntimeException(
+				"ResourceBean.setProhibitedFromUpdateBelowRoleLevelUsingRoleUri() not implemented.");
+	}
+
+	@Override
+	public int compareTo(Individual o) {
+		throw new RuntimeException(
+				"Comparable<Individual>.compareTo() not implemented.");
+	}
+
+	@Override
+	public List<String> getMostSpecificTypeURIs() {
+	    throw new RuntimeException("Individual.getMostSpecificTypeURIs() not implemented.");
+	}
+	
+	@Override
+	public String getRdfsLabel() {
+		throw new RuntimeException("Individual.getRdfsLabel() not implemented.");
+	}
+
+	@Override
+	public void setVClassURI(String in) {
+		throw new RuntimeException("Individual.setVClassURI() not implemented.");
+	}
+
+	@Override
+	public Timestamp getModTime() {
+		throw new RuntimeException("Individual.getModTime() not implemented.");
+	}
+
+	@Override
+	public void setModTime(Timestamp in) {
+		throw new RuntimeException("Individual.setModTime() not implemented.");
+	}
+
+	@Override
+	public List<ObjectProperty> getObjectPropertyList() {
+		throw new RuntimeException(
+				"Individual.getObjectPropertyList() not implemented.");
+	}
+
+	@Override
+	public void setPropertyList(List<ObjectProperty> propertyList) {
+		throw new RuntimeException(
+				"Individual.setPropertyList() not implemented.");
+	}
+
+	@Override
+	public List<ObjectProperty> getPopulatedObjectPropertyList() {
+		throw new RuntimeException(
+				"Individual.getPopulatedObjectPropertyList() not implemented.");
+	}
+
+	@Override
+	public void setPopulatedObjectPropertyList(List<ObjectProperty> propertyList) {
+		throw new RuntimeException(
+				"Individual.setPopulatedObjectPropertyList() not implemented.");
+	}
+
+	@Override
+	public Map<String, ObjectProperty> getObjectPropertyMap() {
+		throw new RuntimeException(
+				"Individual.getObjectPropertyMap() not implemented.");
+	}
+
+	@Override
+	public void setObjectPropertyMap(Map<String, ObjectProperty> propertyMap) {
+		throw new RuntimeException(
+				"Individual.setObjectPropertyMap() not implemented.");
+	}
+
+	@Override
+	public List<DataProperty> getDataPropertyList() {
+		throw new RuntimeException(
+				"Individual.getDataPropertyList() not implemented.");
+	}
+
+	@Override
+	public void setDatatypePropertyList(List<DataProperty> datatypePropertyList) {
+		throw new RuntimeException(
+				"Individual.setDatatypePropertyList() not implemented.");
+	}
+
+	@Override
+	public List<DataProperty> getPopulatedDataPropertyList() {
+		throw new RuntimeException(
+				"Individual.getPopulatedDataPropertyList() not implemented.");
+	}
+
+	@Override
+	public void setPopulatedDataPropertyList(List<DataProperty> dataPropertyList) {
+		throw new RuntimeException(
+				"Individual.setPopulatedDataPropertyList() not implemented.");
+	}
+
+	@Override
+	public Map<String, DataProperty> getDataPropertyMap() {
+		throw new RuntimeException(
+				"Individual.getDataPropertyMap() not implemented.");
+	}
+
+	@Override
+	public void setDataPropertyMap(Map<String, DataProperty> propertyMap) {
+		throw new RuntimeException(
+				"Individual.setDataPropertyMap() not implemented.");
+	}
+
+	@Override
+	public void setDataPropertyStatements(List<DataPropertyStatement> list) {
+		throw new RuntimeException(
+				"Individual.setDataPropertyStatements() not implemented.");
+	}
+
+	@Override
+	public DataPropertyStatement getDataPropertyStatement(String propertyUri) {
+		throw new RuntimeException(
+				"Individual.getDataPropertyStatement() not implemented.");
+	}
+
+	@Override
+	public List<String> getDataValues(String propertyUri) {
+		throw new RuntimeException(
+				"Individual.getDataValues() not implemented.");
+	}
+
+	@Override
+	public void setVClass(VClass class1) {
+		throw new RuntimeException("Individual.setVClass() not implemented.");
+	}
+
+	@Override
+	public void setVClasses(List<VClass> vClassList, boolean direct) {
+		throw new RuntimeException("Individual.setVClasses() not implemented.");
+	}
+
+	@Override
+	public void setObjectPropertyStatements(List<ObjectPropertyStatement> list) {
+		throw new RuntimeException(
+				"Individual.setObjectPropertyStatements() not implemented.");
+	}
+
+	@Override
+	public List<Individual> getRelatedIndividuals(String propertyUri) {
+		throw new RuntimeException(
+				"Individual.getRelatedIndividuals() not implemented.");
+	}
+
+	@Override
+	public List<DataPropertyStatement> getExternalIds() {
+		throw new RuntimeException(
+				"Individual.getExternalIds() not implemented.");
+	}
+
+	@Override
+	public void setExternalIds(List<DataPropertyStatement> externalIds) {
+		throw new RuntimeException(
+				"Individual.setExternalIds() not implemented.");
+	}
+
+	@Override
+	public void setMainImageUri(String mainImageUri) {
+		throw new RuntimeException(
+				"Individual.setMainImageUri() not implemented.");
+	}
+
+	@Override
+	public String getMainImageUri() {
+		throw new RuntimeException(
+				"Individual.getMainImageUri() not implemented.");
+	}
+
+	@Override
+	public String getImageUrl() {
+		throw new RuntimeException("Individual.getImageUrl() not implemented.");
+	}
+
+	@Override
+	public String getThumbUrl() {
+		throw new RuntimeException("Individual.getThumbUrl() not implemented.");
+	}
+
+	@Override
+	public boolean hasThumb() {
+		throw new RuntimeException("Individual.hasThumb() not implemented.");
+	}
+
+	@Override
+	public JSONObject toJSON() throws JSONException {
+		throw new RuntimeException("Individual.toJSON() not implemented.");
+	}
+
+	@Override
+	public Float getSearchBoost() {
+		throw new RuntimeException(
+				"Individual.getSearchBoost() not implemented.");
+	}
+
+	@Override
+	public void setSearchBoost(Float boost) {
+		throw new RuntimeException(
+				"Individual.setSearchBoost() not implemented.");
+	}
+
+	@Override
+	public String getSearchSnippet() {
+		throw new RuntimeException(
+				"Individual.getSearchSnippet() not implemented.");
+	}
+
+	@Override
+	public void setSearchSnippet(String snippet) {
+		throw new RuntimeException(
+				"Individual.setSearchSnippet() not implemented.");
+	}
 }
\ No newline at end of file
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesStub.java
index f259542da..bcd4f4556 100644
--- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesStub.java
+++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/config/ConfigurationPropertiesStub.java
@@ -1,66 +1,66 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package stubs.edu.cornell.mannlib.vitro.webapp.config;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-
-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 {
-	// ----------------------------------------------------------------------
-	// Stub infrastructure
-	// ----------------------------------------------------------------------
-
-	private final Map<String, String> propertyMap = new HashMap<String, String>();
-
-	public void setProperty(String key, String value) {
-		propertyMap.put(key, value);
-	}
-
-	public void setBean(ServletContext ctx) {
-		setBean(ctx, this);
-	}
-
-	@Override
-	public String toString() {
-		return "ConfigurationPropertiesStub[map=" + propertyMap + "]";
-	}
-
-	// ----------------------------------------------------------------------
-	// Stub methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public String getProperty(String key) {
-		return propertyMap.get(key);
-	}
-
-	@Override
-	public String getProperty(String key, String defaultValue) {
-		if (propertyMap.containsKey(key)) {
-			return propertyMap.get(key);
-		} else {
-			return defaultValue;
-		}
-	}
-
-	@Override
-	public Map<String, String> getPropertyMap() {
-		return new HashMap<String, String>(propertyMap);
-	}
-
-	// ----------------------------------------------------------------------
-	// Un-implemented methods
-	// ----------------------------------------------------------------------
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package stubs.edu.cornell.mannlib.vitro.webapp.config;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+
+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 {
+	// ----------------------------------------------------------------------
+	// Stub infrastructure
+	// ----------------------------------------------------------------------
+
+	private final Map<String, String> propertyMap = new HashMap<String, String>();
+
+	public void setProperty(String key, String value) {
+		propertyMap.put(key, value);
+	}
+
+	public void setBean(ServletContext ctx) {
+		setBean(ctx, this);
+	}
+
+	@Override
+	public String toString() {
+		return "ConfigurationPropertiesStub[map=" + propertyMap + "]";
+	}
+
+	// ----------------------------------------------------------------------
+	// Stub methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public String getProperty(String key) {
+		return propertyMap.get(key);
+	}
+
+	@Override
+	public String getProperty(String key, String defaultValue) {
+		if (propertyMap.containsKey(key)) {
+			return propertyMap.get(key);
+		} else {
+			return defaultValue;
+		}
+	}
+
+	@Override
+	public Map<String, String> getPropertyMap() {
+		return new HashMap<String, String>(propertyMap);
+	}
+
+	// ----------------------------------------------------------------------
+	// Un-implemented methods
+	// ----------------------------------------------------------------------
+
+}
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDaoStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDaoStub.java
index 15c6c81f2..5ad473575 100644
--- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDaoStub.java
+++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/DataPropertyDaoStub.java
@@ -1,280 +1,280 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package stubs.edu.cornell.mannlib.vitro.webapp.dao;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.Property;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
-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.
- */
-public class DataPropertyDaoStub implements DataPropertyDao {
-	// ----------------------------------------------------------------------
-	// Stub infrastructure
-	// ----------------------------------------------------------------------
-	
-	private final Map<String, DataProperty> dpMap = new HashMap<String, DataProperty>();
-	private final Map<String, String> configFilesMap = new HashMap<String, String>();
-	
-	public void addDataProperty(DataProperty dataProperty) {
-		if (dataProperty == null) {
-			throw new NullPointerException("dataProperty may not be null.");
-		}
-		
-		String uri = dataProperty.getURI();
-		if (uri == null) {
-			throw new NullPointerException("uri may not be null.");
-		}
-		
-		dpMap.put(uri, dataProperty);
-	}
-
-	public void setCustomListViewConfigFileName(DataProperty property, String filename) {
-		if (property == null) {
-			throw new NullPointerException("property may not be null.");
-		}
-		
-		String uri = property.getURI();
-		if (uri == null) {
-			throw new NullPointerException("uri may not be null.");
-		}
-		
-		configFilesMap.put(uri, filename);
-	}
-	// ----------------------------------------------------------------------
-	// Stub methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public DataProperty getDataPropertyByURI(String dataPropertyURI) {
-		return dpMap.get(dataPropertyURI);
-	}
-
-	@Override
-	public String getCustomListViewConfigFileName(DataProperty dataProperty) {
-		if (dataProperty == null) {
-			return null;
-		}
-		String uri = dataProperty.getURI();
-		if (uri == null) {
-			return null;
-		}
-		return configFilesMap.get(uri);
-	}
-	// ----------------------------------------------------------------------
-	// Un-implemented methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public void addSuperproperty(Property property, Property superproperty) {
-		throw new RuntimeException(
-				"PropertyDao.addSuperproperty() not implemented.");
-	}
-
-	@Override
-	public void addSuperproperty(String propertyURI, String superpropertyURI) {
-		throw new RuntimeException(
-				"PropertyDao.addSuperproperty() not implemented.");
-	}
-
-	@Override
-	public void removeSuperproperty(Property property, Property superproperty) {
-		throw new RuntimeException(
-				"PropertyDao.removeSuperproperty() not implemented.");
-	}
-
-	@Override
-	public void removeSuperproperty(String propertyURI, String superpropertyURI) {
-		throw new RuntimeException(
-				"PropertyDao.removeSuperproperty() not implemented.");
-	}
-
-	@Override
-	public void addSubproperty(Property property, Property subproperty) {
-		throw new RuntimeException(
-				"PropertyDao.addSubproperty() not implemented.");
-	}
-
-	@Override
-	public void addSubproperty(String propertyURI, String subpropertyURI) {
-		throw new RuntimeException(
-				"PropertyDao.addSubproperty() not implemented.");
-	}
-
-	@Override
-	public void removeSubproperty(Property property, Property subproperty) {
-		throw new RuntimeException(
-				"PropertyDao.removeSubproperty() not implemented.");
-	}
-
-	@Override
-	public void removeSubproperty(String propertyURI, String subpropertyURI) {
-		throw new RuntimeException(
-				"PropertyDao.removeSubproperty() not implemented.");
-	}
-
-	@Override
-	public void addEquivalentProperty(String propertyURI,
-			String equivalentPropertyURI) {
-		throw new RuntimeException(
-				"PropertyDao.addEquivalentProperty() not implemented.");
-	}
-
-	@Override
-	public void addEquivalentProperty(Property property,
-			Property equivalentProperty) {
-		throw new RuntimeException(
-				"PropertyDao.addEquivalentProperty() not implemented.");
-	}
-
-	@Override
-	public void removeEquivalentProperty(String propertyURI,
-			String equivalentPropertyURI) {
-		throw new RuntimeException(
-				"PropertyDao.removeEquivalentProperty() not implemented.");
-	}
-
-	@Override
-	public void removeEquivalentProperty(Property property,
-			Property equivalentProperty) {
-		throw new RuntimeException(
-				"PropertyDao.removeEquivalentProperty() not implemented.");
-	}
-
-	@Override
-	public List<String> getSubPropertyURIs(String propertyURI) {
-		throw new RuntimeException(
-				"PropertyDao.getSubPropertyURIs() not implemented.");
-	}
-
-	@Override
-	public List<String> getAllSubPropertyURIs(String propertyURI) {
-		throw new RuntimeException(
-				"PropertyDao.getAllSubPropertyURIs() not implemented.");
-	}
-
-	@Override
-	public List<String> getSuperPropertyURIs(String propertyURI, boolean direct) {
-		throw new RuntimeException(
-				"PropertyDao.getSuperPropertyURIs() not implemented.");
-	}
-
-	@Override
-	public List<String> getAllSuperPropertyURIs(String propertyURI) {
-		throw new RuntimeException(
-				"PropertyDao.getAllSuperPropertyURIs() not implemented.");
-	}
-
-	@Override
-	public List<String> getEquivalentPropertyURIs(String propertyURI) {
-		throw new RuntimeException(
-				"PropertyDao.getEquivalentPropertyURIs() not implemented.");
-	}
-
-	@Override
-	public List<VClass> getClassesWithRestrictionOnProperty(String propertyURI) {
-		throw new RuntimeException(
-				"PropertyDao.getClassesWithRestrictionOnProperty() not implemented.");
-	}
-
-	@Override
-	public List getAllDataProperties() {
-		throw new RuntimeException(
-				"DataPropertyDao.getAllDataProperties() not implemented.");
-	}
-
-	@Override
-	public List getAllExternalIdDataProperties() {
-		throw new RuntimeException(
-				"DataPropertyDao.getAllExternalIdDataProperties() not implemented.");
-	}
-
-	@Override
-	public void fillDataPropertiesForIndividual(Individual individual) {
-		throw new RuntimeException(
-				"DataPropertyDao.fillDataPropertiesForIndividual() not implemented.");
-	}
-
-	@Override
-	public List<DataProperty> getDataPropertiesForVClass(String vClassURI) {
-		throw new RuntimeException(
-				"DataPropertyDao.getDataPropertiesForVClass() not implemented.");
-	}
-
-	@Override
-	public Collection<DataProperty> getAllPossibleDatapropsForIndividual(
-			String individualURI) {
-		throw new RuntimeException(
-				"DataPropertyDao.getAllPossibleDatapropsForIndividual() not implemented.");
-	}
-
-	@Override
-	public String getRequiredDatatypeURI(Individual individual,
-			DataProperty dataProperty) {
-		throw new RuntimeException(
-				"DataPropertyDao.getRequiredDatatypeURI() not implemented.");
-	}
-
-	@Override
-	public String insertDataProperty(DataProperty dataProperty)
-			throws InsertException {
-		throw new RuntimeException(
-				"DataPropertyDao.insertDataProperty() not implemented.");
-	}
-
-	@Override
-	public void updateDataProperty(DataProperty dataProperty) {
-		throw new RuntimeException(
-				"DataPropertyDao.updateDataProperty() not implemented.");
-	}
-
-	@Override
-	public void deleteDataProperty(DataProperty dataProperty) {
-		throw new RuntimeException(
-				"DataPropertyDao.deleteDataProperty() not implemented.");
-	}
-
-	@Override
-	public void deleteDataProperty(String dataPropertyURI) {
-		throw new RuntimeException(
-				"DataPropertyDao.deleteDataProperty() not implemented.");
-	}
-
-	@Override
-	public List<DataProperty> getRootDataProperties() {
-		throw new RuntimeException(
-				"DataPropertyDao.getRootDataProperties() not implemented.");
-	}
-
-	@Override
-	public boolean annotateDataPropertyAsExternalIdentifier(
-			String dataPropertyURI) {
-		throw new RuntimeException(
-				"DataPropertyDao.annotateDataPropertyAsExternalIdentifier() not implemented.");
-	}
-
-	@Override
-	public List<DataProperty> getDataPropertyList(Individual subject) {
-		throw new RuntimeException(
-				"DataPropertyDao.getDataPropertyList() not implemented.");
-	}
-
-	@Override
-	public List<DataProperty> getDataPropertyList(String subjectUri) {
-		throw new RuntimeException(
-				"DataPropertyDao.getDataPropertyList() not implemented.");
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package stubs.edu.cornell.mannlib.vitro.webapp.dao;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import edu.cornell.mannlib.vitro.webapp.beans.DataProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.Property;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
+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.
+ */
+public class DataPropertyDaoStub implements DataPropertyDao {
+	// ----------------------------------------------------------------------
+	// Stub infrastructure
+	// ----------------------------------------------------------------------
+	
+	private final Map<String, DataProperty> dpMap = new HashMap<String, DataProperty>();
+	private final Map<String, String> configFilesMap = new HashMap<String, String>();
+	
+	public void addDataProperty(DataProperty dataProperty) {
+		if (dataProperty == null) {
+			throw new NullPointerException("dataProperty may not be null.");
+		}
+		
+		String uri = dataProperty.getURI();
+		if (uri == null) {
+			throw new NullPointerException("uri may not be null.");
+		}
+		
+		dpMap.put(uri, dataProperty);
+	}
+
+	public void setCustomListViewConfigFileName(DataProperty property, String filename) {
+		if (property == null) {
+			throw new NullPointerException("property may not be null.");
+		}
+		
+		String uri = property.getURI();
+		if (uri == null) {
+			throw new NullPointerException("uri may not be null.");
+		}
+		
+		configFilesMap.put(uri, filename);
+	}
+	// ----------------------------------------------------------------------
+	// Stub methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public DataProperty getDataPropertyByURI(String dataPropertyURI) {
+		return dpMap.get(dataPropertyURI);
+	}
+
+	@Override
+	public String getCustomListViewConfigFileName(DataProperty dataProperty) {
+		if (dataProperty == null) {
+			return null;
+		}
+		String uri = dataProperty.getURI();
+		if (uri == null) {
+			return null;
+		}
+		return configFilesMap.get(uri);
+	}
+	// ----------------------------------------------------------------------
+	// Un-implemented methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public void addSuperproperty(Property property, Property superproperty) {
+		throw new RuntimeException(
+				"PropertyDao.addSuperproperty() not implemented.");
+	}
+
+	@Override
+	public void addSuperproperty(String propertyURI, String superpropertyURI) {
+		throw new RuntimeException(
+				"PropertyDao.addSuperproperty() not implemented.");
+	}
+
+	@Override
+	public void removeSuperproperty(Property property, Property superproperty) {
+		throw new RuntimeException(
+				"PropertyDao.removeSuperproperty() not implemented.");
+	}
+
+	@Override
+	public void removeSuperproperty(String propertyURI, String superpropertyURI) {
+		throw new RuntimeException(
+				"PropertyDao.removeSuperproperty() not implemented.");
+	}
+
+	@Override
+	public void addSubproperty(Property property, Property subproperty) {
+		throw new RuntimeException(
+				"PropertyDao.addSubproperty() not implemented.");
+	}
+
+	@Override
+	public void addSubproperty(String propertyURI, String subpropertyURI) {
+		throw new RuntimeException(
+				"PropertyDao.addSubproperty() not implemented.");
+	}
+
+	@Override
+	public void removeSubproperty(Property property, Property subproperty) {
+		throw new RuntimeException(
+				"PropertyDao.removeSubproperty() not implemented.");
+	}
+
+	@Override
+	public void removeSubproperty(String propertyURI, String subpropertyURI) {
+		throw new RuntimeException(
+				"PropertyDao.removeSubproperty() not implemented.");
+	}
+
+	@Override
+	public void addEquivalentProperty(String propertyURI,
+			String equivalentPropertyURI) {
+		throw new RuntimeException(
+				"PropertyDao.addEquivalentProperty() not implemented.");
+	}
+
+	@Override
+	public void addEquivalentProperty(Property property,
+			Property equivalentProperty) {
+		throw new RuntimeException(
+				"PropertyDao.addEquivalentProperty() not implemented.");
+	}
+
+	@Override
+	public void removeEquivalentProperty(String propertyURI,
+			String equivalentPropertyURI) {
+		throw new RuntimeException(
+				"PropertyDao.removeEquivalentProperty() not implemented.");
+	}
+
+	@Override
+	public void removeEquivalentProperty(Property property,
+			Property equivalentProperty) {
+		throw new RuntimeException(
+				"PropertyDao.removeEquivalentProperty() not implemented.");
+	}
+
+	@Override
+	public List<String> getSubPropertyURIs(String propertyURI) {
+		throw new RuntimeException(
+				"PropertyDao.getSubPropertyURIs() not implemented.");
+	}
+
+	@Override
+	public List<String> getAllSubPropertyURIs(String propertyURI) {
+		throw new RuntimeException(
+				"PropertyDao.getAllSubPropertyURIs() not implemented.");
+	}
+
+	@Override
+	public List<String> getSuperPropertyURIs(String propertyURI, boolean direct) {
+		throw new RuntimeException(
+				"PropertyDao.getSuperPropertyURIs() not implemented.");
+	}
+
+	@Override
+	public List<String> getAllSuperPropertyURIs(String propertyURI) {
+		throw new RuntimeException(
+				"PropertyDao.getAllSuperPropertyURIs() not implemented.");
+	}
+
+	@Override
+	public List<String> getEquivalentPropertyURIs(String propertyURI) {
+		throw new RuntimeException(
+				"PropertyDao.getEquivalentPropertyURIs() not implemented.");
+	}
+
+	@Override
+	public List<VClass> getClassesWithRestrictionOnProperty(String propertyURI) {
+		throw new RuntimeException(
+				"PropertyDao.getClassesWithRestrictionOnProperty() not implemented.");
+	}
+
+	@Override
+	public List getAllDataProperties() {
+		throw new RuntimeException(
+				"DataPropertyDao.getAllDataProperties() not implemented.");
+	}
+
+	@Override
+	public List getAllExternalIdDataProperties() {
+		throw new RuntimeException(
+				"DataPropertyDao.getAllExternalIdDataProperties() not implemented.");
+	}
+
+	@Override
+	public void fillDataPropertiesForIndividual(Individual individual) {
+		throw new RuntimeException(
+				"DataPropertyDao.fillDataPropertiesForIndividual() not implemented.");
+	}
+
+	@Override
+	public List<DataProperty> getDataPropertiesForVClass(String vClassURI) {
+		throw new RuntimeException(
+				"DataPropertyDao.getDataPropertiesForVClass() not implemented.");
+	}
+
+	@Override
+	public Collection<DataProperty> getAllPossibleDatapropsForIndividual(
+			String individualURI) {
+		throw new RuntimeException(
+				"DataPropertyDao.getAllPossibleDatapropsForIndividual() not implemented.");
+	}
+
+	@Override
+	public String getRequiredDatatypeURI(Individual individual,
+			DataProperty dataProperty) {
+		throw new RuntimeException(
+				"DataPropertyDao.getRequiredDatatypeURI() not implemented.");
+	}
+
+	@Override
+	public String insertDataProperty(DataProperty dataProperty)
+			throws InsertException {
+		throw new RuntimeException(
+				"DataPropertyDao.insertDataProperty() not implemented.");
+	}
+
+	@Override
+	public void updateDataProperty(DataProperty dataProperty) {
+		throw new RuntimeException(
+				"DataPropertyDao.updateDataProperty() not implemented.");
+	}
+
+	@Override
+	public void deleteDataProperty(DataProperty dataProperty) {
+		throw new RuntimeException(
+				"DataPropertyDao.deleteDataProperty() not implemented.");
+	}
+
+	@Override
+	public void deleteDataProperty(String dataPropertyURI) {
+		throw new RuntimeException(
+				"DataPropertyDao.deleteDataProperty() not implemented.");
+	}
+
+	@Override
+	public List<DataProperty> getRootDataProperties() {
+		throw new RuntimeException(
+				"DataPropertyDao.getRootDataProperties() not implemented.");
+	}
+
+	@Override
+	public boolean annotateDataPropertyAsExternalIdentifier(
+			String dataPropertyURI) {
+		throw new RuntimeException(
+				"DataPropertyDao.annotateDataPropertyAsExternalIdentifier() not implemented.");
+	}
+
+	@Override
+	public List<DataProperty> getDataPropertyList(Individual subject) {
+		throw new RuntimeException(
+				"DataPropertyDao.getDataPropertyList() not implemented.");
+	}
+
+	@Override
+	public List<DataProperty> getDataPropertyList(String subjectUri) {
+		throw new RuntimeException(
+				"DataPropertyDao.getDataPropertyList() not implemented.");
+	}
+
+}
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/IndividualDaoStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/IndividualDaoStub.java
index f596ce3b4..f2681c078 100644
--- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/IndividualDaoStub.java
+++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/IndividualDaoStub.java
@@ -1,183 +1,183 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package stubs.edu.cornell.mannlib.vitro.webapp.dao;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
-import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
-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.
- */
-public class IndividualDaoStub implements IndividualDao {
-	// ----------------------------------------------------------------------
-	// Stub infrastructure
-	// ----------------------------------------------------------------------
-
-	private final Map<String, Individual> indMap = new HashMap<String, Individual>();
-
-	public void addIndividual(Individual individual) {
-		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);
-	}
-
-	// ----------------------------------------------------------------------
-	// Stub methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public Individual getIndividualByURI(String individualURI) {
-		return indMap.get(individualURI);
-	}
-
-	// ----------------------------------------------------------------------
-	// Un-implemented methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public Collection<DataPropertyStatement> getExternalIds(String individualURI) {
-		throw new RuntimeException(
-				"IndividualDaoStub.getExternalIds() not implemented.");
-	}
-
-	@Override
-	public Collection<DataPropertyStatement> getExternalIds(
-			String individualURI, String dataPropertyURI) {
-		throw new RuntimeException(
-				"IndividualDaoStub.getExternalIds() not implemented.");
-	}
-
-	@Override
-	public void addVClass(String individualURI, String vclassURI) {
-		throw new RuntimeException(
-				"IndividualDaoStub.addVClass() not implemented.");
-	}
-
-	@Override
-	public void removeVClass(String individualURI, String vclassURI) {
-		throw new RuntimeException(
-				"IndividualDaoStub.removeVClass() not implemented.");
-	}
-
-	@Override
-	public List<Individual> getIndividualsByVClass(VClass vclass) {
-		throw new RuntimeException(
-				"IndividualDaoStub.getIndividualsByVClass() not implemented.");
-	}
-
-	@Override
-	public List<Individual> getIndividualsByVClassURI(String vclassURI) {
-		throw new RuntimeException(
-				"IndividualDaoStub.getIndividualsByVClassURI() not implemented.");
-	}
-
-	@Override
-	public List<Individual> getIndividualsByVClassURI(String vclassURI,
-			int offset, int quantity) {
-		throw new RuntimeException(
-				"IndividualDaoStub.getIndividualsByVClassURI() not implemented.");
-	}
-
-	@Override
-	public String insertNewIndividual(Individual individual)
-			throws InsertException {
-		throw new RuntimeException(
-				"IndividualDaoStub.insertNewIndividual() not implemented.");
-	}
-
-	@Override
-	public int updateIndividual(Individual individual) {
-		throw new RuntimeException(
-				"IndividualDaoStub.updateIndividual() not implemented.");
-	}
-
-	@Override
-	public int deleteIndividual(String individualURI) {
-		throw new RuntimeException(
-				"IndividualDaoStub.deleteIndividual() not implemented.");
-	}
-
-	@Override
-	public int deleteIndividual(Individual individual) {
-		throw new RuntimeException(
-				"IndividualDaoStub.deleteIndividual() not implemented.");
-	}
-
-	@Override
-	public void markModified(Individual individual) {
-		throw new RuntimeException(
-				"IndividualDaoStub.markModified() not implemented.");
-	}
-
-	@Override
-	public Iterator<String> getAllOfThisTypeIterator() {
-		throw new RuntimeException(
-				"IndividualDaoStub.getAllOfThisTypeIterator() not implemented.");
-	}	
-
-	@Override
-	public Iterator<String> getUpdatedSinceIterator(long updatedSince) {
-		throw new RuntimeException(
-				"IndividualDaoStub.getUpdatedSinceIterator() not implemented.");
-	}	
-
-	@Override
-	public boolean isIndividualOfClass(String vclassURI, String indURI) {
-		throw new RuntimeException(
-				"IndividualDaoStub.isIndividualOfClass() not implemented.");
-	}
-
-	@Override
-	public List<Individual> getIndividualsByDataProperty(
-			String dataPropertyUri, String value) {
-		throw new RuntimeException(
-				"IndividualDaoStub.getIndividualsByDataProperty() not implemented.");
-	}
-
-	@Override
-	public List<Individual> getIndividualsByDataProperty(
-			String dataPropertyUri, String value, String datatypeUri,
-			String lang) {
-		throw new RuntimeException(
-				"IndividualDaoStub.getIndividualsByDataProperty() not implemented.");
-	}
-
-	@Override
-	public void fillVClassForIndividual(Individual individual) {
-		throw new RuntimeException(
-				"IndividualDaoStub.fillVClassForIndividual() not implemented.");
-	}
-
-	@Override
-	public String getUnusedURI(Individual individual) throws InsertException {
-		throw new RuntimeException(
-				"IndividualDaoStub.getUnusedURI() not implemented.");
-	}
-
-    @Override
-    public EditLiteral getLabelEditLiteral(String individualUri) {
-        throw new RuntimeException(
-        "IndividualDaoStub.getLabelLiteral() not implemented.");
-    }
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package stubs.edu.cornell.mannlib.vitro.webapp.dao;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import edu.cornell.mannlib.vitro.webapp.beans.DataPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
+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.
+ */
+public class IndividualDaoStub implements IndividualDao {
+	// ----------------------------------------------------------------------
+	// Stub infrastructure
+	// ----------------------------------------------------------------------
+
+	private final Map<String, Individual> indMap = new HashMap<String, Individual>();
+
+	public void addIndividual(Individual individual) {
+		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);
+	}
+
+	// ----------------------------------------------------------------------
+	// Stub methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public Individual getIndividualByURI(String individualURI) {
+		return indMap.get(individualURI);
+	}
+
+	// ----------------------------------------------------------------------
+	// Un-implemented methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public Collection<DataPropertyStatement> getExternalIds(String individualURI) {
+		throw new RuntimeException(
+				"IndividualDaoStub.getExternalIds() not implemented.");
+	}
+
+	@Override
+	public Collection<DataPropertyStatement> getExternalIds(
+			String individualURI, String dataPropertyURI) {
+		throw new RuntimeException(
+				"IndividualDaoStub.getExternalIds() not implemented.");
+	}
+
+	@Override
+	public void addVClass(String individualURI, String vclassURI) {
+		throw new RuntimeException(
+				"IndividualDaoStub.addVClass() not implemented.");
+	}
+
+	@Override
+	public void removeVClass(String individualURI, String vclassURI) {
+		throw new RuntimeException(
+				"IndividualDaoStub.removeVClass() not implemented.");
+	}
+
+	@Override
+	public List<Individual> getIndividualsByVClass(VClass vclass) {
+		throw new RuntimeException(
+				"IndividualDaoStub.getIndividualsByVClass() not implemented.");
+	}
+
+	@Override
+	public List<Individual> getIndividualsByVClassURI(String vclassURI) {
+		throw new RuntimeException(
+				"IndividualDaoStub.getIndividualsByVClassURI() not implemented.");
+	}
+
+	@Override
+	public List<Individual> getIndividualsByVClassURI(String vclassURI,
+			int offset, int quantity) {
+		throw new RuntimeException(
+				"IndividualDaoStub.getIndividualsByVClassURI() not implemented.");
+	}
+
+	@Override
+	public String insertNewIndividual(Individual individual)
+			throws InsertException {
+		throw new RuntimeException(
+				"IndividualDaoStub.insertNewIndividual() not implemented.");
+	}
+
+	@Override
+	public int updateIndividual(Individual individual) {
+		throw new RuntimeException(
+				"IndividualDaoStub.updateIndividual() not implemented.");
+	}
+
+	@Override
+	public int deleteIndividual(String individualURI) {
+		throw new RuntimeException(
+				"IndividualDaoStub.deleteIndividual() not implemented.");
+	}
+
+	@Override
+	public int deleteIndividual(Individual individual) {
+		throw new RuntimeException(
+				"IndividualDaoStub.deleteIndividual() not implemented.");
+	}
+
+	@Override
+	public void markModified(Individual individual) {
+		throw new RuntimeException(
+				"IndividualDaoStub.markModified() not implemented.");
+	}
+
+	@Override
+	public Iterator<String> getAllOfThisTypeIterator() {
+		throw new RuntimeException(
+				"IndividualDaoStub.getAllOfThisTypeIterator() not implemented.");
+	}	
+
+	@Override
+	public Iterator<String> getUpdatedSinceIterator(long updatedSince) {
+		throw new RuntimeException(
+				"IndividualDaoStub.getUpdatedSinceIterator() not implemented.");
+	}	
+
+	@Override
+	public boolean isIndividualOfClass(String vclassURI, String indURI) {
+		throw new RuntimeException(
+				"IndividualDaoStub.isIndividualOfClass() not implemented.");
+	}
+
+	@Override
+	public List<Individual> getIndividualsByDataProperty(
+			String dataPropertyUri, String value) {
+		throw new RuntimeException(
+				"IndividualDaoStub.getIndividualsByDataProperty() not implemented.");
+	}
+
+	@Override
+	public List<Individual> getIndividualsByDataProperty(
+			String dataPropertyUri, String value, String datatypeUri,
+			String lang) {
+		throw new RuntimeException(
+				"IndividualDaoStub.getIndividualsByDataProperty() not implemented.");
+	}
+
+	@Override
+	public void fillVClassForIndividual(Individual individual) {
+		throw new RuntimeException(
+				"IndividualDaoStub.fillVClassForIndividual() not implemented.");
+	}
+
+	@Override
+	public String getUnusedURI(Individual individual) throws InsertException {
+		throw new RuntimeException(
+				"IndividualDaoStub.getUnusedURI() not implemented.");
+	}
+
+    @Override
+    public EditLiteral getLabelEditLiteral(String individualUri) {
+        throw new RuntimeException(
+        "IndividualDaoStub.getLabelLiteral() not implemented.");
+    }
+
+}
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java
index 8bcdf87ef..0017b9291 100644
--- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java
+++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/ObjectPropertyDaoStub.java
@@ -1,278 +1,278 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package stubs.edu.cornell.mannlib.vitro.webapp.dao;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import edu.cornell.mannlib.vitro.webapp.beans.Individual;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
-import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
-import edu.cornell.mannlib.vitro.webapp.beans.Property;
-import edu.cornell.mannlib.vitro.webapp.beans.VClass;
-import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
-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.
- */
-public class ObjectPropertyDaoStub implements ObjectPropertyDao {
-	// ----------------------------------------------------------------------
-	// Stub infrastructure
-	// ----------------------------------------------------------------------
-
-	private final Map<String, ObjectProperty> opMap = new HashMap<String, ObjectProperty>();
-	private final Map<String, String> configFilesMap = new HashMap<String, String>();
-
-	public void addObjectProperty(ObjectProperty property) {
-		if (property == null) {
-			throw new NullPointerException("predicate may not be null.");
-		}
-
-		String uri = property.getURI();
-		if (uri == null) {
-			throw new NullPointerException("uri may not be null.");
-		}
-
-		opMap.put(uri, property);
-	}
-	
-	public void setCustomListViewConfigFileName(ObjectProperty property, String filename) {
-		if (property == null) {
-			throw new NullPointerException("property may not be null.");
-		}
-		
-		String uri = property.getURI();
-		if (uri == null) {
-			throw new NullPointerException("uri may not be null.");
-		}
-		
-		configFilesMap.put(uri, filename);
-	}
-
-	// ----------------------------------------------------------------------
-	// Stub methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public ObjectProperty getObjectPropertyByURI(String objectPropertyURI) {
-		if (objectPropertyURI == null) {
-			return null;
-		}
-		return opMap.get(objectPropertyURI);
-	}
-	
-    @Override
-    public ObjectProperty getObjectPropertyByURIAndRangeURI(String objectPropertyURI, String rangeURI) {
-        return getObjectPropertyByURI(objectPropertyURI);
-    }
-
-	@Override
-	public String getCustomListViewConfigFileName(ObjectProperty objectProperty) {
-		if (objectProperty == null) {
-			return null;
-		}
-		String uri = objectProperty.getURI();
-		if (uri == null) {
-			return null;
-		}
-		return configFilesMap.get(uri);
-	}
-
-	// ----------------------------------------------------------------------
-	// Un-implemented methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public void addSuperproperty(Property property, Property superproperty) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.addSuperproperty() not implemented.");
-	}
-
-	@Override
-	public void addSuperproperty(String propertyURI, String superpropertyURI) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.addSuperproperty() not implemented.");
-	}
-
-	@Override
-	public void removeSuperproperty(Property property, Property superproperty) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.removeSuperproperty() not implemented.");
-	}
-
-	@Override
-	public void removeSuperproperty(String propertyURI, String superpropertyURI) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.removeSuperproperty() not implemented.");
-	}
-
-	@Override
-	public void addSubproperty(Property property, Property subproperty) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.addSubproperty() not implemented.");
-	}
-
-	@Override
-	public void addSubproperty(String propertyURI, String subpropertyURI) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.addSubproperty() not implemented.");
-	}
-
-	@Override
-	public void removeSubproperty(Property property, Property subproperty) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.removeSubproperty() not implemented.");
-	}
-
-	@Override
-	public void removeSubproperty(String propertyURI, String subpropertyURI) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.removeSubproperty() not implemented.");
-	}
-
-	@Override
-	public void addEquivalentProperty(String propertyURI,
-			String equivalentPropertyURI) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.addEquivalentProperty() not implemented.");
-	}
-
-	@Override
-	public void addEquivalentProperty(Property property,
-			Property equivalentProperty) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.addEquivalentProperty() not implemented.");
-	}
-
-	@Override
-	public void removeEquivalentProperty(String propertyURI,
-			String equivalentPropertyURI) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.removeEquivalentProperty() not implemented.");
-	}
-
-	@Override
-	public void removeEquivalentProperty(Property property,
-			Property equivalentProperty) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.removeEquivalentProperty() not implemented.");
-	}
-
-	@Override
-	public List<String> getAllSubPropertyURIs(String propertyURI) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.getAllSubPropertyURIs() not implemented.");
-	}
-
-	@Override
-	public List<String> getAllSuperPropertyURIs(String propertyURI) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.getAllSuperPropertyURIs() not implemented.");
-	}
-
-	@Override
-	public List<String> getEquivalentPropertyURIs(String propertyURI) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.getEquivalentPropertyURIs() not implemented.");
-	}
-
-	@Override
-	public List<VClass> getClassesWithRestrictionOnProperty(String propertyURI) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.getClassesWithRestrictionOnProperty() not implemented.");
-	}
-
-	@Override
-	public List<ObjectProperty> getAllObjectProperties() {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.getAllObjectProperties() not implemented.");
-	}
-
-	@Override
-	public List<ObjectProperty> getObjectPropertiesForObjectPropertyStatements(
-			List objectPropertyStatements) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.getObjectPropertiesForObjectPropertyStatements() not implemented.");
-	}
-
-	@Override
-	public List<String> getSuperPropertyURIs(String objectPropertyURI,
-			boolean direct) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.getSuperPropertyURIs() not implemented.");
-	}
-
-	@Override
-	public List<String> getSubPropertyURIs(String objectPropertyURI) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.getSubPropertyURIs() not implemented.");
-	}
-
-	@Override
-	public List<ObjectPropertyStatement> getStatementsUsingObjectProperty(
-			ObjectProperty op) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.getStatementsUsingObjectProperty() not implemented.");
-	}
-
-	@Override
-	public void fillObjectPropertiesForIndividual(Individual individual) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.fillObjectPropertiesForIndividual() not implemented.");
-	}
-
-	@Override
-	public int insertObjectProperty(ObjectProperty objectProperty)
-			throws InsertException {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.insertObjectProperty() not implemented.");
-	}
-
-	@Override
-	public void updateObjectProperty(ObjectProperty objectProperty) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.updateObjectProperty() not implemented.");
-	}
-
-	@Override
-	public void deleteObjectProperty(String objectPropertyURI) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.deleteObjectProperty() not implemented.");
-	}
-
-	@Override
-	public void deleteObjectProperty(ObjectProperty objectProperty) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.deleteObjectProperty() not implemented.");
-	}
-
-	@Override
-	public boolean skipEditForm(String predicateURI) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.skipEditForm() not implemented.");
-	}
-
-	@Override
-	public List<ObjectProperty> getRootObjectProperties() {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.getRootObjectProperties() not implemented.");
-	}
-
-	@Override
-	public List<ObjectProperty> getObjectPropertyList(Individual subject) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.getObjectPropertyList() not implemented.");
-	}
-
-	@Override
-	public List<ObjectProperty> getObjectPropertyList(String subjectUri) {
-		throw new RuntimeException(
-				"ObjectPropertyDaoStub.getObjectPropertyList() not implemented.");
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package stubs.edu.cornell.mannlib.vitro.webapp.dao;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import edu.cornell.mannlib.vitro.webapp.beans.Individual;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty;
+import edu.cornell.mannlib.vitro.webapp.beans.ObjectPropertyStatement;
+import edu.cornell.mannlib.vitro.webapp.beans.Property;
+import edu.cornell.mannlib.vitro.webapp.beans.VClass;
+import edu.cornell.mannlib.vitro.webapp.dao.InsertException;
+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.
+ */
+public class ObjectPropertyDaoStub implements ObjectPropertyDao {
+	// ----------------------------------------------------------------------
+	// Stub infrastructure
+	// ----------------------------------------------------------------------
+
+	private final Map<String, ObjectProperty> opMap = new HashMap<String, ObjectProperty>();
+	private final Map<String, String> configFilesMap = new HashMap<String, String>();
+
+	public void addObjectProperty(ObjectProperty property) {
+		if (property == null) {
+			throw new NullPointerException("predicate may not be null.");
+		}
+
+		String uri = property.getURI();
+		if (uri == null) {
+			throw new NullPointerException("uri may not be null.");
+		}
+
+		opMap.put(uri, property);
+	}
+	
+	public void setCustomListViewConfigFileName(ObjectProperty property, String filename) {
+		if (property == null) {
+			throw new NullPointerException("property may not be null.");
+		}
+		
+		String uri = property.getURI();
+		if (uri == null) {
+			throw new NullPointerException("uri may not be null.");
+		}
+		
+		configFilesMap.put(uri, filename);
+	}
+
+	// ----------------------------------------------------------------------
+	// Stub methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public ObjectProperty getObjectPropertyByURI(String objectPropertyURI) {
+		if (objectPropertyURI == null) {
+			return null;
+		}
+		return opMap.get(objectPropertyURI);
+	}
+	
+    @Override
+    public ObjectProperty getObjectPropertyByURIAndRangeURI(String objectPropertyURI, String rangeURI) {
+        return getObjectPropertyByURI(objectPropertyURI);
+    }
+
+	@Override
+	public String getCustomListViewConfigFileName(ObjectProperty objectProperty) {
+		if (objectProperty == null) {
+			return null;
+		}
+		String uri = objectProperty.getURI();
+		if (uri == null) {
+			return null;
+		}
+		return configFilesMap.get(uri);
+	}
+
+	// ----------------------------------------------------------------------
+	// Un-implemented methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public void addSuperproperty(Property property, Property superproperty) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.addSuperproperty() not implemented.");
+	}
+
+	@Override
+	public void addSuperproperty(String propertyURI, String superpropertyURI) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.addSuperproperty() not implemented.");
+	}
+
+	@Override
+	public void removeSuperproperty(Property property, Property superproperty) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.removeSuperproperty() not implemented.");
+	}
+
+	@Override
+	public void removeSuperproperty(String propertyURI, String superpropertyURI) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.removeSuperproperty() not implemented.");
+	}
+
+	@Override
+	public void addSubproperty(Property property, Property subproperty) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.addSubproperty() not implemented.");
+	}
+
+	@Override
+	public void addSubproperty(String propertyURI, String subpropertyURI) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.addSubproperty() not implemented.");
+	}
+
+	@Override
+	public void removeSubproperty(Property property, Property subproperty) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.removeSubproperty() not implemented.");
+	}
+
+	@Override
+	public void removeSubproperty(String propertyURI, String subpropertyURI) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.removeSubproperty() not implemented.");
+	}
+
+	@Override
+	public void addEquivalentProperty(String propertyURI,
+			String equivalentPropertyURI) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.addEquivalentProperty() not implemented.");
+	}
+
+	@Override
+	public void addEquivalentProperty(Property property,
+			Property equivalentProperty) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.addEquivalentProperty() not implemented.");
+	}
+
+	@Override
+	public void removeEquivalentProperty(String propertyURI,
+			String equivalentPropertyURI) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.removeEquivalentProperty() not implemented.");
+	}
+
+	@Override
+	public void removeEquivalentProperty(Property property,
+			Property equivalentProperty) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.removeEquivalentProperty() not implemented.");
+	}
+
+	@Override
+	public List<String> getAllSubPropertyURIs(String propertyURI) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.getAllSubPropertyURIs() not implemented.");
+	}
+
+	@Override
+	public List<String> getAllSuperPropertyURIs(String propertyURI) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.getAllSuperPropertyURIs() not implemented.");
+	}
+
+	@Override
+	public List<String> getEquivalentPropertyURIs(String propertyURI) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.getEquivalentPropertyURIs() not implemented.");
+	}
+
+	@Override
+	public List<VClass> getClassesWithRestrictionOnProperty(String propertyURI) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.getClassesWithRestrictionOnProperty() not implemented.");
+	}
+
+	@Override
+	public List<ObjectProperty> getAllObjectProperties() {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.getAllObjectProperties() not implemented.");
+	}
+
+	@Override
+	public List<ObjectProperty> getObjectPropertiesForObjectPropertyStatements(
+			List objectPropertyStatements) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.getObjectPropertiesForObjectPropertyStatements() not implemented.");
+	}
+
+	@Override
+	public List<String> getSuperPropertyURIs(String objectPropertyURI,
+			boolean direct) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.getSuperPropertyURIs() not implemented.");
+	}
+
+	@Override
+	public List<String> getSubPropertyURIs(String objectPropertyURI) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.getSubPropertyURIs() not implemented.");
+	}
+
+	@Override
+	public List<ObjectPropertyStatement> getStatementsUsingObjectProperty(
+			ObjectProperty op) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.getStatementsUsingObjectProperty() not implemented.");
+	}
+
+	@Override
+	public void fillObjectPropertiesForIndividual(Individual individual) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.fillObjectPropertiesForIndividual() not implemented.");
+	}
+
+	@Override
+	public int insertObjectProperty(ObjectProperty objectProperty)
+			throws InsertException {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.insertObjectProperty() not implemented.");
+	}
+
+	@Override
+	public void updateObjectProperty(ObjectProperty objectProperty) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.updateObjectProperty() not implemented.");
+	}
+
+	@Override
+	public void deleteObjectProperty(String objectPropertyURI) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.deleteObjectProperty() not implemented.");
+	}
+
+	@Override
+	public void deleteObjectProperty(ObjectProperty objectProperty) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.deleteObjectProperty() not implemented.");
+	}
+
+	@Override
+	public boolean skipEditForm(String predicateURI) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.skipEditForm() not implemented.");
+	}
+
+	@Override
+	public List<ObjectProperty> getRootObjectProperties() {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.getRootObjectProperties() not implemented.");
+	}
+
+	@Override
+	public List<ObjectProperty> getObjectPropertyList(Individual subject) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.getObjectPropertyList() not implemented.");
+	}
+
+	@Override
+	public List<ObjectProperty> getObjectPropertyList(String subjectUri) {
+		throw new RuntimeException(
+				"ObjectPropertyDaoStub.getObjectPropertyList() not implemented.");
+	}
+
+}
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/UserAccountsDaoStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/UserAccountsDaoStub.java
index 856525409..4f4581b39 100644
--- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/UserAccountsDaoStub.java
+++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/UserAccountsDaoStub.java
@@ -1,111 +1,111 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package stubs.edu.cornell.mannlib.vitro.webapp.dao;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
-import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
-import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
-
-/**
- * TODO
- */
-public class UserAccountsDaoStub implements UserAccountsDao {
-	private static final Log log = LogFactory.getLog(UserAccountsDaoStub.class);
-
-	private final Map<String, UserAccount> userAccountsByUri = new HashMap<String, UserAccount>();
-	private final Map<String, PermissionSet> permissionSetsByUri = new HashMap<String, PermissionSet>();
-
-	// ----------------------------------------------------------------------
-	// Stub infrastructure
-	// ----------------------------------------------------------------------
-
-	public void addUser(UserAccount user) {
-		userAccountsByUri.put(user.getUri(), user);
-	}
-	
-	public void addPermissionSet(PermissionSet ps) {
-		permissionSetsByUri.put(ps.getUri(), ps);
-	}
-
-	// ----------------------------------------------------------------------
-	// Stub methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public UserAccount getUserAccountByUri(String uri) {
-		return userAccountsByUri.get(uri);
-	}
-
-	@Override
-	public Collection<PermissionSet> getAllPermissionSets() {
-		return new ArrayList<PermissionSet>(permissionSetsByUri.values());
-	}
-
-	@Override
-	public PermissionSet getPermissionSetByUri(String uri) {
-		return permissionSetsByUri.get(uri);
-	}
-
-	// ----------------------------------------------------------------------
-	// Un-implemented methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public UserAccount getUserAccountByEmail(String emailAddress) {
-		throw new RuntimeException(
-				"UserAccountsDaoStub.getUserAccountByEmail() not implemented.");
-	}
-
-	@Override
-	public String insertUserAccount(UserAccount userAccount) {
-		throw new RuntimeException(
-				"UserAccountsDaoStub.insertUserAccount() not implemented.");
-	}
-
-	@Override
-	public void updateUserAccount(UserAccount userAccount) {
-		throw new RuntimeException(
-				"UserAccountsDaoStub.updateUserAccount() not implemented.");
-	}
-
-	@Override
-	public void deleteUserAccount(String userAccountUri) {
-		throw new RuntimeException(
-				"UserAccountsDaoStub.deleteUserAccount() not implemented.");
-	}
-
-	@Override
-	public UserAccount getUserAccountByExternalAuthId(String externalAuthId) {
-		throw new RuntimeException(
-				"UserAccountsDao.getUserAccountByExternalAuthId() not implemented.");
-	}
-
-	@Override
-	public Collection<UserAccount> getAllUserAccounts() {
-		throw new RuntimeException(
-				"UserAccountsDao.getAllUserAccounts() not implemented.");
-	}
-
-	@Override
-	public Collection<UserAccount> getUserAccountsWhoProxyForPage(
-			String profilePageUri) {
-		throw new RuntimeException(
-				"UserAccountsDaoStub.getUserAccountsWhoProxyForPage() not implemented.");
-	}
-
-	@Override
-	public void setProxyAccountsOnProfile(String profilePageUri,
-			Collection<String> userAccountUris) {
-		throw new RuntimeException(
-				"UserAccountsDaoStub.setProxyAccountsOnProfile() not implemented.");
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package stubs.edu.cornell.mannlib.vitro.webapp.dao;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import edu.cornell.mannlib.vitro.webapp.beans.PermissionSet;
+import edu.cornell.mannlib.vitro.webapp.beans.UserAccount;
+import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
+
+/**
+ * TODO
+ */
+public class UserAccountsDaoStub implements UserAccountsDao {
+	private static final Log log = LogFactory.getLog(UserAccountsDaoStub.class);
+
+	private final Map<String, UserAccount> userAccountsByUri = new HashMap<String, UserAccount>();
+	private final Map<String, PermissionSet> permissionSetsByUri = new HashMap<String, PermissionSet>();
+
+	// ----------------------------------------------------------------------
+	// Stub infrastructure
+	// ----------------------------------------------------------------------
+
+	public void addUser(UserAccount user) {
+		userAccountsByUri.put(user.getUri(), user);
+	}
+	
+	public void addPermissionSet(PermissionSet ps) {
+		permissionSetsByUri.put(ps.getUri(), ps);
+	}
+
+	// ----------------------------------------------------------------------
+	// Stub methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public UserAccount getUserAccountByUri(String uri) {
+		return userAccountsByUri.get(uri);
+	}
+
+	@Override
+	public Collection<PermissionSet> getAllPermissionSets() {
+		return new ArrayList<PermissionSet>(permissionSetsByUri.values());
+	}
+
+	@Override
+	public PermissionSet getPermissionSetByUri(String uri) {
+		return permissionSetsByUri.get(uri);
+	}
+
+	// ----------------------------------------------------------------------
+	// Un-implemented methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public UserAccount getUserAccountByEmail(String emailAddress) {
+		throw new RuntimeException(
+				"UserAccountsDaoStub.getUserAccountByEmail() not implemented.");
+	}
+
+	@Override
+	public String insertUserAccount(UserAccount userAccount) {
+		throw new RuntimeException(
+				"UserAccountsDaoStub.insertUserAccount() not implemented.");
+	}
+
+	@Override
+	public void updateUserAccount(UserAccount userAccount) {
+		throw new RuntimeException(
+				"UserAccountsDaoStub.updateUserAccount() not implemented.");
+	}
+
+	@Override
+	public void deleteUserAccount(String userAccountUri) {
+		throw new RuntimeException(
+				"UserAccountsDaoStub.deleteUserAccount() not implemented.");
+	}
+
+	@Override
+	public UserAccount getUserAccountByExternalAuthId(String externalAuthId) {
+		throw new RuntimeException(
+				"UserAccountsDao.getUserAccountByExternalAuthId() not implemented.");
+	}
+
+	@Override
+	public Collection<UserAccount> getAllUserAccounts() {
+		throw new RuntimeException(
+				"UserAccountsDao.getAllUserAccounts() not implemented.");
+	}
+
+	@Override
+	public Collection<UserAccount> getUserAccountsWhoProxyForPage(
+			String profilePageUri) {
+		throw new RuntimeException(
+				"UserAccountsDaoStub.getUserAccountsWhoProxyForPage() not implemented.");
+	}
+
+	@Override
+	public void setProxyAccountsOnProfile(String profilePageUri,
+			Collection<String> userAccountUris) {
+		throw new RuntimeException(
+				"UserAccountsDaoStub.setProxyAccountsOnProfile() not implemented.");
+	}
+
+}
diff --git a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryStub.java b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryStub.java
index c0aaa9d77..e96dc1c6a 100644
--- a/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryStub.java
+++ b/webapp/test/stubs/edu/cornell/mannlib/vitro/webapp/dao/WebappDaoFactoryStub.java
@@ -1,235 +1,235 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package stubs.edu.cornell.mannlib.vitro.webapp.dao;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import edu.cornell.mannlib.vitro.webapp.dao.ApplicationDao;
-import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
-import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
-import edu.cornell.mannlib.vitro.webapp.dao.DatatypeDao;
-import edu.cornell.mannlib.vitro.webapp.dao.DisplayModelDao;
-import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
-import edu.cornell.mannlib.vitro.webapp.dao.MenuDao;
-import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
-import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao;
-import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
-import edu.cornell.mannlib.vitro.webapp.dao.PageDao;
-import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
-import edu.cornell.mannlib.vitro.webapp.dao.PropertyInstanceDao;
-import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
-import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
-import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
-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.
- */
-public class WebappDaoFactoryStub implements WebappDaoFactory {
-	// ----------------------------------------------------------------------
-	// Stub infrastructure
-	// ----------------------------------------------------------------------
-
-	private String defaultNamespace;
-	private ApplicationDao applicationDao;
-	private DataPropertyDao dataPropertyDao;
-	private IndividualDao individualDao;
-	private MenuDao menuDao;
-	private ObjectPropertyDao objectPropertyDao;
-	private ObjectPropertyStatementDao objectPropertyStatementDao;
-	private OntologyDao ontologyDao;
-	private UserAccountsDao userAccountsDao;
-	private VClassDao vClassDao;
-
-	public void setDefaultNamespace(String defaultNamespace) {
-		this.defaultNamespace = defaultNamespace;
-	}
-
-	public void setApplicationDao(ApplicationDao applicationDao) {
-		this.applicationDao = applicationDao;
-	}
-
-	public void setDataPropertyDao(DataPropertyDao dataPropertyDao) {
-		this.dataPropertyDao = dataPropertyDao;
-	}
-
-	public void setIndividualDao(IndividualDao individualDao) {
-		this.individualDao = individualDao;
-	}
-
-	public void setMenuDao(MenuDao menuDao) {
-		this.menuDao = menuDao;
-	}
-
-	public void setObjectPropertyDao(ObjectPropertyDao objectPropertyDao) {
-		this.objectPropertyDao = objectPropertyDao;
-	}
-
-	public void setObjectPropertyStatementDao(ObjectPropertyStatementDao objectPropertyStatementDao) {
-		this.objectPropertyStatementDao = objectPropertyStatementDao;
-	}
-	
-	public void setOntologyDao(OntologyDao ontologyDao) {
-		this.ontologyDao = ontologyDao;
-	}
-
-	public void setUserAccountsDao(UserAccountsDao userAccountsDao) {
-		this.userAccountsDao = userAccountsDao;
-	}
-	
-	public void setVClassDao(VClassDao vClassDao) {
-		this.vClassDao = vClassDao;
-	}
-
-	// ----------------------------------------------------------------------
-	// Stub methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public String getDefaultNamespace() {
-		return this.defaultNamespace;
-	}
-
-	@Override
-	public ApplicationDao getApplicationDao() {
-		return this.applicationDao;
-	}
-
-	@Override
-	public DataPropertyDao getDataPropertyDao() {
-		return this.dataPropertyDao;
-	}
-
-	@Override
-	public IndividualDao getIndividualDao() {
-		return this.individualDao;
-	}
-
-	@Override
-	public MenuDao getMenuDao() {
-		return this.menuDao;
-	}
-
-	@Override
-	public ObjectPropertyDao getObjectPropertyDao() {
-		return this.objectPropertyDao;
-	}
-
-	@Override
-	public ObjectPropertyStatementDao getObjectPropertyStatementDao() {
-return this.objectPropertyStatementDao;	}
-
-	@Override
-	public OntologyDao getOntologyDao() {
-		return this.ontologyDao;
-	}
-
-	@Override
-	public UserAccountsDao getUserAccountsDao() {
-		return this.userAccountsDao;
-	}
-
-	@Override
-	public VClassDao getVClassDao() {
-		return this.vClassDao;
-	}
-
-	// ----------------------------------------------------------------------
-	// Un-implemented methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public String checkURI(String uriStr) {
-		throw new RuntimeException(
-				"WebappDaoFactory.checkURI() not implemented.");
-	}
-
-	@Override
-	public String checkURI(String uriStr, boolean checkUniqueness) {
-		throw new RuntimeException(
-				"WebappDaoFactory.checkURI() not implemented.");
-	}
-
-	@Override
-	public Set<String> getNonuserNamespaces() {
-		throw new RuntimeException(
-				"WebappDaoFactory.getNonuserNamespaces() not implemented.");
-	}
-
-	@Override
-	public List<String> getPreferredLanguages() {
-		throw new RuntimeException(
-				"WebappDaoFactory.getPreferredLanguages() not implemented.");
-	}
-
-	@Override
-	public List<String> getCommentsForResource(String resourceURI) {
-		throw new RuntimeException(
-				"WebappDaoFactory.getCommentsForResource() not implemented.");
-	}
-
-	@Override
-	public WebappDaoFactory getUserAwareDaoFactory(String userURI) {
-		throw new RuntimeException(
-				"WebappDaoFactory.getUserAwareDaoFactory() not implemented.");
-	}
-
-	@Override
-	public String getUserURI() {
-		throw new RuntimeException(
-				"WebappDaoFactory.getUserURI() not implemented.");
-	}
-
-	@Override
-	public DatatypeDao getDatatypeDao() {
-		throw new RuntimeException(
-				"WebappDaoFactory.getDatatypeDao() not implemented.");
-	}
-
-	@Override
-	public DataPropertyStatementDao getDataPropertyStatementDao() {
-		throw new RuntimeException(
-				"WebappDaoFactory.getDataPropertyStatementDao() not implemented.");
-	}
-
-	@Override
-	public DisplayModelDao getDisplayModelDao() {
-		throw new RuntimeException(
-				"WebappDaoFactory.getDisplayModelDao() not implemented.");
-	}
-
-	@Override
-	public VClassGroupDao getVClassGroupDao() {
-		throw new RuntimeException(
-				"WebappDaoFactory.getVClassGroupDao() not implemented.");
-	}
-
-	@Override
-	public PropertyGroupDao getPropertyGroupDao() {
-		throw new RuntimeException(
-				"WebappDaoFactory.getPropertyGroupDao() not implemented.");
-	}
-
-	@Override
-	public PropertyInstanceDao getPropertyInstanceDao() {
-		throw new RuntimeException(
-				"WebappDaoFactory.getPropertyInstanceDao() not implemented.");
-	}
-
-	@Override
-	public PageDao getPageDao() {
-		throw new RuntimeException(
-				"WebappDaoFactory.getPageDao() not implemented.");
-	}
-
-	@Override
-	public void close() {
-		throw new RuntimeException("WebappDaoFactory.close() not implemented.");
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package stubs.edu.cornell.mannlib.vitro.webapp.dao;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import edu.cornell.mannlib.vitro.webapp.dao.ApplicationDao;
+import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyDao;
+import edu.cornell.mannlib.vitro.webapp.dao.DataPropertyStatementDao;
+import edu.cornell.mannlib.vitro.webapp.dao.DatatypeDao;
+import edu.cornell.mannlib.vitro.webapp.dao.DisplayModelDao;
+import edu.cornell.mannlib.vitro.webapp.dao.IndividualDao;
+import edu.cornell.mannlib.vitro.webapp.dao.MenuDao;
+import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyDao;
+import edu.cornell.mannlib.vitro.webapp.dao.ObjectPropertyStatementDao;
+import edu.cornell.mannlib.vitro.webapp.dao.OntologyDao;
+import edu.cornell.mannlib.vitro.webapp.dao.PageDao;
+import edu.cornell.mannlib.vitro.webapp.dao.PropertyGroupDao;
+import edu.cornell.mannlib.vitro.webapp.dao.PropertyInstanceDao;
+import edu.cornell.mannlib.vitro.webapp.dao.UserAccountsDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VClassDao;
+import edu.cornell.mannlib.vitro.webapp.dao.VClassGroupDao;
+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.
+ */
+public class WebappDaoFactoryStub implements WebappDaoFactory {
+	// ----------------------------------------------------------------------
+	// Stub infrastructure
+	// ----------------------------------------------------------------------
+
+	private String defaultNamespace;
+	private ApplicationDao applicationDao;
+	private DataPropertyDao dataPropertyDao;
+	private IndividualDao individualDao;
+	private MenuDao menuDao;
+	private ObjectPropertyDao objectPropertyDao;
+	private ObjectPropertyStatementDao objectPropertyStatementDao;
+	private OntologyDao ontologyDao;
+	private UserAccountsDao userAccountsDao;
+	private VClassDao vClassDao;
+
+	public void setDefaultNamespace(String defaultNamespace) {
+		this.defaultNamespace = defaultNamespace;
+	}
+
+	public void setApplicationDao(ApplicationDao applicationDao) {
+		this.applicationDao = applicationDao;
+	}
+
+	public void setDataPropertyDao(DataPropertyDao dataPropertyDao) {
+		this.dataPropertyDao = dataPropertyDao;
+	}
+
+	public void setIndividualDao(IndividualDao individualDao) {
+		this.individualDao = individualDao;
+	}
+
+	public void setMenuDao(MenuDao menuDao) {
+		this.menuDao = menuDao;
+	}
+
+	public void setObjectPropertyDao(ObjectPropertyDao objectPropertyDao) {
+		this.objectPropertyDao = objectPropertyDao;
+	}
+
+	public void setObjectPropertyStatementDao(ObjectPropertyStatementDao objectPropertyStatementDao) {
+		this.objectPropertyStatementDao = objectPropertyStatementDao;
+	}
+	
+	public void setOntologyDao(OntologyDao ontologyDao) {
+		this.ontologyDao = ontologyDao;
+	}
+
+	public void setUserAccountsDao(UserAccountsDao userAccountsDao) {
+		this.userAccountsDao = userAccountsDao;
+	}
+	
+	public void setVClassDao(VClassDao vClassDao) {
+		this.vClassDao = vClassDao;
+	}
+
+	// ----------------------------------------------------------------------
+	// Stub methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public String getDefaultNamespace() {
+		return this.defaultNamespace;
+	}
+
+	@Override
+	public ApplicationDao getApplicationDao() {
+		return this.applicationDao;
+	}
+
+	@Override
+	public DataPropertyDao getDataPropertyDao() {
+		return this.dataPropertyDao;
+	}
+
+	@Override
+	public IndividualDao getIndividualDao() {
+		return this.individualDao;
+	}
+
+	@Override
+	public MenuDao getMenuDao() {
+		return this.menuDao;
+	}
+
+	@Override
+	public ObjectPropertyDao getObjectPropertyDao() {
+		return this.objectPropertyDao;
+	}
+
+	@Override
+	public ObjectPropertyStatementDao getObjectPropertyStatementDao() {
+return this.objectPropertyStatementDao;	}
+
+	@Override
+	public OntologyDao getOntologyDao() {
+		return this.ontologyDao;
+	}
+
+	@Override
+	public UserAccountsDao getUserAccountsDao() {
+		return this.userAccountsDao;
+	}
+
+	@Override
+	public VClassDao getVClassDao() {
+		return this.vClassDao;
+	}
+
+	// ----------------------------------------------------------------------
+	// Un-implemented methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public String checkURI(String uriStr) {
+		throw new RuntimeException(
+				"WebappDaoFactory.checkURI() not implemented.");
+	}
+
+	@Override
+	public String checkURI(String uriStr, boolean checkUniqueness) {
+		throw new RuntimeException(
+				"WebappDaoFactory.checkURI() not implemented.");
+	}
+
+	@Override
+	public Set<String> getNonuserNamespaces() {
+		throw new RuntimeException(
+				"WebappDaoFactory.getNonuserNamespaces() not implemented.");
+	}
+
+	@Override
+	public List<String> getPreferredLanguages() {
+		throw new RuntimeException(
+				"WebappDaoFactory.getPreferredLanguages() not implemented.");
+	}
+
+	@Override
+	public List<String> getCommentsForResource(String resourceURI) {
+		throw new RuntimeException(
+				"WebappDaoFactory.getCommentsForResource() not implemented.");
+	}
+
+	@Override
+	public WebappDaoFactory getUserAwareDaoFactory(String userURI) {
+		throw new RuntimeException(
+				"WebappDaoFactory.getUserAwareDaoFactory() not implemented.");
+	}
+
+	@Override
+	public String getUserURI() {
+		throw new RuntimeException(
+				"WebappDaoFactory.getUserURI() not implemented.");
+	}
+
+	@Override
+	public DatatypeDao getDatatypeDao() {
+		throw new RuntimeException(
+				"WebappDaoFactory.getDatatypeDao() not implemented.");
+	}
+
+	@Override
+	public DataPropertyStatementDao getDataPropertyStatementDao() {
+		throw new RuntimeException(
+				"WebappDaoFactory.getDataPropertyStatementDao() not implemented.");
+	}
+
+	@Override
+	public DisplayModelDao getDisplayModelDao() {
+		throw new RuntimeException(
+				"WebappDaoFactory.getDisplayModelDao() not implemented.");
+	}
+
+	@Override
+	public VClassGroupDao getVClassGroupDao() {
+		throw new RuntimeException(
+				"WebappDaoFactory.getVClassGroupDao() not implemented.");
+	}
+
+	@Override
+	public PropertyGroupDao getPropertyGroupDao() {
+		throw new RuntimeException(
+				"WebappDaoFactory.getPropertyGroupDao() not implemented.");
+	}
+
+	@Override
+	public PropertyInstanceDao getPropertyInstanceDao() {
+		throw new RuntimeException(
+				"WebappDaoFactory.getPropertyInstanceDao() not implemented.");
+	}
+
+	@Override
+	public PageDao getPageDao() {
+		throw new RuntimeException(
+				"WebappDaoFactory.getPageDao() not implemented.");
+	}
+
+	@Override
+	public void close() {
+		throw new RuntimeException("WebappDaoFactory.close() not implemented.");
+	}
+
+}
diff --git a/webapp/test/stubs/javax/naming/ContextStub.java b/webapp/test/stubs/javax/naming/ContextStub.java
index 854f9bab6..a112d0c21 100644
--- a/webapp/test/stubs/javax/naming/ContextStub.java
+++ b/webapp/test/stubs/javax/naming/ContextStub.java
@@ -1,219 +1,219 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package stubs.javax.naming;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-import javax.naming.Binding;
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NameClassPair;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-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>
- */
-public class ContextStub implements Context {
-
-	// ----------------------------------------------------------------------
-	// Stub infrastructure
-	// ----------------------------------------------------------------------
-
-	/**
-	 * Keep a single context instance for each path.
-	 */
-	private static final Map<String, ContextStub> instances = new HashMap<String, ContextStub>();
-
-	/**
-	 * Get the context instance for this path. Create one if necessary.
-	 */
-	static ContextStub getInstance(String contextPath, InitialContextStub parent) {
-		if (!instances.containsKey(contextPath)) {
-			instances.put(contextPath, new ContextStub(contextPath, parent));
-		}
-		return instances.get(contextPath);
-	}
-
-	private final String contextPath;
-	private final InitialContextStub parent;
-
-	private ContextStub(String contextPath, InitialContextStub parent) {
-		this.contextPath = contextPath;
-		this.parent = parent;
-	}
-
-	// ----------------------------------------------------------------------
-	// Stub methods
-	// ----------------------------------------------------------------------
-
-	/**
-	 * Let the parent handle it.
-	 */
-	public void rebind(String name, Object obj) throws NamingException {
-		if (name == null) {
-			throw new NullPointerException("ContextStub: name may not be null.");
-		}
-		if (isEmpty(name)) {
-			throw new NamingException("ContextStub: name may not be empty.");
-		}
-		parent.rebind(contextPath + "/" + name, obj);
-	}
-
-	/**
-	 * In most cases, just let the parent handle it.
-	 */
-	public Object lookup(String name) throws NamingException {
-		if (name == null) {
-			throw new NamingException("ContextStub: name may not be null.");
-		}
-		if (isEmpty(name)) {
-			return this;
-		}
-		return parent.lookup(contextPath + "/" + name);
-	}
-
-	// ----------------------------------------------------------------------
-	// Un-implemented methods
-	// ----------------------------------------------------------------------
-
-	public Object addToEnvironment(String propName, Object propVal)
-			throws NamingException {
-		throw new RuntimeException(
-				"ContextStub.addToEnvironment() not implemented.");
-	}
-
-	public void bind(Name name, Object obj) throws NamingException {
-		throw new RuntimeException("ContextStub.bind() not implemented.");
-	}
-
-	public void bind(String name, Object obj) throws NamingException {
-		throw new RuntimeException("ContextStub.bind() not implemented.");
-	}
-
-	public void close() throws NamingException {
-		throw new RuntimeException("ContextStub.close() not implemented.");
-	}
-
-	public Name composeName(Name name, Name prefix) throws NamingException {
-		throw new RuntimeException("ContextStub.composeName() not implemented.");
-	}
-
-	public String composeName(String name, String prefix)
-			throws NamingException {
-		throw new RuntimeException("ContextStub.composeName() not implemented.");
-	}
-
-	public Context createSubcontext(Name name) throws NamingException {
-		throw new RuntimeException(
-				"ContextStub.createSubcontext() not implemented.");
-	}
-
-	public Context createSubcontext(String name) throws NamingException {
-		throw new RuntimeException(
-				"ContextStub.createSubcontext() not implemented.");
-	}
-
-	public void destroySubcontext(Name name) throws NamingException {
-		throw new RuntimeException(
-				"ContextStub.destroySubcontext() not implemented.");
-	}
-
-	public void destroySubcontext(String name) throws NamingException {
-		throw new RuntimeException(
-				"ContextStub.destroySubcontext() not implemented.");
-	}
-
-	public Hashtable<?, ?> getEnvironment() throws NamingException {
-		throw new RuntimeException(
-				"ContextStub.getEnvironment() not implemented.");
-	}
-
-	public String getNameInNamespace() throws NamingException {
-		throw new RuntimeException(
-				"ContextStub.getNameInNamespace() not implemented.");
-	}
-
-	public NameParser getNameParser(Name name) throws NamingException {
-		throw new RuntimeException(
-				"ContextStub.getNameParser() not implemented.");
-	}
-
-	public NameParser getNameParser(String name) throws NamingException {
-		throw new RuntimeException(
-				"ContextStub.getNameParser() not implemented.");
-	}
-
-	public NamingEnumeration<NameClassPair> list(Name name)
-			throws NamingException {
-		throw new RuntimeException("ContextStub.list() not implemented.");
-	}
-
-	public NamingEnumeration<NameClassPair> list(String name)
-			throws NamingException {
-		throw new RuntimeException("ContextStub.list() not implemented.");
-	}
-
-	public NamingEnumeration<Binding> listBindings(Name name)
-			throws NamingException {
-		throw new RuntimeException(
-				"ContextStub.listBindings() not implemented.");
-	}
-
-	public NamingEnumeration<Binding> listBindings(String name)
-			throws NamingException {
-		throw new RuntimeException(
-				"ContextStub.listBindings() not implemented.");
-	}
-
-	public Object lookup(Name name) throws NamingException {
-		throw new RuntimeException("ContextStub.lookup() not implemented.");
-	}
-
-	public Object lookupLink(Name name) throws NamingException {
-		throw new RuntimeException("ContextStub.lookupLink() not implemented.");
-	}
-
-	public Object lookupLink(String name) throws NamingException {
-		throw new RuntimeException("ContextStub.lookupLink() not implemented.");
-	}
-
-	public void rebind(Name name, Object obj) throws NamingException {
-		throw new RuntimeException("ContextStub.rebind() not implemented.");
-	}
-
-	public Object removeFromEnvironment(String propName) throws NamingException {
-		throw new RuntimeException(
-				"ContextStub.removeFromEnvironment() not implemented.");
-	}
-
-	public void rename(Name oldName, Name newName) throws NamingException {
-		throw new RuntimeException("ContextStub.rename() not implemented.");
-	}
-
-	public void rename(String oldName, String newName) throws NamingException {
-		throw new RuntimeException("ContextStub.rename() not implemented.");
-	}
-
-	public void unbind(Name name) throws NamingException {
-		throw new RuntimeException("ContextStub.unbind() not implemented.");
-	}
-
-	public void unbind(String name) throws NamingException {
-		throw new RuntimeException("ContextStub.unbind() not implemented.");
-	}
-
-    private boolean isEmpty(String string) {
-        return (string == null || string.trim().length() == 0);
-    }
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package stubs.javax.naming;
+
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
+import javax.naming.Binding;
+import javax.naming.Context;
+import javax.naming.Name;
+import javax.naming.NameClassPair;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+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>
+ */
+public class ContextStub implements Context {
+
+	// ----------------------------------------------------------------------
+	// Stub infrastructure
+	// ----------------------------------------------------------------------
+
+	/**
+	 * Keep a single context instance for each path.
+	 */
+	private static final Map<String, ContextStub> instances = new HashMap<String, ContextStub>();
+
+	/**
+	 * Get the context instance for this path. Create one if necessary.
+	 */
+	static ContextStub getInstance(String contextPath, InitialContextStub parent) {
+		if (!instances.containsKey(contextPath)) {
+			instances.put(contextPath, new ContextStub(contextPath, parent));
+		}
+		return instances.get(contextPath);
+	}
+
+	private final String contextPath;
+	private final InitialContextStub parent;
+
+	private ContextStub(String contextPath, InitialContextStub parent) {
+		this.contextPath = contextPath;
+		this.parent = parent;
+	}
+
+	// ----------------------------------------------------------------------
+	// Stub methods
+	// ----------------------------------------------------------------------
+
+	/**
+	 * Let the parent handle it.
+	 */
+	public void rebind(String name, Object obj) throws NamingException {
+		if (name == null) {
+			throw new NullPointerException("ContextStub: name may not be null.");
+		}
+		if (isEmpty(name)) {
+			throw new NamingException("ContextStub: name may not be empty.");
+		}
+		parent.rebind(contextPath + "/" + name, obj);
+	}
+
+	/**
+	 * In most cases, just let the parent handle it.
+	 */
+	public Object lookup(String name) throws NamingException {
+		if (name == null) {
+			throw new NamingException("ContextStub: name may not be null.");
+		}
+		if (isEmpty(name)) {
+			return this;
+		}
+		return parent.lookup(contextPath + "/" + name);
+	}
+
+	// ----------------------------------------------------------------------
+	// Un-implemented methods
+	// ----------------------------------------------------------------------
+
+	public Object addToEnvironment(String propName, Object propVal)
+			throws NamingException {
+		throw new RuntimeException(
+				"ContextStub.addToEnvironment() not implemented.");
+	}
+
+	public void bind(Name name, Object obj) throws NamingException {
+		throw new RuntimeException("ContextStub.bind() not implemented.");
+	}
+
+	public void bind(String name, Object obj) throws NamingException {
+		throw new RuntimeException("ContextStub.bind() not implemented.");
+	}
+
+	public void close() throws NamingException {
+		throw new RuntimeException("ContextStub.close() not implemented.");
+	}
+
+	public Name composeName(Name name, Name prefix) throws NamingException {
+		throw new RuntimeException("ContextStub.composeName() not implemented.");
+	}
+
+	public String composeName(String name, String prefix)
+			throws NamingException {
+		throw new RuntimeException("ContextStub.composeName() not implemented.");
+	}
+
+	public Context createSubcontext(Name name) throws NamingException {
+		throw new RuntimeException(
+				"ContextStub.createSubcontext() not implemented.");
+	}
+
+	public Context createSubcontext(String name) throws NamingException {
+		throw new RuntimeException(
+				"ContextStub.createSubcontext() not implemented.");
+	}
+
+	public void destroySubcontext(Name name) throws NamingException {
+		throw new RuntimeException(
+				"ContextStub.destroySubcontext() not implemented.");
+	}
+
+	public void destroySubcontext(String name) throws NamingException {
+		throw new RuntimeException(
+				"ContextStub.destroySubcontext() not implemented.");
+	}
+
+	public Hashtable<?, ?> getEnvironment() throws NamingException {
+		throw new RuntimeException(
+				"ContextStub.getEnvironment() not implemented.");
+	}
+
+	public String getNameInNamespace() throws NamingException {
+		throw new RuntimeException(
+				"ContextStub.getNameInNamespace() not implemented.");
+	}
+
+	public NameParser getNameParser(Name name) throws NamingException {
+		throw new RuntimeException(
+				"ContextStub.getNameParser() not implemented.");
+	}
+
+	public NameParser getNameParser(String name) throws NamingException {
+		throw new RuntimeException(
+				"ContextStub.getNameParser() not implemented.");
+	}
+
+	public NamingEnumeration<NameClassPair> list(Name name)
+			throws NamingException {
+		throw new RuntimeException("ContextStub.list() not implemented.");
+	}
+
+	public NamingEnumeration<NameClassPair> list(String name)
+			throws NamingException {
+		throw new RuntimeException("ContextStub.list() not implemented.");
+	}
+
+	public NamingEnumeration<Binding> listBindings(Name name)
+			throws NamingException {
+		throw new RuntimeException(
+				"ContextStub.listBindings() not implemented.");
+	}
+
+	public NamingEnumeration<Binding> listBindings(String name)
+			throws NamingException {
+		throw new RuntimeException(
+				"ContextStub.listBindings() not implemented.");
+	}
+
+	public Object lookup(Name name) throws NamingException {
+		throw new RuntimeException("ContextStub.lookup() not implemented.");
+	}
+
+	public Object lookupLink(Name name) throws NamingException {
+		throw new RuntimeException("ContextStub.lookupLink() not implemented.");
+	}
+
+	public Object lookupLink(String name) throws NamingException {
+		throw new RuntimeException("ContextStub.lookupLink() not implemented.");
+	}
+
+	public void rebind(Name name, Object obj) throws NamingException {
+		throw new RuntimeException("ContextStub.rebind() not implemented.");
+	}
+
+	public Object removeFromEnvironment(String propName) throws NamingException {
+		throw new RuntimeException(
+				"ContextStub.removeFromEnvironment() not implemented.");
+	}
+
+	public void rename(Name oldName, Name newName) throws NamingException {
+		throw new RuntimeException("ContextStub.rename() not implemented.");
+	}
+
+	public void rename(String oldName, String newName) throws NamingException {
+		throw new RuntimeException("ContextStub.rename() not implemented.");
+	}
+
+	public void unbind(Name name) throws NamingException {
+		throw new RuntimeException("ContextStub.unbind() not implemented.");
+	}
+
+	public void unbind(String name) throws NamingException {
+		throw new RuntimeException("ContextStub.unbind() not implemented.");
+	}
+
+    private boolean isEmpty(String string) {
+        return (string == null || string.trim().length() == 0);
+    }
+
+}
diff --git a/webapp/test/stubs/javax/naming/InitialContextStub.java b/webapp/test/stubs/javax/naming/InitialContextStub.java
index 7cae8ad65..039c098bb 100644
--- a/webapp/test/stubs/javax/naming/InitialContextStub.java
+++ b/webapp/test/stubs/javax/naming/InitialContextStub.java
@@ -1,308 +1,308 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package stubs.javax.naming;
-
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.TreeMap;
-
-import javax.naming.Binding;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.Name;
-import javax.naming.NameClassPair;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-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.
- */
-public class InitialContextStub extends InitialContext {
-
-	// ----------------------------------------------------------------------
-	// Stub infrastructure
-	// ----------------------------------------------------------------------
-
-	private static Map<String, Object> bindings = new TreeMap<String, Object>();
-
-	/**
-	 * Make sure we start the next test with a fresh instance.
-	 */
-	public static void reset() {
-		bindings.clear();
-	}
-
-	/**
-	 * If we have properties that are bound to a level below this name, then
-	 * this name represents a sub-context.
-	 */
-	private boolean isSubContext(String name) {
-		String path = name.endsWith("/") ? name : name + "/";
-
-		for (String key : bindings.keySet()) {
-			if (key.startsWith(path)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	// ----------------------------------------------------------------------
-	// Stub methods
-	// ----------------------------------------------------------------------
-
-	public InitialContextStub() throws NamingException {
-		super();
-	}
-
-	@Override
-	protected void init(Hashtable<?, ?> environment) throws NamingException {
-	}
-
-	@Override
-	protected Context getURLOrDefaultInitCtx(String name)
-			throws NamingException {
-		return super.getURLOrDefaultInitCtx(name);
-	}
-
-	@Override
-	protected Context getDefaultInitCtx() throws NamingException {
-		return ContextStub.getInstance("", this);
-	}
-
-    private boolean isEmpty(String string) {
-        return (string == null || string.trim().length() == 0);
-    }
-
-	@Override
-	public void bind(String name, Object obj) throws NamingException {
-		if (name == null) {
-			throw new NullPointerException(
-					"InitialContextStub: name may not be null.");
-		}
-		if (isEmpty(name)) {
-			throw new NamingException(
-					"InitialContextStub: name may not be empty.");
-		}
-		if (bindings.containsKey(name)) {
-			throw new NamingException(
-					"InitialContextStub: name is already bound.");
-		}
-
-		bindings.put(name, obj);
-	}
-
-	@Override
-	public void rebind(String name, Object obj) throws NamingException {
-		if (name == null) {
-			throw new NullPointerException(
-					"InitialContextStub: name may not be null.");
-		}
-		if (isEmpty(name)) {
-			throw new NamingException(
-					"InitialContextStub: name may not be empty.");
-		}
-
-		bindings.put(name, obj);
-	}
-
-	@Override
-	public Object lookup(String name) throws NamingException {
-		if (name == null) {
-			throw new NullPointerException(
-					"InitialContextStub: name may not be null");
-		}
-		if (isEmpty(name)) {
-			return this;
-		}
-		if (bindings.containsKey(name)) {
-			return bindings.get(name);
-		}
-		if (isSubContext(name)) {
-			return ContextStub.getInstance(name, this);
-		}
-
-		throw new NamingException("InitialContextStub: No binding for '" + name
-				+ "'");
-	}
-
-	// ----------------------------------------------------------------------
-	// Un-implemented methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public Object addToEnvironment(String propName, Object propVal)
-			throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.addToEnvironment() not implemented.");
-	}
-
-	@Override
-	public void bind(Name name, Object obj) throws NamingException {
-		throw new RuntimeException("InitialContextStub.bind() not implemented.");
-	}
-
-	@Override
-	public void close() throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.close() not implemented.");
-	}
-
-	@Override
-	public Name composeName(Name name, Name prefix) throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.composeName() not implemented.");
-	}
-
-	@Override
-	public String composeName(String name, String prefix)
-			throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.composeName() not implemented.");
-	}
-
-	@Override
-	public Context createSubcontext(Name name) throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.createSubcontext() not implemented.");
-	}
-
-	@Override
-	public Context createSubcontext(String name) throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.createSubcontext() not implemented.");
-	}
-
-	@Override
-	public void destroySubcontext(Name name) throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.destroySubcontext() not implemented.");
-	}
-
-	@Override
-	public void destroySubcontext(String name) throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.destroySubcontext() not implemented.");
-	}
-
-	@Override
-	public Hashtable<?, ?> getEnvironment() throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.getEnvironment() not implemented.");
-	}
-
-	@Override
-	public String getNameInNamespace() throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.getNameInNamespace() not implemented.");
-	}
-
-	@Override
-	public NameParser getNameParser(Name name) throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.getNameParser() not implemented.");
-	}
-
-	@Override
-	public NameParser getNameParser(String name) throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.getNameParser() not implemented.");
-	}
-
-	@Override
-	protected Context getURLOrDefaultInitCtx(Name name) throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.getURLOrDefaultInitCtx() not implemented.");
-	}
-
-	@Override
-	public NamingEnumeration<NameClassPair> list(Name name)
-			throws NamingException {
-		throw new RuntimeException("InitialContextStub.list() not implemented.");
-	}
-
-	@Override
-	public NamingEnumeration<NameClassPair> list(String name)
-			throws NamingException {
-		throw new RuntimeException("InitialContextStub.list() not implemented.");
-	}
-
-	@Override
-	public NamingEnumeration<Binding> listBindings(Name name)
-			throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.listBindings() not implemented.");
-	}
-
-	@Override
-	public NamingEnumeration<Binding> listBindings(String name)
-			throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.listBindings() not implemented.");
-	}
-
-	@Override
-	public Object lookup(Name name) throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.lookup() not implemented.");
-	}
-
-	@Override
-	public Object lookupLink(Name name) throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.lookupLink() not implemented.");
-	}
-
-	@Override
-	public Object lookupLink(String name) throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.lookupLink() not implemented.");
-	}
-
-	@Override
-	public void rebind(Name name, Object obj) throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.rebind() not implemented.");
-	}
-
-	@Override
-	public Object removeFromEnvironment(String propName) throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.removeFromEnvironment() not implemented.");
-	}
-
-	@Override
-	public void rename(Name oldName, Name newName) throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.rename() not implemented.");
-	}
-
-	@Override
-	public void rename(String oldName, String newName) throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.rename() not implemented.");
-	}
-
-	@Override
-	public void unbind(Name name) throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.unbind() not implemented.");
-	}
-
-	@Override
-	public void unbind(String name) throws NamingException {
-		throw new RuntimeException(
-				"InitialContextStub.unbind() not implemented.");
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package stubs.javax.naming;
+
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.TreeMap;
+
+import javax.naming.Binding;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.Name;
+import javax.naming.NameClassPair;
+import javax.naming.NameParser;
+import javax.naming.NamingEnumeration;
+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.
+ */
+public class InitialContextStub extends InitialContext {
+
+	// ----------------------------------------------------------------------
+	// Stub infrastructure
+	// ----------------------------------------------------------------------
+
+	private static Map<String, Object> bindings = new TreeMap<String, Object>();
+
+	/**
+	 * Make sure we start the next test with a fresh instance.
+	 */
+	public static void reset() {
+		bindings.clear();
+	}
+
+	/**
+	 * If we have properties that are bound to a level below this name, then
+	 * this name represents a sub-context.
+	 */
+	private boolean isSubContext(String name) {
+		String path = name.endsWith("/") ? name : name + "/";
+
+		for (String key : bindings.keySet()) {
+			if (key.startsWith(path)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	// ----------------------------------------------------------------------
+	// Stub methods
+	// ----------------------------------------------------------------------
+
+	public InitialContextStub() throws NamingException {
+		super();
+	}
+
+	@Override
+	protected void init(Hashtable<?, ?> environment) throws NamingException {
+	}
+
+	@Override
+	protected Context getURLOrDefaultInitCtx(String name)
+			throws NamingException {
+		return super.getURLOrDefaultInitCtx(name);
+	}
+
+	@Override
+	protected Context getDefaultInitCtx() throws NamingException {
+		return ContextStub.getInstance("", this);
+	}
+
+    private boolean isEmpty(String string) {
+        return (string == null || string.trim().length() == 0);
+    }
+
+	@Override
+	public void bind(String name, Object obj) throws NamingException {
+		if (name == null) {
+			throw new NullPointerException(
+					"InitialContextStub: name may not be null.");
+		}
+		if (isEmpty(name)) {
+			throw new NamingException(
+					"InitialContextStub: name may not be empty.");
+		}
+		if (bindings.containsKey(name)) {
+			throw new NamingException(
+					"InitialContextStub: name is already bound.");
+		}
+
+		bindings.put(name, obj);
+	}
+
+	@Override
+	public void rebind(String name, Object obj) throws NamingException {
+		if (name == null) {
+			throw new NullPointerException(
+					"InitialContextStub: name may not be null.");
+		}
+		if (isEmpty(name)) {
+			throw new NamingException(
+					"InitialContextStub: name may not be empty.");
+		}
+
+		bindings.put(name, obj);
+	}
+
+	@Override
+	public Object lookup(String name) throws NamingException {
+		if (name == null) {
+			throw new NullPointerException(
+					"InitialContextStub: name may not be null");
+		}
+		if (isEmpty(name)) {
+			return this;
+		}
+		if (bindings.containsKey(name)) {
+			return bindings.get(name);
+		}
+		if (isSubContext(name)) {
+			return ContextStub.getInstance(name, this);
+		}
+
+		throw new NamingException("InitialContextStub: No binding for '" + name
+				+ "'");
+	}
+
+	// ----------------------------------------------------------------------
+	// Un-implemented methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public Object addToEnvironment(String propName, Object propVal)
+			throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.addToEnvironment() not implemented.");
+	}
+
+	@Override
+	public void bind(Name name, Object obj) throws NamingException {
+		throw new RuntimeException("InitialContextStub.bind() not implemented.");
+	}
+
+	@Override
+	public void close() throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.close() not implemented.");
+	}
+
+	@Override
+	public Name composeName(Name name, Name prefix) throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.composeName() not implemented.");
+	}
+
+	@Override
+	public String composeName(String name, String prefix)
+			throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.composeName() not implemented.");
+	}
+
+	@Override
+	public Context createSubcontext(Name name) throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.createSubcontext() not implemented.");
+	}
+
+	@Override
+	public Context createSubcontext(String name) throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.createSubcontext() not implemented.");
+	}
+
+	@Override
+	public void destroySubcontext(Name name) throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.destroySubcontext() not implemented.");
+	}
+
+	@Override
+	public void destroySubcontext(String name) throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.destroySubcontext() not implemented.");
+	}
+
+	@Override
+	public Hashtable<?, ?> getEnvironment() throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.getEnvironment() not implemented.");
+	}
+
+	@Override
+	public String getNameInNamespace() throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.getNameInNamespace() not implemented.");
+	}
+
+	@Override
+	public NameParser getNameParser(Name name) throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.getNameParser() not implemented.");
+	}
+
+	@Override
+	public NameParser getNameParser(String name) throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.getNameParser() not implemented.");
+	}
+
+	@Override
+	protected Context getURLOrDefaultInitCtx(Name name) throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.getURLOrDefaultInitCtx() not implemented.");
+	}
+
+	@Override
+	public NamingEnumeration<NameClassPair> list(Name name)
+			throws NamingException {
+		throw new RuntimeException("InitialContextStub.list() not implemented.");
+	}
+
+	@Override
+	public NamingEnumeration<NameClassPair> list(String name)
+			throws NamingException {
+		throw new RuntimeException("InitialContextStub.list() not implemented.");
+	}
+
+	@Override
+	public NamingEnumeration<Binding> listBindings(Name name)
+			throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.listBindings() not implemented.");
+	}
+
+	@Override
+	public NamingEnumeration<Binding> listBindings(String name)
+			throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.listBindings() not implemented.");
+	}
+
+	@Override
+	public Object lookup(Name name) throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.lookup() not implemented.");
+	}
+
+	@Override
+	public Object lookupLink(Name name) throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.lookupLink() not implemented.");
+	}
+
+	@Override
+	public Object lookupLink(String name) throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.lookupLink() not implemented.");
+	}
+
+	@Override
+	public void rebind(Name name, Object obj) throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.rebind() not implemented.");
+	}
+
+	@Override
+	public Object removeFromEnvironment(String propName) throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.removeFromEnvironment() not implemented.");
+	}
+
+	@Override
+	public void rename(Name oldName, Name newName) throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.rename() not implemented.");
+	}
+
+	@Override
+	public void rename(String oldName, String newName) throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.rename() not implemented.");
+	}
+
+	@Override
+	public void unbind(Name name) throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.unbind() not implemented.");
+	}
+
+	@Override
+	public void unbind(String name) throws NamingException {
+		throw new RuntimeException(
+				"InitialContextStub.unbind() not implemented.");
+	}
+
+}
diff --git a/webapp/test/stubs/javax/naming/spi/InitialContextFactoryStub.java b/webapp/test/stubs/javax/naming/spi/InitialContextFactoryStub.java
index 654185982..b48a7b9c0 100644
--- a/webapp/test/stubs/javax/naming/spi/InitialContextFactoryStub.java
+++ b/webapp/test/stubs/javax/naming/spi/InitialContextFactoryStub.java
@@ -1,30 +1,30 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package stubs.javax.naming.spi;
-
-import java.util.Hashtable;
-
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.naming.spi.InitialContextFactory;
-
-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());
- * </pre>
- */
-public class InitialContextFactoryStub implements InitialContextFactory {
-	/**
-	 * It's just this easy.
-	 */
-	public Context getInitialContext(Hashtable<?, ?> environment)
-			throws NamingException {
-		return new InitialContextStub();
-	}
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package stubs.javax.naming.spi;
+
+import java.util.Hashtable;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.naming.spi.InitialContextFactory;
+
+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());
+ * </pre>
+ */
+public class InitialContextFactoryStub implements InitialContextFactory {
+	/**
+	 * It's just this easy.
+	 */
+	public Context getInitialContext(Hashtable<?, ?> environment)
+			throws NamingException {
+		return new InitialContextStub();
+	}
+}
diff --git a/webapp/test/stubs/javax/servlet/ServletConfigStub.java b/webapp/test/stubs/javax/servlet/ServletConfigStub.java
index 12af5bef2..9d7eb3d8d 100644
--- a/webapp/test/stubs/javax/servlet/ServletConfigStub.java
+++ b/webapp/test/stubs/javax/servlet/ServletConfigStub.java
@@ -1,56 +1,56 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package stubs.javax.servlet;
-
-import java.util.Enumeration;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-
-/**
- * A simple stub for testing servlets.
- */
-public class ServletConfigStub implements ServletConfig {
-	// ----------------------------------------------------------------------
-	// Stub infrastructure
-	// ----------------------------------------------------------------------
-
-	private ServletContext servletContext;
-
-	public void setServletContext(ServletContext servletContext) {
-		this.servletContext = servletContext;
-	}
-
-	// ----------------------------------------------------------------------
-	// Stub methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public ServletContext getServletContext() {
-		return servletContext;
-	}
-
-	// ----------------------------------------------------------------------
-	// Un-implemented methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public String getInitParameter(String arg0) {
-		throw new RuntimeException(
-				"ServletConfigStub.getInitParameter() not implemented.");
-	}
-
-	@Override
-	@SuppressWarnings("rawtypes")
-	public Enumeration getInitParameterNames() {
-		throw new RuntimeException(
-				"ServletConfigStub.getInitParameterNames() not implemented.");
-	}
-
-	@Override
-	public String getServletName() {
-		throw new RuntimeException(
-				"ServletConfigStub.getServletName() not implemented.");
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package stubs.javax.servlet;
+
+import java.util.Enumeration;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+
+/**
+ * A simple stub for testing servlets.
+ */
+public class ServletConfigStub implements ServletConfig {
+	// ----------------------------------------------------------------------
+	// Stub infrastructure
+	// ----------------------------------------------------------------------
+
+	private ServletContext servletContext;
+
+	public void setServletContext(ServletContext servletContext) {
+		this.servletContext = servletContext;
+	}
+
+	// ----------------------------------------------------------------------
+	// Stub methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public ServletContext getServletContext() {
+		return servletContext;
+	}
+
+	// ----------------------------------------------------------------------
+	// Un-implemented methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public String getInitParameter(String arg0) {
+		throw new RuntimeException(
+				"ServletConfigStub.getInitParameter() not implemented.");
+	}
+
+	@Override
+	@SuppressWarnings("rawtypes")
+	public Enumeration getInitParameterNames() {
+		throw new RuntimeException(
+				"ServletConfigStub.getInitParameterNames() not implemented.");
+	}
+
+	@Override
+	public String getServletName() {
+		throw new RuntimeException(
+				"ServletConfigStub.getServletName() not implemented.");
+	}
+
+}
diff --git a/webapp/test/stubs/javax/servlet/ServletContextStub.java b/webapp/test/stubs/javax/servlet/ServletContextStub.java
index 608289997..cc4e9ca32 100644
--- a/webapp/test/stubs/javax/servlet/ServletContextStub.java
+++ b/webapp/test/stubs/javax/servlet/ServletContextStub.java
@@ -1,243 +1,243 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package stubs.javax.servlet;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import javax.servlet.RequestDispatcher;
-import javax.servlet.Servlet;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * A simple stand-in for the {@link ServletContext}, for use in unit tests.
- */
-public class ServletContextStub implements ServletContext {
-	private static final Log log = LogFactory.getLog(ServletContextStub.class);
-
-	// ----------------------------------------------------------------------
-	// Stub infrastructure
-	// ----------------------------------------------------------------------
-
-	private String contextPath = ""; // root context returns ""
-	private final Map<String, Object> attributes = new HashMap<String, Object>();
-	private final Map<String, String> mockResources = new HashMap<String, String>();
-	private final Map<String, String> realPaths = new HashMap<String, String>();
-
-	public void setContextPath(String contextPath) {
-		if (contextPath == null) {
-			throw new NullPointerException("contextPath may not be null.");
-		}
-	}
-
-	public void setMockResource(String path, String contents) {
-		if (path == null) {
-			throw new NullPointerException("path may not be null.");
-		}
-		if (contents == null) {
-			mockResources.remove(path);
-		} else {
-			mockResources.put(path, contents);
-		}
-	}
-
-	public void setRealPath(String path, String filepath) {
-		if (path == null) {
-			throw new NullPointerException("path may not be null.");
-		}
-		if (filepath == null) {
-			log.debug("removing real path for '" + path + "'");
-			realPaths.remove(path);
-		} else {
-			log.debug("adding real path for '" + path + "' = '" + filepath
-					+ "'");
-			realPaths.put(path, filepath);
-		}
-	}
-
-	/**
-	 * Call setRealPath for each of the files in this directory (non-recursive).
-	 * The prefix is the "pretend" location that we're mapping these files to,
-	 * e.g. "/config/". Use the prefix and the filename as the path.
-	 */
-	public void setRealPaths(String pathPrefix, File dir) {
-		for (File file : dir.listFiles()) {
-			setRealPath(pathPrefix + file.getName(), file.getPath());
-		}
-	}
-
-	// ----------------------------------------------------------------------
-	// Stub methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public String getContextPath() {
-		return contextPath;
-	}
-
-	@Override
-	public Object getAttribute(String name) {
-		return attributes.get(name);
-	}
-
-	@Override
-	public Enumeration<String> getAttributeNames() {
-		return Collections.enumeration(attributes.keySet());
-	}
-
-	@Override
-	public void removeAttribute(String name) {
-		attributes.remove(name);
-	}
-
-	@Override
-	public void setAttribute(String name, Object object) {
-		if (object == null) {
-			removeAttribute(name);
-		} else {
-			attributes.put(name, object);
-		}
-	}
-
-	@Override
-	public InputStream getResourceAsStream(String path) {
-		if (mockResources.containsKey(path)) {
-			return new ByteArrayInputStream(mockResources.get(path).getBytes());
-		} else {
-			return null;
-		}
-	}
-
-	@Override
-	public String getRealPath(String path) {
-		String real = realPaths.get(path);
-		log.debug("Real path for '" + path + "' is '" + real + "'");
-		return real;
-	}
-
-	// ----------------------------------------------------------------------
-	// Un-implemented methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public ServletContext getContext(String arg0) {
-		throw new RuntimeException(
-				"ServletContextStub.getContext() not implemented.");
-	}
-
-	@Override
-	public String getInitParameter(String arg0) {
-		throw new RuntimeException(
-				"ServletContextStub.getInitParameter() not implemented.");
-	}
-
-	@Override
-	@SuppressWarnings("rawtypes")
-	public Enumeration getInitParameterNames() {
-		throw new RuntimeException(
-				"ServletContextStub.getInitParameterNames() not implemented.");
-	}
-
-	@Override
-	public int getMajorVersion() {
-		throw new RuntimeException(
-				"ServletContextStub.getMajorVersion() not implemented.");
-	}
-
-	@Override
-	public String getMimeType(String arg0) {
-		throw new RuntimeException(
-				"ServletContextStub.getMimeType() not implemented.");
-	}
-
-	@Override
-	public int getMinorVersion() {
-		throw new RuntimeException(
-				"ServletContextStub.getMinorVersion() not implemented.");
-	}
-
-	@Override
-	public RequestDispatcher getNamedDispatcher(String arg0) {
-		throw new RuntimeException(
-				"ServletContextStub.getNamedDispatcher() not implemented.");
-	}
-
-	@Override
-	public RequestDispatcher getRequestDispatcher(String arg0) {
-		throw new RuntimeException(
-				"ServletContextStub.getRequestDispatcher() not implemented.");
-	}
-
-	@Override
-	public URL getResource(String arg0) throws MalformedURLException {
-		throw new RuntimeException(
-				"ServletContextStub.getResource() not implemented.");
-	}
-
-	@Override
-	@SuppressWarnings("rawtypes")
-	public Set getResourcePaths(String arg0) {
-		throw new RuntimeException(
-				"ServletContextStub.getResourcePaths() not implemented.");
-	}
-
-	@Override
-	public String getServerInfo() {
-		throw new RuntimeException(
-				"ServletContextStub.getServerInfo() not implemented.");
-	}
-
-	@Override
-	public Servlet getServlet(String arg0) throws ServletException {
-		throw new RuntimeException(
-				"ServletContextStub.getServlet() not implemented.");
-	}
-
-	@Override
-	public String getServletContextName() {
-		throw new RuntimeException(
-				"ServletContextStub.getServletContextName() not implemented.");
-	}
-
-	@Override
-	@SuppressWarnings("rawtypes")
-	public Enumeration getServletNames() {
-		throw new RuntimeException(
-				"ServletContextStub.getServletNames() not implemented.");
-	}
-
-	@Override
-	@SuppressWarnings("rawtypes")
-	public Enumeration getServlets() {
-		throw new RuntimeException(
-				"ServletContextStub.getServlets() not implemented.");
-	}
-
-	@Override
-	public void log(String arg0) {
-		throw new RuntimeException("ServletContextStub.log() not implemented.");
-	}
-
-	@Override
-	public void log(Exception arg0, String arg1) {
-		throw new RuntimeException("ServletContextStub.log() not implemented.");
-	}
-
-	@Override
-	public void log(String arg0, Throwable arg1) {
-		throw new RuntimeException("ServletContextStub.log() not implemented.");
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package stubs.javax.servlet;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * A simple stand-in for the {@link ServletContext}, for use in unit tests.
+ */
+public class ServletContextStub implements ServletContext {
+	private static final Log log = LogFactory.getLog(ServletContextStub.class);
+
+	// ----------------------------------------------------------------------
+	// Stub infrastructure
+	// ----------------------------------------------------------------------
+
+	private String contextPath = ""; // root context returns ""
+	private final Map<String, Object> attributes = new HashMap<String, Object>();
+	private final Map<String, String> mockResources = new HashMap<String, String>();
+	private final Map<String, String> realPaths = new HashMap<String, String>();
+
+	public void setContextPath(String contextPath) {
+		if (contextPath == null) {
+			throw new NullPointerException("contextPath may not be null.");
+		}
+	}
+
+	public void setMockResource(String path, String contents) {
+		if (path == null) {
+			throw new NullPointerException("path may not be null.");
+		}
+		if (contents == null) {
+			mockResources.remove(path);
+		} else {
+			mockResources.put(path, contents);
+		}
+	}
+
+	public void setRealPath(String path, String filepath) {
+		if (path == null) {
+			throw new NullPointerException("path may not be null.");
+		}
+		if (filepath == null) {
+			log.debug("removing real path for '" + path + "'");
+			realPaths.remove(path);
+		} else {
+			log.debug("adding real path for '" + path + "' = '" + filepath
+					+ "'");
+			realPaths.put(path, filepath);
+		}
+	}
+
+	/**
+	 * Call setRealPath for each of the files in this directory (non-recursive).
+	 * The prefix is the "pretend" location that we're mapping these files to,
+	 * e.g. "/config/". Use the prefix and the filename as the path.
+	 */
+	public void setRealPaths(String pathPrefix, File dir) {
+		for (File file : dir.listFiles()) {
+			setRealPath(pathPrefix + file.getName(), file.getPath());
+		}
+	}
+
+	// ----------------------------------------------------------------------
+	// Stub methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public String getContextPath() {
+		return contextPath;
+	}
+
+	@Override
+	public Object getAttribute(String name) {
+		return attributes.get(name);
+	}
+
+	@Override
+	public Enumeration<String> getAttributeNames() {
+		return Collections.enumeration(attributes.keySet());
+	}
+
+	@Override
+	public void removeAttribute(String name) {
+		attributes.remove(name);
+	}
+
+	@Override
+	public void setAttribute(String name, Object object) {
+		if (object == null) {
+			removeAttribute(name);
+		} else {
+			attributes.put(name, object);
+		}
+	}
+
+	@Override
+	public InputStream getResourceAsStream(String path) {
+		if (mockResources.containsKey(path)) {
+			return new ByteArrayInputStream(mockResources.get(path).getBytes());
+		} else {
+			return null;
+		}
+	}
+
+	@Override
+	public String getRealPath(String path) {
+		String real = realPaths.get(path);
+		log.debug("Real path for '" + path + "' is '" + real + "'");
+		return real;
+	}
+
+	// ----------------------------------------------------------------------
+	// Un-implemented methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public ServletContext getContext(String arg0) {
+		throw new RuntimeException(
+				"ServletContextStub.getContext() not implemented.");
+	}
+
+	@Override
+	public String getInitParameter(String arg0) {
+		throw new RuntimeException(
+				"ServletContextStub.getInitParameter() not implemented.");
+	}
+
+	@Override
+	@SuppressWarnings("rawtypes")
+	public Enumeration getInitParameterNames() {
+		throw new RuntimeException(
+				"ServletContextStub.getInitParameterNames() not implemented.");
+	}
+
+	@Override
+	public int getMajorVersion() {
+		throw new RuntimeException(
+				"ServletContextStub.getMajorVersion() not implemented.");
+	}
+
+	@Override
+	public String getMimeType(String arg0) {
+		throw new RuntimeException(
+				"ServletContextStub.getMimeType() not implemented.");
+	}
+
+	@Override
+	public int getMinorVersion() {
+		throw new RuntimeException(
+				"ServletContextStub.getMinorVersion() not implemented.");
+	}
+
+	@Override
+	public RequestDispatcher getNamedDispatcher(String arg0) {
+		throw new RuntimeException(
+				"ServletContextStub.getNamedDispatcher() not implemented.");
+	}
+
+	@Override
+	public RequestDispatcher getRequestDispatcher(String arg0) {
+		throw new RuntimeException(
+				"ServletContextStub.getRequestDispatcher() not implemented.");
+	}
+
+	@Override
+	public URL getResource(String arg0) throws MalformedURLException {
+		throw new RuntimeException(
+				"ServletContextStub.getResource() not implemented.");
+	}
+
+	@Override
+	@SuppressWarnings("rawtypes")
+	public Set getResourcePaths(String arg0) {
+		throw new RuntimeException(
+				"ServletContextStub.getResourcePaths() not implemented.");
+	}
+
+	@Override
+	public String getServerInfo() {
+		throw new RuntimeException(
+				"ServletContextStub.getServerInfo() not implemented.");
+	}
+
+	@Override
+	public Servlet getServlet(String arg0) throws ServletException {
+		throw new RuntimeException(
+				"ServletContextStub.getServlet() not implemented.");
+	}
+
+	@Override
+	public String getServletContextName() {
+		throw new RuntimeException(
+				"ServletContextStub.getServletContextName() not implemented.");
+	}
+
+	@Override
+	@SuppressWarnings("rawtypes")
+	public Enumeration getServletNames() {
+		throw new RuntimeException(
+				"ServletContextStub.getServletNames() not implemented.");
+	}
+
+	@Override
+	@SuppressWarnings("rawtypes")
+	public Enumeration getServlets() {
+		throw new RuntimeException(
+				"ServletContextStub.getServlets() not implemented.");
+	}
+
+	@Override
+	public void log(String arg0) {
+		throw new RuntimeException("ServletContextStub.log() not implemented.");
+	}
+
+	@Override
+	public void log(Exception arg0, String arg1) {
+		throw new RuntimeException("ServletContextStub.log() not implemented.");
+	}
+
+	@Override
+	public void log(String arg0, Throwable arg1) {
+		throw new RuntimeException("ServletContextStub.log() not implemented.");
+	}
+
+}
diff --git a/webapp/test/stubs/javax/servlet/http/HttpServletResponseStub.java b/webapp/test/stubs/javax/servlet/http/HttpServletResponseStub.java
index 7a35e8d16..041a60e4b 100644
--- a/webapp/test/stubs/javax/servlet/http/HttpServletResponseStub.java
+++ b/webapp/test/stubs/javax/servlet/http/HttpServletResponseStub.java
@@ -1,289 +1,289 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package stubs.javax.servlet.http;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * A simple stub for HttpServletResponse
- */
-@SuppressWarnings("deprecation")
-public class HttpServletResponseStub implements HttpServletResponse {
-	// ----------------------------------------------------------------------
-	// Stub infrastructure
-	// ----------------------------------------------------------------------
-
-	private String redirectLocation;
-	private int status = 200;
-	private String errorMessage;
-	private Map<String, String> headers = new HashMap<String, String>();
-	private String contentType;
-	private String charset = "";
-
-	private ByteArrayOutputStream outputStream;
-	private StringWriter outputWriter;
-
-	public String getRedirectLocation() {
-		return redirectLocation;
-	}
-
-	public int getStatus() {
-		return status;
-	}
-
-	public String getErrorMessage() {
-		return errorMessage;
-	}
-
-	public String getOutput() {
-		if (outputStream != null) {
-			return outputStream.toString();
-		} else if (outputWriter != null) {
-			return outputWriter.toString();
-		} else {
-			return "";
-		}
-	}
-
-	public String getHeader(String name) {
-		return headers.get(name);
-	}
-
-	// ----------------------------------------------------------------------
-	// Stub methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public void sendRedirect(String location) throws IOException {
-		this.redirectLocation = location;
-	}
-
-	@Override
-	public void setStatus(int status) {
-		this.status = status;
-	}
-
-	@Override
-	@SuppressWarnings("hiding")
-	public void sendError(int status) throws IOException {
-		this.status = status;
-	}
-
-	@Override
-	@SuppressWarnings("hiding")
-	public void sendError(int status, String message) throws IOException {
-		this.status = status;
-		this.errorMessage = message;
-	}
-
-	@Override
-	public PrintWriter getWriter() throws IOException {
-		if (outputStream != null) {
-			throw new IllegalStateException(
-					"Can't get a Writer after getting an OutputStream.");
-		}
-
-		if (outputWriter == null) {
-			outputWriter = new StringWriter();
-		}
-
-		return new PrintWriter(outputWriter, true);
-	}
-
-	@Override
-	public ServletOutputStream getOutputStream() throws IOException {
-		if (outputWriter != null) {
-			throw new IllegalStateException(
-					"Can't get an OutputStream after getting a Writer.");
-		}
-
-		if (outputStream == null) {
-			outputStream = new ByteArrayOutputStream();
-		}
-
-		return new ServletOutputStream() {
-			@Override
-			public void write(int thisChar) throws IOException {
-				outputStream.write(thisChar);
-			}
-		};
-	}
-
-	@Override
-	public void setHeader(String name, String value) {
-		headers.put(name, value);
-	}
-
-	@Override
-	public boolean containsHeader(String name) {
-		return headers.containsKey(name);
-	}
-
-	/**
-	 * Calling setContentType("this/type;charset=UTF-8") is the same as calling
-	 * setContentType("this/type;charset=UTF-8"); setCharacterEncoding("UTF-8")
-	 */
-	@Override
-	public void setContentType(String contentType) {
-		this.contentType = contentType;
-		
-		Pattern p = Pattern.compile(";\\scharset=([^;]+)");
-		Matcher m = p.matcher(contentType);
-		if (m.find()) {
-			this.charset = m.group(1);
-		}
-	}
-
-	@Override
-	public String getContentType() {
-		return contentType;
-	}
-
-	@Override
-	public void setCharacterEncoding(String charset) {
-		this.charset = charset;
-	}
-
-	@Override
-	public String getCharacterEncoding() {
-		return charset;
-	}
-
-	// ----------------------------------------------------------------------
-	// Un-implemented methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public void flushBuffer() throws IOException {
-		throw new RuntimeException(
-				"HttpServletResponseStub.flushBuffer() not implemented.");
-	}
-
-	@Override
-	public int getBufferSize() {
-		throw new RuntimeException(
-				"HttpServletResponseStub.getBufferSize() not implemented.");
-	}
-
-	@Override
-	public Locale getLocale() {
-		throw new RuntimeException(
-				"HttpServletResponseStub.getLocale() not implemented.");
-	}
-
-	@Override
-	public boolean isCommitted() {
-		throw new RuntimeException(
-				"HttpServletResponseStub.isCommitted() not implemented.");
-	}
-
-	@Override
-	public void reset() {
-		throw new RuntimeException(
-				"HttpServletResponseStub.reset() not implemented.");
-	}
-
-	@Override
-	public void resetBuffer() {
-		throw new RuntimeException(
-				"HttpServletResponseStub.resetBuffer() not implemented.");
-	}
-
-	@Override
-	public void setBufferSize(int arg0) {
-		throw new RuntimeException(
-				"HttpServletResponseStub.setBufferSize() not implemented.");
-	}
-
-	@Override
-	public void setContentLength(int arg0) {
-		throw new RuntimeException(
-				"HttpServletResponseStub.setContentLength() not implemented.");
-	}
-
-	@Override
-	public void setLocale(Locale arg0) {
-		throw new RuntimeException(
-				"HttpServletResponseStub.setLocale() not implemented.");
-	}
-
-	@Override
-	public void addCookie(Cookie arg0) {
-		throw new RuntimeException(
-				"HttpServletResponseStub.addCookie() not implemented.");
-	}
-
-	@Override
-	public void addDateHeader(String arg0, long arg1) {
-		throw new RuntimeException(
-				"HttpServletResponseStub.addDateHeader() not implemented.");
-	}
-
-	@Override
-	public void addHeader(String arg0, String arg1) {
-		throw new RuntimeException(
-				"HttpServletResponseStub.addHeader() not implemented.");
-	}
-
-	@Override
-	public void addIntHeader(String arg0, int arg1) {
-		throw new RuntimeException(
-				"HttpServletResponseStub.addIntHeader() not implemented.");
-	}
-
-	@Override
-	public String encodeRedirectURL(String arg0) {
-		throw new RuntimeException(
-				"HttpServletResponseStub.encodeRedirectURL() not implemented.");
-	}
-
-	@Override
-	public String encodeRedirectUrl(String arg0) {
-		throw new RuntimeException(
-				"HttpServletResponseStub.encodeRedirectUrl() not implemented.");
-	}
-
-	@Override
-	public String encodeURL(String arg0) {
-		throw new RuntimeException(
-				"HttpServletResponseStub.encodeURL() not implemented.");
-	}
-
-	@Override
-	public String encodeUrl(String arg0) {
-		throw new RuntimeException(
-				"HttpServletResponseStub.encodeUrl() not implemented.");
-	}
-
-	@Override
-	public void setDateHeader(String arg0, long arg1) {
-		throw new RuntimeException(
-				"HttpServletResponseStub.setDateHeader() not implemented.");
-	}
-
-	@Override
-	public void setIntHeader(String arg0, int arg1) {
-		throw new RuntimeException(
-				"HttpServletResponseStub.setIntHeader() not implemented.");
-	}
-
-	@Override
-	public void setStatus(int arg0, String arg1) {
-		throw new RuntimeException(
-				"HttpServletResponseStub.setStatus() not implemented.");
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package stubs.javax.servlet.http;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * A simple stub for HttpServletResponse
+ */
+@SuppressWarnings("deprecation")
+public class HttpServletResponseStub implements HttpServletResponse {
+	// ----------------------------------------------------------------------
+	// Stub infrastructure
+	// ----------------------------------------------------------------------
+
+	private String redirectLocation;
+	private int status = 200;
+	private String errorMessage;
+	private Map<String, String> headers = new HashMap<String, String>();
+	private String contentType;
+	private String charset = "";
+
+	private ByteArrayOutputStream outputStream;
+	private StringWriter outputWriter;
+
+	public String getRedirectLocation() {
+		return redirectLocation;
+	}
+
+	public int getStatus() {
+		return status;
+	}
+
+	public String getErrorMessage() {
+		return errorMessage;
+	}
+
+	public String getOutput() {
+		if (outputStream != null) {
+			return outputStream.toString();
+		} else if (outputWriter != null) {
+			return outputWriter.toString();
+		} else {
+			return "";
+		}
+	}
+
+	public String getHeader(String name) {
+		return headers.get(name);
+	}
+
+	// ----------------------------------------------------------------------
+	// Stub methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public void sendRedirect(String location) throws IOException {
+		this.redirectLocation = location;
+	}
+
+	@Override
+	public void setStatus(int status) {
+		this.status = status;
+	}
+
+	@Override
+	@SuppressWarnings("hiding")
+	public void sendError(int status) throws IOException {
+		this.status = status;
+	}
+
+	@Override
+	@SuppressWarnings("hiding")
+	public void sendError(int status, String message) throws IOException {
+		this.status = status;
+		this.errorMessage = message;
+	}
+
+	@Override
+	public PrintWriter getWriter() throws IOException {
+		if (outputStream != null) {
+			throw new IllegalStateException(
+					"Can't get a Writer after getting an OutputStream.");
+		}
+
+		if (outputWriter == null) {
+			outputWriter = new StringWriter();
+		}
+
+		return new PrintWriter(outputWriter, true);
+	}
+
+	@Override
+	public ServletOutputStream getOutputStream() throws IOException {
+		if (outputWriter != null) {
+			throw new IllegalStateException(
+					"Can't get an OutputStream after getting a Writer.");
+		}
+
+		if (outputStream == null) {
+			outputStream = new ByteArrayOutputStream();
+		}
+
+		return new ServletOutputStream() {
+			@Override
+			public void write(int thisChar) throws IOException {
+				outputStream.write(thisChar);
+			}
+		};
+	}
+
+	@Override
+	public void setHeader(String name, String value) {
+		headers.put(name, value);
+	}
+
+	@Override
+	public boolean containsHeader(String name) {
+		return headers.containsKey(name);
+	}
+
+	/**
+	 * Calling setContentType("this/type;charset=UTF-8") is the same as calling
+	 * setContentType("this/type;charset=UTF-8"); setCharacterEncoding("UTF-8")
+	 */
+	@Override
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+		
+		Pattern p = Pattern.compile(";\\scharset=([^;]+)");
+		Matcher m = p.matcher(contentType);
+		if (m.find()) {
+			this.charset = m.group(1);
+		}
+	}
+
+	@Override
+	public String getContentType() {
+		return contentType;
+	}
+
+	@Override
+	public void setCharacterEncoding(String charset) {
+		this.charset = charset;
+	}
+
+	@Override
+	public String getCharacterEncoding() {
+		return charset;
+	}
+
+	// ----------------------------------------------------------------------
+	// Un-implemented methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public void flushBuffer() throws IOException {
+		throw new RuntimeException(
+				"HttpServletResponseStub.flushBuffer() not implemented.");
+	}
+
+	@Override
+	public int getBufferSize() {
+		throw new RuntimeException(
+				"HttpServletResponseStub.getBufferSize() not implemented.");
+	}
+
+	@Override
+	public Locale getLocale() {
+		throw new RuntimeException(
+				"HttpServletResponseStub.getLocale() not implemented.");
+	}
+
+	@Override
+	public boolean isCommitted() {
+		throw new RuntimeException(
+				"HttpServletResponseStub.isCommitted() not implemented.");
+	}
+
+	@Override
+	public void reset() {
+		throw new RuntimeException(
+				"HttpServletResponseStub.reset() not implemented.");
+	}
+
+	@Override
+	public void resetBuffer() {
+		throw new RuntimeException(
+				"HttpServletResponseStub.resetBuffer() not implemented.");
+	}
+
+	@Override
+	public void setBufferSize(int arg0) {
+		throw new RuntimeException(
+				"HttpServletResponseStub.setBufferSize() not implemented.");
+	}
+
+	@Override
+	public void setContentLength(int arg0) {
+		throw new RuntimeException(
+				"HttpServletResponseStub.setContentLength() not implemented.");
+	}
+
+	@Override
+	public void setLocale(Locale arg0) {
+		throw new RuntimeException(
+				"HttpServletResponseStub.setLocale() not implemented.");
+	}
+
+	@Override
+	public void addCookie(Cookie arg0) {
+		throw new RuntimeException(
+				"HttpServletResponseStub.addCookie() not implemented.");
+	}
+
+	@Override
+	public void addDateHeader(String arg0, long arg1) {
+		throw new RuntimeException(
+				"HttpServletResponseStub.addDateHeader() not implemented.");
+	}
+
+	@Override
+	public void addHeader(String arg0, String arg1) {
+		throw new RuntimeException(
+				"HttpServletResponseStub.addHeader() not implemented.");
+	}
+
+	@Override
+	public void addIntHeader(String arg0, int arg1) {
+		throw new RuntimeException(
+				"HttpServletResponseStub.addIntHeader() not implemented.");
+	}
+
+	@Override
+	public String encodeRedirectURL(String arg0) {
+		throw new RuntimeException(
+				"HttpServletResponseStub.encodeRedirectURL() not implemented.");
+	}
+
+	@Override
+	public String encodeRedirectUrl(String arg0) {
+		throw new RuntimeException(
+				"HttpServletResponseStub.encodeRedirectUrl() not implemented.");
+	}
+
+	@Override
+	public String encodeURL(String arg0) {
+		throw new RuntimeException(
+				"HttpServletResponseStub.encodeURL() not implemented.");
+	}
+
+	@Override
+	public String encodeUrl(String arg0) {
+		throw new RuntimeException(
+				"HttpServletResponseStub.encodeUrl() not implemented.");
+	}
+
+	@Override
+	public void setDateHeader(String arg0, long arg1) {
+		throw new RuntimeException(
+				"HttpServletResponseStub.setDateHeader() not implemented.");
+	}
+
+	@Override
+	public void setIntHeader(String arg0, int arg1) {
+		throw new RuntimeException(
+				"HttpServletResponseStub.setIntHeader() not implemented.");
+	}
+
+	@Override
+	public void setStatus(int arg0, String arg1) {
+		throw new RuntimeException(
+				"HttpServletResponseStub.setStatus() not implemented.");
+	}
+
+}
diff --git a/webapp/test/stubs/javax/servlet/http/HttpSessionStub.java b/webapp/test/stubs/javax/servlet/http/HttpSessionStub.java
index 649e2c1e4..cd71d4cef 100644
--- a/webapp/test/stubs/javax/servlet/http/HttpSessionStub.java
+++ b/webapp/test/stubs/javax/servlet/http/HttpSessionStub.java
@@ -1,163 +1,163 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-package stubs.javax.servlet.http;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import stubs.javax.servlet.ServletContextStub;
-
-/**
- * A simple stand-in for the HttpSession, for use in unit tests.
- */
-public class HttpSessionStub implements HttpSession {
-	private static final Log log = LogFactory.getLog(HttpSessionStub.class);
-
-	// ----------------------------------------------------------------------
-	// Stub infrastructure
-	// ----------------------------------------------------------------------
-
-	private String id = "arbitraryId";
-	private ServletContext context;
-	private final Map<String, Object> attributes = new HashMap<String, Object>();
-
-	@SuppressWarnings("unused")
-	private int maxInactiveInterval;
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public void setServletContext(ServletContext context) {
-		this.context = context;
-	}
-
-	// ----------------------------------------------------------------------
-	// Stub methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	public String getId() {
-		return this.id;
-	}
-
-	@Override
-	public ServletContext getServletContext() {
-		if (this.context == null) {
-			return new ServletContextStub();
-		} else {
-			return this.context;
-		}
-	}
-
-	@Override
-	public void setAttribute(String name, Object value) {
-		if (name == null) {
-			throw new NullPointerException("name may not be null.");
-		}
-		if (value == null) {
-			removeAttribute(name);
-		}
-		attributes.put(name, value);
-		log.debug("setAttribute: " + name + "=" + value);
-	}
-
-	@Override
-	public void removeAttribute(String name) {
-		attributes.remove(name);
-		log.debug("removeAttribute: " + name);
-	}
-
-	@Override
-	public Object getAttribute(String name) {
-		return attributes.get(name);
-	}
-
-	/**
-	 * So far, we don't do anything with this, or even confirm that it has been
-	 * set. We just don't throw an exception if someone wants to set it.
-	 */
-	@Override
-	public void setMaxInactiveInterval(int seconds) {
-		this.maxInactiveInterval = seconds;
-	}
-
-	// ----------------------------------------------------------------------
-	// Un-implemented methods
-	// ----------------------------------------------------------------------
-
-	@Override
-	@SuppressWarnings("rawtypes")
-	public Enumeration getAttributeNames() {
-		throw new RuntimeException(
-				"HttpSessionStub.getAttributeNames() not implemented.");
-	}
-
-	@Override
-	public long getCreationTime() {
-		throw new RuntimeException(
-				"HttpSessionStub.getCreationTime() not implemented.");
-	}
-
-	@Override
-	public long getLastAccessedTime() {
-		throw new RuntimeException(
-				"HttpSessionStub.getLastAccessedTime() not implemented.");
-	}
-
-	@Override
-	public int getMaxInactiveInterval() {
-		throw new RuntimeException(
-				"HttpSessionStub.getMaxInactiveInterval() not implemented.");
-	}
-
-	@Deprecated
-	@Override
-	public javax.servlet.http.HttpSessionContext getSessionContext() {
-		throw new RuntimeException(
-				"HttpSessionStub.getSessionContext() not implemented.");
-	}
-
-	@Override
-	public Object getValue(String arg0) {
-		throw new RuntimeException(
-				"HttpSessionStub.getValue() not implemented.");
-	}
-
-	@Override
-	public String[] getValueNames() {
-		throw new RuntimeException(
-				"HttpSessionStub.getValueNames() not implemented.");
-	}
-
-	@Override
-	public void invalidate() {
-		throw new RuntimeException(
-				"HttpSessionStub.invalidate() not implemented.");
-	}
-
-	@Override
-	public boolean isNew() {
-		throw new RuntimeException("HttpSessionStub.isNew() not implemented.");
-	}
-
-	@Override
-	public void putValue(String arg0, Object arg1) {
-		throw new RuntimeException(
-				"HttpSessionStub.putValue() not implemented.");
-	}
-
-	@Override
-	public void removeValue(String arg0) {
-		throw new RuntimeException(
-				"HttpSessionStub.removeValue() not implemented.");
-	}
-
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+package stubs.javax.servlet.http;
+
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import stubs.javax.servlet.ServletContextStub;
+
+/**
+ * A simple stand-in for the HttpSession, for use in unit tests.
+ */
+public class HttpSessionStub implements HttpSession {
+	private static final Log log = LogFactory.getLog(HttpSessionStub.class);
+
+	// ----------------------------------------------------------------------
+	// Stub infrastructure
+	// ----------------------------------------------------------------------
+
+	private String id = "arbitraryId";
+	private ServletContext context;
+	private final Map<String, Object> attributes = new HashMap<String, Object>();
+
+	@SuppressWarnings("unused")
+	private int maxInactiveInterval;
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public void setServletContext(ServletContext context) {
+		this.context = context;
+	}
+
+	// ----------------------------------------------------------------------
+	// Stub methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	public String getId() {
+		return this.id;
+	}
+
+	@Override
+	public ServletContext getServletContext() {
+		if (this.context == null) {
+			return new ServletContextStub();
+		} else {
+			return this.context;
+		}
+	}
+
+	@Override
+	public void setAttribute(String name, Object value) {
+		if (name == null) {
+			throw new NullPointerException("name may not be null.");
+		}
+		if (value == null) {
+			removeAttribute(name);
+		}
+		attributes.put(name, value);
+		log.debug("setAttribute: " + name + "=" + value);
+	}
+
+	@Override
+	public void removeAttribute(String name) {
+		attributes.remove(name);
+		log.debug("removeAttribute: " + name);
+	}
+
+	@Override
+	public Object getAttribute(String name) {
+		return attributes.get(name);
+	}
+
+	/**
+	 * So far, we don't do anything with this, or even confirm that it has been
+	 * set. We just don't throw an exception if someone wants to set it.
+	 */
+	@Override
+	public void setMaxInactiveInterval(int seconds) {
+		this.maxInactiveInterval = seconds;
+	}
+
+	// ----------------------------------------------------------------------
+	// Un-implemented methods
+	// ----------------------------------------------------------------------
+
+	@Override
+	@SuppressWarnings("rawtypes")
+	public Enumeration getAttributeNames() {
+		throw new RuntimeException(
+				"HttpSessionStub.getAttributeNames() not implemented.");
+	}
+
+	@Override
+	public long getCreationTime() {
+		throw new RuntimeException(
+				"HttpSessionStub.getCreationTime() not implemented.");
+	}
+
+	@Override
+	public long getLastAccessedTime() {
+		throw new RuntimeException(
+				"HttpSessionStub.getLastAccessedTime() not implemented.");
+	}
+
+	@Override
+	public int getMaxInactiveInterval() {
+		throw new RuntimeException(
+				"HttpSessionStub.getMaxInactiveInterval() not implemented.");
+	}
+
+	@Deprecated
+	@Override
+	public javax.servlet.http.HttpSessionContext getSessionContext() {
+		throw new RuntimeException(
+				"HttpSessionStub.getSessionContext() not implemented.");
+	}
+
+	@Override
+	public Object getValue(String arg0) {
+		throw new RuntimeException(
+				"HttpSessionStub.getValue() not implemented.");
+	}
+
+	@Override
+	public String[] getValueNames() {
+		throw new RuntimeException(
+				"HttpSessionStub.getValueNames() not implemented.");
+	}
+
+	@Override
+	public void invalidate() {
+		throw new RuntimeException(
+				"HttpSessionStub.invalidate() not implemented.");
+	}
+
+	@Override
+	public boolean isNew() {
+		throw new RuntimeException("HttpSessionStub.isNew() not implemented.");
+	}
+
+	@Override
+	public void putValue(String arg0, Object arg1) {
+		throw new RuntimeException(
+				"HttpSessionStub.putValue() not implemented.");
+	}
+
+	@Override
+	public void removeValue(String arg0) {
+		throw new RuntimeException(
+				"HttpSessionStub.removeValue() not implemented.");
+	}
+
+}
diff --git a/webapp/web/WEB-INF/filegraph/tbox/vitroPublic.owl b/webapp/web/WEB-INF/filegraph/tbox/vitroPublic.owl
index 3e4afaf2a..6692af929 100644
--- a/webapp/web/WEB-INF/filegraph/tbox/vitroPublic.owl
+++ b/webapp/web/WEB-INF/filegraph/tbox/vitroPublic.owl
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE rdf [
-	<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
-]>
-
-<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="http://vitro.mannlib.cornell.edu/ns/vitro/public#"
-	xml:base="http://vitro.mannlib.cornell.edu/ns/vitro/public"
->
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-	Vitro Application Public Ontology
-
-	This ontology is used by the Vitro application. 
-	It contains constructs that are available for public export and use. 
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<owl:Ontology rdf:about="">
-    <rdfs:label rdf:datatype="&xsd;string">Vitro public constructs</rdfs:label>
-    <owl:versionInfo rdf:datatype="&xsd;decimal">0.1</owl:versionInfo>
-</owl:Ontology>
-
-
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-	File-related constructs
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-<owl:Class rdf:about="#File"/>
-<owl:Class rdf:about="#FileByteStream"/>
-
-<owl:DatatypeProperty rdf:about="#filename">
-	<rdfs:domain><owl:Class rdf:about="#File"/></rdfs:domain>
-	<rdfs:range rdf:resource="&xsd;string"/>
-</owl:DatatypeProperty>
-
-<owl:DatatypeProperty rdf:about="#mimeType">
-	<rdfs:domain><owl:Class rdf:about="#File"/></rdfs:domain>
-	<rdfs:range rdf:resource="&xsd;string"/>
-</owl:DatatypeProperty>
-
-<owl:DatatypeProperty rdf:about="#attribution">
-	<rdfs:domain><owl:Class rdf:about="#File"/></rdfs:domain>
-	<rdfs:range rdf:resource="&xsd;string"/>
-</owl:DatatypeProperty>
-
-<owl:DatatypeProperty rdf:about="#directDownloadUrl">
-	<rdfs:domain><owl:Class rdf:about="#FileByteStream"/></rdfs:domain>
-	<rdfs:range rdf:resource="&xsd;string"/>
-</owl:DatatypeProperty>
-
-<owl:ObjectProperty rdf:about="#downloadLocation">
-	<rdfs:domain><owl:Class rdf:about="#File"/></rdfs:domain>
-	<rdfs:range><owl:Class rdf:about="#FileByteStream"/></rdfs:range>
-</owl:ObjectProperty>
-
-<owl:ObjectProperty rdf:about="#thumbnailImage">
-	<rdfs:domain><owl:Class rdf:about="#File"/></rdfs:domain>
-	<rdfs:range><owl:Class rdf:about="#File"/></rdfs:range>
-</owl:ObjectProperty>
-
-<owl:ObjectProperty rdf:about="#mainImage">
-	<rdfs:range><owl:Class rdf:about="#File"/></rdfs:range>
-</owl:ObjectProperty>
-
-<owl:ObjectProperty rdf:about="#image">
-	<rdfs:range><owl:Class rdf:about="#File"/></rdfs:range>
-</owl:ObjectProperty>
-
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE rdf [
+	<!ENTITY xsd "http://www.w3.org/2001/XMLSchema#">
+]>
+
+<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="http://vitro.mannlib.cornell.edu/ns/vitro/public#"
+	xml:base="http://vitro.mannlib.cornell.edu/ns/vitro/public"
+>
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	Vitro Application Public Ontology
+
+	This ontology is used by the Vitro application. 
+	It contains constructs that are available for public export and use. 
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+<owl:Ontology rdf:about="">
+    <rdfs:label rdf:datatype="&xsd;string">Vitro public constructs</rdfs:label>
+    <owl:versionInfo rdf:datatype="&xsd;decimal">0.1</owl:versionInfo>
+</owl:Ontology>
+
+
+<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+	File-related constructs
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+<owl:Class rdf:about="#File"/>
+<owl:Class rdf:about="#FileByteStream"/>
+
+<owl:DatatypeProperty rdf:about="#filename">
+	<rdfs:domain><owl:Class rdf:about="#File"/></rdfs:domain>
+	<rdfs:range rdf:resource="&xsd;string"/>
+</owl:DatatypeProperty>
+
+<owl:DatatypeProperty rdf:about="#mimeType">
+	<rdfs:domain><owl:Class rdf:about="#File"/></rdfs:domain>
+	<rdfs:range rdf:resource="&xsd;string"/>
+</owl:DatatypeProperty>
+
+<owl:DatatypeProperty rdf:about="#attribution">
+	<rdfs:domain><owl:Class rdf:about="#File"/></rdfs:domain>
+	<rdfs:range rdf:resource="&xsd;string"/>
+</owl:DatatypeProperty>
+
+<owl:DatatypeProperty rdf:about="#directDownloadUrl">
+	<rdfs:domain><owl:Class rdf:about="#FileByteStream"/></rdfs:domain>
+	<rdfs:range rdf:resource="&xsd;string"/>
+</owl:DatatypeProperty>
+
+<owl:ObjectProperty rdf:about="#downloadLocation">
+	<rdfs:domain><owl:Class rdf:about="#File"/></rdfs:domain>
+	<rdfs:range><owl:Class rdf:about="#FileByteStream"/></rdfs:range>
+</owl:ObjectProperty>
+
+<owl:ObjectProperty rdf:about="#thumbnailImage">
+	<rdfs:domain><owl:Class rdf:about="#File"/></rdfs:domain>
+	<rdfs:range><owl:Class rdf:about="#File"/></rdfs:range>
+</owl:ObjectProperty>
+
+<owl:ObjectProperty rdf:about="#mainImage">
+	<rdfs:range><owl:Class rdf:about="#File"/></rdfs:range>
+</owl:ObjectProperty>
+
+<owl:ObjectProperty rdf:about="#image">
+	<rdfs:range><owl:Class rdf:about="#File"/></rdfs:range>
+</owl:ObjectProperty>
+
 </rdf:RDF>
\ No newline at end of file
diff --git a/webapp/web/WEB-INF/ontologies/app/menuload/displayDisplay.n3 b/webapp/web/WEB-INF/ontologies/app/menuload/displayDisplay.n3
index 159c88283..35f95df09 100644
--- a/webapp/web/WEB-INF/ontologies/app/menuload/displayDisplay.n3
+++ b/webapp/web/WEB-INF/ontologies/app/menuload/displayDisplay.n3
@@ -1,17 +1,17 @@
-@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
-@prefix owl:     <http://www.w3.org/2002/07/owl#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-rdf:type 
-      a owl:ObjectProperty ;
-      rdfs:label "RDF Type"@en-US ;
-      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 ;                             
-      <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 ;   
-              
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+@prefix owl:     <http://www.w3.org/2002/07/owl#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+rdf:type 
+      a owl:ObjectProperty ;
+      rdfs:label "RDF Type"@en-US ;
+      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 ;                             
+      <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 ;   
+              
               
\ No newline at end of file
diff --git a/webapp/web/WEB-INF/ontologies/app/menuload/displayTBOX.n3 b/webapp/web/WEB-INF/ontologies/app/menuload/displayTBOX.n3
index 835421cee..5d3fe4ccb 100644
--- a/webapp/web/WEB-INF/ontologies/app/menuload/displayTBOX.n3
+++ b/webapp/web/WEB-INF/ontologies/app/menuload/displayTBOX.n3
@@ -1,218 +1,218 @@
-# $This file is distributed under the terms of the license in /doc/license.txt$ 
-
-@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
-@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
-@prefix owl:     <http://www.w3.org/2002/07/owl#> .
-@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
-
-
-#########Classes######### 
-###Basic
-owl:Class
-      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 
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#MainMenu>
-      a       owl:Class ;
-      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#customDisplayViewAnnot>
-              "individual-menu.ftl"^^xsd:string .
-
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#NavigationElement>
-      a       owl:Class .          
-
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page>
-      a       owl:Class .
-
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#HomePage>
-      a       owl:Class .
-
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#ClassGroupPage>
-      a       owl:Class .
-      
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#IndividualsForClassesPage>
-      a       owl:Class .      
-      
- <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#InternalClassesPage>
-  a       owl:Class .   
-      
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#DataGetter>
-      a       owl:Class .  
-
-<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter>
-    a owl:Class .      
-    
-##Adding a data getter type that is Solr Class search, i.e. get individuals for VClass
-<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SolrIndividualsDataGetter>
-    a owl:Class .      
-    
-      
-########Data Properties#########
-
-###Basic
-
-rdfs:comment
-      a       owl:DatatypeProperty .
-      
-rdfs:label
-      a       owl:DatatypeProperty .
-
-      
-owl:versionInfo
-      a       owl:DatatypeProperty .
-      
-###Vitro  model 
-
-<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#modTime>
-      a       owl:DatatypeProperty .
-<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#displayRank>
-      a       owl:DatatypeProperty .
-      
-<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#customDisplayViewAnnot>
-      a       owl:DatatypeProperty .
-      
-###Display  model 
-
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#listViewConfigFile>
-      a       owl:DatatypeProperty .
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#title>
-      a       owl:DatatypeProperty .
-      
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#urlMapping>
-      a       owl:DatatypeProperty .
-
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#requiresBodyTemplate>
-      a       owl:DatatypeProperty .
-      
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#isSelfContainedTemplate>
-      a       owl:DatatypeProperty .
-      
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#menuPosition>
-      a       owl:DatatypeProperty ;
-      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#displayLimitAnnot>
-              "1"^^xsd:int .      
-
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#linkText>
-      a       owl:DatatypeProperty .
-      
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasMenuText>
-      a       owl:DatatypeProperty .  
-      
-  <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#usesDataGetterClass>
-      a       owl:DatatypeProperty .      
-
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#query>
-    a owl:DatatypeProperty .
-    
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#saveToVar>
-    a owl:DatatypeProperty.
-    
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#queryModel>
-    a owl:DatatypeProperty. 
-    
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#htmlValue>
-    a owl:DatatypeProperty.  
-    
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#cannotDeletePage>
-    a owl:DatatypeProperty.                   
-      
-######### Object Properties#########
-###Basic
-rdfs:range
-      a       owl:ObjectProperty .
-rdfs:domain
-      a       owl:ObjectProperty .
-owl:topObjectProperty
-	a owl:ObjectProperty .
-
-##Adding object property defining class for solr data getter	
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasVClassId>
-    a owl:ObjectProperty.                   
-	
-           
-###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 .
-      
-<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#primaryLink>
-      a       owl:ObjectProperty ;
-      rdfs:label "Primary Link"@en-US ;
-      rdfs:range <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#Link> ;
-      rdfs:subPropertyOf <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#primaryLink> , owl:topObjectProperty ;
-      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#customEntryFormAnnot>
-              "defaultLinkForm.jsp"^^xsd:string ;
-      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#forceStubDeletionAnnot>
-              "true"^^xsd:boolean ;
-      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#offerCreateNewOptionAnnot>
-              "true"^^xsd:boolean ;
-      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#selectFromExistingAnnot>
-              "false"^^xsd:boolean ;
-      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#stubObjectPropertyAnnot>
-              "true"^^xsd:boolean .      
-
-rdf:type 
-      a owl:ObjectProperty ;
-      rdfs:label "RDF Type"@en-US ;
-      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 ;                             
-      <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 .       
-
-
-<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#additionalLink>
-      a       owl:ObjectProperty ;
-      rdfs:label "Additional Link"@en-US ;
-      rdfs:range <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#Link> ;
-      rdfs:subPropertyOf <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#additionalLink> , owl:topObjectProperty ;
-      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#customEntryFormAnnot>
-              "defaultLinkForm.jsp"^^xsd:string ;
-      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#forceStubDeletionAnnot>
-              "true"^^xsd:boolean ;
-      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#offerCreateNewOptionAnnot>
-              "true"^^xsd:boolean ;
-      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#selectFromExistingAnnot>
-              "false"^^xsd:boolean ;
-      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#stubObjectPropertyAnnot>
-              "true"^^xsd:boolean .
-              
-###Display model    
-
-###Adding menu management customform annotation
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasElement>
-      a       owl:ObjectProperty .
-      
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#excludeClass>
-      a       owl:ObjectProperty .
-
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#toPage>
-      a       owl:ObjectProperty .      
-      
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#forClassGroup>
-      a       owl:ObjectProperty .
-      
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasDataGetter>
-      a       owl:ObjectProperty .
-      
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#getIndividualsForClass>
-      a       owl:ObjectProperty .  
-      
-<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#restrictResultsByClass>
-      a       owl:ObjectProperty .    
-      
+# $This file is distributed under the terms of the license in /doc/license.txt$ 
+
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix xsd:     <http://www.w3.org/2001/XMLSchema#> .
+@prefix owl:     <http://www.w3.org/2002/07/owl#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+
+
+#########Classes######### 
+###Basic
+owl:Class
+      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 
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#MainMenu>
+      a       owl:Class ;
+      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#customDisplayViewAnnot>
+              "individual-menu.ftl"^^xsd:string .
+
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#NavigationElement>
+      a       owl:Class .          
+
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page>
+      a       owl:Class .
+
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#HomePage>
+      a       owl:Class .
+
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#ClassGroupPage>
+      a       owl:Class .
+      
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#IndividualsForClassesPage>
+      a       owl:Class .      
+      
+ <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#InternalClassesPage>
+  a       owl:Class .   
+      
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#DataGetter>
+      a       owl:Class .  
+
+<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter>
+    a owl:Class .      
+    
+##Adding a data getter type that is Solr Class search, i.e. get individuals for VClass
+<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SolrIndividualsDataGetter>
+    a owl:Class .      
+    
+      
+########Data Properties#########
+
+###Basic
+
+rdfs:comment
+      a       owl:DatatypeProperty .
+      
+rdfs:label
+      a       owl:DatatypeProperty .
+
+      
+owl:versionInfo
+      a       owl:DatatypeProperty .
+      
+###Vitro  model 
+
+<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#modTime>
+      a       owl:DatatypeProperty .
+<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#displayRank>
+      a       owl:DatatypeProperty .
+      
+<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#customDisplayViewAnnot>
+      a       owl:DatatypeProperty .
+      
+###Display  model 
+
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#listViewConfigFile>
+      a       owl:DatatypeProperty .
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#title>
+      a       owl:DatatypeProperty .
+      
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#urlMapping>
+      a       owl:DatatypeProperty .
+
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#requiresBodyTemplate>
+      a       owl:DatatypeProperty .
+      
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#isSelfContainedTemplate>
+      a       owl:DatatypeProperty .
+      
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#menuPosition>
+      a       owl:DatatypeProperty ;
+      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#displayLimitAnnot>
+              "1"^^xsd:int .      
+
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#linkText>
+      a       owl:DatatypeProperty .
+      
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasMenuText>
+      a       owl:DatatypeProperty .  
+      
+  <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#usesDataGetterClass>
+      a       owl:DatatypeProperty .      
+
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#query>
+    a owl:DatatypeProperty .
+    
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#saveToVar>
+    a owl:DatatypeProperty.
+    
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#queryModel>
+    a owl:DatatypeProperty. 
+    
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#htmlValue>
+    a owl:DatatypeProperty.  
+    
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#cannotDeletePage>
+    a owl:DatatypeProperty.                   
+      
+######### Object Properties#########
+###Basic
+rdfs:range
+      a       owl:ObjectProperty .
+rdfs:domain
+      a       owl:ObjectProperty .
+owl:topObjectProperty
+	a owl:ObjectProperty .
+
+##Adding object property defining class for solr data getter	
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasVClassId>
+    a owl:ObjectProperty.                   
+	
+           
+###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 .
+      
+<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#primaryLink>
+      a       owl:ObjectProperty ;
+      rdfs:label "Primary Link"@en-US ;
+      rdfs:range <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#Link> ;
+      rdfs:subPropertyOf <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#primaryLink> , owl:topObjectProperty ;
+      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#customEntryFormAnnot>
+              "defaultLinkForm.jsp"^^xsd:string ;
+      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#forceStubDeletionAnnot>
+              "true"^^xsd:boolean ;
+      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#offerCreateNewOptionAnnot>
+              "true"^^xsd:boolean ;
+      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#selectFromExistingAnnot>
+              "false"^^xsd:boolean ;
+      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#stubObjectPropertyAnnot>
+              "true"^^xsd:boolean .      
+
+rdf:type 
+      a owl:ObjectProperty ;
+      rdfs:label "RDF Type"@en-US ;
+      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 ;                             
+      <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 .       
+
+
+<http://vitro.mannlib.cornell.edu/ns/vitro/0.7#additionalLink>
+      a       owl:ObjectProperty ;
+      rdfs:label "Additional Link"@en-US ;
+      rdfs:range <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#Link> ;
+      rdfs:subPropertyOf <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#additionalLink> , owl:topObjectProperty ;
+      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#customEntryFormAnnot>
+              "defaultLinkForm.jsp"^^xsd:string ;
+      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#forceStubDeletionAnnot>
+              "true"^^xsd:boolean ;
+      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#offerCreateNewOptionAnnot>
+              "true"^^xsd:boolean ;
+      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#selectFromExistingAnnot>
+              "false"^^xsd:boolean ;
+      <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#stubObjectPropertyAnnot>
+              "true"^^xsd:boolean .
+              
+###Display model    
+
+###Adding menu management customform annotation
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasElement>
+      a       owl:ObjectProperty .
+      
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#excludeClass>
+      a       owl:ObjectProperty .
+
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#toPage>
+      a       owl:ObjectProperty .      
+      
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#forClassGroup>
+      a       owl:ObjectProperty .
+      
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#hasDataGetter>
+      a       owl:ObjectProperty .
+      
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#getIndividualsForClass>
+      a       owl:ObjectProperty .  
+      
+<http://vitro.mannlib.cornell.edu/ontologies/display/1.1#restrictResultsByClass>
+      a       owl:ObjectProperty .    
+      
diff --git a/webapp/web/WEB-INF/resources/startup_listeners.txt b/webapp/web/WEB-INF/resources/startup_listeners.txt
index a5c581ecc..d7e47e9d9 100644
--- a/webapp/web/WEB-INF/resources/startup_listeners.txt
+++ b/webapp/web/WEB-INF/resources/startup_listeners.txt
@@ -1,77 +1,77 @@
-#
-# ServletContextListeners for Vitro, to be instantiated and run by the StartupManager.
-# 
-# For more information, 
-#     https://sourceforge.net/apps/mediawiki/vivo/index.php?title=The_StartupManager
-#
-
-edu.cornell.mannlib.vitro.webapp.servlet.setup.JvmSmokeTests
-
-edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSetup
-
-edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSmokeTests
-
-edu.cornell.mannlib.vitro.webapp.config.RevisionInfoSetup
-
-edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory$Setup
-
-### this listener must be run before SDBSetup, all models setups and WebappDaoSetup ###
-edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaPersistentDataSourceSetup
- 
-edu.cornell.mannlib.vitro.webapp.servlet.setup.RDFServiceSetup
-
-edu.cornell.mannlib.vitro.webapp.servlet.setup.ApplicationModelSetup
-edu.cornell.mannlib.vitro.webapp.servlet.setup.UserModelSetup
-edu.cornell.mannlib.vitro.webapp.servlet.setup.ContentModelSetup
-edu.cornell.mannlib.vitro.webapp.servlet.setup.ModelMakerSetup
-
-edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase
-
-edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageSetup
-
-edu.cornell.mannlib.vitro.webapp.web.images.PlaceholderUtil$Setup
-
-# Update the URIs on Permission Sets on UserAccounts from model (1.4) to 1.5.
-edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdatePermissionSetUris
-
-edu.cornell.mannlib.vitro.webapp.servlet.setup.FileGraphSetup
-
-edu.cornell.mannlib.vitro.webapp.servlet.setup.SimpleReasonerSetup
-
-# Must run after JenaDataSourceSetup
-edu.cornell.mannlib.vitro.webapp.servlet.setup.ThemeInfoSetup
-
-edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionRegistry$Setup
-
-edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsLoader
-
-edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper$Setup
-
-edu.cornell.mannlib.vitro.webapp.auth.policy.setup.CommonPolicyFamilySetup
-
-edu.cornell.mannlib.vitro.webapp.auth.policy.RootUserPolicy$Setup
-
-edu.cornell.mannlib.vitro.webapp.auth.policy.RestrictHomeMenuItemEditingPolicy$Setup
-
-edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewServiceSetup
-
-edu.ucsf.vitro.opensocial.OpenSocialSmokeTests
-
-# For multiple language support
-edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionSetup
-
-# The Solr index uses a "public" permission, so the PropertyRestrictionPolicyHelper 
-#   and the PermissionRegistry must already be set up.
-edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup
-
-edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerSetup
-
-# On shutdown, this will kill the background thread started by Apache Commons File Upload
-org.apache.commons.fileupload.servlet.FileCleanerCleanup
-
-# The VClassGroupCache index uses a "public" permission, so the PropertyRestrictionPolicyHelper 
-#   and the PermissionRegistry must already be set up.
-edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache$Setup
-
-# This should be near the end, because it will issue a warning if the connection to Solr times out.
-edu.cornell.mannlib.vitro.webapp.servlet.setup.SolrSmokeTest
+#
+# ServletContextListeners for Vitro, to be instantiated and run by the StartupManager.
+# 
+# For more information, 
+#     https://sourceforge.net/apps/mediawiki/vivo/index.php?title=The_StartupManager
+#
+
+edu.cornell.mannlib.vitro.webapp.servlet.setup.JvmSmokeTests
+
+edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSetup
+
+edu.cornell.mannlib.vitro.webapp.config.ConfigurationPropertiesSmokeTests
+
+edu.cornell.mannlib.vitro.webapp.config.RevisionInfoSetup
+
+edu.cornell.mannlib.vitro.webapp.email.FreemarkerEmailFactory$Setup
+
+### this listener must be run before SDBSetup, all models setups and WebappDaoSetup ###
+edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaPersistentDataSourceSetup
+ 
+edu.cornell.mannlib.vitro.webapp.servlet.setup.RDFServiceSetup
+
+edu.cornell.mannlib.vitro.webapp.servlet.setup.ApplicationModelSetup
+edu.cornell.mannlib.vitro.webapp.servlet.setup.UserModelSetup
+edu.cornell.mannlib.vitro.webapp.servlet.setup.ContentModelSetup
+edu.cornell.mannlib.vitro.webapp.servlet.setup.ModelMakerSetup
+
+edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase
+
+edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageSetup
+
+edu.cornell.mannlib.vitro.webapp.web.images.PlaceholderUtil$Setup
+
+# Update the URIs on Permission Sets on UserAccounts from model (1.4) to 1.5.
+edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdatePermissionSetUris
+
+edu.cornell.mannlib.vitro.webapp.servlet.setup.FileGraphSetup
+
+edu.cornell.mannlib.vitro.webapp.servlet.setup.SimpleReasonerSetup
+
+# Must run after JenaDataSourceSetup
+edu.cornell.mannlib.vitro.webapp.servlet.setup.ThemeInfoSetup
+
+edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionRegistry$Setup
+
+edu.cornell.mannlib.vitro.webapp.auth.permissions.PermissionSetsLoader
+
+edu.cornell.mannlib.vitro.webapp.auth.policy.bean.PropertyRestrictionPolicyHelper$Setup
+
+edu.cornell.mannlib.vitro.webapp.auth.policy.setup.CommonPolicyFamilySetup
+
+edu.cornell.mannlib.vitro.webapp.auth.policy.RootUserPolicy$Setup
+
+edu.cornell.mannlib.vitro.webapp.auth.policy.RestrictHomeMenuItemEditingPolicy$Setup
+
+edu.cornell.mannlib.vitro.webapp.services.shortview.ShortViewServiceSetup
+
+edu.ucsf.vitro.opensocial.OpenSocialSmokeTests
+
+# For multiple language support
+edu.cornell.mannlib.vitro.webapp.i18n.selection.LocaleSelectionSetup
+
+# The Solr index uses a "public" permission, so the PropertyRestrictionPolicyHelper 
+#   and the PermissionRegistry must already be set up.
+edu.cornell.mannlib.vitro.webapp.search.solr.SolrSetup
+
+edu.cornell.mannlib.vitro.webapp.controller.freemarker.FreemarkerSetup
+
+# On shutdown, this will kill the background thread started by Apache Commons File Upload
+org.apache.commons.fileupload.servlet.FileCleanerCleanup
+
+# The VClassGroupCache index uses a "public" permission, so the PropertyRestrictionPolicyHelper 
+#   and the PermissionRegistry must already be set up.
+edu.cornell.mannlib.vitro.webapp.dao.jena.VClassGroupCache$Setup
+
+# This should be near the end, because it will issue a warning if the connection to Solr times out.
+edu.cornell.mannlib.vitro.webapp.servlet.setup.SolrSmokeTest
diff --git a/webapp/web/WEB-INF/tlds/form.tld b/webapp/web/WEB-INF/tlds/form.tld
index 666c487aa..0fd6cd615 100644
--- a/webapp/web/WEB-INF/tlds/form.tld
+++ b/webapp/web/WEB-INF/tlds/form.tld
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<!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>
-	<jspversion>1.1</jspversion>
-	<shortname>Vitro Editing Form Library</shortname>
-	<info>
-		This tag library contains tags for constructing vitro
-		editing forms.  The tag names shadow html elements
-		but provide additional attributes for specifying
-		how dynamic content should be retrieved from persistent
-		storage.
-	</info>
-	
-	<tag>
-		<name>option</name>
-		<tagclass>edu.cornell.mannlib.vedit.tags.OptionTag</tagclass>
-		<bodycontent>empty</bodycontent>
-		<attribute>
-			<name>name</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>		
-	</tag>
-
-	<tag>
-		<name>value</name>
-		<tagclass>edu.cornell.mannlib.vedit.tags.ValueTag</tagclass>
-		<bodycontent>empty</bodycontent>
-		<attribute>
-			<name>name</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>		
-	</tag>
-	
-	<tag>
-		<name>dynamicFields</name>
-		<tagclass>edu.cornell.mannlib.vedit.tags.DynamicFieldsTag</tagclass>
-		<bodycontent>empty</bodycontent>
-		<attribute>
-			<name>type</name>
-			<required>true</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-		<attribute>
-			<name>usePage</name>
-			<required>true</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>
-	</tag>
-	
-	<tag>
-		<name>error</name>
-		<tagclass>edu.cornell.mannlib.vedit.tags.ErrorTag</tagclass>
-		<bodycontent>empty</bodycontent>
-		<attribute>
-			<name>name</name>
-			<required>false</required>
-			<rtexprvalue>true</rtexprvalue>
-		</attribute>		
-	</tag>
-	
-</taglib>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+<!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>
+	<jspversion>1.1</jspversion>
+	<shortname>Vitro Editing Form Library</shortname>
+	<info>
+		This tag library contains tags for constructing vitro
+		editing forms.  The tag names shadow html elements
+		but provide additional attributes for specifying
+		how dynamic content should be retrieved from persistent
+		storage.
+	</info>
+	
+	<tag>
+		<name>option</name>
+		<tagclass>edu.cornell.mannlib.vedit.tags.OptionTag</tagclass>
+		<bodycontent>empty</bodycontent>
+		<attribute>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>		
+	</tag>
+
+	<tag>
+		<name>value</name>
+		<tagclass>edu.cornell.mannlib.vedit.tags.ValueTag</tagclass>
+		<bodycontent>empty</bodycontent>
+		<attribute>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>		
+	</tag>
+	
+	<tag>
+		<name>dynamicFields</name>
+		<tagclass>edu.cornell.mannlib.vedit.tags.DynamicFieldsTag</tagclass>
+		<bodycontent>empty</bodycontent>
+		<attribute>
+			<name>type</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
+			<name>usePage</name>
+			<required>true</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+	</tag>
+	
+	<tag>
+		<name>error</name>
+		<tagclass>edu.cornell.mannlib.vedit.tags.ErrorTag</tagclass>
+		<bodycontent>empty</bodycontent>
+		<attribute>
+			<name>name</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>		
+	</tag>
+	
+</taglib>
diff --git a/webapp/web/WEB-INF/tlds/sparqltag.tld b/webapp/web/WEB-INF/tlds/sparqltag.tld
index 5683802fb..3016f37ab 100644
--- a/webapp/web/WEB-INF/tlds/sparqltag.tld
+++ b/webapp/web/WEB-INF/tlds/sparqltag.tld
@@ -1,279 +1,279 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!-- $Id: sparql.tld,v 1.2 2006/08/06 19:50:30 Dave Exp $ -->
-
-<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">
-  <description></description>
-  <display-name>SPARQL JSP taglib</display-name>	
-  <tlib-version>1.0</tlib-version>
-  <short-name>sparql</short-name>
-  <uri>http://djpowell.net/tmp/sparql-tag/0.1/</uri>
-  
-  <!-- <sparql:sparql> -->
-  
-  <tag>
-    <description>
-      <![CDATA[
-      <p><b>SPARQL container tag.</b></p>
-      <p>This tag must be placed around sparql:select tags to
-      ensure that the live ResultSet's gets closed,
-      when this tag goes out of scope.
-      ]]>
-    </description>
-    <display-name>SPARQL container tag</display-name>
-    <name>sparql</name>
-    <tag-class>net.djpowell.sparqltag.SparqlTag</tag-class>
-    <body-content>scriptless</body-content>
-  </tag>
-
-  <!-- <sparql:lock> -->
-
-  <tag>
-    <description>
-      Obtains a lock or transaction on a model until the tag is closed.
-    </description>
-    <display-name>SPARQL lock tag</display-name>
-    <name>lock</name>    
-    <tag-class>net.djpowell.sparqltag.LockTag</tag-class>
-    <tei-class>net.djpowell.sparqltag.LockTagInfo</tei-class>
-    <body-content>scriptless</body-content>
-    
-    <attribute>
-      <description>The model to lock, or execute in a transaction</description>
-      <name>model</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-      <type>com.hp.hpl.jena.rdf.model.Model</type>
-    </attribute>
-
-    <attribute>
-      <description>
-        Indicates whether transactions should be used instead of
-        critical sections.
-      </description>
-      <name>transactions</name>
-      <!-- default is false -->
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <type>java.lang.String</type>
-    </attribute>
-
-    <attribute>
-      <description>
-        If critical sections are being used, indicates whether a
-        read lock is sufficient, or whether a write-lock is required.
-        The default is true, meaning a read-lock.
-      </description>
-      <name>readonly</name>
-      <!-- default is true-->
-      <required>false</required>
-      <rtexprvalue>true</rtexprvalue>
-      <type>java.lang.String</type>
-    </attribute>
-
-  </tag>
-
-  <!-- <sparql:load> -->
-
-  <tag>
-    <description>SPARQL load tag.  Convenience tag for creating a new model from an RDF/XML URI.</description>
-    <display-name>SPARQL load tag</display-name>
-    <name>load</name>
-    <tag-class>net.djpowell.sparqltag.LoadTag</tag-class>
-    <tei-class>net.djpowell.sparqltag.LoadTagInfo</tei-class>
-    <body-content>empty</body-content>
-
-    <variable>
-      <name-from-attribute>var</name-from-attribute>
-      <variable-class>com.hp.hpl.jena.rdf.model.Model</variable-class>
-      <scope>AT_END</scope>
-    </variable>
-
-    <attribute>
-      <description></description>
-      <name>var</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-      <type>java.lang.String</type>
-    </attribute>
-
-    <attribute>
-      <description></description>
-      <name>uri</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-      <type>java.lang.String</type>
-    </attribute>
-
-  </tag>
-
-  <!-- <sparql:ask> -->
-  
-  <tag>
-    <description>SPARQL ask tag.  (Must be nested inside sparql:sparql)</description>
-    <display-name>SPARQL ask tag</display-name>
-    <name>ask</name>
-    <tag-class>net.djpowell.sparqltag.AskTag</tag-class>
-    <body-content>tagdependent</body-content>
-    
-    <variable>
-      <description></description>
-      <name-from-attribute>var</name-from-attribute>
-      <variable-class>java.lang.Boolean</variable-class>
-      <scope>AT_END</scope>
-    </variable>
-
-    <attribute>
-      <description></description>
-      <name>model</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-      <type>com.hp.hpl.jena.rdf.model.Model</type>
-    </attribute>
-    
-    <attribute>
-      <description></description>
-      <name>var</name>
-      <required>true</required>
-      <rtexprvalue>false</rtexprvalue>
-      <type>java.lang.String</type>
-    </attribute>
-
-    <dynamic-attributes>true</dynamic-attributes>
-    
-    <example>
-      
-    </example>
-    
-  </tag>       
-
-
-  <!-- <sparql:construct> -->
-
-  <tag>
-    <description>SPARQL construct tag.  (Must be nested inside sparql:sparql)</description>
-    <display-name>SPARQL construct tag</display-name>
-    <name>construct</name>
-    <tag-class>net.djpowell.sparqltag.ConstructTag</tag-class>
-    <body-content>tagdependent</body-content>
-
-    <variable>
-      <name-from-attribute>var</name-from-attribute>
-      <variable-class>com.hp.hpl.jena.rdf.model.Model</variable-class>
-      <scope>AT_END</scope>
-    </variable>
-
-    <attribute>
-      <description></description>
-      <name>model</name>
-      <required>true</required>
-      <rtexprvalue>false</rtexprvalue>
-      <type>com.hp.hpl.jena.rdf.model.Model</type>
-    </attribute>
-    
-    <attribute>
-      <description></description>
-      <name>var</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-      <type>java.lang.String</type>
-    </attribute>
-
-    <dynamic-attributes>true</dynamic-attributes>
-
-    <example>
-      
-    </example>
-    
-  </tag>       
-
-
-  <!-- <sparql:describe> -->
-  <tag>
-    <description>SPARQL describe tag.  (Must be nested inside sparql:sparql)</description>
-    <display-name>SPARQL describe tag</display-name>
-    <name>describe</name>
-    <tag-class>net.djpowell.sparqltag.DescribeTag</tag-class>
-    <body-content>tagdependent</body-content>
-
-    <variable>
-      <name-from-attribute>var</name-from-attribute>
-      <variable-class>com.hp.hpl.jena.rdf.model.Model</variable-class>
-      <scope>AT_END</scope>
-    </variable>
-
-    <attribute>
-      <description></description>
-      <name>model</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-      <type>com.hp.hpl.jena.rdf.model.Model</type>
-    </attribute>
-    
-    <attribute>
-      <description></description>
-      <name>var</name>
-      <required>true</required>
-      <rtexprvalue>false</rtexprvalue>
-      <type>java.lang.String</type>
-    </attribute>
-    
-    <dynamic-attributes>true</dynamic-attributes>
-
-    <example>
-      
-    </example>
-    
-  </tag>       
-
-
-  <!-- <sparql:select> -->
-
-  <tag>
-    <description>SPARQL select tag.  (Must be nested inside sparql:sparql)</description>
-    <display-name>SPARQL select tag</display-name>
-    <name>select</name>
-    <tag-class>net.djpowell.sparqltag.SelectTag</tag-class>
-    <body-content>tagdependent</body-content>
-    
-    <variable>
-      <name-from-attribute>var</name-from-attribute>
-      <variable-class>net.djpowell.sparqltag.SelectTag.RSWrapper</variable-class>
-      <!-- .rows = is an Iterator of QuerySolution -->
-      <scope>AT_END</scope>
-    </variable>
-
-    <attribute>
-      <description></description>
-      <name>model</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-      <type>com.hp.hpl.jena.rdf.model.Model</type>
-    </attribute>
-    
-    <attribute>
-      <description></description>
-      <name>var</name>
-      <required>true</required>
-      <rtexprvalue>true</rtexprvalue>
-      <type>java.lang.String</type>
-    </attribute>
-
-    <dynamic-attributes>true</dynamic-attributes>
-
-    <example>
-      
-    </example>
-    
-  </tag>       
-
-</taglib>
-
-<!--
-Revision history
-$Log: sparql.tld,v $
-Revision 1.2  2006/08/06 19:50:30  Dave
-Tidied up build
-
-
--->
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!-- $Id: sparql.tld,v 1.2 2006/08/06 19:50:30 Dave Exp $ -->
+
+<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">
+  <description></description>
+  <display-name>SPARQL JSP taglib</display-name>	
+  <tlib-version>1.0</tlib-version>
+  <short-name>sparql</short-name>
+  <uri>http://djpowell.net/tmp/sparql-tag/0.1/</uri>
+  
+  <!-- <sparql:sparql> -->
+  
+  <tag>
+    <description>
+      <![CDATA[
+      <p><b>SPARQL container tag.</b></p>
+      <p>This tag must be placed around sparql:select tags to
+      ensure that the live ResultSet's gets closed,
+      when this tag goes out of scope.
+      ]]>
+    </description>
+    <display-name>SPARQL container tag</display-name>
+    <name>sparql</name>
+    <tag-class>net.djpowell.sparqltag.SparqlTag</tag-class>
+    <body-content>scriptless</body-content>
+  </tag>
+
+  <!-- <sparql:lock> -->
+
+  <tag>
+    <description>
+      Obtains a lock or transaction on a model until the tag is closed.
+    </description>
+    <display-name>SPARQL lock tag</display-name>
+    <name>lock</name>    
+    <tag-class>net.djpowell.sparqltag.LockTag</tag-class>
+    <tei-class>net.djpowell.sparqltag.LockTagInfo</tei-class>
+    <body-content>scriptless</body-content>
+    
+    <attribute>
+      <description>The model to lock, or execute in a transaction</description>
+      <name>model</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>com.hp.hpl.jena.rdf.model.Model</type>
+    </attribute>
+
+    <attribute>
+      <description>
+        Indicates whether transactions should be used instead of
+        critical sections.
+      </description>
+      <name>transactions</name>
+      <!-- default is false -->
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.String</type>
+    </attribute>
+
+    <attribute>
+      <description>
+        If critical sections are being used, indicates whether a
+        read lock is sufficient, or whether a write-lock is required.
+        The default is true, meaning a read-lock.
+      </description>
+      <name>readonly</name>
+      <!-- default is true-->
+      <required>false</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.String</type>
+    </attribute>
+
+  </tag>
+
+  <!-- <sparql:load> -->
+
+  <tag>
+    <description>SPARQL load tag.  Convenience tag for creating a new model from an RDF/XML URI.</description>
+    <display-name>SPARQL load tag</display-name>
+    <name>load</name>
+    <tag-class>net.djpowell.sparqltag.LoadTag</tag-class>
+    <tei-class>net.djpowell.sparqltag.LoadTagInfo</tei-class>
+    <body-content>empty</body-content>
+
+    <variable>
+      <name-from-attribute>var</name-from-attribute>
+      <variable-class>com.hp.hpl.jena.rdf.model.Model</variable-class>
+      <scope>AT_END</scope>
+    </variable>
+
+    <attribute>
+      <description></description>
+      <name>var</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.String</type>
+    </attribute>
+
+    <attribute>
+      <description></description>
+      <name>uri</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.String</type>
+    </attribute>
+
+  </tag>
+
+  <!-- <sparql:ask> -->
+  
+  <tag>
+    <description>SPARQL ask tag.  (Must be nested inside sparql:sparql)</description>
+    <display-name>SPARQL ask tag</display-name>
+    <name>ask</name>
+    <tag-class>net.djpowell.sparqltag.AskTag</tag-class>
+    <body-content>tagdependent</body-content>
+    
+    <variable>
+      <description></description>
+      <name-from-attribute>var</name-from-attribute>
+      <variable-class>java.lang.Boolean</variable-class>
+      <scope>AT_END</scope>
+    </variable>
+
+    <attribute>
+      <description></description>
+      <name>model</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>com.hp.hpl.jena.rdf.model.Model</type>
+    </attribute>
+    
+    <attribute>
+      <description></description>
+      <name>var</name>
+      <required>true</required>
+      <rtexprvalue>false</rtexprvalue>
+      <type>java.lang.String</type>
+    </attribute>
+
+    <dynamic-attributes>true</dynamic-attributes>
+    
+    <example>
+      
+    </example>
+    
+  </tag>       
+
+
+  <!-- <sparql:construct> -->
+
+  <tag>
+    <description>SPARQL construct tag.  (Must be nested inside sparql:sparql)</description>
+    <display-name>SPARQL construct tag</display-name>
+    <name>construct</name>
+    <tag-class>net.djpowell.sparqltag.ConstructTag</tag-class>
+    <body-content>tagdependent</body-content>
+
+    <variable>
+      <name-from-attribute>var</name-from-attribute>
+      <variable-class>com.hp.hpl.jena.rdf.model.Model</variable-class>
+      <scope>AT_END</scope>
+    </variable>
+
+    <attribute>
+      <description></description>
+      <name>model</name>
+      <required>true</required>
+      <rtexprvalue>false</rtexprvalue>
+      <type>com.hp.hpl.jena.rdf.model.Model</type>
+    </attribute>
+    
+    <attribute>
+      <description></description>
+      <name>var</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.String</type>
+    </attribute>
+
+    <dynamic-attributes>true</dynamic-attributes>
+
+    <example>
+      
+    </example>
+    
+  </tag>       
+
+
+  <!-- <sparql:describe> -->
+  <tag>
+    <description>SPARQL describe tag.  (Must be nested inside sparql:sparql)</description>
+    <display-name>SPARQL describe tag</display-name>
+    <name>describe</name>
+    <tag-class>net.djpowell.sparqltag.DescribeTag</tag-class>
+    <body-content>tagdependent</body-content>
+
+    <variable>
+      <name-from-attribute>var</name-from-attribute>
+      <variable-class>com.hp.hpl.jena.rdf.model.Model</variable-class>
+      <scope>AT_END</scope>
+    </variable>
+
+    <attribute>
+      <description></description>
+      <name>model</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>com.hp.hpl.jena.rdf.model.Model</type>
+    </attribute>
+    
+    <attribute>
+      <description></description>
+      <name>var</name>
+      <required>true</required>
+      <rtexprvalue>false</rtexprvalue>
+      <type>java.lang.String</type>
+    </attribute>
+    
+    <dynamic-attributes>true</dynamic-attributes>
+
+    <example>
+      
+    </example>
+    
+  </tag>       
+
+
+  <!-- <sparql:select> -->
+
+  <tag>
+    <description>SPARQL select tag.  (Must be nested inside sparql:sparql)</description>
+    <display-name>SPARQL select tag</display-name>
+    <name>select</name>
+    <tag-class>net.djpowell.sparqltag.SelectTag</tag-class>
+    <body-content>tagdependent</body-content>
+    
+    <variable>
+      <name-from-attribute>var</name-from-attribute>
+      <variable-class>net.djpowell.sparqltag.SelectTag.RSWrapper</variable-class>
+      <!-- .rows = is an Iterator of QuerySolution -->
+      <scope>AT_END</scope>
+    </variable>
+
+    <attribute>
+      <description></description>
+      <name>model</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>com.hp.hpl.jena.rdf.model.Model</type>
+    </attribute>
+    
+    <attribute>
+      <description></description>
+      <name>var</name>
+      <required>true</required>
+      <rtexprvalue>true</rtexprvalue>
+      <type>java.lang.String</type>
+    </attribute>
+
+    <dynamic-attributes>true</dynamic-attributes>
+
+    <example>
+      
+    </example>
+    
+  </tag>       
+
+</taglib>
+
+<!--
+Revision history
+$Log: sparql.tld,v $
+Revision 1.2  2006/08/06 19:50:30  Dave
+Tidied up build
+
+
+-->
diff --git a/webapp/web/css/jquery_plugins/jquery.realperson.css b/webapp/web/css/jquery_plugins/jquery.realperson.css
index 1efee66b4..5fc4bf943 100644
--- a/webapp/web/css/jquery_plugins/jquery.realperson.css
+++ b/webapp/web/css/jquery_plugins/jquery.realperson.css
@@ -1,38 +1,38 @@
-/* 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. 
-   Please attribute the author if you use it. */
-   
-/* Real Person jQuery plugin styles v1.0.1. */
-.realperson-challenge {
-	display: inline-block;
-	background-color: #ddd;
-	width: 150px;
-	padding-top: 10px;
-	padding-left: 12px;
-}
-.realperson-text {
-	font-family: "Courier New",monospace;
-	font-size: 6px;
-	font-weight: bold;
-	letter-spacing: -1px;
-	line-height: 3px;
-	color: #000;
-}
-.realperson-regen {
-	padding-top: 4px;
-	padding-right: 6px;
-	font-size: 12px;
-	text-align: center;
-	cursor: pointer;
-}
-.realpersonLabel { 
-    display: block; 
-}
-#defaultReal {
-    margin-left: 20px;
-    vertical-align: top;
-    margin-top: 3px;
-}
+/* 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. 
+   Please attribute the author if you use it. */
+   
+/* Real Person jQuery plugin styles v1.0.1. */
+.realperson-challenge {
+	display: inline-block;
+	background-color: #ddd;
+	width: 150px;
+	padding-top: 10px;
+	padding-left: 12px;
+}
+.realperson-text {
+	font-family: "Courier New",monospace;
+	font-size: 6px;
+	font-weight: bold;
+	letter-spacing: -1px;
+	line-height: 3px;
+	color: #000;
+}
+.realperson-regen {
+	padding-top: 4px;
+	padding-right: 6px;
+	font-size: 12px;
+	text-align: center;
+	cursor: pointer;
+}
+.realpersonLabel { 
+    display: block; 
+}
+#defaultReal {
+    margin-left: 20px;
+    vertical-align: top;
+    margin-top: 3px;
+}
diff --git a/webapp/web/css/menupage/pageList.css b/webapp/web/css/menupage/pageList.css
index 87e58489a..28b147602 100644
--- a/webapp/web/css/menupage/pageList.css
+++ b/webapp/web/css/menupage/pageList.css
@@ -1,53 +1,53 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-.menuFlag {
-	width:67px;
-	height:18px;
-	background: url("../../images/checkMark.png") no-repeat left center;  
-}
-table#pageList {
-    table-layout: auto;
-    width: 930px;
-    text-align: left;
-    margin: 0 auto; 
-    border-collapse: collapse;
-    empty-cells: show;
-    caption-side: top;
-    margin: 20px 0 20px 0;
-}
-table#pageList caption {
-    display: none;
-}
-table#pageList th {
-    background-color: #F7F9F9;
-    height: 40px;
-    color: #064D68;
-    padding-top: 7px;
-    border: 1px solid #d9e4ea;
-    border-bottom: none;
-    padding-left: 6px;
-    font-size: .9em;
-}
-table#pageList th {
-    text-align: left;
-} /*Fix for IE8 and 9, force text in a cell to be aligned to the left*/
-th#isMenuPage {
-    width: 86px;
-}
-th#iconColumns {
-    width: 90px;
-}
-table#pageList td {
-    vertical-align: top;
-    padding: .5em;
-    border: 1px solid #d9e4ea; 
-    font-size: .825em;
-    padding-top: .5em;
-    padding-bottom: .5em;
-}  
-table#pageList td  a {
-   word-wrap: break-word;
-}
-table#pageList tr:nth-child(2n) {
-    background-color: rgba(200, 200, 180,.25);
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+.menuFlag {
+	width:67px;
+	height:18px;
+	background: url("../../images/checkMark.png") no-repeat left center;  
+}
+table#pageList {
+    table-layout: auto;
+    width: 930px;
+    text-align: left;
+    margin: 0 auto; 
+    border-collapse: collapse;
+    empty-cells: show;
+    caption-side: top;
+    margin: 20px 0 20px 0;
+}
+table#pageList caption {
+    display: none;
+}
+table#pageList th {
+    background-color: #F7F9F9;
+    height: 40px;
+    color: #064D68;
+    padding-top: 7px;
+    border: 1px solid #d9e4ea;
+    border-bottom: none;
+    padding-left: 6px;
+    font-size: .9em;
+}
+table#pageList th {
+    text-align: left;
+} /*Fix for IE8 and 9, force text in a cell to be aligned to the left*/
+th#isMenuPage {
+    width: 86px;
+}
+th#iconColumns {
+    width: 90px;
+}
+table#pageList td {
+    vertical-align: top;
+    padding: .5em;
+    border: 1px solid #d9e4ea; 
+    font-size: .825em;
+    padding-top: .5em;
+    padding-bottom: .5em;
+}  
+table#pageList td  a {
+   word-wrap: break-word;
+}
+table#pageList tr:nth-child(2n) {
+    background-color: rgba(200, 200, 180,.25);
 }
\ No newline at end of file
diff --git a/webapp/web/css/menupage/pageManagement.css b/webapp/web/css/menupage/pageManagement.css
index 4c2409edf..180230eec 100644
--- a/webapp/web/css/menupage/pageManagement.css
+++ b/webapp/web/css/menupage/pageManagement.css
@@ -1,151 +1,151 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-.pageContent {
-    padding-left:6px;
-    padding-top:2px;   
-}
-
-.pageContentContainer {
-    background-color:#f5f5f5;
-    border-color:#ccc;
-    border-width:1px;
-    border-style:solid;
-    margin-bottom:4px;
-}
-
-.pageContentTypeLabel {
-    padding-left:6px;
-    color:#064D68;
-}
-
-.pageContentWrapper {
-    background-color:#f9f9f9;
-    padding-left:6px;
-    padding-top:2px;
-    border-top-width:1px;
-    border-style:solid;
-    border-color:#ccc;
-}
-
-.pageContentExpand {
-    float:right;
-    padding-right:5px;
-}
-.contentSectionContainer {
-    background-color:#f9f9f9;
-    padding-left:6px;
-    padding-top:2px;
-    border-width:1px;
-    border-style:solid;
-    border-color:#ccc;
-}
-.arrow {
-	width:13px; 
-	height:9px; 
-	display:block;
-}
-.expandArrow {
-    background:url(../../images/vitro_plus_sign.gif) right center no-repeat;
-    min-height:18px;
-}
-.collapseArrow {
-    background:url(../../images/vitro_minus_sign.gif) right center no-repeat;
-    min-height:18px;
-}
-
-.deleteButton {
-    margin-bottom:5px;
-}
-
-section#floatRight {
-    margin-top:0px;
-    float:right;
-    background-color:#fff;
-    width:580px;
-    margin-right:-4px;
-}
-select#typeSelect {
-    margin-top:0px;
-    margin-bottom:20px;
-}
-section#headerBar {
-    background-color:#f5f5f5;
-    border-color:#ccc;
-    border-width:1px;
-    border-style:solid;
-    border-bottom-width:0px;
-    padding-left:6px;
-    color:#064D68;
-}
-input#moreContent {
-    margin-top:8px;
-}
-section#pageDetails {
-    background-color:#fff;
-}
-p#templatePTag {
-    margin-top:8px;
-    margin-bottom:2px;
-}
-p#menuCheckboxPTag {
-    margin-top:15px;
-    margin-bottom:3px;
-}
-section.hideMenuSection {
-    margin-top:10px;
-    display:none;
-}
-section.showMenuSection {
-    margin-top:10px;
-}
-section#addPageOne  {
-    margin-bottom:-12px;
-    margin-top:8px;
-}
-input.doneWithContent {
-    display: inline;
-    padding: 5px 18px 7px;
-    color: #fff;
-    text-decoration: none;
-    border-radius: 4px; 
-    -moz-border-radius: 4px;
-    -webkit-border-radius: 4px;
-    position: relative;
-    cursor: pointer;
-    border: 0;
-    margin: 0;
-    background-color: #398aac;
-    color: #fff;
-    font-size: 14px;
-    font-weight: normal;
-    line-height: 1;
-    margin-right: .6em;
-    margin-bottom:8px;
-    margin-top:0px;
-}
-input#contentCheckbox {
-    margin-left:30px;
-    margin-top:5px;
-    vertical-align:top;
-    padding: 0;
-}
-span.deleteLinkContainer {
-    float:left;
-    margin-left:170px;
-    margin-top:-36px;
-}
-form#managePage textarea {
-    width:98.5%;
-}
-#internal-class {
-    padding: 10px 0 2px 10px; 
-    background: #f0f0f0;
-    margin-right: .4em;
-    margin-bottom: .8em;
-    width: 65%;
-}
-.disabledSubmit {
-    color: #ede ! important;
-    background-color: #b2d15a ! important;
-    cursor: default ! important;
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+.pageContent {
+    padding-left:6px;
+    padding-top:2px;   
+}
+
+.pageContentContainer {
+    background-color:#f5f5f5;
+    border-color:#ccc;
+    border-width:1px;
+    border-style:solid;
+    margin-bottom:4px;
+}
+
+.pageContentTypeLabel {
+    padding-left:6px;
+    color:#064D68;
+}
+
+.pageContentWrapper {
+    background-color:#f9f9f9;
+    padding-left:6px;
+    padding-top:2px;
+    border-top-width:1px;
+    border-style:solid;
+    border-color:#ccc;
+}
+
+.pageContentExpand {
+    float:right;
+    padding-right:5px;
+}
+.contentSectionContainer {
+    background-color:#f9f9f9;
+    padding-left:6px;
+    padding-top:2px;
+    border-width:1px;
+    border-style:solid;
+    border-color:#ccc;
+}
+.arrow {
+	width:13px; 
+	height:9px; 
+	display:block;
+}
+.expandArrow {
+    background:url(../../images/vitro_plus_sign.gif) right center no-repeat;
+    min-height:18px;
+}
+.collapseArrow {
+    background:url(../../images/vitro_minus_sign.gif) right center no-repeat;
+    min-height:18px;
+}
+
+.deleteButton {
+    margin-bottom:5px;
+}
+
+section#floatRight {
+    margin-top:0px;
+    float:right;
+    background-color:#fff;
+    width:580px;
+    margin-right:-4px;
+}
+select#typeSelect {
+    margin-top:0px;
+    margin-bottom:20px;
+}
+section#headerBar {
+    background-color:#f5f5f5;
+    border-color:#ccc;
+    border-width:1px;
+    border-style:solid;
+    border-bottom-width:0px;
+    padding-left:6px;
+    color:#064D68;
+}
+input#moreContent {
+    margin-top:8px;
+}
+section#pageDetails {
+    background-color:#fff;
+}
+p#templatePTag {
+    margin-top:8px;
+    margin-bottom:2px;
+}
+p#menuCheckboxPTag {
+    margin-top:15px;
+    margin-bottom:3px;
+}
+section.hideMenuSection {
+    margin-top:10px;
+    display:none;
+}
+section.showMenuSection {
+    margin-top:10px;
+}
+section#addPageOne  {
+    margin-bottom:-12px;
+    margin-top:8px;
+}
+input.doneWithContent {
+    display: inline;
+    padding: 5px 18px 7px;
+    color: #fff;
+    text-decoration: none;
+    border-radius: 4px; 
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    position: relative;
+    cursor: pointer;
+    border: 0;
+    margin: 0;
+    background-color: #398aac;
+    color: #fff;
+    font-size: 14px;
+    font-weight: normal;
+    line-height: 1;
+    margin-right: .6em;
+    margin-bottom:8px;
+    margin-top:0px;
+}
+input#contentCheckbox {
+    margin-left:30px;
+    margin-top:5px;
+    vertical-align:top;
+    padding: 0;
+}
+span.deleteLinkContainer {
+    float:left;
+    margin-left:170px;
+    margin-top:-36px;
+}
+form#managePage textarea {
+    width:98.5%;
+}
+#internal-class {
+    padding: 10px 0 2px 10px; 
+    background: #f0f0f0;
+    margin-right: .4em;
+    margin-bottom: .8em;
+    width: 65%;
+}
+.disabledSubmit {
+    color: #ede ! important;
+    background-color: #b2d15a ! important;
+    cursor: default ! important;
+}
diff --git a/webapp/web/css/menupage/sparqlresults.css b/webapp/web/css/menupage/sparqlresults.css
index 7cfbf4e85..e20e7ed10 100644
--- a/webapp/web/css/menupage/sparqlresults.css
+++ b/webapp/web/css/menupage/sparqlresults.css
@@ -1,15 +1,15 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-.resultRow {
-float:none;
-clear:both;
-}
-
-.resultCell {
-float:left;
-border:1px solid #000000;
-}
-
-.resultHeading {
-font-weight:bold;
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+.resultRow {
+float:none;
+clear:both;
+}
+
+.resultCell {
+float:left;
+border:1px solid #000000;
+}
+
+.resultHeading {
+font-weight:bold;
 }
\ No newline at end of file
diff --git a/webapp/web/js/account/accountAssociateProfile.js b/webapp/web/js/account/accountAssociateProfile.js
index 5c4cb2b63..1cb0879e4 100644
--- a/webapp/web/js/account/accountAssociateProfile.js
+++ b/webapp/web/js/account/accountAssociateProfile.js
@@ -1,242 +1,242 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-var associateProfileFields = {
-    onLoad: function() {
-        if (this.disableFormInUnsupportedBrowsers()) {
-            return;
-        }        
-
-        this.mixIn();
-        this.initObjectReferences();                 
-        this.bindEventListeners();
-        this.setInitialState();       
-    },
-
-    disableFormInUnsupportedBrowsers: function() {       
-        var disableWrapper = $('#ie67DisableWrapper');
-        
-        // Check for unsupported browsers only if the element exists on the page
-        if (disableWrapper.length) {
-            if (vitro.browserUtils.isIELessThan8()) {
-                disableWrapper.show();
-                $('.noIE67').hide();
-                return true;
-            }
-        }            
-        return false;      
-    },
-
-    mixIn: function() {
-        $.extend(this, associateProfileFieldsData);
-    },
-    
-    initObjectReferences: function() {
-        this.form = $('#userAccountForm');
-        
-        // The external auth ID field and messages
-        this.externalAuthIdField = $('#externalAuthId');
-        this.externalAuthIdInUseMessage = $('#externalAuthIdInUse');
-
-        // We have an associated profile
-        this.associatedArea = $('#associated');
-        this.associatedProfileNameSpan = $('#associatedProfileName');
-        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');
-    },
-
-    bindEventListeners: function() {
-        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.associateProfileNameField.autocomplete({
-            minLength: 3,
-            source: function(request, response) {
-                if (request.term in associateProfileFields.acCache) {
-                    response(associateProfileFields.acCache[request.term]);
-                    return;
-                }
-                $.ajax({
-                    url: associateProfileFields.ajaxUrl,
-                    dataType: 'json',
-                    data: {
-                        action: "autoCompleteProfile",
-                        term: request.term,
-                        externalAuthId: associateProfileFields.externalAuthIdField.val()
-                    }, 
-                    complete: function(xhr, status) {
-                        var results = jQuery.parseJSON(xhr.responseText);
-                        associateProfileFields.acCache[request.term] = results;  
-                        response(results);
-                    }
-                });
-            },
-            select: function(event, ui) {
-                associateProfileFields.showAssociatedProfileArea(ui.item.label, ui.item.uri, ui.item.url); 
-            }
-        });
-
-        
-    },
-    
-    setInitialState: function() {
-        if (this.externalAuthIdField.val().length == 0) {
-            this.hideAllOptionals();
-        } else if (this.associatedProfileInfo) {
-            this.showAssociatedProfileArea(this.associatedProfileInfo.label, this.associatedProfileInfo.uri, this.associatedProfileInfo.url);
-        } else {
-            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)
-            return;
-        }
-
-        $.ajax({
-            url: associateProfileFields.ajaxUrl,
-            dataType: "json",
-            data: {
-                action: "checkExternalAuth",
-                userAccountUri: associateProfileFields.userUri,
-                externalAuthId: externalAuthId
-            },
-            complete: function(xhr, status) {
-                var results = $.parseJSON(xhr.responseText);
-                associateProfileFields.idCache[externalAuthId] = results;  
-                associateProfileFields.applyAjaxResultsForExternalAuthIdField(results);
-            }
-        });
-    },
-
-    applyAjaxResultsForExternalAuthIdField: function(results) {
-        if (results.idInUse) {
-            this.showExternalAuthInUseMessage()
-        } else if (results.matchesProfile) {
-            this.showAssociatedProfileArea(results.profileLabel, results.profileUri, results.profileUrl)
-        } else {
-            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","");
-        } else {
-            this.associateProfileNameField.val('');
-            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");
-        this.associateProfileBackgroundOneArea.css("border","none");
-        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();
-
-        if (this.associationEnabled) {
-            this.associatedProfileNameSpan.html(name);
-            this.associatedProfileUriField.val(uri);
-            this.verifyUrl = url;
-            this.associatedArea.show();
-            this.associateProfileBackgroundOneArea.css("background-color","#f1f2ee");
-            this.associateProfileBackgroundOneArea.css("border","1px solid #ccc");
-        }
-    },
-    
-    showAssociatingOptionsArea: function() {
-        this.hideExternalAuthInUseMessage();
-        this.hideAssociatedProfileArea();
-
-        if (this.associationEnabled) {
-            this.newProfileClassHasChanged();
-            this.associationOptionsArea.show();
-            this.associateProfileBackgroundOneArea.css("background-color","#f1f2ee");
-            this.associateProfileBackgroundOneArea.css("border","1px solid #ccc");
-        }
-    }
-    
-}
- 
-$(document).ready(function() {   
-    associateProfileFields.onLoad();
-}); 
-        
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+var associateProfileFields = {
+    onLoad: function() {
+        if (this.disableFormInUnsupportedBrowsers()) {
+            return;
+        }        
+
+        this.mixIn();
+        this.initObjectReferences();                 
+        this.bindEventListeners();
+        this.setInitialState();       
+    },
+
+    disableFormInUnsupportedBrowsers: function() {       
+        var disableWrapper = $('#ie67DisableWrapper');
+        
+        // Check for unsupported browsers only if the element exists on the page
+        if (disableWrapper.length) {
+            if (vitro.browserUtils.isIELessThan8()) {
+                disableWrapper.show();
+                $('.noIE67').hide();
+                return true;
+            }
+        }            
+        return false;      
+    },
+
+    mixIn: function() {
+        $.extend(this, associateProfileFieldsData);
+    },
+    
+    initObjectReferences: function() {
+        this.form = $('#userAccountForm');
+        
+        // The external auth ID field and messages
+        this.externalAuthIdField = $('#externalAuthId');
+        this.externalAuthIdInUseMessage = $('#externalAuthIdInUse');
+
+        // We have an associated profile
+        this.associatedArea = $('#associated');
+        this.associatedProfileNameSpan = $('#associatedProfileName');
+        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');
+    },
+
+    bindEventListeners: function() {
+        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.associateProfileNameField.autocomplete({
+            minLength: 3,
+            source: function(request, response) {
+                if (request.term in associateProfileFields.acCache) {
+                    response(associateProfileFields.acCache[request.term]);
+                    return;
+                }
+                $.ajax({
+                    url: associateProfileFields.ajaxUrl,
+                    dataType: 'json',
+                    data: {
+                        action: "autoCompleteProfile",
+                        term: request.term,
+                        externalAuthId: associateProfileFields.externalAuthIdField.val()
+                    }, 
+                    complete: function(xhr, status) {
+                        var results = jQuery.parseJSON(xhr.responseText);
+                        associateProfileFields.acCache[request.term] = results;  
+                        response(results);
+                    }
+                });
+            },
+            select: function(event, ui) {
+                associateProfileFields.showAssociatedProfileArea(ui.item.label, ui.item.uri, ui.item.url); 
+            }
+        });
+
+        
+    },
+    
+    setInitialState: function() {
+        if (this.externalAuthIdField.val().length == 0) {
+            this.hideAllOptionals();
+        } else if (this.associatedProfileInfo) {
+            this.showAssociatedProfileArea(this.associatedProfileInfo.label, this.associatedProfileInfo.uri, this.associatedProfileInfo.url);
+        } else {
+            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)
+            return;
+        }
+
+        $.ajax({
+            url: associateProfileFields.ajaxUrl,
+            dataType: "json",
+            data: {
+                action: "checkExternalAuth",
+                userAccountUri: associateProfileFields.userUri,
+                externalAuthId: externalAuthId
+            },
+            complete: function(xhr, status) {
+                var results = $.parseJSON(xhr.responseText);
+                associateProfileFields.idCache[externalAuthId] = results;  
+                associateProfileFields.applyAjaxResultsForExternalAuthIdField(results);
+            }
+        });
+    },
+
+    applyAjaxResultsForExternalAuthIdField: function(results) {
+        if (results.idInUse) {
+            this.showExternalAuthInUseMessage()
+        } else if (results.matchesProfile) {
+            this.showAssociatedProfileArea(results.profileLabel, results.profileUri, results.profileUrl)
+        } else {
+            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","");
+        } else {
+            this.associateProfileNameField.val('');
+            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");
+        this.associateProfileBackgroundOneArea.css("border","none");
+        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();
+
+        if (this.associationEnabled) {
+            this.associatedProfileNameSpan.html(name);
+            this.associatedProfileUriField.val(uri);
+            this.verifyUrl = url;
+            this.associatedArea.show();
+            this.associateProfileBackgroundOneArea.css("background-color","#f1f2ee");
+            this.associateProfileBackgroundOneArea.css("border","1px solid #ccc");
+        }
+    },
+    
+    showAssociatingOptionsArea: function() {
+        this.hideExternalAuthInUseMessage();
+        this.hideAssociatedProfileArea();
+
+        if (this.associationEnabled) {
+            this.newProfileClassHasChanged();
+            this.associationOptionsArea.show();
+            this.associateProfileBackgroundOneArea.css("background-color","#f1f2ee");
+            this.associateProfileBackgroundOneArea.css("border","1px solid #ccc");
+        }
+    }
+    
+}
+ 
+$(document).ready(function() {   
+    associateProfileFields.onLoad();
+}); 
+        
diff --git a/webapp/web/js/betterDateInput.js b/webapp/web/js/betterDateInput.js
index a02a33d23..22dde0fcd 100644
--- a/webapp/web/js/betterDateInput.js
+++ b/webapp/web/js/betterDateInput.js
@@ -1,211 +1,211 @@
-/* 'Magic' date parsing, by Simon Willison (6th October 2003)
-   http://simon.incutio.com/archive/2003/10/06/betterDateInput
-
-   example of usage:
-   <form action="" method="get"><div>
-   <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>
-*/
-
-/* Finds the index of the first occurence of item in the array, or -1 if not found */
-Array.prototype.indexOf = function(item) {
-    for (var i = 0; i < this.length; i++) {
-        if (this[i] == item) {
-            return i;
-        }
-    }
-    return -1;
-};
-/* Returns an array of items judged 'true' by the passed in test function */
-Array.prototype.filter = function(test) {
-    var matches = [];
-    for (var i = 0; i < this.length; i++) {
-        if (test(this[i])) {
-            matches[matches.length] = this[i];
-        }
-    }
-    return matches;
-};
-
-var monthNames = "January February March April May June July August September October November December".split(" ");
-var weekdayNames = "Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" ");
-
-/* Takes a string, returns the index of the month matching that string, throws
-   an error if 0 or more than 1 matches
-*/
-function parseMonth(month) {
-    var matches = monthNames.filter(function(item) { 
-        return new RegExp("^" + month, "i").test(item);
-    });
-    if (matches.length == 0) {
-        throw new Error("Invalid month string");
-    }
-    if (matches.length > 1) {
-        throw new Error("Ambiguous month");
-    }
-    return monthNames.indexOf(matches[0]);
-}
-/* Same as parseMonth but for days of the week */
-function parseWeekday(weekday) {
-    var matches = weekdayNames.filter(function(item) {
-        return new RegExp("^" + weekday, "i").test(item);
-    });
-    if (matches.length == 0) {
-        throw new Error("Invalid day string");
-    }
-    if (matches.length > 1) {
-        throw new Error("Ambiguous 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. 
-*/
-var dateParsePatterns = [
-    // Today
-    {   re: /^tod/i,
-        handler: function() { 
-            return new Date();
-        } 
-    },
-    // Tomorrow
-    {   re: /^tom/i,
-        handler: function() {
-            var d = new Date(); 
-            d.setDate(d.getDate() + 1); 
-            return d;
-        }
-    },
-    // Yesterday
-    {   re: /^yes/i,
-        handler: function() {
-            var d = new Date();
-            d.setDate(d.getDate() - 1);
-            return d;
-        }
-    },
-    // 4th
-    {   re: /^(\d{1,2})(st|nd|rd|th)?$/i, 
-        handler: function(bits) {
-            var d = new Date();
-            d.setDate(parseInt(bits[1], 10));
-            return d;
-        }
-    },
-    // 4th Jan
-    {   re: /^(\d{1,2})(?:st|nd|rd|th)? (\w+)$/i, 
-        handler: function(bits) {
-            var d = new Date();
-            d.setDate(parseInt(bits[1], 10));
-            d.setMonth(parseMonth(bits[2]));
-            return d;
-        }
-    },
-    // 4th Jan 2003
-    {   re: /^(\d{1,2})(?:st|nd|rd|th)? (\w+),? (\d{4})$/i,
-        handler: function(bits) {
-            var d = new Date();
-            d.setDate(parseInt(bits[1], 10));
-            d.setMonth(parseMonth(bits[2]));
-            d.setYear(bits[3]);
-            return d;
-        }
-    },
-    // Jan 4th
-    {   re: /^(\w+) (\d{1,2})(?:st|nd|rd|th)?$/i, 
-        handler: function(bits) {
-            var d = new Date();
-            d.setDate(parseInt(bits[2], 10));
-            d.setMonth(parseMonth(bits[1]));
-            return d;
-        }
-    },
-    // Jan 4th 2003
-    {   re: /^(\w+) (\d{1,2})(?:st|nd|rd|th)?,? (\d{4})$/i,
-        handler: function(bits) {
-            var d = new Date();
-            d.setDate(parseInt(bits[2], 10));
-            d.setMonth(parseMonth(bits[1]));
-            d.setYear(bits[3]);
-            return d;
-        }
-    },
-    // next Tuesday - this is suspect due to weird meaning of "next"
-    {   re: /^next (\w+)$/i,
-        handler: function(bits) {
-            var d = new Date();
-            var day = d.getDay();
-            var newDay = parseWeekday(bits[1]);
-            var addDays = newDay - day;
-            if (newDay <= day) {
-                addDays += 7;
-            }
-            d.setDate(d.getDate() + addDays);
-            return d;
-        }
-    },
-    // last Tuesday
-    {   re: /^last (\w+)$/i,
-        handler: function(bits) {
-            throw new Error("Not yet implemented");
-        }
-    },
-    // mm/dd/yyyy (American style)
-    {   re: /(\d{1,2})\/(\d{1,2})\/(\d{4})/,
-        handler: function(bits) {
-            var d = new Date();
-            d.setYear(bits[3]);
-            d.setDate(parseInt(bits[2], 10));
-            d.setMonth(parseInt(bits[1], 10) - 1); // Because months indexed from 0
-            return d;
-        }
-    },
-    // yyyy-mm-dd (ISO style)
-    {   re: /(\d{4})-(\d{1,2})-(\d{1,2})/,
-        handler: function(bits) {
-            var d = new Date();
-            d.setYear(parseInt(bits[1]));
-            d.setDate(parseInt(bits[3], 10));
-            d.setMonth(parseInt(bits[2], 10) - 1);
-            return d;
-        }
-    },
-];
-
-function parseDateString(s) {
-    for (var i = 0; i < dateParsePatterns.length; i++) {
-        var re = dateParsePatterns[i].re;
-        var handler = dateParsePatterns[i].handler;
-        var bits = re.exec(s);
-        if (bits) {
-            return handler(bits);
-        }
-    }
-    throw new Error("Invalid date string" + s);
-}
-
-function magicDate(input) {
-    var messagespan = input.id + 'Msg';
-    try {
-        var d = parseDateString(input.value);
-        input.value = (d.getMonth() + 1) + '/' + d.getDate() + '/' + d.getFullYear();
-        input.className = '';
-        // Human readable date
-        document.getElementById(messagespan).firstChild.nodeValue = d.toDateString();
-        document.getElementById(messagespan).className = 'normal';
-    }
-    catch (e) {
-        input.className = 'error';
-        var message = e.message;
-        // Fix for IE6 bug
-        if (message.indexOf('is null or not an object') > -1) {
-            message = 'Invalid date string';
-        }
-        document.getElementById(messagespan).firstChild.nodeValue = message;
-        document.getElementById(messagespan).className = 'error';
-    }
-}
+/* 'Magic' date parsing, by Simon Willison (6th October 2003)
+   http://simon.incutio.com/archive/2003/10/06/betterDateInput
+
+   example of usage:
+   <form action="" method="get"><div>
+   <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>
+*/
+
+/* Finds the index of the first occurence of item in the array, or -1 if not found */
+Array.prototype.indexOf = function(item) {
+    for (var i = 0; i < this.length; i++) {
+        if (this[i] == item) {
+            return i;
+        }
+    }
+    return -1;
+};
+/* Returns an array of items judged 'true' by the passed in test function */
+Array.prototype.filter = function(test) {
+    var matches = [];
+    for (var i = 0; i < this.length; i++) {
+        if (test(this[i])) {
+            matches[matches.length] = this[i];
+        }
+    }
+    return matches;
+};
+
+var monthNames = "January February March April May June July August September October November December".split(" ");
+var weekdayNames = "Sunday Monday Tuesday Wednesday Thursday Friday Saturday".split(" ");
+
+/* Takes a string, returns the index of the month matching that string, throws
+   an error if 0 or more than 1 matches
+*/
+function parseMonth(month) {
+    var matches = monthNames.filter(function(item) { 
+        return new RegExp("^" + month, "i").test(item);
+    });
+    if (matches.length == 0) {
+        throw new Error("Invalid month string");
+    }
+    if (matches.length > 1) {
+        throw new Error("Ambiguous month");
+    }
+    return monthNames.indexOf(matches[0]);
+}
+/* Same as parseMonth but for days of the week */
+function parseWeekday(weekday) {
+    var matches = weekdayNames.filter(function(item) {
+        return new RegExp("^" + weekday, "i").test(item);
+    });
+    if (matches.length == 0) {
+        throw new Error("Invalid day string");
+    }
+    if (matches.length > 1) {
+        throw new Error("Ambiguous 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. 
+*/
+var dateParsePatterns = [
+    // Today
+    {   re: /^tod/i,
+        handler: function() { 
+            return new Date();
+        } 
+    },
+    // Tomorrow
+    {   re: /^tom/i,
+        handler: function() {
+            var d = new Date(); 
+            d.setDate(d.getDate() + 1); 
+            return d;
+        }
+    },
+    // Yesterday
+    {   re: /^yes/i,
+        handler: function() {
+            var d = new Date();
+            d.setDate(d.getDate() - 1);
+            return d;
+        }
+    },
+    // 4th
+    {   re: /^(\d{1,2})(st|nd|rd|th)?$/i, 
+        handler: function(bits) {
+            var d = new Date();
+            d.setDate(parseInt(bits[1], 10));
+            return d;
+        }
+    },
+    // 4th Jan
+    {   re: /^(\d{1,2})(?:st|nd|rd|th)? (\w+)$/i, 
+        handler: function(bits) {
+            var d = new Date();
+            d.setDate(parseInt(bits[1], 10));
+            d.setMonth(parseMonth(bits[2]));
+            return d;
+        }
+    },
+    // 4th Jan 2003
+    {   re: /^(\d{1,2})(?:st|nd|rd|th)? (\w+),? (\d{4})$/i,
+        handler: function(bits) {
+            var d = new Date();
+            d.setDate(parseInt(bits[1], 10));
+            d.setMonth(parseMonth(bits[2]));
+            d.setYear(bits[3]);
+            return d;
+        }
+    },
+    // Jan 4th
+    {   re: /^(\w+) (\d{1,2})(?:st|nd|rd|th)?$/i, 
+        handler: function(bits) {
+            var d = new Date();
+            d.setDate(parseInt(bits[2], 10));
+            d.setMonth(parseMonth(bits[1]));
+            return d;
+        }
+    },
+    // Jan 4th 2003
+    {   re: /^(\w+) (\d{1,2})(?:st|nd|rd|th)?,? (\d{4})$/i,
+        handler: function(bits) {
+            var d = new Date();
+            d.setDate(parseInt(bits[2], 10));
+            d.setMonth(parseMonth(bits[1]));
+            d.setYear(bits[3]);
+            return d;
+        }
+    },
+    // next Tuesday - this is suspect due to weird meaning of "next"
+    {   re: /^next (\w+)$/i,
+        handler: function(bits) {
+            var d = new Date();
+            var day = d.getDay();
+            var newDay = parseWeekday(bits[1]);
+            var addDays = newDay - day;
+            if (newDay <= day) {
+                addDays += 7;
+            }
+            d.setDate(d.getDate() + addDays);
+            return d;
+        }
+    },
+    // last Tuesday
+    {   re: /^last (\w+)$/i,
+        handler: function(bits) {
+            throw new Error("Not yet implemented");
+        }
+    },
+    // mm/dd/yyyy (American style)
+    {   re: /(\d{1,2})\/(\d{1,2})\/(\d{4})/,
+        handler: function(bits) {
+            var d = new Date();
+            d.setYear(bits[3]);
+            d.setDate(parseInt(bits[2], 10));
+            d.setMonth(parseInt(bits[1], 10) - 1); // Because months indexed from 0
+            return d;
+        }
+    },
+    // yyyy-mm-dd (ISO style)
+    {   re: /(\d{4})-(\d{1,2})-(\d{1,2})/,
+        handler: function(bits) {
+            var d = new Date();
+            d.setYear(parseInt(bits[1]));
+            d.setDate(parseInt(bits[3], 10));
+            d.setMonth(parseInt(bits[2], 10) - 1);
+            return d;
+        }
+    },
+];
+
+function parseDateString(s) {
+    for (var i = 0; i < dateParsePatterns.length; i++) {
+        var re = dateParsePatterns[i].re;
+        var handler = dateParsePatterns[i].handler;
+        var bits = re.exec(s);
+        if (bits) {
+            return handler(bits);
+        }
+    }
+    throw new Error("Invalid date string" + s);
+}
+
+function magicDate(input) {
+    var messagespan = input.id + 'Msg';
+    try {
+        var d = parseDateString(input.value);
+        input.value = (d.getMonth() + 1) + '/' + d.getDate() + '/' + d.getFullYear();
+        input.className = '';
+        // Human readable date
+        document.getElementById(messagespan).firstChild.nodeValue = d.toDateString();
+        document.getElementById(messagespan).className = 'normal';
+    }
+    catch (e) {
+        input.className = 'error';
+        var message = e.message;
+        // Fix for IE6 bug
+        if (message.indexOf('is null or not an object') > -1) {
+            message = 'Invalid date string';
+        }
+        document.getElementById(messagespan).firstChild.nodeValue = message;
+        document.getElementById(messagespan).className = 'error';
+    }
+}
diff --git a/webapp/web/js/browserUtils.js b/webapp/web/js/browserUtils.js
index 55be9ba7f..326eb9bde 100644
--- a/webapp/web/js/browserUtils.js
+++ b/webapp/web/js/browserUtils.js
@@ -1,24 +1,24 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-var vitro;
-// vitro == null: true
-// vitro === null: false (only true if undefined)
-// typeof vitro == 'undefined': true
-if (!vitro) { 
-    vitro = {};
-}
-
-vitro.browserUtils = {
-    
-    isIELessThan8: function() {
-        var version;
-        if (navigator.appVersion.indexOf("MSIE") == -1) {
-            return false;
-        }
-        else {
-            version = parseFloat(navigator.appVersion.split("MSIE")[1]);
-            return version < 8;
-        }    
-    }
-};
-
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+var vitro;
+// vitro == null: true
+// vitro === null: false (only true if undefined)
+// typeof vitro == 'undefined': true
+if (!vitro) { 
+    vitro = {};
+}
+
+vitro.browserUtils = {
+    
+    isIELessThan8: function() {
+        var version;
+        if (navigator.appVersion.indexOf("MSIE") == -1) {
+            return false;
+        }
+        else {
+            version = parseFloat(navigator.appVersion.split("MSIE")[1]);
+            return version < 8;
+        }    
+    }
+};
+
diff --git a/webapp/web/js/commentsForm.jsp b/webapp/web/js/commentsForm.jsp
index 8b9102a35..30a33d33c 100644
--- a/webapp/web/js/commentsForm.jsp
+++ b/webapp/web/js/commentsForm.jsp
@@ -1,7 +1,7 @@
-<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> 
-
-<%
-    String contextPath = request.getContextPath();
-%>
-
-<script language="JavaScript" type="text/javascript" src="<%= contextPath %>/js/commentForm.js"></script>
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> 
+
+<%
+    String contextPath = request.getContextPath();
+%>
+
+<script language="JavaScript" type="text/javascript" src="<%= contextPath %>/js/commentForm.js"></script>
diff --git a/webapp/web/js/detect.js b/webapp/web/js/detect.js
index cf3508139..d487b6b52 100755
--- a/webapp/web/js/detect.js
+++ b/webapp/web/js/detect.js
@@ -1,174 +1,174 @@
-/* from Nicholas C. Zakas 2005 */
-/* ch 10 browser detection */
-/* downloaded from wrox.com by bdc34 */
-var sUserAgent = navigator.userAgent;
-var fAppVersion = parseFloat(navigator.appVersion);
-
-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");
-        }
-    } 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;
-
-}
-
-var isOpera = sUserAgent.indexOf("Opera") > -1;
-var isMinOpera4 = isMinOpera5 = isMinOpera6 = isMinOpera7 = isMinOpera7_5 = false;
-
-if (isOpera) {
-    var fOperaVersion;
-    if(navigator.appName == "Opera") {
-        fOperaVersion = fAppVersion;
-    } else {
-        var reOperaVersion = new RegExp("Opera (\\d+\\.\\d+)");
-        reOperaVersion.test(sUserAgent);
-        fOperaVersion = parseFloat(RegExp["$1"]);
-    }
-
-    isMinOpera4 = fOperaVersion >= 4;
-    isMinOpera5 = fOperaVersion >= 5;
-    isMinOpera6 = fOperaVersion >= 6;
-    isMinOpera7 = fOperaVersion >= 7;
-    isMinOpera7_5 = fOperaVersion >= 7.5;
-}
-
-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;
-
-if (isKHTML) {
-    isSafari = sUserAgent.indexOf("AppleWebKit") > -1;
-    isKonq = sUserAgent.indexOf("Konqueror") > -1;
-
-    if (isSafari) {
-        var reAppleWebKit = new RegExp("AppleWebKit\\/(\\d+(?:\\.\\d*)?)");
-        reAppleWebKit.test(sUserAgent);
-        var fAppleWebKitVersion = parseFloat(RegExp["$1"]);
-
-        isMinSafari1 = fAppleWebKitVersion >= 85;
-        isMinSafari1_2 = fAppleWebKitVersion >= 124;
-    } else if (isKonq) {
-
-        var reKonq = new RegExp("Konqueror\\/(\\d+(?:\\.\\d+(?:\\.\\d)?)?)");
-        reKonq.test(sUserAgent);
-        isMinKonq2_2 = compareVersions(RegExp["$1"], "2.2") >= 0;
-        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 
-           && sUserAgent.indexOf("MSIE") > -1
-           && !isOpera;
-           
-var isMinIE4 = isMinIE5 = isMinIE5_5 = isMinIE6 = false;
-
-if (isIE) {
-    var reIE = new RegExp("MSIE (\\d+\\.\\d+);");
-    reIE.test(sUserAgent);
-    var fIEVersion = parseFloat(RegExp["$1"]);
-
-    isMinIE4 = fIEVersion >= 4;
-    isMinIE5 = fIEVersion >= 5;
-    isMinIE5_5 = fIEVersion >= 5.5;
-    isMinIE6 = fIEVersion >= 6.0;
-}
-
-var isMoz = sUserAgent.indexOf("Gecko") > -1
-            && !isKHTML;
-
-var isMinMoz1 = sMinMoz1_4 = isMinMoz1_5 = false;
-
-if (isMoz) {
-    var reMoz = new RegExp("rv:(\\d+\\.\\d+(?:\\.\\d+)?)");
-    reMoz.test(sUserAgent);
-    isMinMoz1 = compareVersions(RegExp["$1"], "1.0") >= 0;
-    isMinMoz1_4 = compareVersions(RegExp["$1"], "1.4") >= 0;
-    isMinMoz1_5 = compareVersions(RegExp["$1"], "1.5") >= 0;
-}
-
-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;
-
-if (isNS4) {
-    isMinNS4 = true;
-    isMinNS4_5 = fAppVersion >= 4.5;
-    isMinNS4_7 = fAppVersion >= 4.7;
-    isMinNS4_8 = fAppVersion >= 4.8;
-}
-
-var isWin = (navigator.platform == "Win32") || (navigator.platform == "Windows");
-var isMac = (navigator.platform == "Mac68K") || (navigator.platform == "MacPPC") 
-            || (navigator.platform == "Macintosh");
-
-var isUnix = (navigator.platform == "X11") && !isWin && !isMac;
-
-var isWin95 = isWin98 = isWinNT4 = isWin2K = isWinME = isWinXP = false;
-var isMac68K = isMacPPC = false;
-var isSunOS = isMinSunOS4 = isMinSunOS5 = isMinSunOS5_5 = false;
-
-if (isWin) {
-    isWin95 = sUserAgent.indexOf("Win95") > -1 
-              || sUserAgent.indexOf("Windows 95") > -1;
-    isWin98 = sUserAgent.indexOf("Win98") > -1 
-              || sUserAgent.indexOf("Windows 98") > -1;
-    isWinME = sUserAgent.indexOf("Win 9x 4.90") > -1 
-              || sUserAgent.indexOf("Windows ME") > -1;
-    isWin2K = sUserAgent.indexOf("Windows NT 5.0") > -1 
-              || sUserAgent.indexOf("Windows 2000") > -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 
-              && (!isWinME && !isWin2K && !isWinXP);
-} 
-
-if (isMac) {
-    isMac68K = sUserAgent.indexOf("Mac_68000") > -1 
-               || sUserAgent.indexOf("68K") > -1;
-    isMacPPC = sUserAgent.indexOf("Mac_PowerPC") > -1 
-               || sUserAgent.indexOf("PPC") > -1;  
-}
-
-if (isUnix) {
-    isSunOS = sUserAgent.indexOf("SunOS") > -1;
-
-    if (isSunOS) {
-        var reSunOS = new RegExp("SunOS (\\d+\\.\\d+(?:\\.\\d+)?)");
-        reSunOS.test(sUserAgent);
-        isMinSunOS4 = compareVersions(RegExp["$1"], "4.0") >= 0;
-        isMinSunOS5 = compareVersions(RegExp["$1"], "5.0") >= 0;
-        isMinSunOS5_5 = compareVersions(RegExp["$1"], "5.5") >= 0;
-    }
-}
+/* from Nicholas C. Zakas 2005 */
+/* ch 10 browser detection */
+/* downloaded from wrox.com by bdc34 */
+var sUserAgent = navigator.userAgent;
+var fAppVersion = parseFloat(navigator.appVersion);
+
+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");
+        }
+    } 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;
+
+}
+
+var isOpera = sUserAgent.indexOf("Opera") > -1;
+var isMinOpera4 = isMinOpera5 = isMinOpera6 = isMinOpera7 = isMinOpera7_5 = false;
+
+if (isOpera) {
+    var fOperaVersion;
+    if(navigator.appName == "Opera") {
+        fOperaVersion = fAppVersion;
+    } else {
+        var reOperaVersion = new RegExp("Opera (\\d+\\.\\d+)");
+        reOperaVersion.test(sUserAgent);
+        fOperaVersion = parseFloat(RegExp["$1"]);
+    }
+
+    isMinOpera4 = fOperaVersion >= 4;
+    isMinOpera5 = fOperaVersion >= 5;
+    isMinOpera6 = fOperaVersion >= 6;
+    isMinOpera7 = fOperaVersion >= 7;
+    isMinOpera7_5 = fOperaVersion >= 7.5;
+}
+
+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;
+
+if (isKHTML) {
+    isSafari = sUserAgent.indexOf("AppleWebKit") > -1;
+    isKonq = sUserAgent.indexOf("Konqueror") > -1;
+
+    if (isSafari) {
+        var reAppleWebKit = new RegExp("AppleWebKit\\/(\\d+(?:\\.\\d*)?)");
+        reAppleWebKit.test(sUserAgent);
+        var fAppleWebKitVersion = parseFloat(RegExp["$1"]);
+
+        isMinSafari1 = fAppleWebKitVersion >= 85;
+        isMinSafari1_2 = fAppleWebKitVersion >= 124;
+    } else if (isKonq) {
+
+        var reKonq = new RegExp("Konqueror\\/(\\d+(?:\\.\\d+(?:\\.\\d)?)?)");
+        reKonq.test(sUserAgent);
+        isMinKonq2_2 = compareVersions(RegExp["$1"], "2.2") >= 0;
+        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 
+           && sUserAgent.indexOf("MSIE") > -1
+           && !isOpera;
+           
+var isMinIE4 = isMinIE5 = isMinIE5_5 = isMinIE6 = false;
+
+if (isIE) {
+    var reIE = new RegExp("MSIE (\\d+\\.\\d+);");
+    reIE.test(sUserAgent);
+    var fIEVersion = parseFloat(RegExp["$1"]);
+
+    isMinIE4 = fIEVersion >= 4;
+    isMinIE5 = fIEVersion >= 5;
+    isMinIE5_5 = fIEVersion >= 5.5;
+    isMinIE6 = fIEVersion >= 6.0;
+}
+
+var isMoz = sUserAgent.indexOf("Gecko") > -1
+            && !isKHTML;
+
+var isMinMoz1 = sMinMoz1_4 = isMinMoz1_5 = false;
+
+if (isMoz) {
+    var reMoz = new RegExp("rv:(\\d+\\.\\d+(?:\\.\\d+)?)");
+    reMoz.test(sUserAgent);
+    isMinMoz1 = compareVersions(RegExp["$1"], "1.0") >= 0;
+    isMinMoz1_4 = compareVersions(RegExp["$1"], "1.4") >= 0;
+    isMinMoz1_5 = compareVersions(RegExp["$1"], "1.5") >= 0;
+}
+
+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;
+
+if (isNS4) {
+    isMinNS4 = true;
+    isMinNS4_5 = fAppVersion >= 4.5;
+    isMinNS4_7 = fAppVersion >= 4.7;
+    isMinNS4_8 = fAppVersion >= 4.8;
+}
+
+var isWin = (navigator.platform == "Win32") || (navigator.platform == "Windows");
+var isMac = (navigator.platform == "Mac68K") || (navigator.platform == "MacPPC") 
+            || (navigator.platform == "Macintosh");
+
+var isUnix = (navigator.platform == "X11") && !isWin && !isMac;
+
+var isWin95 = isWin98 = isWinNT4 = isWin2K = isWinME = isWinXP = false;
+var isMac68K = isMacPPC = false;
+var isSunOS = isMinSunOS4 = isMinSunOS5 = isMinSunOS5_5 = false;
+
+if (isWin) {
+    isWin95 = sUserAgent.indexOf("Win95") > -1 
+              || sUserAgent.indexOf("Windows 95") > -1;
+    isWin98 = sUserAgent.indexOf("Win98") > -1 
+              || sUserAgent.indexOf("Windows 98") > -1;
+    isWinME = sUserAgent.indexOf("Win 9x 4.90") > -1 
+              || sUserAgent.indexOf("Windows ME") > -1;
+    isWin2K = sUserAgent.indexOf("Windows NT 5.0") > -1 
+              || sUserAgent.indexOf("Windows 2000") > -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 
+              && (!isWinME && !isWin2K && !isWinXP);
+} 
+
+if (isMac) {
+    isMac68K = sUserAgent.indexOf("Mac_68000") > -1 
+               || sUserAgent.indexOf("68K") > -1;
+    isMacPPC = sUserAgent.indexOf("Mac_PowerPC") > -1 
+               || sUserAgent.indexOf("PPC") > -1;  
+}
+
+if (isUnix) {
+    isSunOS = sUserAgent.indexOf("SunOS") > -1;
+
+    if (isSunOS) {
+        var reSunOS = new RegExp("SunOS (\\d+\\.\\d+(?:\\.\\d+)?)");
+        reSunOS.test(sUserAgent);
+        isMinSunOS4 = compareVersions(RegExp["$1"], "4.0") >= 0;
+        isMinSunOS5 = compareVersions(RegExp["$1"], "5.0") >= 0;
+        isMinSunOS5_5 = compareVersions(RegExp["$1"], "5.5") >= 0;
+    }
+}
diff --git a/webapp/web/js/edit/entityRetry.js b/webapp/web/js/edit/entityRetry.js
index f105d8a2f..3087d9090 100644
--- a/webapp/web/js/edit/entityRetry.js
+++ b/webapp/web/js/edit/entityRetry.js
@@ -1,357 +1,357 @@
-<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<!-- <script type='text/javascript' src='dojo.js'></script> -->
-
-<script language="JavaScript">
-function confirmDelete() {
-    var msg="Are you SURE you want to delete this individual? If in doubt, CANCEL."
-    return confirm(msg);
-}
-</script>
-
-<script type='text/javascript' src='dwr/interface/EntityDWR.js'></script>
-<script type='text/javascript' src='dwr/engine.js'></script>
-<script type='text/javascript' src='dwr/util.js'></script>
-<script type='text/javascript' src='js/vitro.js'></script>
-
-<script language="javascript" type="text/javascript">
-
-if( vitroJsLoaded == null ){ 
-
-  alert("seminar.js needs to have the code from vitro.js loaded first"); 
-
-}
-
-// addEvent(window, 'load', monikerInit);
-
-function monikerInit(){
-
-//   if ($('monikerSelect').options.length=1) {
-//      $('monikerSelectAlt').disabled = false;
-//   }else{
-//      $('monikerSelectAlt').disabled = true;
-//   }
-
-  $('Moniker').onchange = checkMonikers;  
-
-  update();
-
-}
-
-
-
-function update(){ //updates moniker list when type is changed
-
-  DWRUtil.useLoadingMessage();
-
-  EntityDWR.monikers(createList,  document.getElementById("VClassURI").value );
-  
-}
-
-
-
-function createList(data) { //puts options in moniker select list
-
-  fillList("Moniker", data, getCurrentMoniker() );
-
-  var ele = $("Moniker");
-
-  var opt = new Option("none","");
-  ele.options[ele.options.length] = opt;
-
-  var opt = new Option("[new moniker]","");
-  ele.options[ele.options.length] = opt;
-
-  DWRUtil.setValue("Moniker",getCurrentMoniker()); // getCurrentMoniker() is defined on jsp
-
-  checkMonikers();
-}
-
-function getCurrentMoniker() {
-	return document.getElementById("MonikerSelectAlt").value;
-}
-
-
-function checkMonikers(){ //checks if monikers is on [new moniker] and enables alt field
-
-  var sel = $('Moniker');  
-
-  if( sel.value == "" || sel.options.length <= 1){
-    $('MonikerSelectAlt').disabled = false;
-
-  }else{
-
-    $('MonikerSelectAlt').disabled = true; 
-
-  }        
-
-}
-
-
-
-function fillList(id, data, selectedtext) {
-
-  var ele = $(id);
-
-  if (ele == null)    {
-
-    alert("fillList() can't find an element with id: " + id + ".");
-
-    throw id;
-
-  }
-
-
-
-  ele.options.length = 0;     // Empty the list
-
-  if (data == null) { return; }
-
-
-
-  for (var i = 0; i < data.length; i++)    {
-
-    var text = DWRUtil.toDescriptiveString(data[i]);
-
-    var value = text;
-
-
-
-    var opt = new Option(text, value);
-
-    if (selectedtext != null && selectedtext == text){
-
-      opt.selected=true;
-
-    }
-
-    ele.options[ele.options.length] = opt;
-
-  }
-
-}
-
-</script>
-
-<script language="javascript" type="text/javascript" src="js/toggle.js"></script>
-<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",
-		elements : "Description",
-		theme_advanced_buttons1 : "bold,italic,underline,separator,link,bullist,numlist,separator,sub,sup,charmap,separator,undo,redo,separator,removeformat,cleanup,help,code",
-		theme_advanced_buttons2 : "",
-		theme_advanced_buttons3 : "",
-		theme_advanced_toolbar_location : "top",
-		theme_advanced_toolbar_align : "left",
-		theme_advanced_resizing : true,
-		height : "10",
-		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",
-		// extended_valid_elements : "a[href|target|name]",
-		// plugins : "table",
-		// theme_advanced_buttons3_add_before : "tablecontrols,separator",
-		// 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">
-<!--
-
-	/*
-	dojo.require("dojo.dom.*");
-	*/
-	
-	nextId=99999;
-	// fix this with separate values per type
-	
-	function getAllChildren(theNode, childArray) {
-		var ImmediateChildren = theNode.childNodes;
-		if (ImmediateChildren) {
-			for (var i=0;i<ImmediateChildren.length;i++) {
-				childArray.push(ImmediateChildren[i]);
-				getAllChildren(ImmediateChildren[i],childArray);
-			}
-		}
-	}
-	
-	function addLine(baseNode, typeStr)
-	{
-		baseId = baseNode.id.substr(0,baseNode.id.length-7);	
-		newTaName = document.getElementById(baseId+"genTaName").firstChild.nodeValue;
-		theList = document.getElementById(baseId+"ul");
-		nextId++;
-		TrId = nextId;
-		templateRoot = document.getElementById(typeStr+"NN");
-		newRow = templateRoot.cloneNode(true);
-		// newRow.id = newRow.id.substr(0,newRow.id.length-2)+TrId;
-		newRow.id=TrId;
-		newRowChildren = new Array();
-		getAllChildren(newRow,newRowChildren);
-		for (i=0;i<newRowChildren.length;i++) {
-			if (newRowChildren[i].id) {
-				if(newRowChildren[i].id.substr(0,typeStr.length+2)==typeStr+"NN") {
-					newRowChildren[i].id=TrId+newRowChildren[i].id.substr(typeStr.length+2,newRowChildren[i].id.length-typeStr.length-2);
-				}
-			}
-		}
-		theList.appendChild(newRow);
-		theContent=document.getElementById(TrId+"content");
-		theContent.style.display="none";
-		theContentValue=document.getElementById(TrId+"contentValue");
-		theTaTa = document.getElementById(TrId+"tata");
-		theTaTa.name=newTaName;
-		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");			
-		
-		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";
-		clickedRowDeleteLink = document.getElementById(TrId+"deleteLink");
-		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");
-		//theContentValueBackup=document.getElementById(index+"contentValueBackup");
-		//theContentValue.innerHTML = theContentValueBackup.innerHTML;
-		theContentValue.style.textDecoration="none";
-		theTaTa = document.getElementById(index+"tata");
-		theTaTa.innerHTML=theContentValue.innerHTML;
-		clickedRowEditLink = document.getElementById(TrId+"editLink");
-		clickedRowEditLink.style.display="inline";
-		clickedRowDeleteLink = document.getElementById(TrId+"deleteLink");
-		clickedRowDeleteLink.style.display="inline";
-		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");
-		theLic.style.display="none";
-		theTa = document.getElementById(LiId+"ta");
-		theTa.style.display="block";
-		tinyMCE.execCommand('mceAddControl',false,LiId+'tata');
-		return false;
-	}
-	
-	function backToLi(okLinkNode) { 
-		index = okLinkNode.id.substr(0,okLinkNode.id.length-6);
-		textareaDivId = index+"ta";
-		liDivId = index+"contentValue";
-		content = tinyMCE.activeEditor.getContent();
-		tinyMCE.execCommand('mceRemoveControl',false,textareaDivId+'ta');
-		theTextarea = document.getElementById(textareaDivId);
-		theTextarea.style.display="none";
-		theLi = document.getElementById(liDivId);
-		// replace this:
-		theLi.innerHTML = content;
-		theLi.parentNode.style.display = 'block';
-		return false;
-	}
-	
-	function cancelBackToLi(cancelLinkNode) {
-		index = cancelLinkNode.id.substr(0,cancelLinkNode.id.length-10);
-		textareaDivId = index+"ta";
-		liDivId = index+"contentValue";
-		tinyMCE.execCommand('mceRemoveControl',false,textareaDivId+'ta');
-		theTextarea = document.getElementById(textareaDivId);
-		theTextarea.style.display="none";
-		theTaTa = document.getElementById(textareaDivId+"ta");
-		theLi = document.getElementById(liDivId);
-		theLi.parentNode.style.display = 'block';
-		theTaTa.innerHTML = theLi.innerHTML;
-		// if unused new row, just hide it completely (delete?)
-		if (theLi.innerHTML=="") {
-			theUnusedRow = document.getElementById(index);
-			theUnusedRow.style.display="none";
-		}
-		return false;
-	}
-	
-	function submitPage() {
-		theForm = document.getElementById("editForm");
-		theButtonWeWantToClick = document.getElementById("primaryAction");
-		theHiddenInput = document.createElement("input")
-		theHiddenInput.type="hidden";
-		theHiddenInput.name=theButtonWeWantToClick.name;
-		theHiddenInput.value=theButtonWeWantToClick.name;
-		theForm.appendChild(theHiddenInput);
-		theForm.submit();
-	}
-		
-	function findPos(obj)
-	{
-		var curleft = curtop = 0;
-		if (obj.offsetParent) {
-			curleft = obj.offsetLeft
-			curtop = obj.offsetTop
-			while (obj = obj.offsetParent) {
-				curleft += obj.offsetLeft
-				curtop += obj.offsetTop
-			}
-		}
-		return [curleft,curtop];
-	}
--->
-
-    // -------------------------------------------------------------------------------
-    // Using jQuery to step in for DWR and provide original moniker selection behavior
-    // -------------------------------------------------------------------------------
-    var monikerSelection = {
-        // onChange event listener for moniker select list
-        monikerListener: function() {
-            $('#Moniker').change(function() {
-                // alert('The moniker has changed');
-                // if "[new moniker]" is selected, then enable the alt field
-                if ( $('#Moniker option:selected').text() == "[new moniker]" ) {
-                    $('#MonikerSelectAlt').removeAttr('disabled');
-                } else {
-                    $('#MonikerSelectAlt').val('');
-                    $('#MonikerSelectAlt').attr('disabled', 'disabled');
-                }
-            });
-        }
-    }
-
-    $(document).ready(function() {
-        monikerSelection.monikerListener();
-    });
+<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<!-- <script type='text/javascript' src='dojo.js'></script> -->
+
+<script language="JavaScript">
+function confirmDelete() {
+    var msg="Are you SURE you want to delete this individual? If in doubt, CANCEL."
+    return confirm(msg);
+}
+</script>
+
+<script type='text/javascript' src='dwr/interface/EntityDWR.js'></script>
+<script type='text/javascript' src='dwr/engine.js'></script>
+<script type='text/javascript' src='dwr/util.js'></script>
+<script type='text/javascript' src='js/vitro.js'></script>
+
+<script language="javascript" type="text/javascript">
+
+if( vitroJsLoaded == null ){ 
+
+  alert("seminar.js needs to have the code from vitro.js loaded first"); 
+
+}
+
+// addEvent(window, 'load', monikerInit);
+
+function monikerInit(){
+
+//   if ($('monikerSelect').options.length=1) {
+//      $('monikerSelectAlt').disabled = false;
+//   }else{
+//      $('monikerSelectAlt').disabled = true;
+//   }
+
+  $('Moniker').onchange = checkMonikers;  
+
+  update();
+
+}
+
+
+
+function update(){ //updates moniker list when type is changed
+
+  DWRUtil.useLoadingMessage();
+
+  EntityDWR.monikers(createList,  document.getElementById("VClassURI").value );
+  
+}
+
+
+
+function createList(data) { //puts options in moniker select list
+
+  fillList("Moniker", data, getCurrentMoniker() );
+
+  var ele = $("Moniker");
+
+  var opt = new Option("none","");
+  ele.options[ele.options.length] = opt;
+
+  var opt = new Option("[new moniker]","");
+  ele.options[ele.options.length] = opt;
+
+  DWRUtil.setValue("Moniker",getCurrentMoniker()); // getCurrentMoniker() is defined on jsp
+
+  checkMonikers();
+}
+
+function getCurrentMoniker() {
+	return document.getElementById("MonikerSelectAlt").value;
+}
+
+
+function checkMonikers(){ //checks if monikers is on [new moniker] and enables alt field
+
+  var sel = $('Moniker');  
+
+  if( sel.value == "" || sel.options.length <= 1){
+    $('MonikerSelectAlt').disabled = false;
+
+  }else{
+
+    $('MonikerSelectAlt').disabled = true; 
+
+  }        
+
+}
+
+
+
+function fillList(id, data, selectedtext) {
+
+  var ele = $(id);
+
+  if (ele == null)    {
+
+    alert("fillList() can't find an element with id: " + id + ".");
+
+    throw id;
+
+  }
+
+
+
+  ele.options.length = 0;     // Empty the list
+
+  if (data == null) { return; }
+
+
+
+  for (var i = 0; i < data.length; i++)    {
+
+    var text = DWRUtil.toDescriptiveString(data[i]);
+
+    var value = text;
+
+
+
+    var opt = new Option(text, value);
+
+    if (selectedtext != null && selectedtext == text){
+
+      opt.selected=true;
+
+    }
+
+    ele.options[ele.options.length] = opt;
+
+  }
+
+}
+
+</script>
+
+<script language="javascript" type="text/javascript" src="js/toggle.js"></script>
+<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",
+		elements : "Description",
+		theme_advanced_buttons1 : "bold,italic,underline,separator,link,bullist,numlist,separator,sub,sup,charmap,separator,undo,redo,separator,removeformat,cleanup,help,code",
+		theme_advanced_buttons2 : "",
+		theme_advanced_buttons3 : "",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "left",
+		theme_advanced_resizing : true,
+		height : "10",
+		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",
+		// extended_valid_elements : "a[href|target|name]",
+		// plugins : "table",
+		// theme_advanced_buttons3_add_before : "tablecontrols,separator",
+		// 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">
+<!--
+
+	/*
+	dojo.require("dojo.dom.*");
+	*/
+	
+	nextId=99999;
+	// fix this with separate values per type
+	
+	function getAllChildren(theNode, childArray) {
+		var ImmediateChildren = theNode.childNodes;
+		if (ImmediateChildren) {
+			for (var i=0;i<ImmediateChildren.length;i++) {
+				childArray.push(ImmediateChildren[i]);
+				getAllChildren(ImmediateChildren[i],childArray);
+			}
+		}
+	}
+	
+	function addLine(baseNode, typeStr)
+	{
+		baseId = baseNode.id.substr(0,baseNode.id.length-7);	
+		newTaName = document.getElementById(baseId+"genTaName").firstChild.nodeValue;
+		theList = document.getElementById(baseId+"ul");
+		nextId++;
+		TrId = nextId;
+		templateRoot = document.getElementById(typeStr+"NN");
+		newRow = templateRoot.cloneNode(true);
+		// newRow.id = newRow.id.substr(0,newRow.id.length-2)+TrId;
+		newRow.id=TrId;
+		newRowChildren = new Array();
+		getAllChildren(newRow,newRowChildren);
+		for (i=0;i<newRowChildren.length;i++) {
+			if (newRowChildren[i].id) {
+				if(newRowChildren[i].id.substr(0,typeStr.length+2)==typeStr+"NN") {
+					newRowChildren[i].id=TrId+newRowChildren[i].id.substr(typeStr.length+2,newRowChildren[i].id.length-typeStr.length-2);
+				}
+			}
+		}
+		theList.appendChild(newRow);
+		theContent=document.getElementById(TrId+"content");
+		theContent.style.display="none";
+		theContentValue=document.getElementById(TrId+"contentValue");
+		theTaTa = document.getElementById(TrId+"tata");
+		theTaTa.name=newTaName;
+		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");			
+		
+		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";
+		clickedRowDeleteLink = document.getElementById(TrId+"deleteLink");
+		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");
+		//theContentValueBackup=document.getElementById(index+"contentValueBackup");
+		//theContentValue.innerHTML = theContentValueBackup.innerHTML;
+		theContentValue.style.textDecoration="none";
+		theTaTa = document.getElementById(index+"tata");
+		theTaTa.innerHTML=theContentValue.innerHTML;
+		clickedRowEditLink = document.getElementById(TrId+"editLink");
+		clickedRowEditLink.style.display="inline";
+		clickedRowDeleteLink = document.getElementById(TrId+"deleteLink");
+		clickedRowDeleteLink.style.display="inline";
+		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");
+		theLic.style.display="none";
+		theTa = document.getElementById(LiId+"ta");
+		theTa.style.display="block";
+		tinyMCE.execCommand('mceAddControl',false,LiId+'tata');
+		return false;
+	}
+	
+	function backToLi(okLinkNode) { 
+		index = okLinkNode.id.substr(0,okLinkNode.id.length-6);
+		textareaDivId = index+"ta";
+		liDivId = index+"contentValue";
+		content = tinyMCE.activeEditor.getContent();
+		tinyMCE.execCommand('mceRemoveControl',false,textareaDivId+'ta');
+		theTextarea = document.getElementById(textareaDivId);
+		theTextarea.style.display="none";
+		theLi = document.getElementById(liDivId);
+		// replace this:
+		theLi.innerHTML = content;
+		theLi.parentNode.style.display = 'block';
+		return false;
+	}
+	
+	function cancelBackToLi(cancelLinkNode) {
+		index = cancelLinkNode.id.substr(0,cancelLinkNode.id.length-10);
+		textareaDivId = index+"ta";
+		liDivId = index+"contentValue";
+		tinyMCE.execCommand('mceRemoveControl',false,textareaDivId+'ta');
+		theTextarea = document.getElementById(textareaDivId);
+		theTextarea.style.display="none";
+		theTaTa = document.getElementById(textareaDivId+"ta");
+		theLi = document.getElementById(liDivId);
+		theLi.parentNode.style.display = 'block';
+		theTaTa.innerHTML = theLi.innerHTML;
+		// if unused new row, just hide it completely (delete?)
+		if (theLi.innerHTML=="") {
+			theUnusedRow = document.getElementById(index);
+			theUnusedRow.style.display="none";
+		}
+		return false;
+	}
+	
+	function submitPage() {
+		theForm = document.getElementById("editForm");
+		theButtonWeWantToClick = document.getElementById("primaryAction");
+		theHiddenInput = document.createElement("input")
+		theHiddenInput.type="hidden";
+		theHiddenInput.name=theButtonWeWantToClick.name;
+		theHiddenInput.value=theButtonWeWantToClick.name;
+		theForm.appendChild(theHiddenInput);
+		theForm.submit();
+	}
+		
+	function findPos(obj)
+	{
+		var curleft = curtop = 0;
+		if (obj.offsetParent) {
+			curleft = obj.offsetLeft
+			curtop = obj.offsetTop
+			while (obj = obj.offsetParent) {
+				curleft += obj.offsetLeft
+				curtop += obj.offsetTop
+			}
+		}
+		return [curleft,curtop];
+	}
+-->
+
+    // -------------------------------------------------------------------------------
+    // Using jQuery to step in for DWR and provide original moniker selection behavior
+    // -------------------------------------------------------------------------------
+    var monikerSelection = {
+        // onChange event listener for moniker select list
+        monikerListener: function() {
+            $('#Moniker').change(function() {
+                // alert('The moniker has changed');
+                // if "[new moniker]" is selected, then enable the alt field
+                if ( $('#Moniker option:selected').text() == "[new moniker]" ) {
+                    $('#MonikerSelectAlt').removeAttr('disabled');
+                } else {
+                    $('#MonikerSelectAlt').val('');
+                    $('#MonikerSelectAlt').attr('disabled', 'disabled');
+                }
+            });
+        }
+    }
+
+    $(document).ready(function() {
+        monikerSelection.monikerListener();
+    });
 </script>
\ No newline at end of file
diff --git a/webapp/web/js/edit/initTinyMce.js b/webapp/web/js/edit/initTinyMce.js
index fb95f2602..66b4876d5 100644
--- a/webapp/web/js/edit/initTinyMce.js
+++ b/webapp/web/js/edit/initTinyMce.js
@@ -1,29 +1,29 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-var initTinyMCE = {
-    // Initial page setup
-    onLoad: function() {
-        this.mergeFromTemplate();
-        this.initObjects();
-        this.initEditor();
-       
-    },
-    
-    // Add variables from menupage template
-    mergeFromTemplate: function() {
-        $.extend(this, customFormData);
-    },
-    initObjects: function() {
-    	this.wsywigFields = $(".useTinyMce");
-    },
-    // Create references to frequently used elements for convenience
-    initEditor: function() {
-    	initTinyMCE.wsywigFields.tinymce(initTinyMCE.tinyMCEData);
-    	
-    }
-};
-
-$(document).ready(function() {
-    initTinyMCE.onLoad();
-});
-
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+var initTinyMCE = {
+    // Initial page setup
+    onLoad: function() {
+        this.mergeFromTemplate();
+        this.initObjects();
+        this.initEditor();
+       
+    },
+    
+    // Add variables from menupage template
+    mergeFromTemplate: function() {
+        $.extend(this, customFormData);
+    },
+    initObjects: function() {
+    	this.wsywigFields = $(".useTinyMce");
+    },
+    // Create references to frequently used elements for convenience
+    initEditor: function() {
+    	initTinyMCE.wsywigFields.tinymce(initTinyMCE.tinyMCEData);
+    	
+    }
+};
+
+$(document).ready(function() {
+    initTinyMCE.onLoad();
+});
+
diff --git a/webapp/web/js/ents_edit.js b/webapp/web/js/ents_edit.js
index edfcc6870..04ef980de 100644
--- a/webapp/web/js/ents_edit.js
+++ b/webapp/web/js/ents_edit.js
@@ -1,679 +1,679 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-/* this code uses:
-   dwrutil in util.js
-   vitro.js
-   detect.js
-*/
-dojo.require("dojo.io.*");
-dojo.require("dojo.event.*");
-
-//DWREngine.setErrorHandler(function(data){alert("DWREngine error: " + data);});
-//DWREngine.setWarningHandler(function(data){alert("DWREngine warning: " + data);});
-
-/*
-  ents_edit.js has several tasks:
-  1) fill up the property table with one row for each ents2ents record
-  2) delete ents2ents if requested to
-  3) add a form to allow a new ents2ents relations to be created
-  4) bring up a form to edit an existing ents2ents
-
-  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().  
-
-  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
-  2.0rc2.8 did not fix this.  The current solution is a servlet that
-  returns a JSON string for just the entitiy list.
-
-  DWR is still used to get info about the entity and the list of ents2ents.
-
-  CHANGES
-  2006-11-21 bdc34: removing the 'new entity' button, added comments
- */
-
-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
-
-var gVClassUri = null;
-
-//hash: PropertyDWR.propertyId+"D" or "R" (for domain or range)  -->  obj: PropertyDWR
-var gPropertyHash; 
-
-//holds the xhtmlrequest so we can do an abort
-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"); 
-}
-
-var rowId = 1;
-
-function getNextRowId() {
-   rowId++;
-   return rowId;
-}
-
-/** This refreshes the dynamic parts of the page.
-    It is also called on page load. */
-function update( )   {
-  gEntityUri = getEntityUriFromPage();
-  abortExistingEntRequest();
-  clearProp();
-  updateTable();
-  updateEntityAndPropHash();
-  var but = $("newPropButton");
-  if( but ) { but.disabled = false; }
-}
-
-/** called when the property editing form is dismissed */
-function clearProp()  {
-  abortExistingEntRequest();
-  var clearMap={sunrise:"",sunset: ""};
-  editingNewProp = false;
-  gVClassUri = null;
-  DWRUtil.setValues( clearMap );
-  clear($("propertyList"));
-  clear($("vClassList"));
-
-  var ele = $("entitiesList");
-  while( ele != null && ele.length > 0){
-    ele.remove(0);
-  }
-}
-
-/*****************************************************************
- * This updates the gPropertyHash and gEntity.
- *****************************************************************/
-function updateEntityAndPropHash(){
-  gPropertyHash = null;
-  gProperty = null;
-  gEntity = null;
-
-  /* This is the method that is called to set gEntity and then get ents2ents properties */
-  var setGEntity = function(entityObj){
-    gEntity=entityObj;
-    //once we set the gEntity we can get the ents2ents properties.
-    //PropertyDWR.getAllPropInstByVClass(setPropertyHash, entityObj.VClassURI );
-    if( entityObj != null && 'URI' in entityObj )
-        PropertyDWR.getAllPossiblePropInstForIndividual(setPropertyHash, entityObj.URI);
-    //else
-        //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) {  
-    if( propArray == null || propArray.length < 1  ) {
-    	gPropertyHash = null; /* propArray might be null if we have no properties in the system */
-    }else{
-    	gPropertyHash = new Object();
-    	for(var i = 0; i < propArray.length; i++) {
-          var hashid = propArray[i]["propertyURI"] ;
-          if( propArray[i].subjectSide ){
-            hashid = hashid + 'D';
-          } else {
-            hashid = hashid + 'R';
-          }            
-          gPropertyHash[ hashid ] = propArray[i];
-    	}
-    }
-  };
-  
-  //get the gEntity and then build the gPropertyHash
-  EntityDWR.entityByURI(setGEntity, gEntityURI);
-}
-
-/*****************************************************************
- set up some kind of warning that there are no properties in the system
-*****************************************************************/
-function doNoPropsWarning(){
-	alert(
-		"There are no object properties in the system.\n\n"+
-		"This is most likely because you have just finished installing. "+
-		"The button you have clicked adds a new object property statement relating this individual " +
-		"to another individual.  If you are looking to add new object properties to the " +
-		"system, look under the 'About' menu.");
-	var but = $("newPropButton");
-  	if( but ) { but.disabled = true; }
-}
-
-/*****************************************************************
-because dwr calls are async we have a callback 
-*****************************************************************/
-function updateTable(callback) {
-  var cb = callback;
-  function fillTable(props)  {
-     DWRUtil.removeAllRows("propbody");
-     /* This makes the row that gets added to the ents_edit form for each ents2ents object.  */
-     addRows($("propbody"), props,
-             [getDomain, getProperty, getRange, getEdit, getDelete],
-             makeTr);  
-     var newPropTr = $("justwritenTr");
-     if( newPropTr != null ){
-       Fat.fade_element( "justwritenTr" );
-     }
-     if(cb !== undefined && cb !== null ) { cb(); }
-  }
-  PropertyDWR.getExistingProperties(fillTable,gEntityURI);
-}
-
-/**************************************************************************/
-/* ******************** table column builders *****************************/
-/* Change these functions to change the way the html table gets built *****/
-/* in the addRows() func each of these will get called and wrapped in a <tr>
-   to make the row to stick into the table */
-var getDomain = function(prop)  {
-  return prop.subjectName;
-};
-
-var getProperty = function(prop) {
-    return makePropLinkElement(prop.propertyURI, prop.domainPublic);
-};
-
-var getRange = function(prop) {
-  return  makeEntLinkElement(prop.objectEntURI, prop.objectName);
-};
-
-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(' + 
-  '\'' + cleanForString(prop.subjectEntURI) + '\', ' +
-  '\'' + cleanForString(prop.propertyURI)    + '\', ' +
-  '\'' + cleanForString(prop.objectEntURI)   + '\', ' +
-  '\'' + cleanForString(prop.objectName)     + '\', ' +
-  '\'' + cleanForString(prop.domainPublic)   + '\' )">';
-};
-
-var getEdit = function(prop){
-  var quote = new RegExp('\'','g');
-  return '<input type="button" value="Edit" class="form-button" '+
-    'onclick="editTable(this,' +
-         '\''+ cleanForString(prop.subjectEntURI)+'\', ' +
-         '\''+ cleanForString(prop.propertyURI)  +'\', ' +
-         '\''+ cleanForString(prop.objectEntURI) +'\')">';
-};
-
-var quote = new RegExp('\'','g');
-var dquote = new RegExp('"','g');
-
-function cleanForString(strIn){
-  var strOut = strIn.replace(quote, '\\\'');
-  strOut = strOut.replace(dquote, '&quot;');
-  return strOut;
-}
-
-/****************************************************************
-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.  
-*****************************************************************/
-var makeTr = (function(){ /* outer func */
-    // the reason for the outer func is to capture these values in a closure
-    // This allows us to have a func that has state associated with it
-    var previousPropName = "-1";
-    var currentClass = "form-row-even";
-
-    //each time makeTr() is called this is the code that gets executed.
-    return (function(prop) {/* inner func */
-        if( getProperty(prop) != previousPropName ){
-          previousPropName = getProperty(prop);
-          currentClass=(currentClass=="form-row-even"?"form-row-odd":"form-row-even");
-        }
-        tr = document.createElement("tr");
-        //tr.id = "proprow" + prop.ents2entsId;
-        tr.className = currentClass;
-        if( justwritenProp != null &&
-                justwritenProp.subjectEntURI == prop.subjectEntURI &&
-                justwritenProp.propertyURI == prop.propertyURI &&
-                justwritenProp.objectEntURI == prop.objectEntURI){
-            tr.id ="justwritenTr";
-            justwritenProp = null;
-        }
-        return tr;
-      });/*close inner function*/
-  } )(); /*close and call outer function to return the inner function */
-
-/* **************** end table column builders **************** */
-
-/****************************************************************
- ******** Functions for the Property Editing Form **************
- *****************************************************************/
-
-/* called when Edit button is clicked */
-function editTable(inputElement, subjectURI, predicateURI, objectURI){
-    var rowIndex = inputElement.parentNode.parentNode.rowIndex-1 ;
-    var table = $("propbody");
-    table.deleteRow( rowIndex );
-    table.insertRow(rowIndex);
-    table.rows[rowIndex].insertCell(0);
-    var vform = getForm();
-    table.rows[rowIndex].cells[0].appendChild( vform );
-    table.rows[rowIndex].cells[0].colSpan = tableMaxColspan( table );
-    vform.style.display="block";
-
-    PropertyDWR.getProperty(fillForm, subjectURI, predicateURI, objectURI);
-    inputElement.parentNode.parentNode.style.display="none";
-}
-
-/** called when Delete button is clicked */
-function deleteProp( subjectURI, predicateURI, objectURI, objectName, predicateName)  {
-  if( PropertyDWR.deleteProp ){
-    if (confirm("Are you sure you want to delete the property\n"
-                 + objectName + " " + predicateName + "?")) {
-      PropertyDWR.deleteProp(update, subjectURI, predicateURI, objectURI);
-    }
-  } else {
-    alert("Deletion of object property statements is disabled.");
-  }
-}
-
-/*****************************************************************
- adds the editing form <tr> to the propeties table 
-*****************************************************************/
-function appendPropForm(tr, colspan ){
-  var form = getForm();
-  while(tr.cells.length > 0 ){
-    tr.deleteCell(0);
-  }
-  var td = tr.insertCell(-1);
-  td.appendChild( form );
-
-  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. 
-*****************************************************************/
-function newProp() {
-  if( gPropertyHash == null || gPropertyHash.length < 1 ) {
-    	/* propArray might be null if we have no properties in the system */
-    	doNoPropsWarning();    	
-    }else{
-  	var innerNew = function (){
-      var newP = {};
-    	newP.domainClass = gEntity.vClassId;
-    	newP.subjectName = gEntity.name;
-    	newP.subjectEntURI = gEntity.URI;
-        
-    	fillForm( newP );
-    	editingNewProp = true;
-    	fillRangeVClassList();
-    	var table = $("propbody");
-        var tr = table.insertRow(0);
-    	tr.id = "newrow";
-    	appendPropForm( tr, tableMaxColspan( table ) );
- 
-      //table.insertBefore(tr, table.rows[0]);
-  	};
-  	updateTable( innerNew );
-  }
-}
-
-/****************************************************************
- Fills out the property edit form with the given property 
-*****************************************************************/
-function fillForm(aprop)  {
-  clearProp();
-  gProperty = aprop;
-  var vclass = gProperty.domainClass;
-  
-  DWRUtil.setValues(gProperty);
-
-  toggleDisabled("newPropButton");
-  
-  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 
-******************************************************************/
-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 = $("propertyList");
-  clear(propList);
-
-  //add properties as options
-  for( var i in gPropertyHash ) {
-    var prop = gPropertyHash[i];
-    var text = "";
-    var value = prop.propertyURI;
-    if(prop.subjectSide){
-      text= prop.domainPublic;
-      if (prop.rangeClassName != null) {
-    	  text += " ("+prop.rangeClassName +")";
-      }
-      value = value + 'D';
-    } else {
-      text= prop.rangePublic;
-      if (prop.domainClassName != null) {
-    	  text += " ("+prop.domainClassName+")";
-      }
-      value = value + 'R';
-    }
-    var opt = new Option(text, value);
-    if( gProperty.propertyURI == prop.propertyURI ){
-      opt.selected = true; 
-    }
-    propList.options[propList.options.length] = opt;
-  }
-
-  fillRangeVClassList( null );
-}
-
-/*****************************************************************
- 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 = DWRUtil.getValue("propertyList");}
-	
-  //clear the list and put the loading message up
-  var vclassListEle = $("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];	
-	
-  VClassDWR.getVClasses(
-                        function(vclasses){ 
-                          addVClassOptions( vclasses );             
-                        },
-                        prop.domainClassURI, prop.propertyURI, prop.subjectSide);
-}		
-	
-/****************************************************************
- Adds vClasses to the vClassList and trigger an update of
- the entitiesList.
- ****************************************************************/
-function addVClassOptions( vclassArray  ){
-  //  DWRUtil.addOptions("entitiesList",null);
-  var vclassEle = $("vClassList");
-  clear( vclassEle );
-  vclassEle.disabled = false;
-
-  if( vclassArray == null || vclassArray.length < 1){
-    vclassEle.disabled = true;
-    entsEle = $("entitiesList");
-    clear(entsEle);
-    var msg="There are no entities defined yet that could fill this role";
-    var opt = new Option(msg,-1);
-    entsEle.options[entsEle.options.length] = opt;
-    entsEle.disabled = true;
-    return;
-  }
-
-  addOptions("vClassList", vclassArray,
-             function(vclass){ return vclass.URI; },
-             function(vclass){ 
-               var count = "";
-               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[ DWRUtil.getValue("propertyList") ];
-  if( gProperty.propertyURI == prop.propertyURI ){
-    vclassURI = gProperty.rangeClassURI;
-
-    DWRUtil.setValue(vclassEle, vclassURI );
-    //here we were unable to set the vclass select option to the vclassid
-    //of the entity.  this means that the vclass of the entity is not one that
-    //is permited by the PropertyInheritance and other restrictions.
-    if( DWRUtil.getValue(vclassEle) != vclassURI){
-        alert("This entity's class does not match the class of this property.  This is usually the "+
-              "result of the class of the entity having been changed.  Properties that were added when " +
-              "this entity had the old class still reflect that value.\n" +
-              "In general the vitro system handles this but the editing of these misaligned records "+
-              "is not fully supported.\n" );
-    }
-  }
-  fillEntsList(vclassEle );
-}
-
-/*****************************************************************
-  Fill up the entity list in a property editing form.
-  The propId should have the id + 'D' or 'R' to 
-  indicate domain or range. 
-*****************************************************************/
-function fillEntsList( vclassEle ){
-  if( vclassEle == null )
-      vclassEle = $("vClassList");     
-  var vclassUri =  DWRUtil.getValue( vclassEle );
-
-  if( vclassUri == gVClassUri )
-    return;
-  else
-    gVClassUri = vclassUri;
-    
-  var entsListEle = $("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;
-
-  if( vclassUri ){
-   //Notice that this is using the edu.cornell.mannlib.vitro.JSONServlet
-   var base =  getURLandContext();
-   //these are parameters to the dojo JSON call
-
-   var bindArgs = {
-    url:  "dataservice?getEntitiesByVClass=1&vclassURI="+encodeUrl(vclassUri),
-    error: function(type, data, evt){
-       if( type == null ){ type = "none" ; }
-       if( data == null ){ data = "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 );
-     },
-    load: function(type, data, evt){
-       //clear here since we will be using addEntOptions for multiple adds
-//       var entsListEle = $("entitiesList");
-//        clear(entsListEle);
-       addEntOptions(data, -1);
-    },
-    mimetype: "text/json"
-   };
-   abortExistingEntRequest();
-   gEntRequest = dojo.io.bind(bindArgs);   
-  } else {
-    clear(entsListEle);
-  }
-}
-
-/** add entities in entArray as options elements to select element "Individual" */
-function addEntOptions( entArray ){
-  var entsListEle = $("entitiesList");
-
-    if( entArray == null || entArray.length == 0){
-        clear(entsListEle);
-        return;
-    }
-
-  var previouslySelectedEntUri = gProperty.objectEntURI;
-
-  //check if the last element indicates that there are more results to get
-  contObj = null;
-  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;
-  var value;
-  var opt;
-  for (var i = 0; i < entArray.length; i++) {
-    text = entArray[i].name;
-    if( text.length > CUTOFF){ text = text.substr(0,CUTOFF) + "..."; }
-    value = entArray[i].URI;
-    opt = new Option(text, value);
-    entsListEle.options[entsListEle.options.length] = opt;
-    if( previouslySelectedEntUri == value ){
-        entityOptToSelect = opt;
-    }
-  }
-
-  if( contObj != null ){
-    entsListEle.item(0).text = entsListEle.item(0).text + ".";
-    addMoreEntOptions( contObj );
-  } else {    
-    gEntRequests = [];
-    entsListEle.disabled = false;
-    if( entsListEle.length > 0 && entsListEle.item(0).value == -12){
-      entsListEle.remove(0);
-    }
-    if( entityOptToSelect != null ){
-        entityOptToSelect.selected = true;
-    }
-  }
-}
-var entityOptToSelect =null;
-
-/*
- * 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",
-"entsInVClass":2773}
- */
-function addMoreEntOptions( continueObj ){
-  if( continueObj.nextUrl != null ){
-    var bindArgs = {
-    url: continueObj.nextUrl,
-    error: function(type, data, evt){
-        if( type == null ){ type = "none" ; }
-        if( data == null ){ data = "none" ; }
-        if( evt == null ){ evt = "none" ; }       
-        alert("An error addMoreEntOptions()"+"\ntype: " + type +"\ndata: "+
-              data +"\nevt: " + evt );
-      },
-    load: function(type, data, evt){
-        addEntOptions( data );
-      },
-    mimetype: "text/json"
-    };    
-    abortExistingEntRequest();
-    gEntRequest = dojo.io.bind(bindArgs);    
-  }
-}
-
-/*
-Entities are now sent back as JSON in groups of 556.  This is to defend against
-odd network effects and browser flakyness.  DWR was choaking on large datasets
-and isn't very flexable so I moved to JSON.  That still caused problems with
-large data sets ( size > 1500 ) so I'm breaking them up.
-
-The reply from the JSON servlet is a JSON array.  If the last item in the
-array lacks a "id" property then it is information about additional entites.
-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},
- {"resultGroup":3,"entsInVClass":2773,"nextResultGroup":4,"standardReplySize":556}
-]
-
-*/
-
-/****************************************************************
-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 */ 
-  return true;
-}
-
-/**************************************************************
-Write or update ents2ents row.
-***************************************************************/
-function writeProp()  {
-  if( PropertyDWR.insertProp == null  ){
-    alert("Writing of properties disabled for security reasons.");
-    return;
-  }
-  if( !validateForm() ) { return; }
-  var prop = gPropertyHash[DWRUtil.getValue("propertyList")];
-  var newP = {};
-  var oldP = gProperty;
-  newP.propertyURI = prop.propertyURI;
-
-  var selected = DWRUtil.getValue("entitiesList");
-  newP.subjectEntURI= gEntity.URI;
-  newP.objectEntURI = selected ;
-  
-  var callback = function(result){
-    editingNewProp = false;
-    justwritenProp = newP;
-    update();  };
-
-  if( editingNewProp ){    
-    newP.ents2entsId = -1;
-    PropertyDWR.insertProp(callback, newP );
-  } else {
-      var afterDelete=
-              function(result){
-                  PropertyDWR.insertProp(callback, newP);
-              };
-      PropertyDWR.deleteProp(afterDelete,
-              gProperty.subjectEntURI,
-              gProperty.propertyURI,
-              gProperty.objectEntURI);
-  }
-}
-
-/************ Things that happen on load *****************************/
-addEvent(window, 'load', update);
-
-/********************* some utilities ***********************************/
-/* this clones the property edit from a div on the ents_edit.jsp */
-function getForm(){  return $("propeditdiv").cloneNode(true); }
-
-/* a function to display a lot of info about an object */
-function disy( obj, note ){ alert( (note!==null?note:"") + DWRUtil.toDescriptiveString(obj, 3));}
-
-/* attempts to get the URI of the entity being edited */
-function getEntityUriFromPage(){
-  return document.getElementById("entityUriForDwr").nodeValue;      
-}
-
-function abortExistingEntRequest(){
-  if( gEntRequest != null ){
-    if( gEntRequest.abort ){
-        gEntRequest.abort();
-    }else{
-        alert("No abort function found on gEntRequest");
-    }
-    gEntRequest = null;
- }    
-}
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+/* this code uses:
+   dwrutil in util.js
+   vitro.js
+   detect.js
+*/
+dojo.require("dojo.io.*");
+dojo.require("dojo.event.*");
+
+//DWREngine.setErrorHandler(function(data){alert("DWREngine error: " + data);});
+//DWREngine.setWarningHandler(function(data){alert("DWREngine warning: " + data);});
+
+/*
+  ents_edit.js has several tasks:
+  1) fill up the property table with one row for each ents2ents record
+  2) delete ents2ents if requested to
+  3) add a form to allow a new ents2ents relations to be created
+  4) bring up a form to edit an existing ents2ents
+
+  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().  
+
+  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
+  2.0rc2.8 did not fix this.  The current solution is a servlet that
+  returns a JSON string for just the entitiy list.
+
+  DWR is still used to get info about the entity and the list of ents2ents.
+
+  CHANGES
+  2006-11-21 bdc34: removing the 'new entity' button, added comments
+ */
+
+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
+
+var gVClassUri = null;
+
+//hash: PropertyDWR.propertyId+"D" or "R" (for domain or range)  -->  obj: PropertyDWR
+var gPropertyHash; 
+
+//holds the xhtmlrequest so we can do an abort
+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"); 
+}
+
+var rowId = 1;
+
+function getNextRowId() {
+   rowId++;
+   return rowId;
+}
+
+/** This refreshes the dynamic parts of the page.
+    It is also called on page load. */
+function update( )   {
+  gEntityUri = getEntityUriFromPage();
+  abortExistingEntRequest();
+  clearProp();
+  updateTable();
+  updateEntityAndPropHash();
+  var but = $("newPropButton");
+  if( but ) { but.disabled = false; }
+}
+
+/** called when the property editing form is dismissed */
+function clearProp()  {
+  abortExistingEntRequest();
+  var clearMap={sunrise:"",sunset: ""};
+  editingNewProp = false;
+  gVClassUri = null;
+  DWRUtil.setValues( clearMap );
+  clear($("propertyList"));
+  clear($("vClassList"));
+
+  var ele = $("entitiesList");
+  while( ele != null && ele.length > 0){
+    ele.remove(0);
+  }
+}
+
+/*****************************************************************
+ * This updates the gPropertyHash and gEntity.
+ *****************************************************************/
+function updateEntityAndPropHash(){
+  gPropertyHash = null;
+  gProperty = null;
+  gEntity = null;
+
+  /* This is the method that is called to set gEntity and then get ents2ents properties */
+  var setGEntity = function(entityObj){
+    gEntity=entityObj;
+    //once we set the gEntity we can get the ents2ents properties.
+    //PropertyDWR.getAllPropInstByVClass(setPropertyHash, entityObj.VClassURI );
+    if( entityObj != null && 'URI' in entityObj )
+        PropertyDWR.getAllPossiblePropInstForIndividual(setPropertyHash, entityObj.URI);
+    //else
+        //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) {  
+    if( propArray == null || propArray.length < 1  ) {
+    	gPropertyHash = null; /* propArray might be null if we have no properties in the system */
+    }else{
+    	gPropertyHash = new Object();
+    	for(var i = 0; i < propArray.length; i++) {
+          var hashid = propArray[i]["propertyURI"] ;
+          if( propArray[i].subjectSide ){
+            hashid = hashid + 'D';
+          } else {
+            hashid = hashid + 'R';
+          }            
+          gPropertyHash[ hashid ] = propArray[i];
+    	}
+    }
+  };
+  
+  //get the gEntity and then build the gPropertyHash
+  EntityDWR.entityByURI(setGEntity, gEntityURI);
+}
+
+/*****************************************************************
+ set up some kind of warning that there are no properties in the system
+*****************************************************************/
+function doNoPropsWarning(){
+	alert(
+		"There are no object properties in the system.\n\n"+
+		"This is most likely because you have just finished installing. "+
+		"The button you have clicked adds a new object property statement relating this individual " +
+		"to another individual.  If you are looking to add new object properties to the " +
+		"system, look under the 'About' menu.");
+	var but = $("newPropButton");
+  	if( but ) { but.disabled = true; }
+}
+
+/*****************************************************************
+because dwr calls are async we have a callback 
+*****************************************************************/
+function updateTable(callback) {
+  var cb = callback;
+  function fillTable(props)  {
+     DWRUtil.removeAllRows("propbody");
+     /* This makes the row that gets added to the ents_edit form for each ents2ents object.  */
+     addRows($("propbody"), props,
+             [getDomain, getProperty, getRange, getEdit, getDelete],
+             makeTr);  
+     var newPropTr = $("justwritenTr");
+     if( newPropTr != null ){
+       Fat.fade_element( "justwritenTr" );
+     }
+     if(cb !== undefined && cb !== null ) { cb(); }
+  }
+  PropertyDWR.getExistingProperties(fillTable,gEntityURI);
+}
+
+/**************************************************************************/
+/* ******************** table column builders *****************************/
+/* Change these functions to change the way the html table gets built *****/
+/* in the addRows() func each of these will get called and wrapped in a <tr>
+   to make the row to stick into the table */
+var getDomain = function(prop)  {
+  return prop.subjectName;
+};
+
+var getProperty = function(prop) {
+    return makePropLinkElement(prop.propertyURI, prop.domainPublic);
+};
+
+var getRange = function(prop) {
+  return  makeEntLinkElement(prop.objectEntURI, prop.objectName);
+};
+
+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(' + 
+  '\'' + cleanForString(prop.subjectEntURI) + '\', ' +
+  '\'' + cleanForString(prop.propertyURI)    + '\', ' +
+  '\'' + cleanForString(prop.objectEntURI)   + '\', ' +
+  '\'' + cleanForString(prop.objectName)     + '\', ' +
+  '\'' + cleanForString(prop.domainPublic)   + '\' )">';
+};
+
+var getEdit = function(prop){
+  var quote = new RegExp('\'','g');
+  return '<input type="button" value="Edit" class="form-button" '+
+    'onclick="editTable(this,' +
+         '\''+ cleanForString(prop.subjectEntURI)+'\', ' +
+         '\''+ cleanForString(prop.propertyURI)  +'\', ' +
+         '\''+ cleanForString(prop.objectEntURI) +'\')">';
+};
+
+var quote = new RegExp('\'','g');
+var dquote = new RegExp('"','g');
+
+function cleanForString(strIn){
+  var strOut = strIn.replace(quote, '\\\'');
+  strOut = strOut.replace(dquote, '&quot;');
+  return strOut;
+}
+
+/****************************************************************
+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.  
+*****************************************************************/
+var makeTr = (function(){ /* outer func */
+    // the reason for the outer func is to capture these values in a closure
+    // This allows us to have a func that has state associated with it
+    var previousPropName = "-1";
+    var currentClass = "form-row-even";
+
+    //each time makeTr() is called this is the code that gets executed.
+    return (function(prop) {/* inner func */
+        if( getProperty(prop) != previousPropName ){
+          previousPropName = getProperty(prop);
+          currentClass=(currentClass=="form-row-even"?"form-row-odd":"form-row-even");
+        }
+        tr = document.createElement("tr");
+        //tr.id = "proprow" + prop.ents2entsId;
+        tr.className = currentClass;
+        if( justwritenProp != null &&
+                justwritenProp.subjectEntURI == prop.subjectEntURI &&
+                justwritenProp.propertyURI == prop.propertyURI &&
+                justwritenProp.objectEntURI == prop.objectEntURI){
+            tr.id ="justwritenTr";
+            justwritenProp = null;
+        }
+        return tr;
+      });/*close inner function*/
+  } )(); /*close and call outer function to return the inner function */
+
+/* **************** end table column builders **************** */
+
+/****************************************************************
+ ******** Functions for the Property Editing Form **************
+ *****************************************************************/
+
+/* called when Edit button is clicked */
+function editTable(inputElement, subjectURI, predicateURI, objectURI){
+    var rowIndex = inputElement.parentNode.parentNode.rowIndex-1 ;
+    var table = $("propbody");
+    table.deleteRow( rowIndex );
+    table.insertRow(rowIndex);
+    table.rows[rowIndex].insertCell(0);
+    var vform = getForm();
+    table.rows[rowIndex].cells[0].appendChild( vform );
+    table.rows[rowIndex].cells[0].colSpan = tableMaxColspan( table );
+    vform.style.display="block";
+
+    PropertyDWR.getProperty(fillForm, subjectURI, predicateURI, objectURI);
+    inputElement.parentNode.parentNode.style.display="none";
+}
+
+/** called when Delete button is clicked */
+function deleteProp( subjectURI, predicateURI, objectURI, objectName, predicateName)  {
+  if( PropertyDWR.deleteProp ){
+    if (confirm("Are you sure you want to delete the property\n"
+                 + objectName + " " + predicateName + "?")) {
+      PropertyDWR.deleteProp(update, subjectURI, predicateURI, objectURI);
+    }
+  } else {
+    alert("Deletion of object property statements is disabled.");
+  }
+}
+
+/*****************************************************************
+ adds the editing form <tr> to the propeties table 
+*****************************************************************/
+function appendPropForm(tr, colspan ){
+  var form = getForm();
+  while(tr.cells.length > 0 ){
+    tr.deleteCell(0);
+  }
+  var td = tr.insertCell(-1);
+  td.appendChild( form );
+
+  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. 
+*****************************************************************/
+function newProp() {
+  if( gPropertyHash == null || gPropertyHash.length < 1 ) {
+    	/* propArray might be null if we have no properties in the system */
+    	doNoPropsWarning();    	
+    }else{
+  	var innerNew = function (){
+      var newP = {};
+    	newP.domainClass = gEntity.vClassId;
+    	newP.subjectName = gEntity.name;
+    	newP.subjectEntURI = gEntity.URI;
+        
+    	fillForm( newP );
+    	editingNewProp = true;
+    	fillRangeVClassList();
+    	var table = $("propbody");
+        var tr = table.insertRow(0);
+    	tr.id = "newrow";
+    	appendPropForm( tr, tableMaxColspan( table ) );
+ 
+      //table.insertBefore(tr, table.rows[0]);
+  	};
+  	updateTable( innerNew );
+  }
+}
+
+/****************************************************************
+ Fills out the property edit form with the given property 
+*****************************************************************/
+function fillForm(aprop)  {
+  clearProp();
+  gProperty = aprop;
+  var vclass = gProperty.domainClass;
+  
+  DWRUtil.setValues(gProperty);
+
+  toggleDisabled("newPropButton");
+  
+  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 
+******************************************************************/
+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 = $("propertyList");
+  clear(propList);
+
+  //add properties as options
+  for( var i in gPropertyHash ) {
+    var prop = gPropertyHash[i];
+    var text = "";
+    var value = prop.propertyURI;
+    if(prop.subjectSide){
+      text= prop.domainPublic;
+      if (prop.rangeClassName != null) {
+    	  text += " ("+prop.rangeClassName +")";
+      }
+      value = value + 'D';
+    } else {
+      text= prop.rangePublic;
+      if (prop.domainClassName != null) {
+    	  text += " ("+prop.domainClassName+")";
+      }
+      value = value + 'R';
+    }
+    var opt = new Option(text, value);
+    if( gProperty.propertyURI == prop.propertyURI ){
+      opt.selected = true; 
+    }
+    propList.options[propList.options.length] = opt;
+  }
+
+  fillRangeVClassList( null );
+}
+
+/*****************************************************************
+ 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 = DWRUtil.getValue("propertyList");}
+	
+  //clear the list and put the loading message up
+  var vclassListEle = $("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];	
+	
+  VClassDWR.getVClasses(
+                        function(vclasses){ 
+                          addVClassOptions( vclasses );             
+                        },
+                        prop.domainClassURI, prop.propertyURI, prop.subjectSide);
+}		
+	
+/****************************************************************
+ Adds vClasses to the vClassList and trigger an update of
+ the entitiesList.
+ ****************************************************************/
+function addVClassOptions( vclassArray  ){
+  //  DWRUtil.addOptions("entitiesList",null);
+  var vclassEle = $("vClassList");
+  clear( vclassEle );
+  vclassEle.disabled = false;
+
+  if( vclassArray == null || vclassArray.length < 1){
+    vclassEle.disabled = true;
+    entsEle = $("entitiesList");
+    clear(entsEle);
+    var msg="There are no entities defined yet that could fill this role";
+    var opt = new Option(msg,-1);
+    entsEle.options[entsEle.options.length] = opt;
+    entsEle.disabled = true;
+    return;
+  }
+
+  addOptions("vClassList", vclassArray,
+             function(vclass){ return vclass.URI; },
+             function(vclass){ 
+               var count = "";
+               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[ DWRUtil.getValue("propertyList") ];
+  if( gProperty.propertyURI == prop.propertyURI ){
+    vclassURI = gProperty.rangeClassURI;
+
+    DWRUtil.setValue(vclassEle, vclassURI );
+    //here we were unable to set the vclass select option to the vclassid
+    //of the entity.  this means that the vclass of the entity is not one that
+    //is permited by the PropertyInheritance and other restrictions.
+    if( DWRUtil.getValue(vclassEle) != vclassURI){
+        alert("This entity's class does not match the class of this property.  This is usually the "+
+              "result of the class of the entity having been changed.  Properties that were added when " +
+              "this entity had the old class still reflect that value.\n" +
+              "In general the vitro system handles this but the editing of these misaligned records "+
+              "is not fully supported.\n" );
+    }
+  }
+  fillEntsList(vclassEle );
+}
+
+/*****************************************************************
+  Fill up the entity list in a property editing form.
+  The propId should have the id + 'D' or 'R' to 
+  indicate domain or range. 
+*****************************************************************/
+function fillEntsList( vclassEle ){
+  if( vclassEle == null )
+      vclassEle = $("vClassList");     
+  var vclassUri =  DWRUtil.getValue( vclassEle );
+
+  if( vclassUri == gVClassUri )
+    return;
+  else
+    gVClassUri = vclassUri;
+    
+  var entsListEle = $("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;
+
+  if( vclassUri ){
+   //Notice that this is using the edu.cornell.mannlib.vitro.JSONServlet
+   var base =  getURLandContext();
+   //these are parameters to the dojo JSON call
+
+   var bindArgs = {
+    url:  "dataservice?getEntitiesByVClass=1&vclassURI="+encodeUrl(vclassUri),
+    error: function(type, data, evt){
+       if( type == null ){ type = "none" ; }
+       if( data == null ){ data = "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 );
+     },
+    load: function(type, data, evt){
+       //clear here since we will be using addEntOptions for multiple adds
+//       var entsListEle = $("entitiesList");
+//        clear(entsListEle);
+       addEntOptions(data, -1);
+    },
+    mimetype: "text/json"
+   };
+   abortExistingEntRequest();
+   gEntRequest = dojo.io.bind(bindArgs);   
+  } else {
+    clear(entsListEle);
+  }
+}
+
+/** add entities in entArray as options elements to select element "Individual" */
+function addEntOptions( entArray ){
+  var entsListEle = $("entitiesList");
+
+    if( entArray == null || entArray.length == 0){
+        clear(entsListEle);
+        return;
+    }
+
+  var previouslySelectedEntUri = gProperty.objectEntURI;
+
+  //check if the last element indicates that there are more results to get
+  contObj = null;
+  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;
+  var value;
+  var opt;
+  for (var i = 0; i < entArray.length; i++) {
+    text = entArray[i].name;
+    if( text.length > CUTOFF){ text = text.substr(0,CUTOFF) + "..."; }
+    value = entArray[i].URI;
+    opt = new Option(text, value);
+    entsListEle.options[entsListEle.options.length] = opt;
+    if( previouslySelectedEntUri == value ){
+        entityOptToSelect = opt;
+    }
+  }
+
+  if( contObj != null ){
+    entsListEle.item(0).text = entsListEle.item(0).text + ".";
+    addMoreEntOptions( contObj );
+  } else {    
+    gEntRequests = [];
+    entsListEle.disabled = false;
+    if( entsListEle.length > 0 && entsListEle.item(0).value == -12){
+      entsListEle.remove(0);
+    }
+    if( entityOptToSelect != null ){
+        entityOptToSelect.selected = true;
+    }
+  }
+}
+var entityOptToSelect =null;
+
+/*
+ * 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",
+"entsInVClass":2773}
+ */
+function addMoreEntOptions( continueObj ){
+  if( continueObj.nextUrl != null ){
+    var bindArgs = {
+    url: continueObj.nextUrl,
+    error: function(type, data, evt){
+        if( type == null ){ type = "none" ; }
+        if( data == null ){ data = "none" ; }
+        if( evt == null ){ evt = "none" ; }       
+        alert("An error addMoreEntOptions()"+"\ntype: " + type +"\ndata: "+
+              data +"\nevt: " + evt );
+      },
+    load: function(type, data, evt){
+        addEntOptions( data );
+      },
+    mimetype: "text/json"
+    };    
+    abortExistingEntRequest();
+    gEntRequest = dojo.io.bind(bindArgs);    
+  }
+}
+
+/*
+Entities are now sent back as JSON in groups of 556.  This is to defend against
+odd network effects and browser flakyness.  DWR was choaking on large datasets
+and isn't very flexable so I moved to JSON.  That still caused problems with
+large data sets ( size > 1500 ) so I'm breaking them up.
+
+The reply from the JSON servlet is a JSON array.  If the last item in the
+array lacks a "id" property then it is information about additional entites.
+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},
+ {"resultGroup":3,"entsInVClass":2773,"nextResultGroup":4,"standardReplySize":556}
+]
+
+*/
+
+/****************************************************************
+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 */ 
+  return true;
+}
+
+/**************************************************************
+Write or update ents2ents row.
+***************************************************************/
+function writeProp()  {
+  if( PropertyDWR.insertProp == null  ){
+    alert("Writing of properties disabled for security reasons.");
+    return;
+  }
+  if( !validateForm() ) { return; }
+  var prop = gPropertyHash[DWRUtil.getValue("propertyList")];
+  var newP = {};
+  var oldP = gProperty;
+  newP.propertyURI = prop.propertyURI;
+
+  var selected = DWRUtil.getValue("entitiesList");
+  newP.subjectEntURI= gEntity.URI;
+  newP.objectEntURI = selected ;
+  
+  var callback = function(result){
+    editingNewProp = false;
+    justwritenProp = newP;
+    update();  };
+
+  if( editingNewProp ){    
+    newP.ents2entsId = -1;
+    PropertyDWR.insertProp(callback, newP );
+  } else {
+      var afterDelete=
+              function(result){
+                  PropertyDWR.insertProp(callback, newP);
+              };
+      PropertyDWR.deleteProp(afterDelete,
+              gProperty.subjectEntURI,
+              gProperty.propertyURI,
+              gProperty.objectEntURI);
+  }
+}
+
+/************ Things that happen on load *****************************/
+addEvent(window, 'load', update);
+
+/********************* some utilities ***********************************/
+/* this clones the property edit from a div on the ents_edit.jsp */
+function getForm(){  return $("propeditdiv").cloneNode(true); }
+
+/* a function to display a lot of info about an object */
+function disy( obj, note ){ alert( (note!==null?note:"") + DWRUtil.toDescriptiveString(obj, 3));}
+
+/* attempts to get the URI of the entity being edited */
+function getEntityUriFromPage(){
+  return document.getElementById("entityUriForDwr").nodeValue;      
+}
+
+function abortExistingEntRequest(){
+  if( gEntRequest != null ){
+    if( gEntRequest.abort ){
+        gEntRequest.abort();
+    }else{
+        alert("No abort function found on gEntRequest");
+    }
+    gEntRequest = null;
+ }    
+}
diff --git a/webapp/web/js/jquery.fix.clone.js b/webapp/web/js/jquery.fix.clone.js
index b7011aaac..84f11baa4 100644
--- a/webapp/web/js/jquery.fix.clone.js
+++ b/webapp/web/js/jquery.fix.clone.js
@@ -1,26 +1,26 @@
-// Textarea and select clone() bug workaround | Spencer Tipping
-// Licensed under the terms of the MIT source code license
-
-// Motivation.
-// jQuery's clone() method works in most cases, but it fails to copy the value of textareas and select elements. This patch replaces jQuery's clone() method with a wrapper that fills in the
-// values after the fact.
-
-// An interesting error case submitted by Piotr Przybył: If two <select> options had the same value, the clone() method would select the wrong one in the cloned box. The fix, suggested by Piotr
-// and implemented here, is to use the selectedIndex property on the <select> box itself rather than relying on jQuery's value-based val().
-
-(function (original) {
-  jQuery.fn.clone = function () {
-    var result = original.apply(this, arguments),
-        my_textareas = this.find('textarea').add(this.filter('textarea')),
-        result_textareas = result.find('textarea').add(this.filter('textarea')),
-        my_selects = this.find('select').add(this.filter('select')),
-        result_selects = result.find('select').add(this.filter('select'));
-
-    for (var i = 0, l = my_textareas.length; i < l; ++i) $(result_textareas[i]).val($(my_textareas[i]).val());
-    for (var i = 0, l = my_selects.length; i < l; ++i) result_selects[i].selectedIndex = my_selects[i].selectedIndex;
-
-    return result;
-  };
-}) (jQuery.fn.clone);
-
+// Textarea and select clone() bug workaround | Spencer Tipping
+// Licensed under the terms of the MIT source code license
+
+// Motivation.
+// jQuery's clone() method works in most cases, but it fails to copy the value of textareas and select elements. This patch replaces jQuery's clone() method with a wrapper that fills in the
+// values after the fact.
+
+// An interesting error case submitted by Piotr Przybył: If two <select> options had the same value, the clone() method would select the wrong one in the cloned box. The fix, suggested by Piotr
+// and implemented here, is to use the selectedIndex property on the <select> box itself rather than relying on jQuery's value-based val().
+
+(function (original) {
+  jQuery.fn.clone = function () {
+    var result = original.apply(this, arguments),
+        my_textareas = this.find('textarea').add(this.filter('textarea')),
+        result_textareas = result.find('textarea').add(this.filter('textarea')),
+        my_selects = this.find('select').add(this.filter('select')),
+        result_selects = result.find('select').add(this.filter('select'));
+
+    for (var i = 0, l = my_textareas.length; i < l; ++i) $(result_textareas[i]).val($(my_textareas[i]).val());
+    for (var i = 0, l = my_selects.length; i < l; ++i) result_selects[i].selectedIndex = my_selects[i].selectedIndex;
+
+    return result;
+  };
+}) (jQuery.fn.clone);
+
 // Generated by SDoc 
\ No newline at end of file
diff --git a/webapp/web/js/jquery_plugins/jquery.MultiFile.js b/webapp/web/js/jquery_plugins/jquery.MultiFile.js
index 217e88e92..14ba18f65 100644
--- a/webapp/web/js/jquery_plugins/jquery.MultiFile.js
+++ b/webapp/web/js/jquery_plugins/jquery.MultiFile.js
@@ -1,501 +1,501 @@
-/*
- ### 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
-*/
-/*
- CHANGE LOG:
-	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
-	Improved code organization / performance
-	Default name is now files[] - square brackets indicate an array is being submitted
-	Added namePattern options - allows user to configure name of slave elements
-	 - $name = master name, $id = master id, $g = group count, $i = slave count
-		- eg.: $name$i will result in file1, file2, file3 and so on...
-*/
-
-/*# AVOID COLLISIONS #*/
-;if(jQuery) (function($){
-/*# AVOID COLLISIONS #*/
- 
- // extend jQuery - $.MultiFile hook
- $.extend($, {
-  MultiFile: function( o /* Object */ ){
-   //return $("INPUT[@type='file'].multi").MultiFile(o);
-   return $("input:file.multi").MultiFile(o);
-  }
- });
- 
-	//===
-	
-	// extend $.MultiFile - default options
- $.extend($.MultiFile, {
-  options: {
-			accept: '', max: -1,
-			// error handling function
-			error: function(s){
-				if($.blockUI){
-					$.blockUI({
-      message: s.replace(/\n/gi,'<br/>'),
-						css: { 
-							border:'none', padding:'15px', size:'12.0pt',
-							backgroundColor:'#900', color:'#fff',
-							opacity:'.8','-webkit-border-radius': '10px','-moz-border-radius': '10px'
-						}
-     });
-					window.setTimeout($.unblockUI, 2000);
-				}
-				else{
-					alert(s);
-				}
-			},
-			// namePattern: $name/$id (from master element), $i (slave count), $g (group count)
-			namePattern: '$name',
-			// STRING: collection lets you show messages in different languages
-			STRING: {
-				remove:'remove',
-				denied:'You cannot select a $ext file.\nTry again...',
-				selected:'File selected: $file',
-				duplicate:'This file has already been selected:\n$file'
-			}
-		}
- });
- 
-	//===
-	
- // extend $.MultiFile - global methods
- $.extend($.MultiFile, {
-  disableEmpty: function(){
-			$('input:file'/*.multi'*/).each(function(){
-				var $this = $(this);
-				if($this.val()=='') $this.addClass('mfD').each(function(){ this.disabled = true });
-			});
-  },
-		reEnableEmpty: function(){
-   $('input:file.mfD').removeClass('mfD').each(function(){ this.disabled = false });
-		},
-		autoIntercept: [ 'submit', 'ajaxSubmit', 'validate' /* array of methods to intercept */ ],
-		intercepted: {},
-		intercept: function(methods, context, args){
-			var method, value; args = args || [];
-			if(args.constructor.toString().indexOf("Array")<0) args = [ args ];
-			if(typeof(methods)=='function'){
-				$.MultiFile.disableEmpty();
-				value = methods.apply(context || window, args);
-				$.MultiFile.reEnableEmpty();
-				return value;
-			};
-			if(methods.constructor.toString().indexOf("Array")<0) methods = [methods];
-			for(var i=0;i<methods.length;i++){
-				method = methods[i]+''; // make sure that we have a STRING
-				if(method) (function(method){ // make sure that method is ISOLATED for the interception
-					$.MultiFile.intercepted[method] = $.fn[method] || function(){};
-					$.fn[method] = function(){
-						$.MultiFile.disableEmpty();
-						//if(console) console.log(['$.MultiFile.intercepted', method, this, arguments]);
-						value = $.MultiFile.intercepted[method].apply(this, arguments);
-						$.MultiFile.reEnableEmpty();
-						return value;
-					}; // interception
-				})(method); // MAKE SURE THAT method IS ISOLATED for the interception
-			};// 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*/ : 
-        null/*metadata plugin not available*/)) || {},
-								o || {}
-							);
-       // limit number of files that can be selected?
-       if(!(o.max>0) /*IsNull(MASTER.max)*/){
-        o.max = $(MASTER).attr('maxlength');
-        if(!(o.max>0) /*IsNull(MASTER.max)*/){
-         o.max = (String(MASTER.className.match(/\b(max|limit)\-([0-9]+)\b/gi) || ['']).match(/[0-9]+/gi) || [''])[0];
-         if(!(o.max>0)) o.max = -1;
-									else           o.max = String(o.max).match(/[0-9]+/gi)[0];
-        }
-       };
-       o.max = new Number(o.max);
-       // limit extensions?
-							o.accept = o.accept || $(MASTER).attr('accept') || '';
-       if(!o.accept){
-        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, {
-        n: 0, // How many elements are currently selected?
-        slaves: [], files: [],
-								instanceKey: MASTER.id || 'MultiFile'+String(group_count), // Instance Key?
-        generateID: function(z){ return MASTER.instanceKey + (z>0 ?'_F'+String(z):''); },
-								trigger: function(event, element){
-									var handler = MASTER[event], value = $(element).attr('value');
-									if(handler){
-										var returnValue = handler(element, value, MASTER);
-										if( returnValue!=null ) return returnValue;
-									}
-									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
-        MASTER.n++;
-        // Add reference to master element
-        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#
-        slave.name = String(MASTER.namePattern
-								 /*master name*/.replace(/\$name/gi,$(MASTER).attr('name'))
-								 /*master id  */.replace(/\$id/gi,  $(MASTER).attr('id'))
-								 /*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!=''){
-												if(!v.match(MASTER.rxAccept)){
-             ERROR = MASTER.STRING.denied.replace('$ext', String(v.match(/\.\w{1,4}$/gi)));
-												}
-           }
-          };
-          
-          // Disallow duplicates
-										for(var f=0;f<MASTER.slaves.length;f++){
-											if(MASTER.slaves[f]!=this){
-												if(MASTER.slaves[f].value==v){
-													ERROR = MASTER.STRING.duplicate.replace('$file', v.match(/[^\/\\]+$/gi));
-												}
-											}
-          };
-										
-          // 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
-										//# Let's remember which input we've generated so
-										// 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--;
-            MASTER.addSlave(newEle[0], this.i);
-            slave.parent().prepend(newEle);
-            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();
-           MASTER.eCur = slave;
-										}
-										else{
-											$(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
-
-
-
-/*
- ### Default implementation ###
- The plugin will attach itself to file inputs
- with the class 'multi' when the page loads
- 
- Use the jQuery start plugin to 
-*/
-/*
-if($.start){ $.start('MultiFile', $.MultiFile) }
-else $(function(){ $.MultiFile() });
-*/
-if($.start)
- $.start('MultiFile', function(context){ context = context || this; // attach to start-up
-  $("INPUT[@type='file'].multi", context).MultiFile();
- });
-// $.start
-else
- $(function(){ $.MultiFile() });
-// $()
-
-
-
-/*# AVOID COLLISIONS #*/
-})(jQuery);
-/*# AVOID COLLISIONS #*/
+/*
+ ### 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
+*/
+/*
+ CHANGE LOG:
+	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
+	Improved code organization / performance
+	Default name is now files[] - square brackets indicate an array is being submitted
+	Added namePattern options - allows user to configure name of slave elements
+	 - $name = master name, $id = master id, $g = group count, $i = slave count
+		- eg.: $name$i will result in file1, file2, file3 and so on...
+*/
+
+/*# AVOID COLLISIONS #*/
+;if(jQuery) (function($){
+/*# AVOID COLLISIONS #*/
+ 
+ // extend jQuery - $.MultiFile hook
+ $.extend($, {
+  MultiFile: function( o /* Object */ ){
+   //return $("INPUT[@type='file'].multi").MultiFile(o);
+   return $("input:file.multi").MultiFile(o);
+  }
+ });
+ 
+	//===
+	
+	// extend $.MultiFile - default options
+ $.extend($.MultiFile, {
+  options: {
+			accept: '', max: -1,
+			// error handling function
+			error: function(s){
+				if($.blockUI){
+					$.blockUI({
+      message: s.replace(/\n/gi,'<br/>'),
+						css: { 
+							border:'none', padding:'15px', size:'12.0pt',
+							backgroundColor:'#900', color:'#fff',
+							opacity:'.8','-webkit-border-radius': '10px','-moz-border-radius': '10px'
+						}
+     });
+					window.setTimeout($.unblockUI, 2000);
+				}
+				else{
+					alert(s);
+				}
+			},
+			// namePattern: $name/$id (from master element), $i (slave count), $g (group count)
+			namePattern: '$name',
+			// STRING: collection lets you show messages in different languages
+			STRING: {
+				remove:'remove',
+				denied:'You cannot select a $ext file.\nTry again...',
+				selected:'File selected: $file',
+				duplicate:'This file has already been selected:\n$file'
+			}
+		}
+ });
+ 
+	//===
+	
+ // extend $.MultiFile - global methods
+ $.extend($.MultiFile, {
+  disableEmpty: function(){
+			$('input:file'/*.multi'*/).each(function(){
+				var $this = $(this);
+				if($this.val()=='') $this.addClass('mfD').each(function(){ this.disabled = true });
+			});
+  },
+		reEnableEmpty: function(){
+   $('input:file.mfD').removeClass('mfD').each(function(){ this.disabled = false });
+		},
+		autoIntercept: [ 'submit', 'ajaxSubmit', 'validate' /* array of methods to intercept */ ],
+		intercepted: {},
+		intercept: function(methods, context, args){
+			var method, value; args = args || [];
+			if(args.constructor.toString().indexOf("Array")<0) args = [ args ];
+			if(typeof(methods)=='function'){
+				$.MultiFile.disableEmpty();
+				value = methods.apply(context || window, args);
+				$.MultiFile.reEnableEmpty();
+				return value;
+			};
+			if(methods.constructor.toString().indexOf("Array")<0) methods = [methods];
+			for(var i=0;i<methods.length;i++){
+				method = methods[i]+''; // make sure that we have a STRING
+				if(method) (function(method){ // make sure that method is ISOLATED for the interception
+					$.MultiFile.intercepted[method] = $.fn[method] || function(){};
+					$.fn[method] = function(){
+						$.MultiFile.disableEmpty();
+						//if(console) console.log(['$.MultiFile.intercepted', method, this, arguments]);
+						value = $.MultiFile.intercepted[method].apply(this, arguments);
+						$.MultiFile.reEnableEmpty();
+						return value;
+					}; // interception
+				})(method); // MAKE SURE THAT method IS ISOLATED for the interception
+			};// 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*/ : 
+        null/*metadata plugin not available*/)) || {},
+								o || {}
+							);
+       // limit number of files that can be selected?
+       if(!(o.max>0) /*IsNull(MASTER.max)*/){
+        o.max = $(MASTER).attr('maxlength');
+        if(!(o.max>0) /*IsNull(MASTER.max)*/){
+         o.max = (String(MASTER.className.match(/\b(max|limit)\-([0-9]+)\b/gi) || ['']).match(/[0-9]+/gi) || [''])[0];
+         if(!(o.max>0)) o.max = -1;
+									else           o.max = String(o.max).match(/[0-9]+/gi)[0];
+        }
+       };
+       o.max = new Number(o.max);
+       // limit extensions?
+							o.accept = o.accept || $(MASTER).attr('accept') || '';
+       if(!o.accept){
+        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, {
+        n: 0, // How many elements are currently selected?
+        slaves: [], files: [],
+								instanceKey: MASTER.id || 'MultiFile'+String(group_count), // Instance Key?
+        generateID: function(z){ return MASTER.instanceKey + (z>0 ?'_F'+String(z):''); },
+								trigger: function(event, element){
+									var handler = MASTER[event], value = $(element).attr('value');
+									if(handler){
+										var returnValue = handler(element, value, MASTER);
+										if( returnValue!=null ) return returnValue;
+									}
+									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
+        MASTER.n++;
+        // Add reference to master element
+        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#
+        slave.name = String(MASTER.namePattern
+								 /*master name*/.replace(/\$name/gi,$(MASTER).attr('name'))
+								 /*master id  */.replace(/\$id/gi,  $(MASTER).attr('id'))
+								 /*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!=''){
+												if(!v.match(MASTER.rxAccept)){
+             ERROR = MASTER.STRING.denied.replace('$ext', String(v.match(/\.\w{1,4}$/gi)));
+												}
+           }
+          };
+          
+          // Disallow duplicates
+										for(var f=0;f<MASTER.slaves.length;f++){
+											if(MASTER.slaves[f]!=this){
+												if(MASTER.slaves[f].value==v){
+													ERROR = MASTER.STRING.duplicate.replace('$file', v.match(/[^\/\\]+$/gi));
+												}
+											}
+          };
+										
+          // 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
+										//# Let's remember which input we've generated so
+										// 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--;
+            MASTER.addSlave(newEle[0], this.i);
+            slave.parent().prepend(newEle);
+            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();
+           MASTER.eCur = slave;
+										}
+										else{
+											$(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
+
+
+
+/*
+ ### Default implementation ###
+ The plugin will attach itself to file inputs
+ with the class 'multi' when the page loads
+ 
+ Use the jQuery start plugin to 
+*/
+/*
+if($.start){ $.start('MultiFile', $.MultiFile) }
+else $(function(){ $.MultiFile() });
+*/
+if($.start)
+ $.start('MultiFile', function(context){ context = context || this; // attach to start-up
+  $("INPUT[@type='file'].multi", context).MultiFile();
+ });
+// $.start
+else
+ $(function(){ $.MultiFile() });
+// $()
+
+
+
+/*# AVOID COLLISIONS #*/
+})(jQuery);
+/*# AVOID COLLISIONS #*/
diff --git a/webapp/web/js/jquery_plugins/jquery.MultiFile.pack.js b/webapp/web/js/jquery_plugins/jquery.MultiFile.pack.js
index f79034e94..99e796411 100644
--- a/webapp/web/js/jquery_plugins/jquery.MultiFile.pack.js
+++ b/webapp/web/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
-*/
+/*
+ ### 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
diff --git a/webapp/web/js/jquery_plugins/jquery.realperson.js b/webapp/web/js/jquery_plugins/jquery.realperson.js
index 9f0c715f8..29f7c4c37 100644
--- a/webapp/web/js/jquery_plugins/jquery.realperson.js
+++ b/webapp/web/js/jquery_plugins/jquery.realperson.js
@@ -1,183 +1,183 @@
-/* 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. 
-   Please attribute the author if you use it. */
-
-(function($) { // Hide scope, no $ conflict
-
-var PROP_NAME = 'realPerson';
-
-/* Real person manager. */
-function RealPerson() {
-	this._defaults = {
-		length: 6, // Number of characters to use
-		includeNumbers: false, // True to use numbers as well as letters
-		regenerate: 'Click to change', // Instruction text to regenerate
-		hashName: '{n}Hash' // Name of the hash value field to compare with,
-			// use {n} to substitute with the original field name
-	};
-}
-
-var CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-var DOTS = [
-	['   *   ', '  * *  ', '  * *  ', ' *   * ', ' ***** ', '*     *', '*     *'],
-	['****** ', '*     *', '*     *', '****** ', '*     *', '*     *', '****** '],
-	[' ***** ', '*     *', '*      ', '*      ', '*      ', '*     *', ' ***** '],
-	['****** ', '*     *', '*     *', '*     *', '*     *', '*     *', '****** '],
-	['*******', '*      ', '*      ', '****   ', '*      ', '*      ', '*******'],
-	['*******', '*      ', '*      ', '****   ', '*      ', '*      ', '*      '],
-	[' ***** ', '*     *', '*      ', '*      ', '*   ***', '*     *', ' ***** '],
-	['*     *', '*     *', '*     *', '*******', '*     *', '*     *', '*     *'],
-	['*******', '   *   ', '   *   ', '   *   ', '   *   ', '   *   ', '*******'],
-	['      *', '      *', '      *', '      *', '      *', '*     *', ' ***** '],
-	['*     *', '*   ** ', '* **   ', '**     ', '* **   ', '*   ** ', '*     *'],
-	['*      ', '*      ', '*      ', '*      ', '*      ', '*      ', '*******'],
-	['*     *', '**   **', '* * * *', '*  *  *', '*     *', '*     *', '*     *'],
-	['*     *', '**    *', '* *   *', '*  *  *', '*   * *', '*    **', '*     *'],
-	[' ***** ', '*     *', '*     *', '*     *', '*     *', '*     *', ' ***** '],
-	['****** ', '*     *', '*     *', '****** ', '*      ', '*      ', '*      '],
-	[' ***** ', '*     *', '*     *', '*     *', '*   * *', '*    * ', ' **** *'],
-	['****** ', '*     *', '*     *', '****** ', '*   *  ', '*    * ', '*     *'],
-	[' ***** ', '*     *', '*      ', ' ***** ', '      *', '*     *', ' ***** '],
-	['*******', '   *   ', '   *   ', '   *   ', '   *   ', '   *   ', '   *   '],
-	['*     *', '*     *', '*     *', '*     *', '*     *', '*     *', ' ***** '],
-	['*     *', '*     *', ' *   * ', ' *   * ', '  * *  ', '  * *  ', '   *   '],
-	['*     *', '*     *', '*     *', '*  *  *', '* * * *', '**   **', '*     *'],
-	['*     *', ' *   * ', '  * *  ', '   *   ', '  * *  ', ' *   * ', '*     *'],
-	['*     *', ' *   * ', '  * *  ', '   *   ', '   *   ', '   *   ', '   *   '],
-	['*******', '     * ', '    *  ', '   *   ', '  *    ', ' *     ', '*******'],
-	['  ***  ', ' *   * ', '*     *', '*     *', '*     *', ' *   * ', '  ***  '],
-	['   *   ', '  **   ', ' * *   ', '   *   ', '   *   ', '   *   ', '*******'],
-	[' ***** ', '*     *', '      *', '     * ', '   **  ', ' **    ', '*******'],
-	[' ***** ', '*     *', '      *', '    ** ', '      *', '*     *', ' ***** '],
-	['    *  ', '   **  ', '  * *  ', ' *  *  ', '*******', '    *  ', '    *  '],
-	['*******', '*      ', '****** ', '      *', '      *', '*     *', ' ***** '],
-	['  **** ', ' *     ', '*      ', '****** ', '*     *', '*     *', ' ***** '],
-	['*******', '     * ', '    *  ', '   *   ', '  *    ', ' *     ', '*      '],
-	[' ***** ', '*     *', '*     *', ' ***** ', '*     *', '*     *', ' ***** '],
-	[' ***** ', '*     *', '*     *', ' ******', '      *', '     * ', ' ****  ']];
-
-$.extend(RealPerson.prototype, {
-	/* Class name added to elements to indicate already configured with real person. */
-	markerClassName: 'hasRealPerson',
-
-	/* Override the default settings for all real person instances.
-	   @param  settings  (object) the new settings to use as defaults
-	   @return  (RealPerson) this object */
-	setDefaults: function(settings) {
-		$.extend(this._defaults, settings || {});
-		return this;
-	},
-
-	/* Attach the real person functionality to an input field.
-	   @param  target    (element) the control to affect
-	   @param  settings  (object) the custom options for this instance */
-	_attachRealPerson: function(target, settings) {
-		target = $(target);
-		if (target.hasClass(this.markerClassName)) {
-			return;
-		}
-		target.addClass(this.markerClassName);
-		var inst = {settings: $.extend({}, this._defaults)};
-		$.data(target[0], PROP_NAME, inst);
-		this._changeRealPerson(target, settings);
-	},
-
-	/* Reconfigure the settings for a real person control.
-	   @param  target    (element) the control to affect
-	   @param  settings  (object) the new options for this instance or
-	                     (string) an individual property name
-	   @param  value     (any) the individual property value (omit if settings is an object) */
-	_changeRealPerson: function(target, settings, value) {
-		target = $(target);
-		if (!target.hasClass(this.markerClassName)) {
-			return;
-		}
-		settings = settings || {};
-		if (typeof settings == 'string') {
-			var name = settings;
-			settings = {};
-			settings[name] = value;
-		}
-		var inst = $.data(target[0], PROP_NAME);
-		$.extend(inst.settings, settings);
-		target.prevAll('.realperson-challenge,.realperson-hash').remove().end().
-			before(this._generateHTML(target, inst));
-	},
-
-	/* Generate the additional content for this control.
-	   @param  target  (jQuery) the input field
-	   @param  inst    (object) the current instance settings
-	   @return  (string) the additional content */
-	_generateHTML: function(target, inst) {
-		var text = '';
-		for (var i = 0; i < inst.settings.length; i++) {
-			text += CHARS.charAt(Math.floor(Math.random() *
-				(inst.settings.includeNumbers ? 36 : 26)));
-		}
-		var html = '<div class="realperson-challenge"><div class="realperson-text">';
-		for (var i = 0; i < DOTS[0].length; i++) {
-			for (var j = 0; j < text.length; j++) {
-				html += DOTS[CHARS.indexOf(text.charAt(j))][i].replace(/ /g, '&nbsp;') +
-					'&nbsp;&nbsp;';
-			}
-			html += '<br>';
-		}
-		html += '</div><div class="realperson-regen">' + inst.settings.regenerate +
-			'</div></div><input type="hidden" class="realperson-hash" name="' +
-			inst.settings.hashName.replace(/\{n\}/, target.attr('name')) +
-			'" value="' + this._hash(text) + '">';
-		return html;
-	},
-
-	/* Remove the real person functionality from a control.
-	   @param  target  (element) the control to affect */
-	_destroyRealPerson: function(target) {
-		target = $(target);
-		if (!target.hasClass(this.markerClassName)) {
-			return;
-		}
-		target.removeClass(this.markerClassName).
-			prevAll('.realperson-challenge,.realperson-hash').remove();
-		$.removeData(target[0], PROP_NAME);
-	},
-
-	/* Compute a hash value for the given text.
-	   @param  value  (string) the text to hash
-	   @return  the corresponding hash value */
-	_hash: function(value) {
-		var hash = 5381;
-		for (var i = 0; i < value.length; i++) {
-			hash = ((hash << 5) + hash) + value.charCodeAt(i);
-		}
-		return hash;
-	}
-});
-
-/* Attach the real person functionality to a jQuery selection.
-   @param  command  (string) the command to run (optional, default 'attach')
-   @param  options  (object) the new settings to use for these instances (optional)
-   @return  (jQuery) for chaining further calls */
-$.fn.realperson = function(options) {
-	var otherArgs = Array.prototype.slice.call(arguments, 1);
-	return this.each(function() {
-		if (typeof options == 'string') {
-			$.realperson['_' + options + 'RealPerson'].
-				apply($.realperson, [this].concat(otherArgs));
-		}
-		else {
-			$.realperson._attachRealPerson(this, options || {});
-		}
-	});
-};
-
-/* Initialise the real person functionality. */
-$.realperson = new RealPerson(); // singleton instance
-
-$('.realperson-challenge').live('click', function() {
-	$(this).next().next().realperson('change');
-});
-
-})(jQuery);
+/* 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. 
+   Please attribute the author if you use it. */
+
+(function($) { // Hide scope, no $ conflict
+
+var PROP_NAME = 'realPerson';
+
+/* Real person manager. */
+function RealPerson() {
+	this._defaults = {
+		length: 6, // Number of characters to use
+		includeNumbers: false, // True to use numbers as well as letters
+		regenerate: 'Click to change', // Instruction text to regenerate
+		hashName: '{n}Hash' // Name of the hash value field to compare with,
+			// use {n} to substitute with the original field name
+	};
+}
+
+var CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+var DOTS = [
+	['   *   ', '  * *  ', '  * *  ', ' *   * ', ' ***** ', '*     *', '*     *'],
+	['****** ', '*     *', '*     *', '****** ', '*     *', '*     *', '****** '],
+	[' ***** ', '*     *', '*      ', '*      ', '*      ', '*     *', ' ***** '],
+	['****** ', '*     *', '*     *', '*     *', '*     *', '*     *', '****** '],
+	['*******', '*      ', '*      ', '****   ', '*      ', '*      ', '*******'],
+	['*******', '*      ', '*      ', '****   ', '*      ', '*      ', '*      '],
+	[' ***** ', '*     *', '*      ', '*      ', '*   ***', '*     *', ' ***** '],
+	['*     *', '*     *', '*     *', '*******', '*     *', '*     *', '*     *'],
+	['*******', '   *   ', '   *   ', '   *   ', '   *   ', '   *   ', '*******'],
+	['      *', '      *', '      *', '      *', '      *', '*     *', ' ***** '],
+	['*     *', '*   ** ', '* **   ', '**     ', '* **   ', '*   ** ', '*     *'],
+	['*      ', '*      ', '*      ', '*      ', '*      ', '*      ', '*******'],
+	['*     *', '**   **', '* * * *', '*  *  *', '*     *', '*     *', '*     *'],
+	['*     *', '**    *', '* *   *', '*  *  *', '*   * *', '*    **', '*     *'],
+	[' ***** ', '*     *', '*     *', '*     *', '*     *', '*     *', ' ***** '],
+	['****** ', '*     *', '*     *', '****** ', '*      ', '*      ', '*      '],
+	[' ***** ', '*     *', '*     *', '*     *', '*   * *', '*    * ', ' **** *'],
+	['****** ', '*     *', '*     *', '****** ', '*   *  ', '*    * ', '*     *'],
+	[' ***** ', '*     *', '*      ', ' ***** ', '      *', '*     *', ' ***** '],
+	['*******', '   *   ', '   *   ', '   *   ', '   *   ', '   *   ', '   *   '],
+	['*     *', '*     *', '*     *', '*     *', '*     *', '*     *', ' ***** '],
+	['*     *', '*     *', ' *   * ', ' *   * ', '  * *  ', '  * *  ', '   *   '],
+	['*     *', '*     *', '*     *', '*  *  *', '* * * *', '**   **', '*     *'],
+	['*     *', ' *   * ', '  * *  ', '   *   ', '  * *  ', ' *   * ', '*     *'],
+	['*     *', ' *   * ', '  * *  ', '   *   ', '   *   ', '   *   ', '   *   '],
+	['*******', '     * ', '    *  ', '   *   ', '  *    ', ' *     ', '*******'],
+	['  ***  ', ' *   * ', '*     *', '*     *', '*     *', ' *   * ', '  ***  '],
+	['   *   ', '  **   ', ' * *   ', '   *   ', '   *   ', '   *   ', '*******'],
+	[' ***** ', '*     *', '      *', '     * ', '   **  ', ' **    ', '*******'],
+	[' ***** ', '*     *', '      *', '    ** ', '      *', '*     *', ' ***** '],
+	['    *  ', '   **  ', '  * *  ', ' *  *  ', '*******', '    *  ', '    *  '],
+	['*******', '*      ', '****** ', '      *', '      *', '*     *', ' ***** '],
+	['  **** ', ' *     ', '*      ', '****** ', '*     *', '*     *', ' ***** '],
+	['*******', '     * ', '    *  ', '   *   ', '  *    ', ' *     ', '*      '],
+	[' ***** ', '*     *', '*     *', ' ***** ', '*     *', '*     *', ' ***** '],
+	[' ***** ', '*     *', '*     *', ' ******', '      *', '     * ', ' ****  ']];
+
+$.extend(RealPerson.prototype, {
+	/* Class name added to elements to indicate already configured with real person. */
+	markerClassName: 'hasRealPerson',
+
+	/* Override the default settings for all real person instances.
+	   @param  settings  (object) the new settings to use as defaults
+	   @return  (RealPerson) this object */
+	setDefaults: function(settings) {
+		$.extend(this._defaults, settings || {});
+		return this;
+	},
+
+	/* Attach the real person functionality to an input field.
+	   @param  target    (element) the control to affect
+	   @param  settings  (object) the custom options for this instance */
+	_attachRealPerson: function(target, settings) {
+		target = $(target);
+		if (target.hasClass(this.markerClassName)) {
+			return;
+		}
+		target.addClass(this.markerClassName);
+		var inst = {settings: $.extend({}, this._defaults)};
+		$.data(target[0], PROP_NAME, inst);
+		this._changeRealPerson(target, settings);
+	},
+
+	/* Reconfigure the settings for a real person control.
+	   @param  target    (element) the control to affect
+	   @param  settings  (object) the new options for this instance or
+	                     (string) an individual property name
+	   @param  value     (any) the individual property value (omit if settings is an object) */
+	_changeRealPerson: function(target, settings, value) {
+		target = $(target);
+		if (!target.hasClass(this.markerClassName)) {
+			return;
+		}
+		settings = settings || {};
+		if (typeof settings == 'string') {
+			var name = settings;
+			settings = {};
+			settings[name] = value;
+		}
+		var inst = $.data(target[0], PROP_NAME);
+		$.extend(inst.settings, settings);
+		target.prevAll('.realperson-challenge,.realperson-hash').remove().end().
+			before(this._generateHTML(target, inst));
+	},
+
+	/* Generate the additional content for this control.
+	   @param  target  (jQuery) the input field
+	   @param  inst    (object) the current instance settings
+	   @return  (string) the additional content */
+	_generateHTML: function(target, inst) {
+		var text = '';
+		for (var i = 0; i < inst.settings.length; i++) {
+			text += CHARS.charAt(Math.floor(Math.random() *
+				(inst.settings.includeNumbers ? 36 : 26)));
+		}
+		var html = '<div class="realperson-challenge"><div class="realperson-text">';
+		for (var i = 0; i < DOTS[0].length; i++) {
+			for (var j = 0; j < text.length; j++) {
+				html += DOTS[CHARS.indexOf(text.charAt(j))][i].replace(/ /g, '&nbsp;') +
+					'&nbsp;&nbsp;';
+			}
+			html += '<br>';
+		}
+		html += '</div><div class="realperson-regen">' + inst.settings.regenerate +
+			'</div></div><input type="hidden" class="realperson-hash" name="' +
+			inst.settings.hashName.replace(/\{n\}/, target.attr('name')) +
+			'" value="' + this._hash(text) + '">';
+		return html;
+	},
+
+	/* Remove the real person functionality from a control.
+	   @param  target  (element) the control to affect */
+	_destroyRealPerson: function(target) {
+		target = $(target);
+		if (!target.hasClass(this.markerClassName)) {
+			return;
+		}
+		target.removeClass(this.markerClassName).
+			prevAll('.realperson-challenge,.realperson-hash').remove();
+		$.removeData(target[0], PROP_NAME);
+	},
+
+	/* Compute a hash value for the given text.
+	   @param  value  (string) the text to hash
+	   @return  the corresponding hash value */
+	_hash: function(value) {
+		var hash = 5381;
+		for (var i = 0; i < value.length; i++) {
+			hash = ((hash << 5) + hash) + value.charCodeAt(i);
+		}
+		return hash;
+	}
+});
+
+/* Attach the real person functionality to a jQuery selection.
+   @param  command  (string) the command to run (optional, default 'attach')
+   @param  options  (object) the new settings to use for these instances (optional)
+   @return  (jQuery) for chaining further calls */
+$.fn.realperson = function(options) {
+	var otherArgs = Array.prototype.slice.call(arguments, 1);
+	return this.each(function() {
+		if (typeof options == 'string') {
+			$.realperson['_' + options + 'RealPerson'].
+				apply($.realperson, [this].concat(otherArgs));
+		}
+		else {
+			$.realperson._attachRealPerson(this, options || {});
+		}
+	});
+};
+
+/* Initialise the real person functionality. */
+$.realperson = new RealPerson(); // singleton instance
+
+$('.realperson-challenge').live('click', function() {
+	$(this).next().next().realperson('change');
+});
+
+})(jQuery);
diff --git a/webapp/web/js/jquery_plugins/ui.datepicker.css b/webapp/web/js/jquery_plugins/ui.datepicker.css
index ab46fb7b4..073b179d6 100644
--- a/webapp/web/js/jquery_plugins/ui.datepicker.css
+++ b/webapp/web/js/jquery_plugins/ui.datepicker.css
@@ -1,208 +1,208 @@
-/* Main Style Sheet for jQuery UI date picker */
-#datepicker_div, .datepicker_inline {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 14px;
-	padding: 0;
-	margin: 0;
-	background: #ddd;
-	width: 185px;
-}
-#datepicker_div {
-	display: none;
-	border: 1px solid #777;
-	z-index: 9999; /*must have*/
-}
-.datepicker_inline {
-	float: left;
-	display: block;
-	border: 0;
-}
-.datepicker_rtl {
-	direction: rtl;
-}
-.datepicker_dialog {
-	padding: 5px !important;
-	border: 4px ridge #ddd !important;
-}
-button.datepicker_trigger {
-	width: 25px;
-}
-img.datepicker_trigger {
-	margin: 2px;
-	vertical-align: middle;
-}
-.datepicker_prompt {
-	float: left;
-	padding: 2px;
-	background: #ddd;
-	color: #000;
-}
-* html .datepicker_prompt {
-	width: 185px;
-}
-.datepicker_control, .datepicker_links, .datepicker_header, .datepicker {
-	clear: both;
-	float: left;
-	width: 100%;
-	color: #fff;
-}
-.datepicker_control {
-	background: #400;
-	padding: 2px 0px;
-}
-.datepicker_links {
-	background: #000;
-	padding: 2px 0px;
-}
-.datepicker_control, .datepicker_links {
-	font-weight: bold;
-	font-size: 80%;
-	letter-spacing: 1px;
-}
-.datepicker_links label { /* disabled links */
-	padding: 2px 5px;
-	color: #888;
-}
-.datepicker_clear, .datepicker_prev {
-	float: left;
-	width: 34%;
-}
-.datepicker_rtl .datepicker_clear, .datepicker_rtl .datepicker_prev {
-	float: right;
-	text-align: right;
-}
-.datepicker_current {
-	float: left;
-	width: 30%;
-	text-align: center;
-}
-.datepicker_close, .datepicker_next {
-	float: right;
-	width: 34%;
-	text-align: right;
-}
-.datepicker_rtl .datepicker_close, .datepicker_rtl .datepicker_next {
-	float: left;
-	text-align: left;
-}
-.datepicker_header {
-	padding: 1px 0 3px;
-	background: #333;
-	text-align: center;
-	font-weight: bold;
-	height: 1.3em;
-}
-.datepicker_header select {
-	background: #333;
-	color: #fff;
-	border: 0px;
-	font-weight: bold;
-}
-.datepicker {
-	background: #ccc;
-	text-align: center;
-	font-size: 100%;
-}
-.datepicker a {
-	display: block;
-	width: 100%;
-}
-.datepicker_titleRow {
-	background: #777;
-}
-.datepicker_daysRow {
-	background: #eee;
-	color: #666;
-}
-.datepicker_weekCol {
-	background: #777;
-	color: #fff;
-}
-.datepicker_daysCell {
-	color: #000;
-	border: 1px solid #ddd;
-}
-.datepicker_daysCell a{
-	display: block;
-}
-.datepicker_weekEndCell {
-	background: #ddd;
-}
-.datepicker_titleRow .datepicker_weekEndCell {
-	background: #777;
-}
-.datepicker_daysCellOver {
-	background: #fff;
-	border: 1px solid #777;
-}
-.datepicker_unselectable {
-	color: #888;
-}
-.datepicker_today {
-	background: #fcc !important;
-}
-.datepicker_currentDay {
-	background: #999 !important;
-}
-.datepicker_status {
-	background: #ddd;
-	width: 100%;
-	font-size: 80%;
-	text-align: center;
-}
-
-/* ________ Datepicker Links _______
-
-** Reset link properties and then override them with !important */
-#datepicker_div a, .datepicker_inline a {
-	cursor: pointer;
-	margin: 0;
-	padding: 0;
-	background: none;
-	color: #000;
-}
-.datepicker_inline .datepicker_links a {
-	padding: 0 5px !important;
-}
-.datepicker_control a, .datepicker_links a {
-	padding: 2px 5px !important;
-	color: #eee !important;
-}
-.datepicker_titleRow a {
-	color: #eee !important;
-}
-.datepicker_control a:hover {
-	background: #fdd !important;
-	color: #333 !important;
-}
-.datepicker_links a:hover, .datepicker_titleRow a:hover {
-	background: #ddd !important;
-	color: #333 !important;
-}
-
-/* ___________ MULTIPLE MONTHS _________*/
-
-.datepicker_multi .datepicker {
-	border: 1px solid #777;
-}
-.datepicker_oneMonth {
-	float: left;
-	width: 185px;
-}
-.datepicker_newRow {
-	clear: left;
-}
-
-/* ___________ IE6 IFRAME FIX ________ */
-
-.datepicker_cover {
-    display: none; /*sorry for IE5*/
-    display/**/: block; /*sorry for IE5*/
-    position: absolute; /*must have*/
-    z-index: -1; /*must have*/
-    filter: mask(); /*must have*/
-    top: -4px; /*must have*/
-    left: -4px; /*must have*/
-    width: 200px; /*must have*/
-    height: 200px; /*must have*/
+/* Main Style Sheet for jQuery UI date picker */
+#datepicker_div, .datepicker_inline {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	padding: 0;
+	margin: 0;
+	background: #ddd;
+	width: 185px;
+}
+#datepicker_div {
+	display: none;
+	border: 1px solid #777;
+	z-index: 9999; /*must have*/
+}
+.datepicker_inline {
+	float: left;
+	display: block;
+	border: 0;
+}
+.datepicker_rtl {
+	direction: rtl;
+}
+.datepicker_dialog {
+	padding: 5px !important;
+	border: 4px ridge #ddd !important;
+}
+button.datepicker_trigger {
+	width: 25px;
+}
+img.datepicker_trigger {
+	margin: 2px;
+	vertical-align: middle;
+}
+.datepicker_prompt {
+	float: left;
+	padding: 2px;
+	background: #ddd;
+	color: #000;
+}
+* html .datepicker_prompt {
+	width: 185px;
+}
+.datepicker_control, .datepicker_links, .datepicker_header, .datepicker {
+	clear: both;
+	float: left;
+	width: 100%;
+	color: #fff;
+}
+.datepicker_control {
+	background: #400;
+	padding: 2px 0px;
+}
+.datepicker_links {
+	background: #000;
+	padding: 2px 0px;
+}
+.datepicker_control, .datepicker_links {
+	font-weight: bold;
+	font-size: 80%;
+	letter-spacing: 1px;
+}
+.datepicker_links label { /* disabled links */
+	padding: 2px 5px;
+	color: #888;
+}
+.datepicker_clear, .datepicker_prev {
+	float: left;
+	width: 34%;
+}
+.datepicker_rtl .datepicker_clear, .datepicker_rtl .datepicker_prev {
+	float: right;
+	text-align: right;
+}
+.datepicker_current {
+	float: left;
+	width: 30%;
+	text-align: center;
+}
+.datepicker_close, .datepicker_next {
+	float: right;
+	width: 34%;
+	text-align: right;
+}
+.datepicker_rtl .datepicker_close, .datepicker_rtl .datepicker_next {
+	float: left;
+	text-align: left;
+}
+.datepicker_header {
+	padding: 1px 0 3px;
+	background: #333;
+	text-align: center;
+	font-weight: bold;
+	height: 1.3em;
+}
+.datepicker_header select {
+	background: #333;
+	color: #fff;
+	border: 0px;
+	font-weight: bold;
+}
+.datepicker {
+	background: #ccc;
+	text-align: center;
+	font-size: 100%;
+}
+.datepicker a {
+	display: block;
+	width: 100%;
+}
+.datepicker_titleRow {
+	background: #777;
+}
+.datepicker_daysRow {
+	background: #eee;
+	color: #666;
+}
+.datepicker_weekCol {
+	background: #777;
+	color: #fff;
+}
+.datepicker_daysCell {
+	color: #000;
+	border: 1px solid #ddd;
+}
+.datepicker_daysCell a{
+	display: block;
+}
+.datepicker_weekEndCell {
+	background: #ddd;
+}
+.datepicker_titleRow .datepicker_weekEndCell {
+	background: #777;
+}
+.datepicker_daysCellOver {
+	background: #fff;
+	border: 1px solid #777;
+}
+.datepicker_unselectable {
+	color: #888;
+}
+.datepicker_today {
+	background: #fcc !important;
+}
+.datepicker_currentDay {
+	background: #999 !important;
+}
+.datepicker_status {
+	background: #ddd;
+	width: 100%;
+	font-size: 80%;
+	text-align: center;
+}
+
+/* ________ Datepicker Links _______
+
+** Reset link properties and then override them with !important */
+#datepicker_div a, .datepicker_inline a {
+	cursor: pointer;
+	margin: 0;
+	padding: 0;
+	background: none;
+	color: #000;
+}
+.datepicker_inline .datepicker_links a {
+	padding: 0 5px !important;
+}
+.datepicker_control a, .datepicker_links a {
+	padding: 2px 5px !important;
+	color: #eee !important;
+}
+.datepicker_titleRow a {
+	color: #eee !important;
+}
+.datepicker_control a:hover {
+	background: #fdd !important;
+	color: #333 !important;
+}
+.datepicker_links a:hover, .datepicker_titleRow a:hover {
+	background: #ddd !important;
+	color: #333 !important;
+}
+
+/* ___________ MULTIPLE MONTHS _________*/
+
+.datepicker_multi .datepicker {
+	border: 1px solid #777;
+}
+.datepicker_oneMonth {
+	float: left;
+	width: 185px;
+}
+.datepicker_newRow {
+	clear: left;
+}
+
+/* ___________ IE6 IFRAME FIX ________ */
+
+.datepicker_cover {
+    display: none; /*sorry for IE5*/
+    display/**/: block; /*sorry for IE5*/
+    position: absolute; /*must have*/
+    z-index: -1; /*must have*/
+    filter: mask(); /*must have*/
+    top: -4px; /*must have*/
+    left: -4px; /*must have*/
+    width: 200px; /*must have*/
+    height: 200px; /*must have*/
 }
\ No newline at end of file
diff --git a/webapp/web/js/jquery_plugins/ui.datepicker.js b/webapp/web/js/jquery_plugins/ui.datepicker.js
index a5f2f2fe5..828524428 100644
--- a/webapp/web/js/jquery_plugins/ui.datepicker.js
+++ b/webapp/web/js/jquery_plugins/ui.datepicker.js
@@ -1,1439 +1,1439 @@
-/* jQuery UI Date Picker v3.4.3 (previously jQuery Calendar)
-   Written by Marc Grabanski (m@marcgrabanski.com) and Keith Wood (kbwood@virginbroadband.com.au).
-
-   Copyright (c) 2007 Marc Grabanski (http://marcgrabanski.com/code/ui-datepicker)
-   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.
-   Use the singleton instance of this class, $.datepicker, to interact with the date picker.
-   Settings for (groups of) date pickers are maintained in an instance object
-   (DatepickerInstance), allowing multiple different settings on the same page. */
-
-function Datepicker() {
-	this.debug = false; // Change this to true to start debugging
-	this._nextId = 0; // Next ID for a date picker instance
-	this._inst = []; // List of instances indexed by ID
-	this._curInst = null; // The current instance in use
-	this._disabledInputs = []; // List of date picker inputs that have been disabled
-	this._datepickerShowing = false; // True if the popup picker is showing , false if not
-	this._inDialog = false; // True if showing within a "dialog", false if not
-	this.regional = []; // Available regional settings, indexed by language code
-	this.regional[''] = { // Default regional settings
-		clearText: 'Clear', // Display text for clear link
-		clearStatus: 'Erase the current date', // Status text for clear link
-		closeText: 'Close', // Display text for close link
-		closeStatus: 'Close without change', // Status text for close link
-		prevText: '&#x3c;Prev', // Display text for previous month link
-		prevStatus: 'Show the previous month', // Status text for previous month link
-		nextText: 'Next&#x3e;', // Display text for next month link
-		nextStatus: 'Show the next month', // Status text for next month link
-		currentText: 'Today', // Display text for current month link
-		currentStatus: 'Show the current month', // Status text for current month link
-		monthNames: ['January','February','March','April','May','June',
-			'July','August','September','October','November','December'], // Names of months for drop-down and formatting
-		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], // For formatting
-		monthStatus: 'Show a different month', // Status text for selecting a month
-		yearStatus: 'Show a different year', // Status text for selecting a year
-		weekHeader: 'Wk', // Header for the week of the year column
-		weekStatus: 'Week of the year', // Status text for the week of the year column
-		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'], // For formatting
-		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'], // For formatting
-		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'], // Column headings for days starting at Sunday
-		dayStatus: 'Set DD as first week day', // Status text for the day of the week selection
-		dateStatus: 'Select DD, M d', // Status text for the date selection
-		dateFormat: 'mm/dd/yy', // See format options on parseDate
-		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
-		initStatus: 'Select a date', // Initial Status text on opening
-		isRTL: false // True if right-to-left language, false if left-to-right
-	};
-	this._defaults = { // Global defaults for all the date picker instances
-		showOn: 'focus', // 'focus' for popup on focus,
-			// 'button' for trigger button, or 'both' for either
-		showAnim: 'show', // Name of jQuery animation for popup
-		defaultDate: null, // Used when field is blank: actual date,
-			// +/-number for offset from today, null for today
-		appendText: '', // Display text following the input box, e.g. showing the format
-		buttonText: '...', // Text for trigger button
-		buttonImage: '', // URL for trigger button image
-		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
-		closeAtTop: true, // True to have the clear/close at the top,
-			// false to have them at the bottom
-		mandatory: false, // True to hide the Clear link, false to include it
-		hideIfNoPrevNext: false, // True to hide next/previous month links
-			// if not applicable, false to just disable them
-		changeMonth: true, // True if month can be selected directly, false if only prev/next
-		changeYear: true, // True if year can be selected directly, false if only prev/next
-		yearRange: '-10:+10', // Range of years to display in drop-down,
-			// either relative to current year (-nn:+nn) or absolute (nnnn:nnnn)
-		changeFirstDay: true, // True to click on day name to change, false to remain as set
-		showOtherMonths: false, // True to show dates in other months, false to leave blank
-		showWeeks: false, // True to show week of the year, false to omit
-		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, 
-			// 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 -
-			// takes date and instance as parameters, returns display text
-		minDate: null, // The earliest selectable date, or null for no limit
-		maxDate: null, // The latest selectable date, or null for no limit
-		speed: 'normal', // Speed of display/closure
-		beforeShowDay: null, // Function that takes a date and returns an array with
-			// [0] = true if selectable, false if not,
-			// [1] = custom CSS class name(s) or '', e.g. $.datepicker.noWeekends
-		beforeShow: null, // Function that takes an input field and
-			// returns a set of custom settings for the date picker
-		onSelect: null, // Define a callback function when a date is selected
-		onClose: null, // Define a callback function when the datepicker is closed
-		numberOfMonths: 1, // Number of months to show at a time
-		stepMonths: 1, // Number of months to step back/forward
-		rangeSelect: false, // Allows for selecting a date range on one date picker
-		rangeSeparator: ' - ' // Text between two dates in a range
-	};
-	$.extend(this._defaults, this.regional['']);
-	this._datepickerDiv = $('<div id="datepicker_div"></div>');
-}
-
-$.extend(Datepicker.prototype, {
-	/* Class name added to elements to indicate already configured with a date picker. */
-	markerClassName: 'hasDatepicker',
-
-	/* Debug logging (if enabled). */
-	log: function () {
-		if (this.debug)
-			console.log.apply('', arguments);
-	},
-	
-	/* Register a new date picker instance - with custom settings. */
-	_register: function(inst) {
-		var id = this._nextId++;
-		this._inst[id] = inst;
-		return id;
-	},
-
-	/* Retrieve a particular date picker instance based on its ID. */
-	_getInst: function(id) {
-		return this._inst[id] || id;
-	},
-
-	/* 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) {
-		extendRemove(this._defaults, settings || {});
-		return this;
-	},
-
-	/* Attach the date picker to a jQuery selection.
-	   @param  target    element - the target input field or division or span
-	   @param  settings  object - the new settings to use for this date picker instance (anonymous) */
-	_attachDatepicker: function(target, settings) {
-		// check for settings on the control itself - in namespace 'date:'
-		var inlineSettings = null;
-		for (attrName in this._defaults) {
-			var attrValue = target.getAttribute('date:' + attrName);
-			if (attrValue) {
-				inlineSettings = inlineSettings || {};
-				try {
-					inlineSettings[attrName] = eval(attrValue);
-				} catch (err) {
-					inlineSettings[attrName] = attrValue;
-				}
-			}
-		}
-		var nodeName = target.nodeName.toLowerCase();
-		var instSettings = (inlineSettings ? 
-			$.extend(settings || {}, inlineSettings || {}) : settings);
-		if (nodeName == 'input') {
-			var inst = (inst && !inlineSettings ? inst :
-				new DatepickerInstance(instSettings, false));
-			this._connectDatepicker(target, inst);
-		} else if (nodeName == 'div' || nodeName == 'span') {
-			var inst = new DatepickerInstance(instSettings, true);
-			this._inlineDatepicker(target, inst);
-		}
-	},
-
-	/* Detach a datepicker from its control.
-	   @param  target    element - the target input field or division or span */
-	_destroyDatepicker: function(target) {
-		var nodeName = target.nodeName.toLowerCase();
-		var calId = target._calId;
-		target._calId = null;
-		var $target = $(target);
-		if (nodeName == 'input') {
-			$target.siblings('.datepicker_append').replaceWith('').end()
-				.siblings('.datepicker_trigger').replaceWith('').end()
-				.removeClass(this.markerClassName)
-				.unbind('focus', this._showDatepicker)
-				.unbind('keydown', this._doKeyDown)
-				.unbind('keypress', this._doKeyPress);
-			var wrapper = $target.parents('.datepicker_wrap');
-			if (wrapper)
-				wrapper.replaceWith(wrapper.html());
-		} else if (nodeName == 'div' || nodeName == 'span')
-			$target.removeClass(this.markerClassName).empty();
-		if ($('input[_calId=' + calId + ']').length == 0)
-			// clean up if last for this ID
-			this._inst[calId] = null;
-	},
-
-	/* Enable the date picker to a jQuery selection.
-	   @param  target    element - the target input field or division or span */
-	_enableDatepicker: function(target) {
-		target.disabled = false;
-		$(target).siblings('button.datepicker_trigger').each(function() { this.disabled = false; }).end()
-			.siblings('img.datepicker_trigger').css({opacity: '1.0', cursor: ''});
-		this._disabledInputs = $.map(this._disabledInputs,
-			function(value) { return (value == target ? null : value); }); // delete entry
-	},
-
-	/* Disable the date picker to a jQuery selection.
-	   @param  target    element - the target input field or division or span */
-	_disableDatepicker: function(target) {
-		target.disabled = true;
-		$(target).siblings('button.datepicker_trigger').each(function() { this.disabled = true; }).end()
-			.siblings('img.datepicker_trigger').css({opacity: '0.5', cursor: 'default'});
-		this._disabledInputs = $.map($.datepicker._disabledInputs,
-			function(value) { return (value == target ? null : value); }); // delete entry
-		this._disabledInputs[$.datepicker._disabledInputs.length] = target;
-	},
-
-	/* Is the first field in a jQuery collection disabled as a datepicker?
-	   @param  target    element - the target input field or division or span
-	   @return boolean - true if disabled, false if enabled */
-	_isDisabledDatepicker: function(target) {
-		if (!target)
-			return false;
-		for (var i = 0; i < this._disabledInputs.length; i++) {
-			if (this._disabledInputs[i] == target)
-				return true;
-		}
-		return false;
-	},
-
-	/* Update the settings for a date picker attached to an input field or division.
-	   @param  target  element - the target input field or division or span
-	   @param  name    string - the name of the setting to change or
-	                   object - the new settings to update
-	   @param  value   any - the new value for the setting (omit if above is an object) */
-	_changeDatepicker: function(target, name, value) {
-		var settings = name || {};
-		if (typeof name == 'string') {
-			settings = {};
-			settings[name] = value;
-		}
-		if (inst = this._getInst(target._calId)) {
-			extendRemove(inst._settings, settings);
-			this._updateDatepicker(inst);
-		}
-	},
-
-	/* Set the dates for a jQuery selection.
-	   @param  target   element - the target input field or division or span
-	   @param  date     Date - the new date
-	   @param  endDate  Date - the new end date for a range (optional) */
-	_setDateDatepicker: function(target, date, endDate) {
-		if (inst = this._getInst(target._calId)) {
-			inst._setDate(date, endDate);
-			this._updateDatepicker(inst);
-		}
-	},
-
-	/* Get the date(s) for the first entry in a jQuery selection.
-	   @param  target  element - the target input field or division or span
-	   @return Date - the current date or
-	           Date[2] - the current dates for a range */
-	_getDateDatepicker: function(target) {
-		var inst = this._getInst(target._calId);
-		return (inst ? inst._getDate() : null);
-	},
-
-	/* Handle keystrokes. */
-	_doKeyDown: function(e) {
-		var inst = $.datepicker._getInst(this._calId);
-		if ($.datepicker._datepickerShowing)
-			switch (e.keyCode) {
-				case 9:  $.datepicker._hideDatepicker(null, '');
-						break; // hide on tab out
-				case 13: $.datepicker._selectDay(inst, inst._selectedMonth, inst._selectedYear,
-							$('td.datepicker_daysCellOver', inst._datepickerDiv)[0]);
-						return false; // don't submit the form
-						break; // select the value on enter
-				case 27: $.datepicker._hideDatepicker(null, inst._get('speed'));
-						break; // hide on escape
-				case 33: $.datepicker._adjustDate(inst,
-							(e.ctrlKey ? -1 : -inst._get('stepMonths')), (e.ctrlKey ? 'Y' : 'M'));
-						break; // previous month/year on page up/+ ctrl
-				case 34: $.datepicker._adjustDate(inst,
-							(e.ctrlKey ? +1 : +inst._get('stepMonths')), (e.ctrlKey ? 'Y' : 'M'));
-						break; // next month/year on page down/+ ctrl
-				case 35: if (e.ctrlKey) $.datepicker._clearDate(inst);
-						break; // clear on ctrl+end
-				case 36: if (e.ctrlKey) $.datepicker._gotoToday(inst);
-						break; // current on ctrl+home
-				case 37: if (e.ctrlKey) $.datepicker._adjustDate(inst, -1, 'D');
-						break; // -1 day on ctrl+left
-				case 38: if (e.ctrlKey) $.datepicker._adjustDate(inst, -7, 'D');
-						break; // -1 week on ctrl+up
-				case 39: if (e.ctrlKey) $.datepicker._adjustDate(inst, +1, 'D');
-						break; // +1 day on ctrl+right
-				case 40: if (e.ctrlKey) $.datepicker._adjustDate(inst, +7, 'D');
-						break; // +1 week on ctrl+down
-			}
-		else if (e.keyCode == 36 && e.ctrlKey) // display the date picker on ctrl+home
-			$.datepicker._showDatepicker(this);
-	},
-
-	/* Filter entered characters - based on date format. */
-	_doKeyPress: function(e) {
-		var inst = $.datepicker._getInst(this._calId);
-		var chars = $.datepicker._possibleChars(inst._get('dateFormat'));
-		var chr = String.fromCharCode(e.charCode == undefined ? e.keyCode : e.charCode);
-		return e.ctrlKey || (chr < ' ' || !chars || chars.indexOf(chr) > -1);
-	},
-
-	/* Attach the date picker to an input field. */
-	_connectDatepicker: function(target, inst) {
-		var input = $(target);
-		if (input.is('.' + this.markerClassName))
-			return;
-		var appendText = inst._get('appendText');
-		var isRTL = inst._get('isRTL');
-		if (appendText) {
-			if (isRTL)
-				input.before('<span class="datepicker_append">' + appendText);
-			else
-				input.after('<span class="datepicker_append">' + appendText);
-		}
-		var showOn = inst._get('showOn');
-		if (showOn == 'focus' || showOn == 'both') // pop-up date picker when in the marked field
-			input.focus(this._showDatepicker);
-		if (showOn == 'button' || showOn == 'both') { // pop-up date picker when button clicked
-			input.wrap('<span class="datepicker_wrap">');
-			var buttonText = inst._get('buttonText');
-			var buttonImage = inst._get('buttonImage');
-			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 != '' ? 
-						$('<img>').attr({ src:buttonImage, alt:buttonText, title:buttonText }) : buttonText));
-			if (isRTL)
-				input.before(trigger);
-			else
-				input.after(trigger);
-			trigger.click(function() {
-				if ($.datepicker._datepickerShowing && $.datepicker._lastInput == target)
-					$.datepicker._hideDatepicker();
-				else
-					$.datepicker._showDatepicker(target);
-			});
-        }
-		input.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress)
-			.bind("setData.datepicker", function(event, key, value) {
-				inst._settings[key] = value;
-			}).bind("getData.datepicker", function(event, key) {
-				return inst._get(key);
-			});
-		input[0]._calId = inst._id;
-	},
-
-	/* Attach an inline date picker to a div. */
-	_inlineDatepicker: function(target, inst) {
-		var input = $(target);
-		if (input.is('.' + this.markerClassName))
-			return;
-		input.addClass(this.markerClassName).append(inst._datepickerDiv)
-			.bind("setData.datepicker", function(event, key, value){
-				inst._settings[key] = value;
-			}).bind("getData.datepicker", function(event, key){
-				return inst._get(key);
-			});
-		input[0]._calId = inst._id;
-		this._updateDatepicker(inst);
-	},
-
-	/* Tidy up after displaying the date picker. */
-	_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
-	   @param  dateText  string - the initial date to display (in the current format)
-	   @param  onSelect  function - the function(dateText) to call when a date is selected
-	   @param  settings  object - update the dialog date picker instance's settings (anonymous object)
-	   @param  pos       int[2] - coordinates for the dialog's position within the screen or
-	                     event - with x/y coordinates or
-	                     leave empty for default (screen centre)
-	   @return the manager object */
-	_dialogDatepicker: function(input, dateText, onSelect, settings, pos) {
-		var inst = this._dialogInst; // internal instance
-		if (!inst) {
-			inst = this._dialogInst = new DatepickerInstance({}, false);
-			this._dialogInput = $('<input type="text" size="1" style="position: absolute; top: -100px;"/>');
-			this._dialogInput.keydown(this._doKeyDown);
-			$('body').append(this._dialogInput);
-			this._dialogInput[0]._calId = inst._id;
-		}
-		extendRemove(inst._settings, settings || {});
-		this._dialogInput.val(dateText);
-
-		this._pos = (pos ? (pos.length ? pos : [pos.pageX, pos.pageY]) : null);
-		if (!this._pos) {
-			var browserWidth = window.innerWidth || document.documentElement.clientWidth ||	document.body.clientWidth;
-			var browserHeight = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
-			var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
-			var scrollY = document.documentElement.scrollTop || document.body.scrollTop;
-			this._pos = // should use actual width/height below
-				[(browserWidth / 2) - 100 + scrollX, (browserHeight / 2) - 150 + scrollY];
-		}
-
-		// move input on screen for focus, but hidden behind dialog
-		this._dialogInput.css('left', this._pos[0] + 'px').css('top', this._pos[1] + 'px');
-		inst._settings.onSelect = onSelect;
-		this._inDialog = true;
-		this._datepickerDiv.addClass('datepicker_dialog');
-		this._showDatepicker(this._dialogInput[0]);
-		if ($.blockUI)
-			$.blockUI(this._datepickerDiv);
-		return this;
-	},
-
-	/* Pop-up the date picker for a given input field.
-	   @param  input  element - the input field attached to the date picker or
-	                  event - if triggered by focus */
-	_showDatepicker: function(input) {
-		input = input.target || input;
-		if (input.nodeName.toLowerCase() != 'input') // find from button/image trigger
-			input = $('input', input.parentNode)[0];
-		if ($.datepicker._isDisabledDatepicker(input) || $.datepicker._lastInput == input) // already here
-			return;
-		var inst = $.datepicker._getInst(input._calId);
-		var beforeShow = inst._get('beforeShow');
-		extendRemove(inst._settings, (beforeShow ? beforeShow.apply(input, [input, inst]) : {}));
-		$.datepicker._hideDatepicker(null, '');
-		$.datepicker._lastInput = input;
-		inst._setDateFromField(input);
-		if ($.datepicker._inDialog) // hide cursor
-			input.value = '';
-		if (!$.datepicker._pos) { // position below input
-			$.datepicker._pos = $.datepicker._findPos(input);
-			$.datepicker._pos[1] += input.offsetHeight; // add the height
-		}
-		var isFixed = false;
-		$(input).parents().each(function() {
-			isFixed |= $(this).css('position') == 'fixed';
-		});
-		if (isFixed && $.browser.opera) { // correction for Opera when fixed and scrolled
-			$.datepicker._pos[0] -= document.documentElement.scrollLeft;
-			$.datepicker._pos[1] -= document.documentElement.scrollTop;
-		}
-		inst._datepickerDiv.css('position', ($.datepicker._inDialog && $.blockUI ?
-			'static' : (isFixed ? 'fixed' : 'absolute')))
-			.css({ left: $.datepicker._pos[0] + 'px', top: $.datepicker._pos[1] + 'px' });
-		$.datepicker._pos = null;
-		inst._rangeStart = null;
-		$.datepicker._updateDatepicker(inst);
-		if (!inst._inline) {
-			var speed = inst._get('speed');
-			var postProcess = function() {
-				$.datepicker._datepickerShowing = true;
-				$.datepicker._afterShow(inst);
-			};
-			var showAnim = inst._get('showAnim') || 'show';
-			inst._datepickerDiv[showAnim](speed, postProcess);
-			if (speed == '')
-				postProcess();
-			if (inst._input[0].type != 'hidden')
-				inst._input[0].focus();
-			$.datepicker._curInst = inst;
-		}
-	},
-
-	/* Generate the date picker content. */
-	_updateDatepicker: function(inst) {
-		inst._datepickerDiv.empty().append(inst._generateDatepicker());
-		var numMonths = inst._getNumberOfMonths();
-		if (numMonths[0] != 1 || numMonths[1] != 1)
-			inst._datepickerDiv.addClass('datepicker_multi');
-		else
-			inst._datepickerDiv.removeClass('datepicker_multi');
-
-		if (inst._get('isRTL'))
-			inst._datepickerDiv.addClass('datepicker_rtl');
-		else
-			inst._datepickerDiv.removeClass('datepicker_rtl');
-
-		if (inst._input && inst._input[0].type != 'hidden')
-			$(inst._input[0]).focus();
-	},
-
-	/* Tidy up after displaying the date picker. */
-	_afterShow: function(inst) {
-		var numMonths = inst._getNumberOfMonths(); // fix width for dynamic number of date pickers
-		inst._datepickerDiv.width(numMonths[1] * $('.datepicker', inst._datepickerDiv[0])[0].offsetWidth);
-		if ($.browser.msie && parseInt($.browser.version) < 7) { // fix IE < 7 select problems
-			$('iframe.datepicker_cover').css({width: inst._datepickerDiv.width() + 4,
-				height: inst._datepickerDiv.height() + 4});
-		}
-		// re-position on screen if necessary
-		var isFixed = inst._datepickerDiv.css('position') == 'fixed';
-		var pos = inst._input ? $.datepicker._findPos(inst._input[0]) : null;
-		var browserWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
-		var browserHeight = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
-		var scrollX = (isFixed ? 0 : document.documentElement.scrollLeft || document.body.scrollLeft);
-		var scrollY = (isFixed ? 0 : document.documentElement.scrollTop || document.body.scrollTop);
-		// reposition date picker horizontally if outside the browser window
-		if ((inst._datepickerDiv.offset().left + inst._datepickerDiv.width() -
-				(isFixed && $.browser.msie ? document.documentElement.scrollLeft : 0)) >
-				(browserWidth + scrollX)) {
-			inst._datepickerDiv.css('left', Math.max(scrollX,
-				pos[0] + (inst._input ? $(inst._input[0]).width() : null) - inst._datepickerDiv.width() -
-				(isFixed && $.browser.opera ? document.documentElement.scrollLeft : 0)) + 'px');
-		}
-		// reposition date picker vertically if outside the browser window
-		if ((inst._datepickerDiv.offset().top + inst._datepickerDiv.height() -
-				(isFixed && $.browser.msie ? document.documentElement.scrollTop : 0)) >
-				(browserHeight + scrollY) ) {
-			inst._datepickerDiv.css('top', Math.max(scrollY,
-				pos[1] - (this._inDialog ? 0 : inst._datepickerDiv.height()) -
-				(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)) {
-            obj = obj.nextSibling;
-        }
-        var position = $(obj).offset();
-	    return [position.left, position.top];
-	},
-
-	/* Hide the date picker from view.
-	   @param  input  element - the input field attached to the date picker
-	   @param  speed  string - the speed at which to close the date picker */
-	_hideDatepicker: function(input, speed) {
-		var inst = this._curInst;
-		if (!inst)
-			return;
-		var rangeSelect = inst._get('rangeSelect');
-		if (rangeSelect && this._stayOpen) {
-			this._selectDate(inst, inst._formatDate(
-				inst._currentDay, inst._currentMonth, inst._currentYear));
-		}
-		this._stayOpen = false;
-		if (this._datepickerShowing) {
-			speed = (speed != null ? speed : inst._get('speed'));
-			var showAnim = inst._get('showAnim');
-			inst._datepickerDiv[(showAnim == 'slideDown' ? 'slideUp' :
-				(showAnim == 'fadeIn' ? 'fadeOut' : 'hide'))](speed, function() {
-				$.datepicker._tidyDialog(inst);
-			});
-			if (speed == '')
-				this._tidyDialog(inst);
-			var onClose = inst._get('onClose');
-			if (onClose) {
-				onClose.apply((inst._input ? inst._input[0] : null),
-					[inst._getDate(), inst]);  // trigger custom callback
-			}
-			this._datepickerShowing = false;
-			this._lastInput = null;
-			inst._settings.prompt = null;
-			if (this._inDialog) {
-				this._dialogInput.css({ position: 'absolute', left: '0', top: '-100px' });
-				if ($.blockUI) {
-					$.unblockUI();
-					$('body').append(this._datepickerDiv);
-				}
-			}
-			this._inDialog = false;
-		}
-		this._curInst = null;
-	},
-
-	/* Tidy up after a dialog display. */
-	_tidyDialog: function(inst) {
-		inst._datepickerDiv.removeClass('datepicker_dialog').unbind('.datepicker');
-		$('.datepicker_prompt', inst._datepickerDiv).remove();
-	},
-
-	/* Close date picker if clicked elsewhere. */
-	_checkExternalClick: function(event) {
-		if (!$.datepicker._curInst)
-			return;
-		var $target = $(event.target);
-		if (($target.parents("#datepicker_div").length == 0) &&
-				($target.attr('class') != 'datepicker_trigger') &&
-				$.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI)) {
-			$.datepicker._hideDatepicker(null, '');
-		}
-	},
-
-	/* Adjust one of the date sub-fields. */
-	_adjustDate: function(id, offset, period) {
-		var inst = this._getInst(id);
-		inst._adjustDate(offset, period);
-		this._updateDatepicker(inst);
-	},
-
-	/* Action for current link. */
-	_gotoToday: function(id) {
-		var date = new Date();
-		var inst = this._getInst(id);
-		inst._selectedDay = date.getDate();
-		inst._drawMonth = inst._selectedMonth = date.getMonth();
-		inst._drawYear = inst._selectedYear = date.getFullYear();
-		this._adjustDate(inst);
-	},
-
-	/* Action for selecting a new month/year. */
-	_selectMonthYear: function(id, select, period) {
-		var inst = this._getInst(id);
-		inst._selectingMonthYear = false;
-		inst[period == 'M' ? '_drawMonth' : '_drawYear'] =
-			select.options[select.selectedIndex].value - 0;
-		this._adjustDate(inst);
-	},
-
-	/* Restore input focus after not changing month/year. */
-	_clickMonthYear: function(id) {
-		var inst = this._getInst(id);
-		if (inst._input && inst._selectingMonthYear && !$.browser.msie)
-			inst._input[0].focus();
-		inst._selectingMonthYear = !inst._selectingMonthYear;
-	},
-
-	/* Action for changing the first week day. */
-	_changeFirstDay: function(id, day) {
-		var inst = this._getInst(id);
-		inst._settings.firstDay = day;
-		this._updateDatepicker(inst);
-	},
-
-	/* Action for selecting a day. */
-	_selectDay: function(id, month, year, td) {
-		if ($(td).is('.datepicker_unselectable'))
-			return;
-		var inst = this._getInst(id);
-		var rangeSelect = inst._get('rangeSelect');
-		if (rangeSelect) {
-			if (!this._stayOpen) {
-				$('.datepicker td').removeClass('datepicker_currentDay');
-				$(td).addClass('datepicker_currentDay');
-			} 
-			this._stayOpen = !this._stayOpen;
-		}
-		inst._selectedDay = inst._currentDay = $('a', td).html();
-		inst._selectedMonth = inst._currentMonth = month;
-		inst._selectedYear = inst._currentYear = year;
-		this._selectDate(id, inst._formatDate(
-			inst._currentDay, inst._currentMonth, inst._currentYear));
-		if (this._stayOpen) {
-			inst._endDay = inst._endMonth = inst._endYear = null;
-			inst._rangeStart = new Date(inst._currentYear, inst._currentMonth, inst._currentDay);
-			this._updateDatepicker(inst);
-		}
-		else if (rangeSelect) {
-			inst._endDay = inst._currentDay;
-			inst._endMonth = inst._currentMonth;
-			inst._endYear = inst._currentYear;
-			inst._selectedDay = inst._currentDay = inst._rangeStart.getDate();
-			inst._selectedMonth = inst._currentMonth = inst._rangeStart.getMonth();
-			inst._selectedYear = inst._currentYear = inst._rangeStart.getFullYear();
-			inst._rangeStart = null;
-			if (inst._inline)
-				this._updateDatepicker(inst);
-		}
-	},
-
-	/* Erase the input field and hide the date picker. */
-	_clearDate: function(id) {
-		var inst = this._getInst(id);
-		if (inst._get('mandatory'))
-			return;
-		this._stayOpen = false;
-		inst._endDay = inst._endMonth = inst._endYear = inst._rangeStart = null;
-		this._selectDate(inst, '');
-	},
-
-	/* Update the input field with the selected date. */
-	_selectDate: function(id, dateStr) {
-		var inst = this._getInst(id);
-		dateStr = (dateStr != null ? dateStr : inst._formatDate());
-		if (inst._rangeStart)
-			dateStr = inst._formatDate(inst._rangeStart) + inst._get('rangeSeparator') + dateStr;
-		if (inst._input)
-			inst._input.val(dateStr);
-		var onSelect = inst._get('onSelect');
-		if (onSelect)
-			onSelect.apply((inst._input ? inst._input[0] : null), [dateStr, inst]);  // trigger custom callback
-		else if (inst._input)
-			inst._input.trigger('change'); // fire the change event
-		if (inst._inline)
-			this._updateDatepicker(inst);
-		else if (!this._stayOpen) {
-			this._hideDatepicker(null, inst._get('speed'));
-			this._lastInput = inst._input[0];
-			if (typeof(inst._input[0]) != 'object')
-				inst._input[0].focus(); // restore focus
-			this._lastInput = null;
-		}
-	},
-
-	/* Set as beforeShowDay function to prevent selection of weekends.
-	   @param  date  Date - the date to customise
-	   @return [boolean, string] - is this date selectable?, what is its CSS class? */
-	noWeekends: function(date) {
-		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 */
-	iso8601Week: function(date) {
-		var checkDate = new Date(date.getFullYear(), date.getMonth(), date.getDate(), (date.getTimezoneOffset() / -60));
-		var firstMon = new Date(checkDate.getFullYear(), 1 - 1, 4); // First week always contains 4 Jan
-		var firstDay = firstMon.getDay() || 7; // Day of week: Mon = 1, ..., Sun = 7
-		firstMon.setDate(firstMon.getDate() + 1 - firstDay); // Preceding Monday
-		if (firstDay < 4 && checkDate < firstMon) { // Adjust first three days in year if necessary
-			checkDate.setDate(checkDate.getDate() - 3); // Generate for previous year
-			return $.datepicker.iso8601Week(checkDate);
-		} else if (checkDate > new Date(checkDate.getFullYear(), 12 - 1, 28)) { // Check last three days in year
-			firstDay = new Date(checkDate.getFullYear() + 1, 1 - 1, 4).getDay() || 7;
-			if (firstDay > 4 && (checkDate.getDay() || 7) < firstDay - 3) { // Adjust if necessary
-				checkDate.setDate(checkDate.getDate() + 3); // Generate for next year
-				return $.datepicker.iso8601Week(checkDate);
-			}
-		}
-		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
-	   @return  the status display text for this date */
-	dateStatus: function(date, inst) {
-		return $.datepicker.formatDate(inst._get('dateStatus'), date, inst._getFormatConfig());
-	},
-
-	/* Parse a string value into a date object.
-	   The format can be combinations of the following:
-	   d  - day of month (no leading zero)
-	   dd - day of month (two digit)
-	   D  - day name short
-	   DD - day name long
-	   m  - month of year (no leading zero)
-	   mm - month of year (two digit)
-	   M  - month name short
-	   MM - month name long
-	   y  - year (two digit)
-	   yy - year (four digit)
-	   '...' - literal text
-	   '' - single quote
-
-	   @param  format           String - the expected format of the date
-	   @param  value            String - the date in the above format
-	   @param  settings  Object - attributes include:
-	                     shortYearCutoff  Number - the cutoff year for determining the century (optional)
-	                     dayNamesShort    String[7] - abbreviated names of the days from Sunday (optional)
-	                     dayNames         String[7] - names of the days from Sunday (optional)
-	                     monthNamesShort  String[12] - abbreviated names of the months (optional)
-	                     monthNames       String[12] - names of the months (optional)
-	   @return  Date - the extracted date value or null if value is blank */
-	parseDate: function (format, value, settings) {
-		if (format == null || value == null)
-			throw 'Invalid arguments';
-		value = (typeof value == 'object' ? value.toString() : value + '');
-		if (value == '')
-			return null;
-		var shortYearCutoff = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff;
-		var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort;
-		var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames;
-		var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort;
-		var monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames;
-		var year = -1;
-		var month = -1;
-		var day = -1;
-		var literal = false;
-		// Check whether a format character is doubled
-		var lookAhead = function(match) {
-			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
-			if (matches)
-				iFormat++;
-			return matches;	
-		};
-		// Extract a number from the string value
-		var getNumber = function(match) {
-			lookAhead(match);
-			var size = (match == 'y' ? 4 : 2);
-			var num = 0;
-			while (size > 0 && iValue < value.length &&
-					value.charAt(iValue) >= '0' && value.charAt(iValue) <= '9') {
-				num = num * 10 + (value.charAt(iValue++) - 0);
-				size--;
-			}
-			if (size == (match == 'y' ? 4 : 2))
-				throw 'Missing number at position ' + iValue;
-			return num;
-		};
-		// Extract a name from the string value and convert to an index
-		var getName = function(match, shortNames, longNames) {
-			var names = (lookAhead(match) ? longNames : shortNames);
-			var size = 0;
-			for (var j = 0; j < names.length; j++)
-				size = Math.max(size, names[j].length);
-			var name = '';
-			var iInit = iValue;
-			while (size > 0 && iValue < value.length) {
-				name += value.charAt(iValue++);
-				for (var i = 0; i < names.length; i++)
-					if (name == names[i])
-						return i + 1;
-				size--;
-			}
-			throw 'Unknown name at position ' + iInit;
-		};
-		// Confirm that a literal character matches the string value
-		var checkLiteral = function() {
-			if (value.charAt(iValue) != format.charAt(iFormat))
-				throw 'Unexpected literal at position ' + iValue;
-			iValue++;
-		};
-		var iValue = 0;
-		for (var iFormat = 0; iFormat < format.length; iFormat++) {
-			if (literal)
-				if (format.charAt(iFormat) == "'" && !lookAhead("'"))
-					literal = false;
-				else
-					checkLiteral();
-			else
-				switch (format.charAt(iFormat)) {
-					case 'd':
-						day = getNumber('d');
-						break;
-					case 'D': 
-						getName('D', dayNamesShort, dayNames);
-						break;
-					case 'm': 
-						month = getNumber('m');
-						break;
-					case 'M':
-						month = getName('M', monthNamesShort, monthNames); 
-						break;
-					case 'y':
-						year = getNumber('y');
-						break;
-					case "'":
-						if (lookAhead("'"))
-							checkLiteral();
-						else
-							literal = true;
-						break;
-					default:
-						checkLiteral();
-				}
-		}
-		if (year < 100) {
-			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
-				(year <= shortYearCutoff ? 0 : -100);
-		}
-		var date = new Date(year, month - 1, day);
-		if (date.getFullYear() != year || date.getMonth() + 1 != month || date.getDate() != day) {
-			throw 'Invalid date'; // E.g. 31/02/*
-		}
-		return date;
-	},
-
-	/* Format a date object into a string value.
-	   The format can be combinations of the following:
-	   d  - day of month (no leading zero)
-	   dd - day of month (two digit)
-	   D  - day name short
-	   DD - day name long
-	   m  - month of year (no leading zero)
-	   mm - month of year (two digit)
-	   M  - month name short
-	   MM - month name long
-	   y  - year (two digit)
-	   yy - year (four digit)
-	   '...' - literal text
-	   '' - single quote
-
-	   @param  format    String - the desired format of the date
-	   @param  date      Date - the date value to format
-	   @param  settings  Object - attributes include:
-	                     dayNamesShort    String[7] - abbreviated names of the days from Sunday (optional)
-	                     dayNames         String[7] - names of the days from Sunday (optional)
-	                     monthNamesShort  String[12] - abbreviated names of the months (optional)
-	                     monthNames       String[12] - names of the months (optional)
-	   @return  String - the date in the above format */
-	formatDate: function (format, date, settings) {
-		if (!date)
-			return '';
-		var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort;
-		var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames;
-		var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort;
-		var monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames;
-		// Check whether a format character is doubled
-		var lookAhead = function(match) {
-			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
-			if (matches)
-				iFormat++;
-			return matches;	
-		};
-		// Format a number, with leading zero if necessary
-		var formatNumber = function(match, value) {
-			return (lookAhead(match) && value < 10 ? '0' : '') + value;
-		};
-		// Format a name, short or long as requested
-		var formatName = function(match, value, shortNames, longNames) {
-			return (lookAhead(match) ? longNames[value] : shortNames[value]);
-		};
-		var output = '';
-		var literal = false;
-		if (date) {
-			for (var iFormat = 0; iFormat < format.length; iFormat++) {
-				if (literal)
-					if (format.charAt(iFormat) == "'" && !lookAhead("'"))
-						literal = false;
-					else
-						output += format.charAt(iFormat);
-				else
-					switch (format.charAt(iFormat)) {
-						case 'd':
-							output += formatNumber('d', date.getDate()); 
-							break;
-						case 'D': 
-							output += formatName('D', date.getDay(), dayNamesShort, dayNames);
-							break;
-						case 'm': 
-							output += formatNumber('m', date.getMonth() + 1); 
-							break;
-						case 'M':
-							output += formatName('M', date.getMonth(), monthNamesShort, monthNames); 
-							break;
-						case 'y':
-							output += (lookAhead('y') ? date.getFullYear() : 
-								(date.getYear() % 100 < 10 ? '0' : '') + date.getYear() % 100);
-							break;
-						case "'":
-							if (lookAhead("'"))
-								output += "'";
-							else
-								literal = true;
-							break;
-						default:
-							output += format.charAt(iFormat);
-					}
-			}
-		}
-		return output;
-	},
-
-	/* Extract all possible characters from the date format. */
-	_possibleChars: function (format) {
-		var chars = '';
-		var literal = false;
-		for (var iFormat = 0; iFormat < format.length; iFormat++)
-			if (literal)
-				if (format.charAt(iFormat) == "'" && !lookAhead("'"))
-					literal = false;
-				else
-					chars += format.charAt(iFormat);
-			else
-				switch (format.charAt(iFormat)) {
-					case 'd' || 'm' || 'y':
-						chars += '0123456789'; 
-						break;
-					case 'D' || 'M':
-						return null; // Accept anything
-					case "'":
-						if (lookAhead("'"))
-							chars += "'";
-						else
-							literal = true;
-						break;
-					default:
-						chars += format.charAt(iFormat);
-				}
-		return chars;
-	}
-});
-
-/* Individualised settings for date picker functionality applied to one or more related inputs.
-   Instances are managed and manipulated through the Datepicker manager. */
-function DatepickerInstance(settings, inline) {
-	this._id = $.datepicker._register(this);
-	this._selectedDay = 0; // Current date for selection
-	this._selectedMonth = 0; // 0-11
-	this._selectedYear = 0; // 4-digit year
-	this._drawMonth = 0; // Current month at start of datepicker
-	this._drawYear = 0;
-	this._input = null; // The attached input field
-	this._inline = inline; // True if showing inline, false if used in a popup
-	this._datepickerDiv = (!inline ? $.datepicker._datepickerDiv :
-		$('<div id="datepicker_div_' + this._id + '" class="datepicker_inline">'));
-	// customise the date picker object - uses manager defaults if not overridden
-	this._settings = extendRemove(settings || {}); // clone
-	if (inline)
-		this._setDate(this._getDefaultDate());
-}
-
-$.extend(DatepickerInstance.prototype, {
-	/* Get a setting value, defaulting if necessary. */
-	_get: function(name) {
-		return this._settings[name] !== undefined ? this._settings[name] : $.datepicker._defaults[name];
-	},
-
-	/* Parse existing date and initialise date picker. */
-	_setDateFromField: function(input) {
-		this._input = $(input);
-		var dateFormat = this._get('dateFormat');
-		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) {
-			var settings = this._getFormatConfig();
-			if (dates.length > 1) {
-				date = $.datepicker.parseDate(dateFormat, dates[1], settings) || defaultDate;
-				this._endDay = date.getDate();
-				this._endMonth = date.getMonth();
-				this._endYear = date.getFullYear();
-			}
-			try {
-				date = $.datepicker.parseDate(dateFormat, dates[0], settings) || defaultDate;
-			} catch (e) {
-				$.datepicker.log(e);
-				date = defaultDate;
-			}
-		}
-		this._selectedDay = date.getDate();
-		this._drawMonth = this._selectedMonth = date.getMonth();
-		this._drawYear = this._selectedYear = date.getFullYear();
-		this._currentDay = (dates[0] ? date.getDate() : 0);
-		this._currentMonth = (dates[0] ? date.getMonth() : 0);
-		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());
-		var minDate = this._getMinMaxDate('min', true);
-		var maxDate = this._getMinMaxDate('max');
-		date = (minDate && date < minDate ? minDate : date);
-		date = (maxDate && date > maxDate ? maxDate : date);
-		return date;
-	},
-
-	/* A date may be specified as an exact value or a relative one. */
-	_determineDate: function(name, defaultDate) {
-		var offsetNumeric = function(offset) {
-			var date = new Date();
-			date.setDate(date.getDate() + offset);
-			return date;
-		};
-		var offsetString = function(offset, getDaysInMonth) {
-			var date = new Date();
-			var matches = /^([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?$/.exec(offset);
-			if (matches) {
-				var year = date.getFullYear();
-				var month = date.getMonth();
-				var day = date.getDate();
-				switch (matches[2] || 'd') {
-					case 'd' : case 'D' :
-						day += (matches[1] - 0); break;
-					case 'w' : case 'W' :
-						day += (matches[1] * 7); break;
-					case 'm' : case 'M' :
-						month += (matches[1] - 0); 
-						day = Math.min(day, getDaysInMonth(year, month));
-						break;
-					case 'y': case 'Y' :
-						year += (matches[1] - 0);
-						day = Math.min(day, getDaysInMonth(year, month));
-						break;
-				}
-				date = new Date(year, month, day);
-			}
-			return date;
-		};
-		var date = this._get(name);
-		return (date == null ? defaultDate :
-			(typeof date == 'string' ? offsetString(date, this._getDaysInMonth) :
-			(typeof date == 'number' ? offsetNumeric(date) : date)));
-	},
-
-	/* Set the date(s) directly. */
-	_setDate: function(date, endDate) {
-		this._selectedDay = this._currentDay = date.getDate();
-		this._drawMonth = this._selectedMonth = this._currentMonth = date.getMonth();
-		this._drawYear = this._selectedYear = this._currentYear = date.getFullYear();
-		if (this._get('rangeSelect')) {
-			if (endDate) {
-				this._endDay = endDate.getDate();
-				this._endMonth = endDate.getMonth();
-				this._endYear = endDate.getFullYear();
-			} else {
-				this._endDay = this._currentDay;
-				this._endMonth = this._currentMonth;
-				this._endYear = this._currentYear;
-			}
-		}
-		this._adjustDate();
-	},
-
-	/* Retrieve the date(s) directly. */
-	_getDate: function() {
-		var startDate = (!this._currentYear || (this._input && this._input.val() == '') ? null :
-			new Date(this._currentYear, this._currentMonth, this._currentDay));
-		if (this._get('rangeSelect')) {
-			return [startDate, (!this._endYear ? null :
-				new Date(this._endYear, this._endMonth, this._endDay))];
-		} else
-			return startDate;
-	},
-
-	/* Generate the HTML for the current state of the date picker. */
-	_generateDatepicker: function() {
-		var today = new Date();
-		today = new Date(today.getFullYear(), today.getMonth(), today.getDate()); // clear time
-		var showStatus = this._get('showStatus');
-		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 + ');"' + 
-			(showStatus ? this._addStatus(this._get('clearStatus') || '&#xa0;') : '') + '>' +
-			this._get('clearText') + '</a></div>');
-		var controls = '<div class="datepicker_control">' + (isRTL ? '' : clear) +
-			'<div class="datepicker_close"><a onclick="jQuery.datepicker._hideDatepicker();"' +
-			(showStatus ? this._addStatus(this._get('closeStatus') || '&#xa0;') : '') + '>' +
-			this._get('closeText') + '</a></div>' + (isRTL ? clear : '')  + '</div>';
-		var prompt = this._get('prompt');
-		var closeAtTop = this._get('closeAtTop');
-		var hideIfNoPrevNext = this._get('hideIfNoPrevNext');
-		var numMonths = this._getNumberOfMonths();
-		var stepMonths = this._get('stepMonths');
-		var isMultiMonth = (numMonths[0] != 1 || numMonths[1] != 1);
-		var minDate = this._getMinMaxDate('min', true);
-		var maxDate = this._getMinMaxDate('max');
-		var drawMonth = this._drawMonth;
-		var drawYear = this._drawYear;
-		if (maxDate) {
-			var maxDraw = new Date(maxDate.getFullYear(),
-				maxDate.getMonth() - numMonths[1] + 1, maxDate.getDate());
-			maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw);
-			while (new Date(drawYear, drawMonth, 1) > maxDraw) {
-				drawMonth--;
-				if (drawMonth < 0) {
-					drawMonth = 11;
-					drawYear--;
-				}
-			}
-		}
-		// controls and links
-		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>' :
-			(hideIfNoPrevNext ? '' : '<label>' + this._get('prevText') + '</label>')) + '</div>';
-		var next = '<div class="datepicker_next">' + (this._canAdjustMonth(+1, drawYear, drawMonth) ?
-			'<a onclick="jQuery.datepicker._adjustDate(' + this._id + ', +' + stepMonths + ', \'M\');"' +
-			(showStatus ? this._addStatus(this._get('nextStatus') || '&#xa0;') : '') + '>' +
-			this._get('nextText') + '</a>' :
-			(hideIfNoPrevNext ? '>' : '<label>' + this._get('nextText') + '</label>')) + '</div>';
-		var html = (prompt ? '<div class="datepicker_prompt">' + prompt + '</div>' : '') +
-			(closeAtTop && !this._inline ? controls : '') +
-			'<div class="datepicker_links">' + (isRTL ? next : prev) +
-			(this._isInRange(today) ? '<div class="datepicker_current">' +
-			'<a onclick="jQuery.datepicker._gotoToday(' + this._id + ');"' +
-			(showStatus ? this._addStatus(this._get('currentStatus') || '&#xa0;') : '') + '>' +
-			this._get('currentText') + '</a></div>' : '') + (isRTL ? prev : next) + '</div>';
-		var showWeeks = this._get('showWeeks');
-		for (var row = 0; row < numMonths[0]; row++)
-			for (var col = 0; col < numMonths[1]; col++) {
-				var selectedDate = new Date(drawYear, drawMonth, this._selectedDay);
-				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>' + 
-					'<tr class="datepicker_titleRow">' +
-					(showWeeks ? '<td>' + this._get('weekHeader') + '</td>' : '');
-				var firstDay = this._get('firstDay');
-				var changeFirstDay = this._get('changeFirstDay');
-				var dayNames = this._get('dayNames');
-				var dayNamesShort = this._get('dayNamesShort');
-				var dayNamesMin = this._get('dayNamesMin');
-				for (var dow = 0; dow < 7; dow++) { // days of the week
-					var day = (dow + firstDay) % 7;
-					var status = this._get('dayStatus') || '&#xa0;';
-					status = (status.indexOf('DD') > -1 ? status.replace(/DD/, dayNames[day]) :
-						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 + ');"') + 
-						(showStatus ? this._addStatus(status) : '') + ' title="' + dayNames[day] + '">' +
-						dayNamesMin[day] + (changeFirstDay ? '</a>' : '</span>') + '</td>';
-				}
-				html += '</tr></thead><tbody>';
-				var daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
-				if (drawYear == this._selectedYear && drawMonth == this._selectedMonth) {
-					this._selectedDay = Math.min(this._selectedDay, daysInMonth);
-				}
-				var leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
-				var currentDate = (!this._currentDay ? new Date(9999, 9, 9) :
-					new Date(this._currentYear, this._currentMonth, this._currentDay));
-				var endDate = this._endDay ? new Date(this._endYear, this._endMonth, this._endDay) : currentDate;
-				var printDate = new Date(drawYear, drawMonth, 1 - leadDays);
-				var numRows = (isMultiMonth ? 6 : Math.ceil((leadDays + daysInMonth) / 7)); // calculate the number of rows to generate
-				var beforeShowDay = this._get('beforeShowDay');
-				var showOtherMonths = this._get('showOtherMonths');
-				var calculateWeek = this._get('calculateWeek') || $.datepicker.iso8601Week;
-				var dateStatus = this._get('statusForDate') || $.datepicker.dateStatus;
-				for (var dRow = 0; dRow < numRows; dRow++) { // create date picker rows
-					html += '<tr class="datepicker_daysRow">' +
-						(showWeeks ? '<td class="datepicker_weekCol">' + calculateWeek(printDate) + '</td>' : '');
-					for (var dow = 0; dow < 7; dow++) { // create date picker days
-						var daySettings = (beforeShowDay ?
-							beforeShowDay.apply((this._input ? this._input[0] : null), [printDate]) : [true, '']);
-						var otherMonth = (printDate.getMonth() != drawMonth);
-						var unselectable = otherMonth || !daySettings[0] ||
-							(minDate && printDate < minDate) || (maxDate && printDate > maxDate);
-						html += '<td class="datepicker_daysCell' +
-							((dow + firstDay + 6) % 7 >= 5 ? ' datepicker_weekEndCell' : '') + // highlight weekends
-							(otherMonth ? ' datepicker_otherMonth' : '') + // highlight days from other months
-							(printDate.getTime() == selectedDate.getTime() && drawMonth == this._selectedMonth ?
-							' datepicker_daysCellOver' : '') + // highlight selected day
-							(unselectable ? ' datepicker_unselectable' : '') +  // highlight unselectable days
-							(otherMonth && !showOtherMonths ? '' : ' ' + daySettings[1] + // highlight custom dates
-							(printDate.getTime() >= currentDate.getTime() && printDate.getTime() <= endDate.getTime() ?  // in current range
-							' datepicker_currentDay' : '') + // highlight selected day
-							(printDate.getTime() == today.getTime() ? ' datepicker_today' : '')) + '"' + // highlight today (if different)
-							(unselectable ? '' : ' onmouseover="jQuery(this).addClass(\'datepicker_daysCellOver\');' +
-							(!showStatus || (otherMonth && !showOtherMonths) ? '' : 'jQuery(\'#datepicker_status_' +
-							this._id + '\').html(\'' + (dateStatus.apply((this._input ? this._input[0] : null),
-							[printDate, this]) || '&#xa0;') +'\');') + '"' +
-							' onmouseout="jQuery(this).removeClass(\'datepicker_daysCellOver\');' +
-							(!showStatus || (otherMonth && !showOtherMonths) ? '' : 'jQuery(\'#datepicker_status_' +
-							this._id + '\').html(\'&#xa0;\');') + '" onclick="jQuery.datepicker._selectDay(' +
-							this._id + ',' + drawMonth + ',' + drawYear + ', this);"') + '>' + // actions
-							(otherMonth ? (showOtherMonths ? printDate.getDate() : '&#xa0;') : // display for other months
-							(unselectable ? printDate.getDate() : '<a>' + printDate.getDate() + '</a>')) + '</td>'; // display for this month
-						printDate.setDate(printDate.getDate() + 1);
-					}
-					html += '</tr>';
-				}
-				drawMonth++;
-				if (drawMonth > 11) {
-					drawMonth = 0;
-					drawYear++;
-				}
-				html += '</tbody></table></div>';
-			}
-		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 ? 
-			'<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);
-		var showStatus = this._get('showStatus');
-		var html = '<div class="datepicker_header">';
-		// month selection
-		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);
-			html += '<select class="datepicker_newMonth" ' +
-				'onchange="jQuery.datepicker._selectMonthYear(' + this._id + ', this, \'M\');" ' +
-				'onclick="jQuery.datepicker._clickMonthYear(' + this._id + ');"' +
-				(showStatus ? this._addStatus(this._get('monthStatus') || '&#xa0;') : '') + '>';
-			for (var month = 0; month < 12; month++) {
-				if ((!inMinYear || month >= minDate.getMonth()) &&
-						(!inMaxYear || month <= maxDate.getMonth())) {
-					html += '<option value="' + month + '"' +
-						(month == drawMonth ? ' selected="selected"' : '') +
-						'>' + monthNames[month] + '</option>';
-				}
-			}
-			html += '</select>';
-		}
-		// year selection
-		if (secondary || !this._get('changeYear'))
-			html += drawYear;
-		else {
-			// determine range of years to display
-			var years = this._get('yearRange').split(':');
-			var year = 0;
-			var endYear = 0;
-			if (years.length != 2) {
-				year = drawYear - 10;
-				endYear = drawYear + 10;
-			} else if (years[0].charAt(0) == '+' || years[0].charAt(0) == '-') {
-				year = drawYear + parseInt(years[0], 10);
-				endYear = drawYear + parseInt(years[1], 10);
-			} else {
-				year = parseInt(years[0], 10);
-				endYear = parseInt(years[1], 10);
-			}
-			year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
-			endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
-			html += '<select class="datepicker_newYear" ' +
-				'onchange="jQuery.datepicker._selectMonthYear(' + this._id + ', this, \'Y\');" ' +
-				'onclick="jQuery.datepicker._clickMonthYear(' + this._id + ');"' +
-				(showStatus ? this._addStatus(this._get('yearStatus') || '&#xa0;') : '') + '>';
-			for (; year <= endYear; year++) {
-				html += '<option value="' + year + '"' +
-					(year == drawYear ? ' selected="selected"' : '') +
-					'>' + year + '</option>';
-			}
-			html += '</select>';
-		}
-		html += '</div>'; // Close datepicker_header
-		return html;
-	},
-
-	/* Provide code to set and clear the status panel. */
-	_addStatus: function(text) {
-		return ' onmouseover="jQuery(\'#datepicker_status_' + this._id + '\').html(\'' + text + '\');" ' +
-			'onmouseout="jQuery(\'#datepicker_status_' + this._id + '\').html(\'&#xa0;\');"';
-	},
-
-	/* Adjust one of the date sub-fields. */
-	_adjustDate: function(offset, period) {
-		var year = this._drawYear + (period == 'Y' ? offset : 0);
-		var month = this._drawMonth + (period == 'M' ? offset : 0);
-		var day = Math.min(this._selectedDay, this._getDaysInMonth(year, month)) +
-			(period == 'D' ? offset : 0);
-		var date = new Date(year, month, day);
-		// ensure it is within the bounds set
-		var minDate = this._getMinMaxDate('min', true);
-		var maxDate = this._getMinMaxDate('max');
-		date = (minDate && date < minDate ? minDate : date);
-		date = (maxDate && date > maxDate ? maxDate : date);
-		this._selectedDay = date.getDate();
-		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');
-		return (numMonths == null ? [1, 1] : (typeof numMonths == 'number' ? [1, numMonths] : numMonths));
-	},
-
-	/* Determine the current maximum date - ensure no time components are set - may be overridden for a range. */
-	_getMinMaxDate: function(minMax, checkRange) {
-		var date = this._determineDate(minMax + 'Date', null);
-		if (date) {
-			date.setHours(0);
-			date.setMinutes(0);
-			date.setSeconds(0);
-			date.setMilliseconds(0);
-		}
-		return date || (checkRange ? this._rangeStart : null);
-	},
-
-	/* Find the number of days in a given month. */
-	_getDaysInMonth: function(year, month) {
-		return 32 - new Date(year, month, 32).getDate();
-	},
-
-	/* Find the day of the week of the first of a month. */
-	_getFirstDayOfMonth: function(year, month) {
-		return new Date(year, month, 1).getDay();
-	},
-
-	/* Determines if we should allow a "next/prev" month display change. */
-	_canAdjustMonth: function(offset, curYear, curMonth) {
-		var numMonths = this._getNumberOfMonths();
-		var date = new Date(curYear, curMonth + (offset < 0 ? offset : numMonths[1]), 1);
-		if (offset < 0)
-			date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
-		return this._isInRange(date);
-	},
-
-	/* Is the given date in the accepted range? */
-	_isInRange: function(date) {
-		// during range selection, use minimum of selected date and range start
-		var newMinDate = (!this._rangeStart ? null :
-			new Date(this._selectedYear, this._selectedMonth, this._selectedDay));
-		newMinDate = (newMinDate && this._rangeStart < newMinDate ? this._rangeStart : newMinDate);
-		var minDate = newMinDate || this._getMinMaxDate('min');
-		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');
-		shortYearCutoff = (typeof shortYearCutoff != 'string' ? shortYearCutoff :
-			new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
-		return {shortYearCutoff: shortYearCutoff,
-			dayNamesShort: this._get('dayNamesShort'), dayNames: this._get('dayNames'),
-			monthNamesShort: this._get('monthNamesShort'), monthNames: this._get('monthNames')};
-	},
-
-	/* Format the given date for display. */
-	_formatDate: function(day, month, year) {
-		if (!day) {
-			this._currentDay = this._selectedDay;
-			this._currentMonth = this._selectedMonth;
-			this._currentYear = this._selectedYear;
-		}
-		var date = (day ? (typeof day == 'object' ? day : new Date(year, month, day)) :
-			new Date(this._currentYear, this._currentMonth, this._currentDay));
-		return $.datepicker.formatDate(this._get('dateFormat'), date, this._getFormatConfig());
-	}
-});
-
-/* jQuery extend now ignores nulls! */
-function extendRemove(target, props) {
-	$.extend(target, props);
-	for (var name in props)
-		if (props[name] == null)
-			target[name] = null;
-	return target;
-};
-
-/* Invoke the datepicker functionality.
-   @param  options  String - a command, optionally followed by additional parameters or
-                    Object - settings for attaching new datepicker functionality
-   @return  jQuery object */
-$.fn.datepicker = function(options){
-	var otherArgs = Array.prototype.slice.call(arguments, 1);
-	if (typeof options == 'string' && (options == 'isDisabled' || options == 'getDate')) {
-		return $.datepicker['_' + options + 'Datepicker'].apply($.datepicker, [this[0]].concat(otherArgs));
-	}
-	return this.each(function() {
-		typeof options == 'string' ?
-			$.datepicker['_' + options + 'Datepicker'].apply($.datepicker, [this].concat(otherArgs)) :
-			$.datepicker._attachDatepicker(this, options);
-	});
-};
-
-$.datepicker = new Datepicker(); // singleton instance
-	
-/* Initialise the date picker. */
-$(document).ready(function() {
-	$(document.body).append($.datepicker._datepickerDiv)
-		.mousedown($.datepicker._checkExternalClick);
-});
-
+/* jQuery UI Date Picker v3.4.3 (previously jQuery Calendar)
+   Written by Marc Grabanski (m@marcgrabanski.com) and Keith Wood (kbwood@virginbroadband.com.au).
+
+   Copyright (c) 2007 Marc Grabanski (http://marcgrabanski.com/code/ui-datepicker)
+   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.
+   Use the singleton instance of this class, $.datepicker, to interact with the date picker.
+   Settings for (groups of) date pickers are maintained in an instance object
+   (DatepickerInstance), allowing multiple different settings on the same page. */
+
+function Datepicker() {
+	this.debug = false; // Change this to true to start debugging
+	this._nextId = 0; // Next ID for a date picker instance
+	this._inst = []; // List of instances indexed by ID
+	this._curInst = null; // The current instance in use
+	this._disabledInputs = []; // List of date picker inputs that have been disabled
+	this._datepickerShowing = false; // True if the popup picker is showing , false if not
+	this._inDialog = false; // True if showing within a "dialog", false if not
+	this.regional = []; // Available regional settings, indexed by language code
+	this.regional[''] = { // Default regional settings
+		clearText: 'Clear', // Display text for clear link
+		clearStatus: 'Erase the current date', // Status text for clear link
+		closeText: 'Close', // Display text for close link
+		closeStatus: 'Close without change', // Status text for close link
+		prevText: '&#x3c;Prev', // Display text for previous month link
+		prevStatus: 'Show the previous month', // Status text for previous month link
+		nextText: 'Next&#x3e;', // Display text for next month link
+		nextStatus: 'Show the next month', // Status text for next month link
+		currentText: 'Today', // Display text for current month link
+		currentStatus: 'Show the current month', // Status text for current month link
+		monthNames: ['January','February','March','April','May','June',
+			'July','August','September','October','November','December'], // Names of months for drop-down and formatting
+		monthNamesShort: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'], // For formatting
+		monthStatus: 'Show a different month', // Status text for selecting a month
+		yearStatus: 'Show a different year', // Status text for selecting a year
+		weekHeader: 'Wk', // Header for the week of the year column
+		weekStatus: 'Week of the year', // Status text for the week of the year column
+		dayNames: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'], // For formatting
+		dayNamesShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'], // For formatting
+		dayNamesMin: ['Su','Mo','Tu','We','Th','Fr','Sa'], // Column headings for days starting at Sunday
+		dayStatus: 'Set DD as first week day', // Status text for the day of the week selection
+		dateStatus: 'Select DD, M d', // Status text for the date selection
+		dateFormat: 'mm/dd/yy', // See format options on parseDate
+		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
+		initStatus: 'Select a date', // Initial Status text on opening
+		isRTL: false // True if right-to-left language, false if left-to-right
+	};
+	this._defaults = { // Global defaults for all the date picker instances
+		showOn: 'focus', // 'focus' for popup on focus,
+			// 'button' for trigger button, or 'both' for either
+		showAnim: 'show', // Name of jQuery animation for popup
+		defaultDate: null, // Used when field is blank: actual date,
+			// +/-number for offset from today, null for today
+		appendText: '', // Display text following the input box, e.g. showing the format
+		buttonText: '...', // Text for trigger button
+		buttonImage: '', // URL for trigger button image
+		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
+		closeAtTop: true, // True to have the clear/close at the top,
+			// false to have them at the bottom
+		mandatory: false, // True to hide the Clear link, false to include it
+		hideIfNoPrevNext: false, // True to hide next/previous month links
+			// if not applicable, false to just disable them
+		changeMonth: true, // True if month can be selected directly, false if only prev/next
+		changeYear: true, // True if year can be selected directly, false if only prev/next
+		yearRange: '-10:+10', // Range of years to display in drop-down,
+			// either relative to current year (-nn:+nn) or absolute (nnnn:nnnn)
+		changeFirstDay: true, // True to click on day name to change, false to remain as set
+		showOtherMonths: false, // True to show dates in other months, false to leave blank
+		showWeeks: false, // True to show week of the year, false to omit
+		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, 
+			// 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 -
+			// takes date and instance as parameters, returns display text
+		minDate: null, // The earliest selectable date, or null for no limit
+		maxDate: null, // The latest selectable date, or null for no limit
+		speed: 'normal', // Speed of display/closure
+		beforeShowDay: null, // Function that takes a date and returns an array with
+			// [0] = true if selectable, false if not,
+			// [1] = custom CSS class name(s) or '', e.g. $.datepicker.noWeekends
+		beforeShow: null, // Function that takes an input field and
+			// returns a set of custom settings for the date picker
+		onSelect: null, // Define a callback function when a date is selected
+		onClose: null, // Define a callback function when the datepicker is closed
+		numberOfMonths: 1, // Number of months to show at a time
+		stepMonths: 1, // Number of months to step back/forward
+		rangeSelect: false, // Allows for selecting a date range on one date picker
+		rangeSeparator: ' - ' // Text between two dates in a range
+	};
+	$.extend(this._defaults, this.regional['']);
+	this._datepickerDiv = $('<div id="datepicker_div"></div>');
+}
+
+$.extend(Datepicker.prototype, {
+	/* Class name added to elements to indicate already configured with a date picker. */
+	markerClassName: 'hasDatepicker',
+
+	/* Debug logging (if enabled). */
+	log: function () {
+		if (this.debug)
+			console.log.apply('', arguments);
+	},
+	
+	/* Register a new date picker instance - with custom settings. */
+	_register: function(inst) {
+		var id = this._nextId++;
+		this._inst[id] = inst;
+		return id;
+	},
+
+	/* Retrieve a particular date picker instance based on its ID. */
+	_getInst: function(id) {
+		return this._inst[id] || id;
+	},
+
+	/* 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) {
+		extendRemove(this._defaults, settings || {});
+		return this;
+	},
+
+	/* Attach the date picker to a jQuery selection.
+	   @param  target    element - the target input field or division or span
+	   @param  settings  object - the new settings to use for this date picker instance (anonymous) */
+	_attachDatepicker: function(target, settings) {
+		// check for settings on the control itself - in namespace 'date:'
+		var inlineSettings = null;
+		for (attrName in this._defaults) {
+			var attrValue = target.getAttribute('date:' + attrName);
+			if (attrValue) {
+				inlineSettings = inlineSettings || {};
+				try {
+					inlineSettings[attrName] = eval(attrValue);
+				} catch (err) {
+					inlineSettings[attrName] = attrValue;
+				}
+			}
+		}
+		var nodeName = target.nodeName.toLowerCase();
+		var instSettings = (inlineSettings ? 
+			$.extend(settings || {}, inlineSettings || {}) : settings);
+		if (nodeName == 'input') {
+			var inst = (inst && !inlineSettings ? inst :
+				new DatepickerInstance(instSettings, false));
+			this._connectDatepicker(target, inst);
+		} else if (nodeName == 'div' || nodeName == 'span') {
+			var inst = new DatepickerInstance(instSettings, true);
+			this._inlineDatepicker(target, inst);
+		}
+	},
+
+	/* Detach a datepicker from its control.
+	   @param  target    element - the target input field or division or span */
+	_destroyDatepicker: function(target) {
+		var nodeName = target.nodeName.toLowerCase();
+		var calId = target._calId;
+		target._calId = null;
+		var $target = $(target);
+		if (nodeName == 'input') {
+			$target.siblings('.datepicker_append').replaceWith('').end()
+				.siblings('.datepicker_trigger').replaceWith('').end()
+				.removeClass(this.markerClassName)
+				.unbind('focus', this._showDatepicker)
+				.unbind('keydown', this._doKeyDown)
+				.unbind('keypress', this._doKeyPress);
+			var wrapper = $target.parents('.datepicker_wrap');
+			if (wrapper)
+				wrapper.replaceWith(wrapper.html());
+		} else if (nodeName == 'div' || nodeName == 'span')
+			$target.removeClass(this.markerClassName).empty();
+		if ($('input[_calId=' + calId + ']').length == 0)
+			// clean up if last for this ID
+			this._inst[calId] = null;
+	},
+
+	/* Enable the date picker to a jQuery selection.
+	   @param  target    element - the target input field or division or span */
+	_enableDatepicker: function(target) {
+		target.disabled = false;
+		$(target).siblings('button.datepicker_trigger').each(function() { this.disabled = false; }).end()
+			.siblings('img.datepicker_trigger').css({opacity: '1.0', cursor: ''});
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value == target ? null : value); }); // delete entry
+	},
+
+	/* Disable the date picker to a jQuery selection.
+	   @param  target    element - the target input field or division or span */
+	_disableDatepicker: function(target) {
+		target.disabled = true;
+		$(target).siblings('button.datepicker_trigger').each(function() { this.disabled = true; }).end()
+			.siblings('img.datepicker_trigger').css({opacity: '0.5', cursor: 'default'});
+		this._disabledInputs = $.map($.datepicker._disabledInputs,
+			function(value) { return (value == target ? null : value); }); // delete entry
+		this._disabledInputs[$.datepicker._disabledInputs.length] = target;
+	},
+
+	/* Is the first field in a jQuery collection disabled as a datepicker?
+	   @param  target    element - the target input field or division or span
+	   @return boolean - true if disabled, false if enabled */
+	_isDisabledDatepicker: function(target) {
+		if (!target)
+			return false;
+		for (var i = 0; i < this._disabledInputs.length; i++) {
+			if (this._disabledInputs[i] == target)
+				return true;
+		}
+		return false;
+	},
+
+	/* Update the settings for a date picker attached to an input field or division.
+	   @param  target  element - the target input field or division or span
+	   @param  name    string - the name of the setting to change or
+	                   object - the new settings to update
+	   @param  value   any - the new value for the setting (omit if above is an object) */
+	_changeDatepicker: function(target, name, value) {
+		var settings = name || {};
+		if (typeof name == 'string') {
+			settings = {};
+			settings[name] = value;
+		}
+		if (inst = this._getInst(target._calId)) {
+			extendRemove(inst._settings, settings);
+			this._updateDatepicker(inst);
+		}
+	},
+
+	/* Set the dates for a jQuery selection.
+	   @param  target   element - the target input field or division or span
+	   @param  date     Date - the new date
+	   @param  endDate  Date - the new end date for a range (optional) */
+	_setDateDatepicker: function(target, date, endDate) {
+		if (inst = this._getInst(target._calId)) {
+			inst._setDate(date, endDate);
+			this._updateDatepicker(inst);
+		}
+	},
+
+	/* Get the date(s) for the first entry in a jQuery selection.
+	   @param  target  element - the target input field or division or span
+	   @return Date - the current date or
+	           Date[2] - the current dates for a range */
+	_getDateDatepicker: function(target) {
+		var inst = this._getInst(target._calId);
+		return (inst ? inst._getDate() : null);
+	},
+
+	/* Handle keystrokes. */
+	_doKeyDown: function(e) {
+		var inst = $.datepicker._getInst(this._calId);
+		if ($.datepicker._datepickerShowing)
+			switch (e.keyCode) {
+				case 9:  $.datepicker._hideDatepicker(null, '');
+						break; // hide on tab out
+				case 13: $.datepicker._selectDay(inst, inst._selectedMonth, inst._selectedYear,
+							$('td.datepicker_daysCellOver', inst._datepickerDiv)[0]);
+						return false; // don't submit the form
+						break; // select the value on enter
+				case 27: $.datepicker._hideDatepicker(null, inst._get('speed'));
+						break; // hide on escape
+				case 33: $.datepicker._adjustDate(inst,
+							(e.ctrlKey ? -1 : -inst._get('stepMonths')), (e.ctrlKey ? 'Y' : 'M'));
+						break; // previous month/year on page up/+ ctrl
+				case 34: $.datepicker._adjustDate(inst,
+							(e.ctrlKey ? +1 : +inst._get('stepMonths')), (e.ctrlKey ? 'Y' : 'M'));
+						break; // next month/year on page down/+ ctrl
+				case 35: if (e.ctrlKey) $.datepicker._clearDate(inst);
+						break; // clear on ctrl+end
+				case 36: if (e.ctrlKey) $.datepicker._gotoToday(inst);
+						break; // current on ctrl+home
+				case 37: if (e.ctrlKey) $.datepicker._adjustDate(inst, -1, 'D');
+						break; // -1 day on ctrl+left
+				case 38: if (e.ctrlKey) $.datepicker._adjustDate(inst, -7, 'D');
+						break; // -1 week on ctrl+up
+				case 39: if (e.ctrlKey) $.datepicker._adjustDate(inst, +1, 'D');
+						break; // +1 day on ctrl+right
+				case 40: if (e.ctrlKey) $.datepicker._adjustDate(inst, +7, 'D');
+						break; // +1 week on ctrl+down
+			}
+		else if (e.keyCode == 36 && e.ctrlKey) // display the date picker on ctrl+home
+			$.datepicker._showDatepicker(this);
+	},
+
+	/* Filter entered characters - based on date format. */
+	_doKeyPress: function(e) {
+		var inst = $.datepicker._getInst(this._calId);
+		var chars = $.datepicker._possibleChars(inst._get('dateFormat'));
+		var chr = String.fromCharCode(e.charCode == undefined ? e.keyCode : e.charCode);
+		return e.ctrlKey || (chr < ' ' || !chars || chars.indexOf(chr) > -1);
+	},
+
+	/* Attach the date picker to an input field. */
+	_connectDatepicker: function(target, inst) {
+		var input = $(target);
+		if (input.is('.' + this.markerClassName))
+			return;
+		var appendText = inst._get('appendText');
+		var isRTL = inst._get('isRTL');
+		if (appendText) {
+			if (isRTL)
+				input.before('<span class="datepicker_append">' + appendText);
+			else
+				input.after('<span class="datepicker_append">' + appendText);
+		}
+		var showOn = inst._get('showOn');
+		if (showOn == 'focus' || showOn == 'both') // pop-up date picker when in the marked field
+			input.focus(this._showDatepicker);
+		if (showOn == 'button' || showOn == 'both') { // pop-up date picker when button clicked
+			input.wrap('<span class="datepicker_wrap">');
+			var buttonText = inst._get('buttonText');
+			var buttonImage = inst._get('buttonImage');
+			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 != '' ? 
+						$('<img>').attr({ src:buttonImage, alt:buttonText, title:buttonText }) : buttonText));
+			if (isRTL)
+				input.before(trigger);
+			else
+				input.after(trigger);
+			trigger.click(function() {
+				if ($.datepicker._datepickerShowing && $.datepicker._lastInput == target)
+					$.datepicker._hideDatepicker();
+				else
+					$.datepicker._showDatepicker(target);
+			});
+        }
+		input.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress)
+			.bind("setData.datepicker", function(event, key, value) {
+				inst._settings[key] = value;
+			}).bind("getData.datepicker", function(event, key) {
+				return inst._get(key);
+			});
+		input[0]._calId = inst._id;
+	},
+
+	/* Attach an inline date picker to a div. */
+	_inlineDatepicker: function(target, inst) {
+		var input = $(target);
+		if (input.is('.' + this.markerClassName))
+			return;
+		input.addClass(this.markerClassName).append(inst._datepickerDiv)
+			.bind("setData.datepicker", function(event, key, value){
+				inst._settings[key] = value;
+			}).bind("getData.datepicker", function(event, key){
+				return inst._get(key);
+			});
+		input[0]._calId = inst._id;
+		this._updateDatepicker(inst);
+	},
+
+	/* Tidy up after displaying the date picker. */
+	_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
+	   @param  dateText  string - the initial date to display (in the current format)
+	   @param  onSelect  function - the function(dateText) to call when a date is selected
+	   @param  settings  object - update the dialog date picker instance's settings (anonymous object)
+	   @param  pos       int[2] - coordinates for the dialog's position within the screen or
+	                     event - with x/y coordinates or
+	                     leave empty for default (screen centre)
+	   @return the manager object */
+	_dialogDatepicker: function(input, dateText, onSelect, settings, pos) {
+		var inst = this._dialogInst; // internal instance
+		if (!inst) {
+			inst = this._dialogInst = new DatepickerInstance({}, false);
+			this._dialogInput = $('<input type="text" size="1" style="position: absolute; top: -100px;"/>');
+			this._dialogInput.keydown(this._doKeyDown);
+			$('body').append(this._dialogInput);
+			this._dialogInput[0]._calId = inst._id;
+		}
+		extendRemove(inst._settings, settings || {});
+		this._dialogInput.val(dateText);
+
+		this._pos = (pos ? (pos.length ? pos : [pos.pageX, pos.pageY]) : null);
+		if (!this._pos) {
+			var browserWidth = window.innerWidth || document.documentElement.clientWidth ||	document.body.clientWidth;
+			var browserHeight = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
+			var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
+			var scrollY = document.documentElement.scrollTop || document.body.scrollTop;
+			this._pos = // should use actual width/height below
+				[(browserWidth / 2) - 100 + scrollX, (browserHeight / 2) - 150 + scrollY];
+		}
+
+		// move input on screen for focus, but hidden behind dialog
+		this._dialogInput.css('left', this._pos[0] + 'px').css('top', this._pos[1] + 'px');
+		inst._settings.onSelect = onSelect;
+		this._inDialog = true;
+		this._datepickerDiv.addClass('datepicker_dialog');
+		this._showDatepicker(this._dialogInput[0]);
+		if ($.blockUI)
+			$.blockUI(this._datepickerDiv);
+		return this;
+	},
+
+	/* Pop-up the date picker for a given input field.
+	   @param  input  element - the input field attached to the date picker or
+	                  event - if triggered by focus */
+	_showDatepicker: function(input) {
+		input = input.target || input;
+		if (input.nodeName.toLowerCase() != 'input') // find from button/image trigger
+			input = $('input', input.parentNode)[0];
+		if ($.datepicker._isDisabledDatepicker(input) || $.datepicker._lastInput == input) // already here
+			return;
+		var inst = $.datepicker._getInst(input._calId);
+		var beforeShow = inst._get('beforeShow');
+		extendRemove(inst._settings, (beforeShow ? beforeShow.apply(input, [input, inst]) : {}));
+		$.datepicker._hideDatepicker(null, '');
+		$.datepicker._lastInput = input;
+		inst._setDateFromField(input);
+		if ($.datepicker._inDialog) // hide cursor
+			input.value = '';
+		if (!$.datepicker._pos) { // position below input
+			$.datepicker._pos = $.datepicker._findPos(input);
+			$.datepicker._pos[1] += input.offsetHeight; // add the height
+		}
+		var isFixed = false;
+		$(input).parents().each(function() {
+			isFixed |= $(this).css('position') == 'fixed';
+		});
+		if (isFixed && $.browser.opera) { // correction for Opera when fixed and scrolled
+			$.datepicker._pos[0] -= document.documentElement.scrollLeft;
+			$.datepicker._pos[1] -= document.documentElement.scrollTop;
+		}
+		inst._datepickerDiv.css('position', ($.datepicker._inDialog && $.blockUI ?
+			'static' : (isFixed ? 'fixed' : 'absolute')))
+			.css({ left: $.datepicker._pos[0] + 'px', top: $.datepicker._pos[1] + 'px' });
+		$.datepicker._pos = null;
+		inst._rangeStart = null;
+		$.datepicker._updateDatepicker(inst);
+		if (!inst._inline) {
+			var speed = inst._get('speed');
+			var postProcess = function() {
+				$.datepicker._datepickerShowing = true;
+				$.datepicker._afterShow(inst);
+			};
+			var showAnim = inst._get('showAnim') || 'show';
+			inst._datepickerDiv[showAnim](speed, postProcess);
+			if (speed == '')
+				postProcess();
+			if (inst._input[0].type != 'hidden')
+				inst._input[0].focus();
+			$.datepicker._curInst = inst;
+		}
+	},
+
+	/* Generate the date picker content. */
+	_updateDatepicker: function(inst) {
+		inst._datepickerDiv.empty().append(inst._generateDatepicker());
+		var numMonths = inst._getNumberOfMonths();
+		if (numMonths[0] != 1 || numMonths[1] != 1)
+			inst._datepickerDiv.addClass('datepicker_multi');
+		else
+			inst._datepickerDiv.removeClass('datepicker_multi');
+
+		if (inst._get('isRTL'))
+			inst._datepickerDiv.addClass('datepicker_rtl');
+		else
+			inst._datepickerDiv.removeClass('datepicker_rtl');
+
+		if (inst._input && inst._input[0].type != 'hidden')
+			$(inst._input[0]).focus();
+	},
+
+	/* Tidy up after displaying the date picker. */
+	_afterShow: function(inst) {
+		var numMonths = inst._getNumberOfMonths(); // fix width for dynamic number of date pickers
+		inst._datepickerDiv.width(numMonths[1] * $('.datepicker', inst._datepickerDiv[0])[0].offsetWidth);
+		if ($.browser.msie && parseInt($.browser.version) < 7) { // fix IE < 7 select problems
+			$('iframe.datepicker_cover').css({width: inst._datepickerDiv.width() + 4,
+				height: inst._datepickerDiv.height() + 4});
+		}
+		// re-position on screen if necessary
+		var isFixed = inst._datepickerDiv.css('position') == 'fixed';
+		var pos = inst._input ? $.datepicker._findPos(inst._input[0]) : null;
+		var browserWidth = window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth;
+		var browserHeight = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight;
+		var scrollX = (isFixed ? 0 : document.documentElement.scrollLeft || document.body.scrollLeft);
+		var scrollY = (isFixed ? 0 : document.documentElement.scrollTop || document.body.scrollTop);
+		// reposition date picker horizontally if outside the browser window
+		if ((inst._datepickerDiv.offset().left + inst._datepickerDiv.width() -
+				(isFixed && $.browser.msie ? document.documentElement.scrollLeft : 0)) >
+				(browserWidth + scrollX)) {
+			inst._datepickerDiv.css('left', Math.max(scrollX,
+				pos[0] + (inst._input ? $(inst._input[0]).width() : null) - inst._datepickerDiv.width() -
+				(isFixed && $.browser.opera ? document.documentElement.scrollLeft : 0)) + 'px');
+		}
+		// reposition date picker vertically if outside the browser window
+		if ((inst._datepickerDiv.offset().top + inst._datepickerDiv.height() -
+				(isFixed && $.browser.msie ? document.documentElement.scrollTop : 0)) >
+				(browserHeight + scrollY) ) {
+			inst._datepickerDiv.css('top', Math.max(scrollY,
+				pos[1] - (this._inDialog ? 0 : inst._datepickerDiv.height()) -
+				(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)) {
+            obj = obj.nextSibling;
+        }
+        var position = $(obj).offset();
+	    return [position.left, position.top];
+	},
+
+	/* Hide the date picker from view.
+	   @param  input  element - the input field attached to the date picker
+	   @param  speed  string - the speed at which to close the date picker */
+	_hideDatepicker: function(input, speed) {
+		var inst = this._curInst;
+		if (!inst)
+			return;
+		var rangeSelect = inst._get('rangeSelect');
+		if (rangeSelect && this._stayOpen) {
+			this._selectDate(inst, inst._formatDate(
+				inst._currentDay, inst._currentMonth, inst._currentYear));
+		}
+		this._stayOpen = false;
+		if (this._datepickerShowing) {
+			speed = (speed != null ? speed : inst._get('speed'));
+			var showAnim = inst._get('showAnim');
+			inst._datepickerDiv[(showAnim == 'slideDown' ? 'slideUp' :
+				(showAnim == 'fadeIn' ? 'fadeOut' : 'hide'))](speed, function() {
+				$.datepicker._tidyDialog(inst);
+			});
+			if (speed == '')
+				this._tidyDialog(inst);
+			var onClose = inst._get('onClose');
+			if (onClose) {
+				onClose.apply((inst._input ? inst._input[0] : null),
+					[inst._getDate(), inst]);  // trigger custom callback
+			}
+			this._datepickerShowing = false;
+			this._lastInput = null;
+			inst._settings.prompt = null;
+			if (this._inDialog) {
+				this._dialogInput.css({ position: 'absolute', left: '0', top: '-100px' });
+				if ($.blockUI) {
+					$.unblockUI();
+					$('body').append(this._datepickerDiv);
+				}
+			}
+			this._inDialog = false;
+		}
+		this._curInst = null;
+	},
+
+	/* Tidy up after a dialog display. */
+	_tidyDialog: function(inst) {
+		inst._datepickerDiv.removeClass('datepicker_dialog').unbind('.datepicker');
+		$('.datepicker_prompt', inst._datepickerDiv).remove();
+	},
+
+	/* Close date picker if clicked elsewhere. */
+	_checkExternalClick: function(event) {
+		if (!$.datepicker._curInst)
+			return;
+		var $target = $(event.target);
+		if (($target.parents("#datepicker_div").length == 0) &&
+				($target.attr('class') != 'datepicker_trigger') &&
+				$.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI)) {
+			$.datepicker._hideDatepicker(null, '');
+		}
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustDate: function(id, offset, period) {
+		var inst = this._getInst(id);
+		inst._adjustDate(offset, period);
+		this._updateDatepicker(inst);
+	},
+
+	/* Action for current link. */
+	_gotoToday: function(id) {
+		var date = new Date();
+		var inst = this._getInst(id);
+		inst._selectedDay = date.getDate();
+		inst._drawMonth = inst._selectedMonth = date.getMonth();
+		inst._drawYear = inst._selectedYear = date.getFullYear();
+		this._adjustDate(inst);
+	},
+
+	/* Action for selecting a new month/year. */
+	_selectMonthYear: function(id, select, period) {
+		var inst = this._getInst(id);
+		inst._selectingMonthYear = false;
+		inst[period == 'M' ? '_drawMonth' : '_drawYear'] =
+			select.options[select.selectedIndex].value - 0;
+		this._adjustDate(inst);
+	},
+
+	/* Restore input focus after not changing month/year. */
+	_clickMonthYear: function(id) {
+		var inst = this._getInst(id);
+		if (inst._input && inst._selectingMonthYear && !$.browser.msie)
+			inst._input[0].focus();
+		inst._selectingMonthYear = !inst._selectingMonthYear;
+	},
+
+	/* Action for changing the first week day. */
+	_changeFirstDay: function(id, day) {
+		var inst = this._getInst(id);
+		inst._settings.firstDay = day;
+		this._updateDatepicker(inst);
+	},
+
+	/* Action for selecting a day. */
+	_selectDay: function(id, month, year, td) {
+		if ($(td).is('.datepicker_unselectable'))
+			return;
+		var inst = this._getInst(id);
+		var rangeSelect = inst._get('rangeSelect');
+		if (rangeSelect) {
+			if (!this._stayOpen) {
+				$('.datepicker td').removeClass('datepicker_currentDay');
+				$(td).addClass('datepicker_currentDay');
+			} 
+			this._stayOpen = !this._stayOpen;
+		}
+		inst._selectedDay = inst._currentDay = $('a', td).html();
+		inst._selectedMonth = inst._currentMonth = month;
+		inst._selectedYear = inst._currentYear = year;
+		this._selectDate(id, inst._formatDate(
+			inst._currentDay, inst._currentMonth, inst._currentYear));
+		if (this._stayOpen) {
+			inst._endDay = inst._endMonth = inst._endYear = null;
+			inst._rangeStart = new Date(inst._currentYear, inst._currentMonth, inst._currentDay);
+			this._updateDatepicker(inst);
+		}
+		else if (rangeSelect) {
+			inst._endDay = inst._currentDay;
+			inst._endMonth = inst._currentMonth;
+			inst._endYear = inst._currentYear;
+			inst._selectedDay = inst._currentDay = inst._rangeStart.getDate();
+			inst._selectedMonth = inst._currentMonth = inst._rangeStart.getMonth();
+			inst._selectedYear = inst._currentYear = inst._rangeStart.getFullYear();
+			inst._rangeStart = null;
+			if (inst._inline)
+				this._updateDatepicker(inst);
+		}
+	},
+
+	/* Erase the input field and hide the date picker. */
+	_clearDate: function(id) {
+		var inst = this._getInst(id);
+		if (inst._get('mandatory'))
+			return;
+		this._stayOpen = false;
+		inst._endDay = inst._endMonth = inst._endYear = inst._rangeStart = null;
+		this._selectDate(inst, '');
+	},
+
+	/* Update the input field with the selected date. */
+	_selectDate: function(id, dateStr) {
+		var inst = this._getInst(id);
+		dateStr = (dateStr != null ? dateStr : inst._formatDate());
+		if (inst._rangeStart)
+			dateStr = inst._formatDate(inst._rangeStart) + inst._get('rangeSeparator') + dateStr;
+		if (inst._input)
+			inst._input.val(dateStr);
+		var onSelect = inst._get('onSelect');
+		if (onSelect)
+			onSelect.apply((inst._input ? inst._input[0] : null), [dateStr, inst]);  // trigger custom callback
+		else if (inst._input)
+			inst._input.trigger('change'); // fire the change event
+		if (inst._inline)
+			this._updateDatepicker(inst);
+		else if (!this._stayOpen) {
+			this._hideDatepicker(null, inst._get('speed'));
+			this._lastInput = inst._input[0];
+			if (typeof(inst._input[0]) != 'object')
+				inst._input[0].focus(); // restore focus
+			this._lastInput = null;
+		}
+	},
+
+	/* Set as beforeShowDay function to prevent selection of weekends.
+	   @param  date  Date - the date to customise
+	   @return [boolean, string] - is this date selectable?, what is its CSS class? */
+	noWeekends: function(date) {
+		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 */
+	iso8601Week: function(date) {
+		var checkDate = new Date(date.getFullYear(), date.getMonth(), date.getDate(), (date.getTimezoneOffset() / -60));
+		var firstMon = new Date(checkDate.getFullYear(), 1 - 1, 4); // First week always contains 4 Jan
+		var firstDay = firstMon.getDay() || 7; // Day of week: Mon = 1, ..., Sun = 7
+		firstMon.setDate(firstMon.getDate() + 1 - firstDay); // Preceding Monday
+		if (firstDay < 4 && checkDate < firstMon) { // Adjust first three days in year if necessary
+			checkDate.setDate(checkDate.getDate() - 3); // Generate for previous year
+			return $.datepicker.iso8601Week(checkDate);
+		} else if (checkDate > new Date(checkDate.getFullYear(), 12 - 1, 28)) { // Check last three days in year
+			firstDay = new Date(checkDate.getFullYear() + 1, 1 - 1, 4).getDay() || 7;
+			if (firstDay > 4 && (checkDate.getDay() || 7) < firstDay - 3) { // Adjust if necessary
+				checkDate.setDate(checkDate.getDate() + 3); // Generate for next year
+				return $.datepicker.iso8601Week(checkDate);
+			}
+		}
+		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
+	   @return  the status display text for this date */
+	dateStatus: function(date, inst) {
+		return $.datepicker.formatDate(inst._get('dateStatus'), date, inst._getFormatConfig());
+	},
+
+	/* Parse a string value into a date object.
+	   The format can be combinations of the following:
+	   d  - day of month (no leading zero)
+	   dd - day of month (two digit)
+	   D  - day name short
+	   DD - day name long
+	   m  - month of year (no leading zero)
+	   mm - month of year (two digit)
+	   M  - month name short
+	   MM - month name long
+	   y  - year (two digit)
+	   yy - year (four digit)
+	   '...' - literal text
+	   '' - single quote
+
+	   @param  format           String - the expected format of the date
+	   @param  value            String - the date in the above format
+	   @param  settings  Object - attributes include:
+	                     shortYearCutoff  Number - the cutoff year for determining the century (optional)
+	                     dayNamesShort    String[7] - abbreviated names of the days from Sunday (optional)
+	                     dayNames         String[7] - names of the days from Sunday (optional)
+	                     monthNamesShort  String[12] - abbreviated names of the months (optional)
+	                     monthNames       String[12] - names of the months (optional)
+	   @return  Date - the extracted date value or null if value is blank */
+	parseDate: function (format, value, settings) {
+		if (format == null || value == null)
+			throw 'Invalid arguments';
+		value = (typeof value == 'object' ? value.toString() : value + '');
+		if (value == '')
+			return null;
+		var shortYearCutoff = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff;
+		var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort;
+		var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames;
+		var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort;
+		var monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames;
+		var year = -1;
+		var month = -1;
+		var day = -1;
+		var literal = false;
+		// Check whether a format character is doubled
+		var lookAhead = function(match) {
+			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
+			if (matches)
+				iFormat++;
+			return matches;	
+		};
+		// Extract a number from the string value
+		var getNumber = function(match) {
+			lookAhead(match);
+			var size = (match == 'y' ? 4 : 2);
+			var num = 0;
+			while (size > 0 && iValue < value.length &&
+					value.charAt(iValue) >= '0' && value.charAt(iValue) <= '9') {
+				num = num * 10 + (value.charAt(iValue++) - 0);
+				size--;
+			}
+			if (size == (match == 'y' ? 4 : 2))
+				throw 'Missing number at position ' + iValue;
+			return num;
+		};
+		// Extract a name from the string value and convert to an index
+		var getName = function(match, shortNames, longNames) {
+			var names = (lookAhead(match) ? longNames : shortNames);
+			var size = 0;
+			for (var j = 0; j < names.length; j++)
+				size = Math.max(size, names[j].length);
+			var name = '';
+			var iInit = iValue;
+			while (size > 0 && iValue < value.length) {
+				name += value.charAt(iValue++);
+				for (var i = 0; i < names.length; i++)
+					if (name == names[i])
+						return i + 1;
+				size--;
+			}
+			throw 'Unknown name at position ' + iInit;
+		};
+		// Confirm that a literal character matches the string value
+		var checkLiteral = function() {
+			if (value.charAt(iValue) != format.charAt(iFormat))
+				throw 'Unexpected literal at position ' + iValue;
+			iValue++;
+		};
+		var iValue = 0;
+		for (var iFormat = 0; iFormat < format.length; iFormat++) {
+			if (literal)
+				if (format.charAt(iFormat) == "'" && !lookAhead("'"))
+					literal = false;
+				else
+					checkLiteral();
+			else
+				switch (format.charAt(iFormat)) {
+					case 'd':
+						day = getNumber('d');
+						break;
+					case 'D': 
+						getName('D', dayNamesShort, dayNames);
+						break;
+					case 'm': 
+						month = getNumber('m');
+						break;
+					case 'M':
+						month = getName('M', monthNamesShort, monthNames); 
+						break;
+					case 'y':
+						year = getNumber('y');
+						break;
+					case "'":
+						if (lookAhead("'"))
+							checkLiteral();
+						else
+							literal = true;
+						break;
+					default:
+						checkLiteral();
+				}
+		}
+		if (year < 100) {
+			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
+				(year <= shortYearCutoff ? 0 : -100);
+		}
+		var date = new Date(year, month - 1, day);
+		if (date.getFullYear() != year || date.getMonth() + 1 != month || date.getDate() != day) {
+			throw 'Invalid date'; // E.g. 31/02/*
+		}
+		return date;
+	},
+
+	/* Format a date object into a string value.
+	   The format can be combinations of the following:
+	   d  - day of month (no leading zero)
+	   dd - day of month (two digit)
+	   D  - day name short
+	   DD - day name long
+	   m  - month of year (no leading zero)
+	   mm - month of year (two digit)
+	   M  - month name short
+	   MM - month name long
+	   y  - year (two digit)
+	   yy - year (four digit)
+	   '...' - literal text
+	   '' - single quote
+
+	   @param  format    String - the desired format of the date
+	   @param  date      Date - the date value to format
+	   @param  settings  Object - attributes include:
+	                     dayNamesShort    String[7] - abbreviated names of the days from Sunday (optional)
+	                     dayNames         String[7] - names of the days from Sunday (optional)
+	                     monthNamesShort  String[12] - abbreviated names of the months (optional)
+	                     monthNames       String[12] - names of the months (optional)
+	   @return  String - the date in the above format */
+	formatDate: function (format, date, settings) {
+		if (!date)
+			return '';
+		var dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort;
+		var dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames;
+		var monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort;
+		var monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames;
+		// Check whether a format character is doubled
+		var lookAhead = function(match) {
+			var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) == match);
+			if (matches)
+				iFormat++;
+			return matches;	
+		};
+		// Format a number, with leading zero if necessary
+		var formatNumber = function(match, value) {
+			return (lookAhead(match) && value < 10 ? '0' : '') + value;
+		};
+		// Format a name, short or long as requested
+		var formatName = function(match, value, shortNames, longNames) {
+			return (lookAhead(match) ? longNames[value] : shortNames[value]);
+		};
+		var output = '';
+		var literal = false;
+		if (date) {
+			for (var iFormat = 0; iFormat < format.length; iFormat++) {
+				if (literal)
+					if (format.charAt(iFormat) == "'" && !lookAhead("'"))
+						literal = false;
+					else
+						output += format.charAt(iFormat);
+				else
+					switch (format.charAt(iFormat)) {
+						case 'd':
+							output += formatNumber('d', date.getDate()); 
+							break;
+						case 'D': 
+							output += formatName('D', date.getDay(), dayNamesShort, dayNames);
+							break;
+						case 'm': 
+							output += formatNumber('m', date.getMonth() + 1); 
+							break;
+						case 'M':
+							output += formatName('M', date.getMonth(), monthNamesShort, monthNames); 
+							break;
+						case 'y':
+							output += (lookAhead('y') ? date.getFullYear() : 
+								(date.getYear() % 100 < 10 ? '0' : '') + date.getYear() % 100);
+							break;
+						case "'":
+							if (lookAhead("'"))
+								output += "'";
+							else
+								literal = true;
+							break;
+						default:
+							output += format.charAt(iFormat);
+					}
+			}
+		}
+		return output;
+	},
+
+	/* Extract all possible characters from the date format. */
+	_possibleChars: function (format) {
+		var chars = '';
+		var literal = false;
+		for (var iFormat = 0; iFormat < format.length; iFormat++)
+			if (literal)
+				if (format.charAt(iFormat) == "'" && !lookAhead("'"))
+					literal = false;
+				else
+					chars += format.charAt(iFormat);
+			else
+				switch (format.charAt(iFormat)) {
+					case 'd' || 'm' || 'y':
+						chars += '0123456789'; 
+						break;
+					case 'D' || 'M':
+						return null; // Accept anything
+					case "'":
+						if (lookAhead("'"))
+							chars += "'";
+						else
+							literal = true;
+						break;
+					default:
+						chars += format.charAt(iFormat);
+				}
+		return chars;
+	}
+});
+
+/* Individualised settings for date picker functionality applied to one or more related inputs.
+   Instances are managed and manipulated through the Datepicker manager. */
+function DatepickerInstance(settings, inline) {
+	this._id = $.datepicker._register(this);
+	this._selectedDay = 0; // Current date for selection
+	this._selectedMonth = 0; // 0-11
+	this._selectedYear = 0; // 4-digit year
+	this._drawMonth = 0; // Current month at start of datepicker
+	this._drawYear = 0;
+	this._input = null; // The attached input field
+	this._inline = inline; // True if showing inline, false if used in a popup
+	this._datepickerDiv = (!inline ? $.datepicker._datepickerDiv :
+		$('<div id="datepicker_div_' + this._id + '" class="datepicker_inline">'));
+	// customise the date picker object - uses manager defaults if not overridden
+	this._settings = extendRemove(settings || {}); // clone
+	if (inline)
+		this._setDate(this._getDefaultDate());
+}
+
+$.extend(DatepickerInstance.prototype, {
+	/* Get a setting value, defaulting if necessary. */
+	_get: function(name) {
+		return this._settings[name] !== undefined ? this._settings[name] : $.datepicker._defaults[name];
+	},
+
+	/* Parse existing date and initialise date picker. */
+	_setDateFromField: function(input) {
+		this._input = $(input);
+		var dateFormat = this._get('dateFormat');
+		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) {
+			var settings = this._getFormatConfig();
+			if (dates.length > 1) {
+				date = $.datepicker.parseDate(dateFormat, dates[1], settings) || defaultDate;
+				this._endDay = date.getDate();
+				this._endMonth = date.getMonth();
+				this._endYear = date.getFullYear();
+			}
+			try {
+				date = $.datepicker.parseDate(dateFormat, dates[0], settings) || defaultDate;
+			} catch (e) {
+				$.datepicker.log(e);
+				date = defaultDate;
+			}
+		}
+		this._selectedDay = date.getDate();
+		this._drawMonth = this._selectedMonth = date.getMonth();
+		this._drawYear = this._selectedYear = date.getFullYear();
+		this._currentDay = (dates[0] ? date.getDate() : 0);
+		this._currentMonth = (dates[0] ? date.getMonth() : 0);
+		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());
+		var minDate = this._getMinMaxDate('min', true);
+		var maxDate = this._getMinMaxDate('max');
+		date = (minDate && date < minDate ? minDate : date);
+		date = (maxDate && date > maxDate ? maxDate : date);
+		return date;
+	},
+
+	/* A date may be specified as an exact value or a relative one. */
+	_determineDate: function(name, defaultDate) {
+		var offsetNumeric = function(offset) {
+			var date = new Date();
+			date.setDate(date.getDate() + offset);
+			return date;
+		};
+		var offsetString = function(offset, getDaysInMonth) {
+			var date = new Date();
+			var matches = /^([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?$/.exec(offset);
+			if (matches) {
+				var year = date.getFullYear();
+				var month = date.getMonth();
+				var day = date.getDate();
+				switch (matches[2] || 'd') {
+					case 'd' : case 'D' :
+						day += (matches[1] - 0); break;
+					case 'w' : case 'W' :
+						day += (matches[1] * 7); break;
+					case 'm' : case 'M' :
+						month += (matches[1] - 0); 
+						day = Math.min(day, getDaysInMonth(year, month));
+						break;
+					case 'y': case 'Y' :
+						year += (matches[1] - 0);
+						day = Math.min(day, getDaysInMonth(year, month));
+						break;
+				}
+				date = new Date(year, month, day);
+			}
+			return date;
+		};
+		var date = this._get(name);
+		return (date == null ? defaultDate :
+			(typeof date == 'string' ? offsetString(date, this._getDaysInMonth) :
+			(typeof date == 'number' ? offsetNumeric(date) : date)));
+	},
+
+	/* Set the date(s) directly. */
+	_setDate: function(date, endDate) {
+		this._selectedDay = this._currentDay = date.getDate();
+		this._drawMonth = this._selectedMonth = this._currentMonth = date.getMonth();
+		this._drawYear = this._selectedYear = this._currentYear = date.getFullYear();
+		if (this._get('rangeSelect')) {
+			if (endDate) {
+				this._endDay = endDate.getDate();
+				this._endMonth = endDate.getMonth();
+				this._endYear = endDate.getFullYear();
+			} else {
+				this._endDay = this._currentDay;
+				this._endMonth = this._currentMonth;
+				this._endYear = this._currentYear;
+			}
+		}
+		this._adjustDate();
+	},
+
+	/* Retrieve the date(s) directly. */
+	_getDate: function() {
+		var startDate = (!this._currentYear || (this._input && this._input.val() == '') ? null :
+			new Date(this._currentYear, this._currentMonth, this._currentDay));
+		if (this._get('rangeSelect')) {
+			return [startDate, (!this._endYear ? null :
+				new Date(this._endYear, this._endMonth, this._endDay))];
+		} else
+			return startDate;
+	},
+
+	/* Generate the HTML for the current state of the date picker. */
+	_generateDatepicker: function() {
+		var today = new Date();
+		today = new Date(today.getFullYear(), today.getMonth(), today.getDate()); // clear time
+		var showStatus = this._get('showStatus');
+		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 + ');"' + 
+			(showStatus ? this._addStatus(this._get('clearStatus') || '&#xa0;') : '') + '>' +
+			this._get('clearText') + '</a></div>');
+		var controls = '<div class="datepicker_control">' + (isRTL ? '' : clear) +
+			'<div class="datepicker_close"><a onclick="jQuery.datepicker._hideDatepicker();"' +
+			(showStatus ? this._addStatus(this._get('closeStatus') || '&#xa0;') : '') + '>' +
+			this._get('closeText') + '</a></div>' + (isRTL ? clear : '')  + '</div>';
+		var prompt = this._get('prompt');
+		var closeAtTop = this._get('closeAtTop');
+		var hideIfNoPrevNext = this._get('hideIfNoPrevNext');
+		var numMonths = this._getNumberOfMonths();
+		var stepMonths = this._get('stepMonths');
+		var isMultiMonth = (numMonths[0] != 1 || numMonths[1] != 1);
+		var minDate = this._getMinMaxDate('min', true);
+		var maxDate = this._getMinMaxDate('max');
+		var drawMonth = this._drawMonth;
+		var drawYear = this._drawYear;
+		if (maxDate) {
+			var maxDraw = new Date(maxDate.getFullYear(),
+				maxDate.getMonth() - numMonths[1] + 1, maxDate.getDate());
+			maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw);
+			while (new Date(drawYear, drawMonth, 1) > maxDraw) {
+				drawMonth--;
+				if (drawMonth < 0) {
+					drawMonth = 11;
+					drawYear--;
+				}
+			}
+		}
+		// controls and links
+		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>' :
+			(hideIfNoPrevNext ? '' : '<label>' + this._get('prevText') + '</label>')) + '</div>';
+		var next = '<div class="datepicker_next">' + (this._canAdjustMonth(+1, drawYear, drawMonth) ?
+			'<a onclick="jQuery.datepicker._adjustDate(' + this._id + ', +' + stepMonths + ', \'M\');"' +
+			(showStatus ? this._addStatus(this._get('nextStatus') || '&#xa0;') : '') + '>' +
+			this._get('nextText') + '</a>' :
+			(hideIfNoPrevNext ? '>' : '<label>' + this._get('nextText') + '</label>')) + '</div>';
+		var html = (prompt ? '<div class="datepicker_prompt">' + prompt + '</div>' : '') +
+			(closeAtTop && !this._inline ? controls : '') +
+			'<div class="datepicker_links">' + (isRTL ? next : prev) +
+			(this._isInRange(today) ? '<div class="datepicker_current">' +
+			'<a onclick="jQuery.datepicker._gotoToday(' + this._id + ');"' +
+			(showStatus ? this._addStatus(this._get('currentStatus') || '&#xa0;') : '') + '>' +
+			this._get('currentText') + '</a></div>' : '') + (isRTL ? prev : next) + '</div>';
+		var showWeeks = this._get('showWeeks');
+		for (var row = 0; row < numMonths[0]; row++)
+			for (var col = 0; col < numMonths[1]; col++) {
+				var selectedDate = new Date(drawYear, drawMonth, this._selectedDay);
+				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>' + 
+					'<tr class="datepicker_titleRow">' +
+					(showWeeks ? '<td>' + this._get('weekHeader') + '</td>' : '');
+				var firstDay = this._get('firstDay');
+				var changeFirstDay = this._get('changeFirstDay');
+				var dayNames = this._get('dayNames');
+				var dayNamesShort = this._get('dayNamesShort');
+				var dayNamesMin = this._get('dayNamesMin');
+				for (var dow = 0; dow < 7; dow++) { // days of the week
+					var day = (dow + firstDay) % 7;
+					var status = this._get('dayStatus') || '&#xa0;';
+					status = (status.indexOf('DD') > -1 ? status.replace(/DD/, dayNames[day]) :
+						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 + ');"') + 
+						(showStatus ? this._addStatus(status) : '') + ' title="' + dayNames[day] + '">' +
+						dayNamesMin[day] + (changeFirstDay ? '</a>' : '</span>') + '</td>';
+				}
+				html += '</tr></thead><tbody>';
+				var daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
+				if (drawYear == this._selectedYear && drawMonth == this._selectedMonth) {
+					this._selectedDay = Math.min(this._selectedDay, daysInMonth);
+				}
+				var leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
+				var currentDate = (!this._currentDay ? new Date(9999, 9, 9) :
+					new Date(this._currentYear, this._currentMonth, this._currentDay));
+				var endDate = this._endDay ? new Date(this._endYear, this._endMonth, this._endDay) : currentDate;
+				var printDate = new Date(drawYear, drawMonth, 1 - leadDays);
+				var numRows = (isMultiMonth ? 6 : Math.ceil((leadDays + daysInMonth) / 7)); // calculate the number of rows to generate
+				var beforeShowDay = this._get('beforeShowDay');
+				var showOtherMonths = this._get('showOtherMonths');
+				var calculateWeek = this._get('calculateWeek') || $.datepicker.iso8601Week;
+				var dateStatus = this._get('statusForDate') || $.datepicker.dateStatus;
+				for (var dRow = 0; dRow < numRows; dRow++) { // create date picker rows
+					html += '<tr class="datepicker_daysRow">' +
+						(showWeeks ? '<td class="datepicker_weekCol">' + calculateWeek(printDate) + '</td>' : '');
+					for (var dow = 0; dow < 7; dow++) { // create date picker days
+						var daySettings = (beforeShowDay ?
+							beforeShowDay.apply((this._input ? this._input[0] : null), [printDate]) : [true, '']);
+						var otherMonth = (printDate.getMonth() != drawMonth);
+						var unselectable = otherMonth || !daySettings[0] ||
+							(minDate && printDate < minDate) || (maxDate && printDate > maxDate);
+						html += '<td class="datepicker_daysCell' +
+							((dow + firstDay + 6) % 7 >= 5 ? ' datepicker_weekEndCell' : '') + // highlight weekends
+							(otherMonth ? ' datepicker_otherMonth' : '') + // highlight days from other months
+							(printDate.getTime() == selectedDate.getTime() && drawMonth == this._selectedMonth ?
+							' datepicker_daysCellOver' : '') + // highlight selected day
+							(unselectable ? ' datepicker_unselectable' : '') +  // highlight unselectable days
+							(otherMonth && !showOtherMonths ? '' : ' ' + daySettings[1] + // highlight custom dates
+							(printDate.getTime() >= currentDate.getTime() && printDate.getTime() <= endDate.getTime() ?  // in current range
+							' datepicker_currentDay' : '') + // highlight selected day
+							(printDate.getTime() == today.getTime() ? ' datepicker_today' : '')) + '"' + // highlight today (if different)
+							(unselectable ? '' : ' onmouseover="jQuery(this).addClass(\'datepicker_daysCellOver\');' +
+							(!showStatus || (otherMonth && !showOtherMonths) ? '' : 'jQuery(\'#datepicker_status_' +
+							this._id + '\').html(\'' + (dateStatus.apply((this._input ? this._input[0] : null),
+							[printDate, this]) || '&#xa0;') +'\');') + '"' +
+							' onmouseout="jQuery(this).removeClass(\'datepicker_daysCellOver\');' +
+							(!showStatus || (otherMonth && !showOtherMonths) ? '' : 'jQuery(\'#datepicker_status_' +
+							this._id + '\').html(\'&#xa0;\');') + '" onclick="jQuery.datepicker._selectDay(' +
+							this._id + ',' + drawMonth + ',' + drawYear + ', this);"') + '>' + // actions
+							(otherMonth ? (showOtherMonths ? printDate.getDate() : '&#xa0;') : // display for other months
+							(unselectable ? printDate.getDate() : '<a>' + printDate.getDate() + '</a>')) + '</td>'; // display for this month
+						printDate.setDate(printDate.getDate() + 1);
+					}
+					html += '</tr>';
+				}
+				drawMonth++;
+				if (drawMonth > 11) {
+					drawMonth = 0;
+					drawYear++;
+				}
+				html += '</tbody></table></div>';
+			}
+		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 ? 
+			'<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);
+		var showStatus = this._get('showStatus');
+		var html = '<div class="datepicker_header">';
+		// month selection
+		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);
+			html += '<select class="datepicker_newMonth" ' +
+				'onchange="jQuery.datepicker._selectMonthYear(' + this._id + ', this, \'M\');" ' +
+				'onclick="jQuery.datepicker._clickMonthYear(' + this._id + ');"' +
+				(showStatus ? this._addStatus(this._get('monthStatus') || '&#xa0;') : '') + '>';
+			for (var month = 0; month < 12; month++) {
+				if ((!inMinYear || month >= minDate.getMonth()) &&
+						(!inMaxYear || month <= maxDate.getMonth())) {
+					html += '<option value="' + month + '"' +
+						(month == drawMonth ? ' selected="selected"' : '') +
+						'>' + monthNames[month] + '</option>';
+				}
+			}
+			html += '</select>';
+		}
+		// year selection
+		if (secondary || !this._get('changeYear'))
+			html += drawYear;
+		else {
+			// determine range of years to display
+			var years = this._get('yearRange').split(':');
+			var year = 0;
+			var endYear = 0;
+			if (years.length != 2) {
+				year = drawYear - 10;
+				endYear = drawYear + 10;
+			} else if (years[0].charAt(0) == '+' || years[0].charAt(0) == '-') {
+				year = drawYear + parseInt(years[0], 10);
+				endYear = drawYear + parseInt(years[1], 10);
+			} else {
+				year = parseInt(years[0], 10);
+				endYear = parseInt(years[1], 10);
+			}
+			year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
+			endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
+			html += '<select class="datepicker_newYear" ' +
+				'onchange="jQuery.datepicker._selectMonthYear(' + this._id + ', this, \'Y\');" ' +
+				'onclick="jQuery.datepicker._clickMonthYear(' + this._id + ');"' +
+				(showStatus ? this._addStatus(this._get('yearStatus') || '&#xa0;') : '') + '>';
+			for (; year <= endYear; year++) {
+				html += '<option value="' + year + '"' +
+					(year == drawYear ? ' selected="selected"' : '') +
+					'>' + year + '</option>';
+			}
+			html += '</select>';
+		}
+		html += '</div>'; // Close datepicker_header
+		return html;
+	},
+
+	/* Provide code to set and clear the status panel. */
+	_addStatus: function(text) {
+		return ' onmouseover="jQuery(\'#datepicker_status_' + this._id + '\').html(\'' + text + '\');" ' +
+			'onmouseout="jQuery(\'#datepicker_status_' + this._id + '\').html(\'&#xa0;\');"';
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustDate: function(offset, period) {
+		var year = this._drawYear + (period == 'Y' ? offset : 0);
+		var month = this._drawMonth + (period == 'M' ? offset : 0);
+		var day = Math.min(this._selectedDay, this._getDaysInMonth(year, month)) +
+			(period == 'D' ? offset : 0);
+		var date = new Date(year, month, day);
+		// ensure it is within the bounds set
+		var minDate = this._getMinMaxDate('min', true);
+		var maxDate = this._getMinMaxDate('max');
+		date = (minDate && date < minDate ? minDate : date);
+		date = (maxDate && date > maxDate ? maxDate : date);
+		this._selectedDay = date.getDate();
+		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');
+		return (numMonths == null ? [1, 1] : (typeof numMonths == 'number' ? [1, numMonths] : numMonths));
+	},
+
+	/* Determine the current maximum date - ensure no time components are set - may be overridden for a range. */
+	_getMinMaxDate: function(minMax, checkRange) {
+		var date = this._determineDate(minMax + 'Date', null);
+		if (date) {
+			date.setHours(0);
+			date.setMinutes(0);
+			date.setSeconds(0);
+			date.setMilliseconds(0);
+		}
+		return date || (checkRange ? this._rangeStart : null);
+	},
+
+	/* Find the number of days in a given month. */
+	_getDaysInMonth: function(year, month) {
+		return 32 - new Date(year, month, 32).getDate();
+	},
+
+	/* Find the day of the week of the first of a month. */
+	_getFirstDayOfMonth: function(year, month) {
+		return new Date(year, month, 1).getDay();
+	},
+
+	/* Determines if we should allow a "next/prev" month display change. */
+	_canAdjustMonth: function(offset, curYear, curMonth) {
+		var numMonths = this._getNumberOfMonths();
+		var date = new Date(curYear, curMonth + (offset < 0 ? offset : numMonths[1]), 1);
+		if (offset < 0)
+			date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
+		return this._isInRange(date);
+	},
+
+	/* Is the given date in the accepted range? */
+	_isInRange: function(date) {
+		// during range selection, use minimum of selected date and range start
+		var newMinDate = (!this._rangeStart ? null :
+			new Date(this._selectedYear, this._selectedMonth, this._selectedDay));
+		newMinDate = (newMinDate && this._rangeStart < newMinDate ? this._rangeStart : newMinDate);
+		var minDate = newMinDate || this._getMinMaxDate('min');
+		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');
+		shortYearCutoff = (typeof shortYearCutoff != 'string' ? shortYearCutoff :
+			new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
+		return {shortYearCutoff: shortYearCutoff,
+			dayNamesShort: this._get('dayNamesShort'), dayNames: this._get('dayNames'),
+			monthNamesShort: this._get('monthNamesShort'), monthNames: this._get('monthNames')};
+	},
+
+	/* Format the given date for display. */
+	_formatDate: function(day, month, year) {
+		if (!day) {
+			this._currentDay = this._selectedDay;
+			this._currentMonth = this._selectedMonth;
+			this._currentYear = this._selectedYear;
+		}
+		var date = (day ? (typeof day == 'object' ? day : new Date(year, month, day)) :
+			new Date(this._currentYear, this._currentMonth, this._currentDay));
+		return $.datepicker.formatDate(this._get('dateFormat'), date, this._getFormatConfig());
+	}
+});
+
+/* jQuery extend now ignores nulls! */
+function extendRemove(target, props) {
+	$.extend(target, props);
+	for (var name in props)
+		if (props[name] == null)
+			target[name] = null;
+	return target;
+};
+
+/* Invoke the datepicker functionality.
+   @param  options  String - a command, optionally followed by additional parameters or
+                    Object - settings for attaching new datepicker functionality
+   @return  jQuery object */
+$.fn.datepicker = function(options){
+	var otherArgs = Array.prototype.slice.call(arguments, 1);
+	if (typeof options == 'string' && (options == 'isDisabled' || options == 'getDate')) {
+		return $.datepicker['_' + options + 'Datepicker'].apply($.datepicker, [this[0]].concat(otherArgs));
+	}
+	return this.each(function() {
+		typeof options == 'string' ?
+			$.datepicker['_' + options + 'Datepicker'].apply($.datepicker, [this].concat(otherArgs)) :
+			$.datepicker._attachDatepicker(this, 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
diff --git a/webapp/web/js/json2.js b/webapp/web/js/json2.js
index ab769faf9..3b0c872d1 100644
--- a/webapp/web/js/json2.js
+++ b/webapp/web/js/json2.js
@@ -1,487 +1,487 @@
-/*
-    json2.js
-    2011-10-19
-
-    Public Domain.
-
-    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
-
-    See http://www.JSON.org/js.html
-
-
-    This code should be minified before deployment.
-    See http://javascript.crockford.com/jsmin.html
-
-    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
-    NOT CONTROL.
-
-
-    This file creates a global JSON object containing two methods: stringify
-    and parse.
-
-        JSON.stringify(value, replacer, space)
-            value       any JavaScript value, usually an object or array.
-
-            replacer    an optional parameter that determines how object
-                        values are stringified for objects. It can be a
-                        function or an array of strings.
-
-            space       an optional parameter that specifies the indentation
-                        of nested structures. If it is omitted, the text will
-                        be packed without extra whitespace. If it is a number,
-                        it will specify the number of spaces to indent at each
-                        level. If it is a string (such as '\t' or '&nbsp;'),
-                        it contains the characters used to indent at each level.
-
-            This method produces a JSON text from a JavaScript value.
-
-            When an object value is found, if the object contains a toJSON
-            method, its toJSON method will be called and the result will be
-            stringified. A toJSON method does not serialize: it returns the
-            value represented by the name/value pair that should be serialized,
-            or undefined if nothing should be serialized. The toJSON method
-            will be passed the key associated with the value, and this will be
-            bound to the value
-
-            For example, this would serialize Dates as ISO strings.
-
-                Date.prototype.toJSON = function (key) {
-                    function f(n) {
-                        // Format integers to have at least two digits.
-                        return n < 10 ? '0' + n : n;
-                    }
-
-                    return this.getUTCFullYear()   + '-' +
-                         f(this.getUTCMonth() + 1) + '-' +
-                         f(this.getUTCDate())      + 'T' +
-                         f(this.getUTCHours())     + ':' +
-                         f(this.getUTCMinutes())   + ':' +
-                         f(this.getUTCSeconds())   + 'Z';
-                };
-
-            You can provide an optional replacer method. It will be passed the
-            key and value of each member, with this bound to the containing
-            object. The value that is returned from your method will be
-            serialized. If your method returns undefined, then the member will
-            be excluded from the serialization.
-
-            If the replacer parameter is an array of strings, then it will be
-            used to select the members to be serialized. It filters the results
-            such that only members with keys listed in the replacer array are
-            stringified.
-
-            Values that do not have JSON representations, such as undefined or
-            functions, will not be serialized. Such values in objects will be
-            dropped; in arrays they will be replaced with null. You can use
-            a replacer function to replace those with JSON values.
-            JSON.stringify(undefined) returns undefined.
-
-            The optional space parameter produces a stringification of the
-            value that is filled with line breaks and indentation to make it
-            easier to read.
-
-            If the space parameter is a non-empty string, then that string will
-            be used for indentation. If the space parameter is a number, then
-            the indentation will be that many spaces.
-
-            Example:
-
-            text = JSON.stringify(['e', {pluribus: 'unum'}]);
-            // text is '["e",{"pluribus":"unum"}]'
-
-
-            text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
-            // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
-
-            text = JSON.stringify([new Date()], function (key, value) {
-                return this[key] instanceof Date ?
-                    'Date(' + this[key] + ')' : value;
-            });
-            // text is '["Date(---current time---)"]'
-
-
-        JSON.parse(text, reviver)
-            This method parses a JSON text to produce an object or array.
-            It can throw a SyntaxError exception.
-
-            The optional reviver parameter is a function that can filter and
-            transform the results. It receives each of the keys and values,
-            and its return value is used instead of the original value.
-            If it returns what it received, then the structure is not modified.
-            If it returns undefined then the member is deleted.
-
-            Example:
-
-            // Parse the text. Values that look like ISO date strings will
-            // be converted to Date objects.
-
-            myData = JSON.parse(text, function (key, value) {
-                var a;
-                if (typeof value === 'string') {
-                    a =
-/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
-                    if (a) {
-                        return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
-                            +a[5], +a[6]));
-                    }
-                }
-                return value;
-            });
-
-            myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
-                var d;
-                if (typeof value === 'string' &&
-                        value.slice(0, 5) === 'Date(' &&
-                        value.slice(-1) === ')') {
-                    d = new Date(value.slice(5, -1));
-                    if (d) {
-                        return d;
-                    }
-                }
-                return value;
-            });
-
-
-    This is a reference implementation. You are free to copy, modify, or
-    redistribute.
-*/
-
-/*jslint evil: true, regexp: true */
-
-/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
-    call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
-    getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
-    lastIndex, length, parse, prototype, push, replace, slice, stringify,
-    test, toJSON, toString, valueOf
-*/
-
-
-// Create a JSON object only if one does not already exist. We create the
-// methods in a closure to avoid creating global variables.
-
-var JSON;
-if (!JSON) {
-    JSON = {};
-}
-
-(function () {
-    'use strict';
-
-    function f(n) {
-        // Format integers to have at least two digits.
-        return n < 10 ? '0' + n : n;
-    }
-
-    if (typeof Date.prototype.toJSON !== 'function') {
-
-        Date.prototype.toJSON = function (key) {
-
-            return isFinite(this.valueOf())
-                ? this.getUTCFullYear()     + '-' +
-                    f(this.getUTCMonth() + 1) + '-' +
-                    f(this.getUTCDate())      + 'T' +
-                    f(this.getUTCHours())     + ':' +
-                    f(this.getUTCMinutes())   + ':' +
-                    f(this.getUTCSeconds())   + 'Z'
-                : null;
-        };
-
-        String.prototype.toJSON      =
-            Number.prototype.toJSON  =
-            Boolean.prototype.toJSON = function (key) {
-                return this.valueOf();
-            };
-    }
-
-    var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-        escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-        gap,
-        indent,
-        meta = {    // table of character substitutions
-            '\b': '\\b',
-            '\t': '\\t',
-            '\n': '\\n',
-            '\f': '\\f',
-            '\r': '\\r',
-            '"' : '\\"',
-            '\\': '\\\\'
-        },
-        rep;
-
-
-    function quote(string) {
-
-// If the string contains no control characters, no quote characters, and no
-// backslash characters, then we can safely slap some quotes around it.
-// Otherwise we must also replace the offending characters with safe escape
-// sequences.
-
-        escapable.lastIndex = 0;
-        return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
-            var c = meta[a];
-            return typeof c === 'string'
-                ? c
-                : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-        }) + '"' : '"' + string + '"';
-    }
-
-
-    function str(key, holder) {
-
-// Produce a string from holder[key].
-
-        var i,          // The loop counter.
-            k,          // The member key.
-            v,          // The member value.
-            length,
-            mind = gap,
-            partial,
-            value = holder[key];
-
-// If the value has a toJSON method, call it to obtain a replacement value.
-
-        if (value && typeof value === 'object' &&
-                typeof value.toJSON === 'function') {
-            value = value.toJSON(key);
-        }
-
-// If we were called with a replacer function, then call the replacer to
-// obtain a replacement value.
-
-        if (typeof rep === 'function') {
-            value = rep.call(holder, key, value);
-        }
-
-// What happens next depends on the value's type.
-
-        switch (typeof value) {
-        case 'string':
-            return quote(value);
-
-        case 'number':
-
-// JSON numbers must be finite. Encode non-finite numbers as null.
-
-            return isFinite(value) ? String(value) : 'null';
-
-        case 'boolean':
-        case 'null':
-
-// If the value is a boolean or null, convert it to a string. Note:
-// typeof null does not produce 'null'. The case is included here in
-// the remote chance that this gets fixed someday.
-
-            return String(value);
-
-// If the type is 'object', we might be dealing with an object or an array or
-// null.
-
-        case 'object':
-
-// Due to a specification blunder in ECMAScript, typeof null is 'object',
-// so watch out for that case.
-
-            if (!value) {
-                return 'null';
-            }
-
-// Make an array to hold the partial results of stringifying this object value.
-
-            gap += indent;
-            partial = [];
-
-// Is the value an array?
-
-            if (Object.prototype.toString.apply(value) === '[object Array]') {
-
-// The value is an array. Stringify every element. Use null as a placeholder
-// for non-JSON values.
-
-                length = value.length;
-                for (i = 0; i < length; i += 1) {
-                    partial[i] = str(i, value) || 'null';
-                }
-
-// Join all of the elements together, separated with commas, and wrap them in
-// brackets.
-
-                v = partial.length === 0
-                    ? '[]'
-                    : gap
-                    ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']'
-                    : '[' + partial.join(',') + ']';
-                gap = mind;
-                return v;
-            }
-
-// If the replacer is an array, use it to select the members to be stringified.
-
-            if (rep && typeof rep === 'object') {
-                length = rep.length;
-                for (i = 0; i < length; i += 1) {
-                    if (typeof rep[i] === 'string') {
-                        k = rep[i];
-                        v = str(k, value);
-                        if (v) {
-                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
-                        }
-                    }
-                }
-            } else {
-
-// Otherwise, iterate through all of the keys in the object.
-
-                for (k in value) {
-                    if (Object.prototype.hasOwnProperty.call(value, k)) {
-                        v = str(k, value);
-                        if (v) {
-                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
-                        }
-                    }
-                }
-            }
-
-// Join all of the member texts together, separated with commas,
-// and wrap them in braces.
-
-            v = partial.length === 0
-                ? '{}'
-                : gap
-                ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}'
-                : '{' + partial.join(',') + '}';
-            gap = mind;
-            return v;
-        }
-    }
-
-// If the JSON object does not yet have a stringify method, give it one.
-
-    if (typeof JSON.stringify !== 'function') {
-        JSON.stringify = function (value, replacer, space) {
-
-// The stringify method takes a value and an optional replacer, and an optional
-// space parameter, and returns a JSON text. The replacer can be a function
-// that can replace values, or an array of strings that will select the keys.
-// A default replacer method can be provided. Use of the space parameter can
-// produce text that is more easily readable.
-
-            var i;
-            gap = '';
-            indent = '';
-
-// If the space parameter is a number, make an indent string containing that
-// many spaces.
-
-            if (typeof space === 'number') {
-                for (i = 0; i < space; i += 1) {
-                    indent += ' ';
-                }
-
-// If the space parameter is a string, it will be used as the indent string.
-
-            } else if (typeof space === 'string') {
-                indent = space;
-            }
-
-// If there is a replacer, it must be a function or an array.
-// Otherwise, throw an error.
-
-            rep = replacer;
-            if (replacer && typeof replacer !== 'function' &&
-                    (typeof replacer !== 'object' ||
-                    typeof replacer.length !== 'number')) {
-                throw new Error('JSON.stringify');
-            }
-
-// Make a fake root object containing our value under the key of ''.
-// Return the result of stringifying the value.
-
-            return str('', {'': value});
-        };
-    }
-
-
-// If the JSON object does not yet have a parse method, give it one.
-
-    if (typeof JSON.parse !== 'function') {
-        JSON.parse = function (text, reviver) {
-
-// The parse method takes a text and an optional reviver function, and returns
-// a JavaScript value if the text is a valid JSON text.
-
-            var j;
-
-            function walk(holder, key) {
-
-// The walk method is used to recursively walk the resulting structure so
-// that modifications can be made.
-
-                var k, v, value = holder[key];
-                if (value && typeof value === 'object') {
-                    for (k in value) {
-                        if (Object.prototype.hasOwnProperty.call(value, k)) {
-                            v = walk(value, k);
-                            if (v !== undefined) {
-                                value[k] = v;
-                            } else {
-                                delete value[k];
-                            }
-                        }
-                    }
-                }
-                return reviver.call(holder, key, value);
-            }
-
-
-// Parsing happens in four stages. In the first stage, we replace certain
-// Unicode characters with escape sequences. JavaScript handles many characters
-// incorrectly, either silently deleting them, or treating them as line endings.
-
-            text = String(text);
-            cx.lastIndex = 0;
-            if (cx.test(text)) {
-                text = text.replace(cx, function (a) {
-                    return '\\u' +
-                        ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
-                });
-            }
-
-// In the second stage, we run the text against regular expressions that look
-// for non-JSON patterns. We are especially concerned with '()' and 'new'
-// because they can cause invocation, and '=' because it can cause mutation.
-// But just to be safe, we want to reject all unexpected forms.
-
-// We split the second stage into 4 regexp operations in order to work around
-// crippling inefficiencies in IE's and Safari's regexp engines. First we
-// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
-// replace all simple value tokens with ']' characters. Third, we delete all
-// open brackets that follow a colon or comma or that begin the text. Finally,
-// we look to see that the remaining characters are only whitespace or ']' or
-// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
-
-            if (/^[\],:{}\s]*$/
-                    .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
-                        .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
-                        .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
-
-// In the third stage we use the eval function to compile the text into a
-// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
-// in JavaScript: it can begin a block or an object literal. We wrap the text
-// in parens to eliminate the ambiguity.
-
-                j = eval('(' + text + ')');
-
-// In the optional fourth stage, we recursively walk the new structure, passing
-// each name/value pair to a reviver function for possible transformation.
-
-                return typeof reviver === 'function'
-                    ? walk({'': j}, '')
-                    : j;
-            }
-
-// If the text is not JSON parseable, then a SyntaxError is thrown.
-
-            throw new SyntaxError('JSON.parse');
-        };
-    }
-}());
+/*
+    json2.js
+    2011-10-19
+
+    Public Domain.
+
+    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+
+    See http://www.JSON.org/js.html
+
+
+    This code should be minified before deployment.
+    See http://javascript.crockford.com/jsmin.html
+
+    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+    NOT CONTROL.
+
+
+    This file creates a global JSON object containing two methods: stringify
+    and parse.
+
+        JSON.stringify(value, replacer, space)
+            value       any JavaScript value, usually an object or array.
+
+            replacer    an optional parameter that determines how object
+                        values are stringified for objects. It can be a
+                        function or an array of strings.
+
+            space       an optional parameter that specifies the indentation
+                        of nested structures. If it is omitted, the text will
+                        be packed without extra whitespace. If it is a number,
+                        it will specify the number of spaces to indent at each
+                        level. If it is a string (such as '\t' or '&nbsp;'),
+                        it contains the characters used to indent at each level.
+
+            This method produces a JSON text from a JavaScript value.
+
+            When an object value is found, if the object contains a toJSON
+            method, its toJSON method will be called and the result will be
+            stringified. A toJSON method does not serialize: it returns the
+            value represented by the name/value pair that should be serialized,
+            or undefined if nothing should be serialized. The toJSON method
+            will be passed the key associated with the value, and this will be
+            bound to the value
+
+            For example, this would serialize Dates as ISO strings.
+
+                Date.prototype.toJSON = function (key) {
+                    function f(n) {
+                        // Format integers to have at least two digits.
+                        return n < 10 ? '0' + n : n;
+                    }
+
+                    return this.getUTCFullYear()   + '-' +
+                         f(this.getUTCMonth() + 1) + '-' +
+                         f(this.getUTCDate())      + 'T' +
+                         f(this.getUTCHours())     + ':' +
+                         f(this.getUTCMinutes())   + ':' +
+                         f(this.getUTCSeconds())   + 'Z';
+                };
+
+            You can provide an optional replacer method. It will be passed the
+            key and value of each member, with this bound to the containing
+            object. The value that is returned from your method will be
+            serialized. If your method returns undefined, then the member will
+            be excluded from the serialization.
+
+            If the replacer parameter is an array of strings, then it will be
+            used to select the members to be serialized. It filters the results
+            such that only members with keys listed in the replacer array are
+            stringified.
+
+            Values that do not have JSON representations, such as undefined or
+            functions, will not be serialized. Such values in objects will be
+            dropped; in arrays they will be replaced with null. You can use
+            a replacer function to replace those with JSON values.
+            JSON.stringify(undefined) returns undefined.
+
+            The optional space parameter produces a stringification of the
+            value that is filled with line breaks and indentation to make it
+            easier to read.
+
+            If the space parameter is a non-empty string, then that string will
+            be used for indentation. If the space parameter is a number, then
+            the indentation will be that many spaces.
+
+            Example:
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}]);
+            // text is '["e",{"pluribus":"unum"}]'
+
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
+            // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
+
+            text = JSON.stringify([new Date()], function (key, value) {
+                return this[key] instanceof Date ?
+                    'Date(' + this[key] + ')' : value;
+            });
+            // text is '["Date(---current time---)"]'
+
+
+        JSON.parse(text, reviver)
+            This method parses a JSON text to produce an object or array.
+            It can throw a SyntaxError exception.
+
+            The optional reviver parameter is a function that can filter and
+            transform the results. It receives each of the keys and values,
+            and its return value is used instead of the original value.
+            If it returns what it received, then the structure is not modified.
+            If it returns undefined then the member is deleted.
+
+            Example:
+
+            // Parse the text. Values that look like ISO date strings will
+            // be converted to Date objects.
+
+            myData = JSON.parse(text, function (key, value) {
+                var a;
+                if (typeof value === 'string') {
+                    a =
+/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
+                    if (a) {
+                        return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
+                            +a[5], +a[6]));
+                    }
+                }
+                return value;
+            });
+
+            myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
+                var d;
+                if (typeof value === 'string' &&
+                        value.slice(0, 5) === 'Date(' &&
+                        value.slice(-1) === ')') {
+                    d = new Date(value.slice(5, -1));
+                    if (d) {
+                        return d;
+                    }
+                }
+                return value;
+            });
+
+
+    This is a reference implementation. You are free to copy, modify, or
+    redistribute.
+*/
+
+/*jslint evil: true, regexp: true */
+
+/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
+    call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
+    getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
+    lastIndex, length, parse, prototype, push, replace, slice, stringify,
+    test, toJSON, toString, valueOf
+*/
+
+
+// Create a JSON object only if one does not already exist. We create the
+// methods in a closure to avoid creating global variables.
+
+var JSON;
+if (!JSON) {
+    JSON = {};
+}
+
+(function () {
+    'use strict';
+
+    function f(n) {
+        // Format integers to have at least two digits.
+        return n < 10 ? '0' + n : n;
+    }
+
+    if (typeof Date.prototype.toJSON !== 'function') {
+
+        Date.prototype.toJSON = function (key) {
+
+            return isFinite(this.valueOf())
+                ? this.getUTCFullYear()     + '-' +
+                    f(this.getUTCMonth() + 1) + '-' +
+                    f(this.getUTCDate())      + 'T' +
+                    f(this.getUTCHours())     + ':' +
+                    f(this.getUTCMinutes())   + ':' +
+                    f(this.getUTCSeconds())   + 'Z'
+                : null;
+        };
+
+        String.prototype.toJSON      =
+            Number.prototype.toJSON  =
+            Boolean.prototype.toJSON = function (key) {
+                return this.valueOf();
+            };
+    }
+
+    var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+        escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+        gap,
+        indent,
+        meta = {    // table of character substitutions
+            '\b': '\\b',
+            '\t': '\\t',
+            '\n': '\\n',
+            '\f': '\\f',
+            '\r': '\\r',
+            '"' : '\\"',
+            '\\': '\\\\'
+        },
+        rep;
+
+
+    function quote(string) {
+
+// If the string contains no control characters, no quote characters, and no
+// backslash characters, then we can safely slap some quotes around it.
+// Otherwise we must also replace the offending characters with safe escape
+// sequences.
+
+        escapable.lastIndex = 0;
+        return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
+            var c = meta[a];
+            return typeof c === 'string'
+                ? c
+                : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+        }) + '"' : '"' + string + '"';
+    }
+
+
+    function str(key, holder) {
+
+// Produce a string from holder[key].
+
+        var i,          // The loop counter.
+            k,          // The member key.
+            v,          // The member value.
+            length,
+            mind = gap,
+            partial,
+            value = holder[key];
+
+// If the value has a toJSON method, call it to obtain a replacement value.
+
+        if (value && typeof value === 'object' &&
+                typeof value.toJSON === 'function') {
+            value = value.toJSON(key);
+        }
+
+// If we were called with a replacer function, then call the replacer to
+// obtain a replacement value.
+
+        if (typeof rep === 'function') {
+            value = rep.call(holder, key, value);
+        }
+
+// What happens next depends on the value's type.
+
+        switch (typeof value) {
+        case 'string':
+            return quote(value);
+
+        case 'number':
+
+// JSON numbers must be finite. Encode non-finite numbers as null.
+
+            return isFinite(value) ? String(value) : 'null';
+
+        case 'boolean':
+        case 'null':
+
+// If the value is a boolean or null, convert it to a string. Note:
+// typeof null does not produce 'null'. The case is included here in
+// the remote chance that this gets fixed someday.
+
+            return String(value);
+
+// If the type is 'object', we might be dealing with an object or an array or
+// null.
+
+        case 'object':
+
+// Due to a specification blunder in ECMAScript, typeof null is 'object',
+// so watch out for that case.
+
+            if (!value) {
+                return 'null';
+            }
+
+// Make an array to hold the partial results of stringifying this object value.
+
+            gap += indent;
+            partial = [];
+
+// Is the value an array?
+
+            if (Object.prototype.toString.apply(value) === '[object Array]') {
+
+// The value is an array. Stringify every element. Use null as a placeholder
+// for non-JSON values.
+
+                length = value.length;
+                for (i = 0; i < length; i += 1) {
+                    partial[i] = str(i, value) || 'null';
+                }
+
+// Join all of the elements together, separated with commas, and wrap them in
+// brackets.
+
+                v = partial.length === 0
+                    ? '[]'
+                    : gap
+                    ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']'
+                    : '[' + partial.join(',') + ']';
+                gap = mind;
+                return v;
+            }
+
+// If the replacer is an array, use it to select the members to be stringified.
+
+            if (rep && typeof rep === 'object') {
+                length = rep.length;
+                for (i = 0; i < length; i += 1) {
+                    if (typeof rep[i] === 'string') {
+                        k = rep[i];
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            } else {
+
+// Otherwise, iterate through all of the keys in the object.
+
+                for (k in value) {
+                    if (Object.prototype.hasOwnProperty.call(value, k)) {
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            }
+
+// Join all of the member texts together, separated with commas,
+// and wrap them in braces.
+
+            v = partial.length === 0
+                ? '{}'
+                : gap
+                ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}'
+                : '{' + partial.join(',') + '}';
+            gap = mind;
+            return v;
+        }
+    }
+
+// If the JSON object does not yet have a stringify method, give it one.
+
+    if (typeof JSON.stringify !== 'function') {
+        JSON.stringify = function (value, replacer, space) {
+
+// The stringify method takes a value and an optional replacer, and an optional
+// space parameter, and returns a JSON text. The replacer can be a function
+// that can replace values, or an array of strings that will select the keys.
+// A default replacer method can be provided. Use of the space parameter can
+// produce text that is more easily readable.
+
+            var i;
+            gap = '';
+            indent = '';
+
+// If the space parameter is a number, make an indent string containing that
+// many spaces.
+
+            if (typeof space === 'number') {
+                for (i = 0; i < space; i += 1) {
+                    indent += ' ';
+                }
+
+// If the space parameter is a string, it will be used as the indent string.
+
+            } else if (typeof space === 'string') {
+                indent = space;
+            }
+
+// If there is a replacer, it must be a function or an array.
+// Otherwise, throw an error.
+
+            rep = replacer;
+            if (replacer && typeof replacer !== 'function' &&
+                    (typeof replacer !== 'object' ||
+                    typeof replacer.length !== 'number')) {
+                throw new Error('JSON.stringify');
+            }
+
+// Make a fake root object containing our value under the key of ''.
+// Return the result of stringifying the value.
+
+            return str('', {'': value});
+        };
+    }
+
+
+// If the JSON object does not yet have a parse method, give it one.
+
+    if (typeof JSON.parse !== 'function') {
+        JSON.parse = function (text, reviver) {
+
+// The parse method takes a text and an optional reviver function, and returns
+// a JavaScript value if the text is a valid JSON text.
+
+            var j;
+
+            function walk(holder, key) {
+
+// The walk method is used to recursively walk the resulting structure so
+// that modifications can be made.
+
+                var k, v, value = holder[key];
+                if (value && typeof value === 'object') {
+                    for (k in value) {
+                        if (Object.prototype.hasOwnProperty.call(value, k)) {
+                            v = walk(value, k);
+                            if (v !== undefined) {
+                                value[k] = v;
+                            } else {
+                                delete value[k];
+                            }
+                        }
+                    }
+                }
+                return reviver.call(holder, key, value);
+            }
+
+
+// Parsing happens in four stages. In the first stage, we replace certain
+// Unicode characters with escape sequences. JavaScript handles many characters
+// incorrectly, either silently deleting them, or treating them as line endings.
+
+            text = String(text);
+            cx.lastIndex = 0;
+            if (cx.test(text)) {
+                text = text.replace(cx, function (a) {
+                    return '\\u' +
+                        ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+                });
+            }
+
+// In the second stage, we run the text against regular expressions that look
+// for non-JSON patterns. We are especially concerned with '()' and 'new'
+// because they can cause invocation, and '=' because it can cause mutation.
+// But just to be safe, we want to reject all unexpected forms.
+
+// We split the second stage into 4 regexp operations in order to work around
+// crippling inefficiencies in IE's and Safari's regexp engines. First we
+// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
+// replace all simple value tokens with ']' characters. Third, we delete all
+// open brackets that follow a colon or comma or that begin the text. Finally,
+// we look to see that the remaining characters are only whitespace or ']' or
+// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
+
+            if (/^[\],:{}\s]*$/
+                    .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
+                        .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
+                        .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+// In the third stage we use the eval function to compile the text into a
+// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
+// in JavaScript: it can begin a block or an object literal. We wrap the text
+// in parens to eliminate the ambiguity.
+
+                j = eval('(' + text + ')');
+
+// In the optional fourth stage, we recursively walk the new structure, passing
+// each name/value pair to a reviver function for possible transformation.
+
+                return typeof reviver === 'function'
+                    ? walk({'': j}, '')
+                    : j;
+            }
+
+// If the text is not JSON parseable, then a SyntaxError is thrown.
+
+            throw new SyntaxError('JSON.parse');
+        };
+    }
+}());
diff --git a/webapp/web/js/menupage/menumanagement_edit.js b/webapp/web/js/menupage/menumanagement_edit.js
index 7b0d1b808..e5266bdde 100644
--- a/webapp/web/js/menupage/menumanagement_edit.js
+++ b/webapp/web/js/menupage/menumanagement_edit.js
@@ -1,174 +1,174 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-var menuManagementEdit = {
-    onLoad: function() {
-        $.extend(this, i18nStrings);
-        this.initObjects();
-        this.bindEventListeners();
-        this.toggleClassSelection();
-    },
-    initObjects: function() {
-        this.defaultTemplateRadio = $('input.default-template');
-        this.customTemplateRadio = $('input.custom-template');
-        this.customTemplate = $('#custom-template');
-        this.changeContentType = $('#changeContentType');
-        this.selectContentType = $('#selectContentType');
-        this.existingContentType = $('#existingContentType');
-        this.selectClassGroupDropdown = $('#selectClassGroup');
-        this.classesForClassGroup = $('#classesInSelectedGroup');
-        this.selectedGroupForPage = $('#selectedContentTypeValue');
-        this.allClassesSelectedCheckbox = $('#allSelected');
-        this.displayInternalMessage = $('#internal-class label em');
-    },
-    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');
-        });
-        this.customTemplateRadio.click(function(){
-            // If checked, hide this input element
-            menuManagementEdit.customTemplate.removeClass('hidden');
-        });
-        $("form").submit(function () { 
-            var validationError = menuManagementEdit.validateMenuItemForm();
-            if (validationError == "") {
-                   $(this).submit();
-               } else{
-                   $('#error-alert').removeClass('hidden');
-                   $('#error-alert p').html(validationError);
-                   $.scrollTo({ top:0, left:0}, 500)
-                   return false;
-               } 
-         });
-    },
-    updateInternalClassMessage:function(classGroupName) { //User has changed content type 
-        //Set content type within internal class message
-        this.displayInternalMessage.filter(":first").html(classGroupName);
-    },
-    showClassGroups: function() { //User has clicked change content type
-        //Show the section with the class group dropdown
-        this.selectContentType.removeClass("hidden");
-        //Hide the "change content type" section which shows the selected class group
-        this.existingContentType.addClass("hidden");
-        //Hide the checkboxes for classes within the class group
-        this.classesForClassGroup.addClass("hidden");
-    },
-    hideClassGroups: function() { //User has selected class group/content type, page should show classes for class group and 'existing' type with change link
-        //Hide the class group dropdown
-        this.selectContentType.addClass("hidden");
-        //Show the "change content type" section which shows the selected class group
-        this.existingContentType.removeClass("hidden");
-        //Show the classes in the class group
-        this.classesForClassGroup.removeClass("hidden");
-        
-    },
-    toggleClassSelection: function() {
-        // Check/unckeck all classes for selection
-        $('input:checkbox[name=allSelected]').click(function(){
-             if ( this.checked ) {
-             // if checked, select all the checkboxes
-             $('input:checkbox[name=classInClassGroup]').attr('checked','checked');
-
-             } else {
-             // if not checked, deselect all the checkboxes
-               $('input:checkbox[name=classInClassGroup]').removeAttr('checked');
-             }
-        });
-
-        $('input:checkbox[name=classInClassGroup]').click(function(){
-            $('input:checkbox[name=allSelected]').removeAttr('checked');
-        });
-    },
-    validateMenuItemForm: function() {
-        var validationError = "";
-        
-        // Check menu name
-        if ($('input[type=text][name=menuName]').val() == "") {
-            validationError += menuManagementEdit.supplyName + "<br />";
-            }
-        // 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 />"; 
-            }
-        }
-        
-        // if no class group selected, this is an error
-        if ($('#selectClassGroup').val() =='-1') {
-            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;
-            var noClassesSelected = $('input[name="classInClassGroup"]:checked').length;
-            if (allSelected == 0 && noClassesSelected == 0) {
-                //at least one class should be selected
-                validationError += menuManagementEdit.selectContentType + "<br />";
-            }
-        }
-      
-       
-        //check select class group
-       
-        return validationError;
-    },
-    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>' + 
-                          '</li>';
-                  selectedClassesList.append(appendHtml);
-              });
-              menuManagementEdit.toggleClassSelection();
-          }
- 
-        });
-    }
-};
-
-$(document).ready(function() {   
-    menuManagementEdit.onLoad();
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+var menuManagementEdit = {
+    onLoad: function() {
+        $.extend(this, i18nStrings);
+        this.initObjects();
+        this.bindEventListeners();
+        this.toggleClassSelection();
+    },
+    initObjects: function() {
+        this.defaultTemplateRadio = $('input.default-template');
+        this.customTemplateRadio = $('input.custom-template');
+        this.customTemplate = $('#custom-template');
+        this.changeContentType = $('#changeContentType');
+        this.selectContentType = $('#selectContentType');
+        this.existingContentType = $('#existingContentType');
+        this.selectClassGroupDropdown = $('#selectClassGroup');
+        this.classesForClassGroup = $('#classesInSelectedGroup');
+        this.selectedGroupForPage = $('#selectedContentTypeValue');
+        this.allClassesSelectedCheckbox = $('#allSelected');
+        this.displayInternalMessage = $('#internal-class label em');
+    },
+    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');
+        });
+        this.customTemplateRadio.click(function(){
+            // If checked, hide this input element
+            menuManagementEdit.customTemplate.removeClass('hidden');
+        });
+        $("form").submit(function () { 
+            var validationError = menuManagementEdit.validateMenuItemForm();
+            if (validationError == "") {
+                   $(this).submit();
+               } else{
+                   $('#error-alert').removeClass('hidden');
+                   $('#error-alert p').html(validationError);
+                   $.scrollTo({ top:0, left:0}, 500)
+                   return false;
+               } 
+         });
+    },
+    updateInternalClassMessage:function(classGroupName) { //User has changed content type 
+        //Set content type within internal class message
+        this.displayInternalMessage.filter(":first").html(classGroupName);
+    },
+    showClassGroups: function() { //User has clicked change content type
+        //Show the section with the class group dropdown
+        this.selectContentType.removeClass("hidden");
+        //Hide the "change content type" section which shows the selected class group
+        this.existingContentType.addClass("hidden");
+        //Hide the checkboxes for classes within the class group
+        this.classesForClassGroup.addClass("hidden");
+    },
+    hideClassGroups: function() { //User has selected class group/content type, page should show classes for class group and 'existing' type with change link
+        //Hide the class group dropdown
+        this.selectContentType.addClass("hidden");
+        //Show the "change content type" section which shows the selected class group
+        this.existingContentType.removeClass("hidden");
+        //Show the classes in the class group
+        this.classesForClassGroup.removeClass("hidden");
+        
+    },
+    toggleClassSelection: function() {
+        // Check/unckeck all classes for selection
+        $('input:checkbox[name=allSelected]').click(function(){
+             if ( this.checked ) {
+             // if checked, select all the checkboxes
+             $('input:checkbox[name=classInClassGroup]').attr('checked','checked');
+
+             } else {
+             // if not checked, deselect all the checkboxes
+               $('input:checkbox[name=classInClassGroup]').removeAttr('checked');
+             }
+        });
+
+        $('input:checkbox[name=classInClassGroup]').click(function(){
+            $('input:checkbox[name=allSelected]').removeAttr('checked');
+        });
+    },
+    validateMenuItemForm: function() {
+        var validationError = "";
+        
+        // Check menu name
+        if ($('input[type=text][name=menuName]').val() == "") {
+            validationError += menuManagementEdit.supplyName + "<br />";
+            }
+        // 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 />"; 
+            }
+        }
+        
+        // if no class group selected, this is an error
+        if ($('#selectClassGroup').val() =='-1') {
+            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;
+            var noClassesSelected = $('input[name="classInClassGroup"]:checked').length;
+            if (allSelected == 0 && noClassesSelected == 0) {
+                //at least one class should be selected
+                validationError += menuManagementEdit.selectContentType + "<br />";
+            }
+        }
+      
+       
+        //check select class group
+       
+        return validationError;
+    },
+    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>' + 
+                          '</li>';
+                  selectedClassesList.append(appendHtml);
+              });
+              menuManagementEdit.toggleClassSelection();
+          }
+ 
+        });
+    }
+};
+
+$(document).ready(function() {   
+    menuManagementEdit.onLoad();
 });
\ No newline at end of file
diff --git a/webapp/web/js/menupage/processClassGroupDataGetterContent.js b/webapp/web/js/menupage/processClassGroupDataGetterContent.js
index 938064cd5..065e9583e 100644
--- a/webapp/web/js/menupage/processClassGroupDataGetterContent.js
+++ b/webapp/web/js/menupage/processClassGroupDataGetterContent.js
@@ -1,153 +1,153 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-$.extend(this, i18nStringsBrowseGroups);
-//Process sparql data getter and provide a json object with the necessary information
-//Depending on what is included here, a different type of data getter might be used
-var processClassGroupDataGetterContent = {
-	dataGetterClass:null,
-	//can use this if expect to initialize from elsewhere
-	initProcessor:function(dataGetterClassInput) {
-		this.dataGetterClass = dataGetterClassInput;
-	},
-	
-	//Do we need a separate content type for each of the others?
-	processPageContentSection:function(pageContentSection) {
-		//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 
-	populatePageContentSection:function(existingContentObject, pageContentSection) {
-		var classGroupValue = existingContentObject["classGroup"];
-		pageContentSection.find("select[name='selectClassGroup']").val(classGroupValue);
-		//For now, will utilize the function in pageManagementUtils
-		//But should move over any class group specific event handlers etc. into this javascript section
-		//Get 'results' from content object
-		var results = existingContentObject["results"];
-		if(results != null) {
-			processClassGroupDataGetterContent.displayClassesForClassGroup(results, pageContentSection);
-			//Bind event handlers
-			processClassGroupDataGetterContent.bindEventHandlers(pageContentSection);
-			//Show hidden class
-		}
-	},
-	//For the label of the content section for editing, need to add additional value
-	retrieveContentLabel:function() {
-		return i18nStringsBrowseGroups.browseClassGroup;
-	},
-	retrieveAdditionalLabelText:function(existingContentObject) {
-		var label = "";
-		var results = existingContentObject["results"];
-		if(results != null && results["classGroupName"] != null) {
-			label = results["classGroupName"];
-		}
-		return label;
-	},
-	//this is copied from pageManagementUtils but eventually
-	//we should move all event bindings etc. specific to a content type into its own
-	//processing methods
-	//TODO: Refine so no references to pageManagementUtils required
-	//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>' + 
-                        '</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) {
-            	displayInternalMessage.filter(":first").html(results.classGroupName);
-            }
-            //This is an EXISTING selection, so value should not be empty
-    	 	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
-	//handler to THIS new section
-	 toggleClassSelection: function(pageContentSection) {
-        // Check/unckeck all classes for selection
-        pageContentSection.find('input:checkbox[name=allSelected]').click(function(){
-             if ( this.checked ) {
-             // if checked, select all the checkboxes for this particular section
-            $(this).closest("ul").find('input:checkbox[name=classInClassGroup]').attr('checked','checked');
-             //$('input:checkbox[name=classInClassGroup]').attr('checked','checked');
-
-             } else {
-             // if not checked, deselect all the checkboxes
-                 $(this).closest("ul").find('input:checkbox[name=classInClassGroup]').removeAttr('checked');
-
-              // $('input:checkbox[name=classInClassGroup]').removeAttr('checked');
-             }
-        });
-
-        pageContentSection.find('input:checkbox[name=classInClassGroup]').click(function(){
-            $(this).closest("ul").find('input:checkbox[name=allSelected]').removeAttr('checked');
-        });
-    },
-    bindEventHandlers:function(pageContentSection) {
-        processClassGroupDataGetterContent.toggleClassSelection(pageContentSection);
-
-    	var selectClassGroupDropdown =  pageContentSection.find("select[name='selectClassGroup']");
-    	selectClassGroupDropdown.change(function(e, el) {
-             processClassGroupDataGetterContent.chooseClassGroup(pageContentSection);
-         });
-    },
-    chooseClassGroup: function(pageContentSection) {        
-    	var selectClassGroupDropdown =  pageContentSection.find("select[name='selectClassGroup']");
-        var url = "dataservice?getVClassesForVClassGroup=1&classgroupUri=";
-        var vclassUri = selectClassGroupDropdown.val();
-        url += encodeURIComponent(vclassUri);
-        //Get the page content section
-        //Make ajax call to retrieve vclasses
-        $.getJSON(url, function(results) {
-        	//Moved the function to processClassGroupDataGetterContent
-        	//Should probably remove this entire method and copy there
-        	processClassGroupDataGetterContent.displayClassesForClassGroup(results, pageContentSection);
-        });
-    },
-    //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 />"; 
-         } else {
-             //class group has been selected, make sure there is at least one class selected
-             var allSelected = pageContentSection.find('input[name="allSelected"]:checked').length;
-             var noClassesSelected = pageContentSection.find('input[name="classInClassGroup"]:checked').length;
-             if (allSelected == 0 && noClassesSelected == 0) {
-                 //at least one class should be selected
-                 validationError +=  pageContentSectionLabel + ": " + i18nStringsBrowseGroups.selectClasses + "<br />";
-             }
-         }
-    	 return validationError;
-    }
-	   
-		
-		
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+$.extend(this, i18nStringsBrowseGroups);
+//Process sparql data getter and provide a json object with the necessary information
+//Depending on what is included here, a different type of data getter might be used
+var processClassGroupDataGetterContent = {
+	dataGetterClass:null,
+	//can use this if expect to initialize from elsewhere
+	initProcessor:function(dataGetterClassInput) {
+		this.dataGetterClass = dataGetterClassInput;
+	},
+	
+	//Do we need a separate content type for each of the others?
+	processPageContentSection:function(pageContentSection) {
+		//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 
+	populatePageContentSection:function(existingContentObject, pageContentSection) {
+		var classGroupValue = existingContentObject["classGroup"];
+		pageContentSection.find("select[name='selectClassGroup']").val(classGroupValue);
+		//For now, will utilize the function in pageManagementUtils
+		//But should move over any class group specific event handlers etc. into this javascript section
+		//Get 'results' from content object
+		var results = existingContentObject["results"];
+		if(results != null) {
+			processClassGroupDataGetterContent.displayClassesForClassGroup(results, pageContentSection);
+			//Bind event handlers
+			processClassGroupDataGetterContent.bindEventHandlers(pageContentSection);
+			//Show hidden class
+		}
+	},
+	//For the label of the content section for editing, need to add additional value
+	retrieveContentLabel:function() {
+		return i18nStringsBrowseGroups.browseClassGroup;
+	},
+	retrieveAdditionalLabelText:function(existingContentObject) {
+		var label = "";
+		var results = existingContentObject["results"];
+		if(results != null && results["classGroupName"] != null) {
+			label = results["classGroupName"];
+		}
+		return label;
+	},
+	//this is copied from pageManagementUtils but eventually
+	//we should move all event bindings etc. specific to a content type into its own
+	//processing methods
+	//TODO: Refine so no references to pageManagementUtils required
+	//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>' + 
+                        '</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) {
+            	displayInternalMessage.filter(":first").html(results.classGroupName);
+            }
+            //This is an EXISTING selection, so value should not be empty
+    	 	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
+	//handler to THIS new section
+	 toggleClassSelection: function(pageContentSection) {
+        // Check/unckeck all classes for selection
+        pageContentSection.find('input:checkbox[name=allSelected]').click(function(){
+             if ( this.checked ) {
+             // if checked, select all the checkboxes for this particular section
+            $(this).closest("ul").find('input:checkbox[name=classInClassGroup]').attr('checked','checked');
+             //$('input:checkbox[name=classInClassGroup]').attr('checked','checked');
+
+             } else {
+             // if not checked, deselect all the checkboxes
+                 $(this).closest("ul").find('input:checkbox[name=classInClassGroup]').removeAttr('checked');
+
+              // $('input:checkbox[name=classInClassGroup]').removeAttr('checked');
+             }
+        });
+
+        pageContentSection.find('input:checkbox[name=classInClassGroup]').click(function(){
+            $(this).closest("ul").find('input:checkbox[name=allSelected]').removeAttr('checked');
+        });
+    },
+    bindEventHandlers:function(pageContentSection) {
+        processClassGroupDataGetterContent.toggleClassSelection(pageContentSection);
+
+    	var selectClassGroupDropdown =  pageContentSection.find("select[name='selectClassGroup']");
+    	selectClassGroupDropdown.change(function(e, el) {
+             processClassGroupDataGetterContent.chooseClassGroup(pageContentSection);
+         });
+    },
+    chooseClassGroup: function(pageContentSection) {        
+    	var selectClassGroupDropdown =  pageContentSection.find("select[name='selectClassGroup']");
+        var url = "dataservice?getVClassesForVClassGroup=1&classgroupUri=";
+        var vclassUri = selectClassGroupDropdown.val();
+        url += encodeURIComponent(vclassUri);
+        //Get the page content section
+        //Make ajax call to retrieve vclasses
+        $.getJSON(url, function(results) {
+        	//Moved the function to processClassGroupDataGetterContent
+        	//Should probably remove this entire method and copy there
+        	processClassGroupDataGetterContent.displayClassesForClassGroup(results, pageContentSection);
+        });
+    },
+    //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 />"; 
+         } else {
+             //class group has been selected, make sure there is at least one class selected
+             var allSelected = pageContentSection.find('input[name="allSelected"]:checked').length;
+             var noClassesSelected = pageContentSection.find('input[name="classInClassGroup"]:checked').length;
+             if (allSelected == 0 && noClassesSelected == 0) {
+                 //at least one class should be selected
+                 validationError +=  pageContentSectionLabel + ": " + i18nStringsBrowseGroups.selectClasses + "<br />";
+             }
+         }
+    	 return validationError;
+    }
+	   
+		
+		
 } 
\ No newline at end of file
diff --git a/webapp/web/js/menupage/processDataGetterUtils.js b/webapp/web/js/menupage/processDataGetterUtils.js
index f02067df5..d6132a6c7 100644
--- a/webapp/web/js/menupage/processDataGetterUtils.js
+++ b/webapp/web/js/menupage/processDataGetterUtils.js
@@ -1,38 +1,38 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-//This class is responsible for the product-specific form processing/content selection that might be possible
-//Overrides the usual behavior of selecting the specific JavaScript class needed to convert the form inputs
-//into a JSON object for submission based on the page content type
-
-//This will need to be overridden or extended, what have you.. in VIVO
-var processDataGetterUtils = {
-		dataGetterProcessorMap:{"browseClassGroup": processClassGroupDataGetterContent, 
-								"sparqlQuery": processSparqlDataGetterContent, 
-								"fixedHtml":processFixedHTMLDataGetterContent,
-								"individualsForClasses":processIndividualsForClassesDataGetterContent},
-	    selectDataGetterType:function(pageContentSection) {
-			var contentType = pageContentSection.attr("contentType");
-			//The form can provide "browse class group" as content type but need to check
-			//whether this is in fact individuals for classes instead
-			if(contentType == "browseClassGroup") {
-				//Is ALL NOT selected and there are other classes, pick one
-				//this SHOULD be an array
-				var allClassesSelected = pageContentSection.find("input[name='allSelected']:checked");
-				//If all NOT selected then need to pick a different content type
-				if(allClassesSelected.length == 0) {
-					contentType = "individualsForClasses";
-				}
-			} 
-			
-			return contentType;
-	    },
-	    isRelatedToBrowseClassGroup:function(contentType) {
-	    	return (contentType == "browseClassGroup" || contentType == "individualsForClasses");
-	    },
-	    getContentTypeForCloning:function(contentType) {
-	    	if(contentType == "browseClassGroup" || contentType == "individualsForClasses") {
-	    		return "browseClassGroup";
-	    	} 
-	    	return contentType;
-	    }
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+//This class is responsible for the product-specific form processing/content selection that might be possible
+//Overrides the usual behavior of selecting the specific JavaScript class needed to convert the form inputs
+//into a JSON object for submission based on the page content type
+
+//This will need to be overridden or extended, what have you.. in VIVO
+var processDataGetterUtils = {
+		dataGetterProcessorMap:{"browseClassGroup": processClassGroupDataGetterContent, 
+								"sparqlQuery": processSparqlDataGetterContent, 
+								"fixedHtml":processFixedHTMLDataGetterContent,
+								"individualsForClasses":processIndividualsForClassesDataGetterContent},
+	    selectDataGetterType:function(pageContentSection) {
+			var contentType = pageContentSection.attr("contentType");
+			//The form can provide "browse class group" as content type but need to check
+			//whether this is in fact individuals for classes instead
+			if(contentType == "browseClassGroup") {
+				//Is ALL NOT selected and there are other classes, pick one
+				//this SHOULD be an array
+				var allClassesSelected = pageContentSection.find("input[name='allSelected']:checked");
+				//If all NOT selected then need to pick a different content type
+				if(allClassesSelected.length == 0) {
+					contentType = "individualsForClasses";
+				}
+			} 
+			
+			return contentType;
+	    },
+	    isRelatedToBrowseClassGroup:function(contentType) {
+	    	return (contentType == "browseClassGroup" || contentType == "individualsForClasses");
+	    },
+	    getContentTypeForCloning:function(contentType) {
+	    	if(contentType == "browseClassGroup" || contentType == "individualsForClasses") {
+	    		return "browseClassGroup";
+	    	} 
+	    	return contentType;
+	    }
 };
\ No newline at end of file
diff --git a/webapp/web/js/menupage/processFixedHTMLDataGetterContent.js b/webapp/web/js/menupage/processFixedHTMLDataGetterContent.js
index 25fc5d1d4..0b17c42c8 100644
--- a/webapp/web/js/menupage/processFixedHTMLDataGetterContent.js
+++ b/webapp/web/js/menupage/processFixedHTMLDataGetterContent.js
@@ -1,77 +1,77 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-$.extend(this, i18nStringsFixedHtml);
-//Process sparql data getter and provide a json object with the necessary information
-var processFixedHTMLDataGetterContent = {
-	dataGetterClass:null,
-	//can use this if expect to initialize from elsewhere
-	initProcessor:function(dataGetterClass) {
-		this.dataGetterClass =dataGetterClass;
-	},
-	//requires variable and text area
-	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 
-	    //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 
-	populatePageContentSection:function(existingContentObject, pageContentSection) {
-		var saveToVarValue = existingContentObject["saveToVar"];
-		var htmlValue = existingContentObject["htmlValue"];
-		//In displaying the html value for the edit field, replace the encoded quotes with regular quotes
-		htmlValue = processFixedHTMLDataGetterContent.replaceEncodedWithEscapedQuotes(htmlValue);
-		//Now find and set value
-		pageContentSection.find("input[name='saveToVar']").val(saveToVarValue);
-		pageContentSection.find("textarea[name='htmlValue']").val(htmlValue);
-	},
-	//For the label of the content section for editing, need to add additional value
-	retrieveContentLabel:function() {
-		return i18nStringsFixedHtml.fixedHtml;
-	},
-	//For the label of the content section for editing, need to add additional value
-	retrieveAdditionalLabelText:function(existingContentObject) {
-		var saveToVarValue = existingContentObject["saveToVar"];
-		return saveToVarValue;
-	},
-    //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
-    	var variableValue = pageContentSection.find("input[name='saveToVar']").val();
-    	if(variableValue == "") {
-    		validationError += pageContentSectionLabel + ": " + i18nStringsFixedHtml.supplyVariableName + " <br />";
-    	}
-    	if(processFixedHTMLDataGetterContent.stringHasSingleQuote(variableValue)) {
-    		validationError += pageContentSectionLabel + ": " + i18nStringsFixedHtml.noApostrophes + " <br />";
-    	}
-    	if(processFixedHTMLDataGetterContent.stringHasDoubleQuote(variableValue)) {
-    		validationError += pageContentSectionLabel + ": " + i18nStringsFixedHtml.noDoubleQuotes + " <br />";
-    	}
-		var htmlValue = pageContentSection.find("textarea[name='htmlValue']").val();
-		if(htmlValue == "") {
-			validationError += pageContentSectionLabel + ": " + i18nStringsFixedHtml.supplyHtml + " <br />";
-		}
-    	return validationError;
-    },
-    encodeQuotes:function(inputStr) {
-    	return inputStr.replace(/'/g, '&#39;').replace(/"/g, '&quot;');
-    },
-    //For the variable name, no single quote should be allowed
-    //This can be extended for other special characters
-    stringHasSingleQuote:function(inputStr) {
-    	return(inputStr.indexOf("'") != -1);
-    },
-    stringHasDoubleQuote:function(inputStr) {
-    	return(inputStr.indexOf("\"") != -1);
-    },
-    replaceEncodedWithEscapedQuotes: function(inputStr) {
-    	return inputStr.replace(/&#39;/g, "\'").replace(/&quot;/g, "\"");
-    }
-		
-		
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+$.extend(this, i18nStringsFixedHtml);
+//Process sparql data getter and provide a json object with the necessary information
+var processFixedHTMLDataGetterContent = {
+	dataGetterClass:null,
+	//can use this if expect to initialize from elsewhere
+	initProcessor:function(dataGetterClass) {
+		this.dataGetterClass =dataGetterClass;
+	},
+	//requires variable and text area
+	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 
+	    //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 
+	populatePageContentSection:function(existingContentObject, pageContentSection) {
+		var saveToVarValue = existingContentObject["saveToVar"];
+		var htmlValue = existingContentObject["htmlValue"];
+		//In displaying the html value for the edit field, replace the encoded quotes with regular quotes
+		htmlValue = processFixedHTMLDataGetterContent.replaceEncodedWithEscapedQuotes(htmlValue);
+		//Now find and set value
+		pageContentSection.find("input[name='saveToVar']").val(saveToVarValue);
+		pageContentSection.find("textarea[name='htmlValue']").val(htmlValue);
+	},
+	//For the label of the content section for editing, need to add additional value
+	retrieveContentLabel:function() {
+		return i18nStringsFixedHtml.fixedHtml;
+	},
+	//For the label of the content section for editing, need to add additional value
+	retrieveAdditionalLabelText:function(existingContentObject) {
+		var saveToVarValue = existingContentObject["saveToVar"];
+		return saveToVarValue;
+	},
+    //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
+    	var variableValue = pageContentSection.find("input[name='saveToVar']").val();
+    	if(variableValue == "") {
+    		validationError += pageContentSectionLabel + ": " + i18nStringsFixedHtml.supplyVariableName + " <br />";
+    	}
+    	if(processFixedHTMLDataGetterContent.stringHasSingleQuote(variableValue)) {
+    		validationError += pageContentSectionLabel + ": " + i18nStringsFixedHtml.noApostrophes + " <br />";
+    	}
+    	if(processFixedHTMLDataGetterContent.stringHasDoubleQuote(variableValue)) {
+    		validationError += pageContentSectionLabel + ": " + i18nStringsFixedHtml.noDoubleQuotes + " <br />";
+    	}
+		var htmlValue = pageContentSection.find("textarea[name='htmlValue']").val();
+		if(htmlValue == "") {
+			validationError += pageContentSectionLabel + ": " + i18nStringsFixedHtml.supplyHtml + " <br />";
+		}
+    	return validationError;
+    },
+    encodeQuotes:function(inputStr) {
+    	return inputStr.replace(/'/g, '&#39;').replace(/"/g, '&quot;');
+    },
+    //For the variable name, no single quote should be allowed
+    //This can be extended for other special characters
+    stringHasSingleQuote:function(inputStr) {
+    	return(inputStr.indexOf("'") != -1);
+    },
+    stringHasDoubleQuote:function(inputStr) {
+    	return(inputStr.indexOf("\"") != -1);
+    },
+    replaceEncodedWithEscapedQuotes: function(inputStr) {
+    	return inputStr.replace(/&#39;/g, "\'").replace(/&quot;/g, "\"");
+    }
+		
+		
 }
\ No newline at end of file
diff --git a/webapp/web/js/menupage/processIndividualsForClassesDataGetterContent.js b/webapp/web/js/menupage/processIndividualsForClassesDataGetterContent.js
index 39b745d9e..a50423657 100644
--- a/webapp/web/js/menupage/processIndividualsForClassesDataGetterContent.js
+++ b/webapp/web/js/menupage/processIndividualsForClassesDataGetterContent.js
@@ -1,62 +1,62 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-var processIndividualsForClassesDataGetterContent = {
-	dataGetterClass:null,
-	//can use this if expect to initialize from elsewhere
-	initProcessor:function(dataGetterClassInput) {
-		this.dataGetterClass = dataGetterClassInput;
-	},
-	//Do we need a separate content type for each of the others?
-	processPageContentSection:function(pageContentSection) {
-		//Will look at classes etc. 
-		var classGroup = pageContentSection.find("select[name='selectClassGroup']").val();
-		//query model should also be an input
-		//Get classes selected
-		var classesSelected = [];
-		pageContentSection.find("input[name='classInClassGroup']:checked").each(function(){
-			//Need to make sure that the class is also saved as a URI
-			classesSelected.push($(this).val());
-		});
-		var returnObject = {classGroup:classGroup, classesSelectedInClassGroup:classesSelected, dataGetterClass:this.dataGetterClass};
-		return returnObject;
-	},
-	//For the label of the content section for editing, need to add additional value
-	retrieveContentLabel:function() {
-		return processClassGroupDataGetterContent.retrieveContentLabel();
-	},
-	//For an existing set of content where form is already set, fill in the values 
-	populatePageContentSection:function(existingContentObject, pageContentSection) {
-		//select class group in dropdown and append the classes within that class group
-		processClassGroupDataGetterContent.populatePageContentSection(existingContentObject, pageContentSection);
-		var classesSelected = existingContentObject["classesSelectedInClassGroup"];
-		var numberSelected = classesSelected.length;
-		var i;
-		//Uncheck all since default is checked
-		pageContentSection.find("input[name='classInClassGroup']").removeAttr("checked");
-		for(i = 0; i < numberSelected; i++) {
-			var classSelected = classesSelected[i];
-			pageContentSection.find("input[name='classInClassGroup'][value='" + classSelected + "']").attr("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"];
-	    	if(resultsClasses != null) {
-	    		var numberClasses = resultsClasses.length;
-	    		if(numberClasses != numberSelected) {
-	    			pageContentSection.find("input[name='allSelected']").removeAttr("checked");
-	    		}
-	    	}
-		}
-	},
-	//For the label of the content section for editing, need to add additional value
-	retrieveAdditionalLabelText:function(existingContentObject) {
-		return processClassGroupDataGetterContent.retrieveAdditionalLabelText(existingContentObject);
-	},
-	 //Validation on form submit: Check to see that class group has been selected 
-    validateFormSubmission: function(pageContentSection, pageContentSectionLabel) {
-    	return processClassGroupDataGetterContent.validateFormSubmission(pageContentSection, pageContentSectionLabel);
-    }
-		
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+var processIndividualsForClassesDataGetterContent = {
+	dataGetterClass:null,
+	//can use this if expect to initialize from elsewhere
+	initProcessor:function(dataGetterClassInput) {
+		this.dataGetterClass = dataGetterClassInput;
+	},
+	//Do we need a separate content type for each of the others?
+	processPageContentSection:function(pageContentSection) {
+		//Will look at classes etc. 
+		var classGroup = pageContentSection.find("select[name='selectClassGroup']").val();
+		//query model should also be an input
+		//Get classes selected
+		var classesSelected = [];
+		pageContentSection.find("input[name='classInClassGroup']:checked").each(function(){
+			//Need to make sure that the class is also saved as a URI
+			classesSelected.push($(this).val());
+		});
+		var returnObject = {classGroup:classGroup, classesSelectedInClassGroup:classesSelected, dataGetterClass:this.dataGetterClass};
+		return returnObject;
+	},
+	//For the label of the content section for editing, need to add additional value
+	retrieveContentLabel:function() {
+		return processClassGroupDataGetterContent.retrieveContentLabel();
+	},
+	//For an existing set of content where form is already set, fill in the values 
+	populatePageContentSection:function(existingContentObject, pageContentSection) {
+		//select class group in dropdown and append the classes within that class group
+		processClassGroupDataGetterContent.populatePageContentSection(existingContentObject, pageContentSection);
+		var classesSelected = existingContentObject["classesSelectedInClassGroup"];
+		var numberSelected = classesSelected.length;
+		var i;
+		//Uncheck all since default is checked
+		pageContentSection.find("input[name='classInClassGroup']").removeAttr("checked");
+		for(i = 0; i < numberSelected; i++) {
+			var classSelected = classesSelected[i];
+			pageContentSection.find("input[name='classInClassGroup'][value='" + classSelected + "']").attr("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"];
+	    	if(resultsClasses != null) {
+	    		var numberClasses = resultsClasses.length;
+	    		if(numberClasses != numberSelected) {
+	    			pageContentSection.find("input[name='allSelected']").removeAttr("checked");
+	    		}
+	    	}
+		}
+	},
+	//For the label of the content section for editing, need to add additional value
+	retrieveAdditionalLabelText:function(existingContentObject) {
+		return processClassGroupDataGetterContent.retrieveAdditionalLabelText(existingContentObject);
+	},
+	 //Validation on form submit: Check to see that class group has been selected 
+    validateFormSubmission: function(pageContentSection, pageContentSectionLabel) {
+    	return processClassGroupDataGetterContent.validateFormSubmission(pageContentSection, pageContentSectionLabel);
+    }
+		
 }
\ No newline at end of file
diff --git a/webapp/web/js/menupage/processSparqlDataGetterContent.js b/webapp/web/js/menupage/processSparqlDataGetterContent.js
index f371de215..a7790fdd7 100644
--- a/webapp/web/js/menupage/processSparqlDataGetterContent.js
+++ b/webapp/web/js/menupage/processSparqlDataGetterContent.js
@@ -1,97 +1,97 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-$.extend(this, i18nStringsSparqlQuery);
-
-//Process sparql data getter and provide a json object with the necessary information
-var processSparqlDataGetterContent = {
-	dataGetterClass:null,
-	//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 queryValue = pageContentSection.find("textarea[name='query']").val();
-		queryValue = processSparqlDataGetterContent.encodeQuotes(queryValue);
-		var queryModel = pageContentSection.find("input[name='queryModel']").val();
-
-		//query model should also be an input
-		//set query model to query model here - vitro:contentDisplayModel
-		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 
-	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);
-		pageContentSection.find("input[name='queryModel']").val(queryModelValue);
-	},
-	//For the label of the content section for editing, need to add additional value
-	retrieveContentLabel:function() {
-		return i18nStringsSparqlQuery.sparqlResults;
-	},
-	//For the label of the content section for editing, need to add additional value
-	retrieveAdditionalLabelText:function(existingContentObject) {
-		var saveToVarValue = existingContentObject["saveToVar"];
-		return saveToVarValue;
-	},
-    //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
-    	var variableValue = pageContentSection.find("input[name='saveToVar']").val();
-    	if(variableValue == "") {
-    		validationError += pageContentSectionLabel + ": " + i18nStringsSparqlQuery.supplyQueryVariable + " <br />"
-    	}
-    	if(processSparqlDataGetterContent.stringHasSingleQuote(variableValue)) {
-    		validationError += pageContentSectionLabel + ": " + i18nStringsSparqlQuery.noApostrophes + " <br />";
-    	}
-    	if(processSparqlDataGetterContent.stringHasDoubleQuote(variableValue)) {
-    		validationError += pageContentSectionLabel + ": " + i18nStringsSparqlQuery.noDoubleQuotes + " <br />";
-    	}
-    	//Check that query  model does not have single or double quotes within it
-    	//Uncomment this/adapt this when we actually allow display the query model input
-    	/*
-    	var queryModelValue = pageContentSection.find("input[name='queryModel']").val();
-    	if(processSparqlDataGetterContent.stringHasSingleQuote(queryModelValue)) {
-    		validationError += pageContentSectionLabel + ": The query model should not have an apostrophe . <br />";
-
-    	}
-    	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 />";
-		}
-    	return validationError;
-    },
-    encodeQuotes:function(inputStr) {
-    	return inputStr.replace(/'/g, '&#39;').replace(/"/g, '&quot;');
-    },
-    //For the variable name, no single quote should be allowed
-    //This can be extended for other special characters
-    stringHasSingleQuote:function(inputStr) {
-    	return(inputStr.indexOf("'") != -1);
-    },
-    stringHasDoubleQuote:function(inputStr) {
-    	return(inputStr.indexOf("\"") != -1);
-    },
-    replaceEncodedWithEscapedQuotes: function(inputStr) {
-
-    	return inputStr.replace(/&#39;/g, "\'").replace(/&quot;/g, "\"");
-    }
-		
-		
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+$.extend(this, i18nStringsSparqlQuery);
+
+//Process sparql data getter and provide a json object with the necessary information
+var processSparqlDataGetterContent = {
+	dataGetterClass:null,
+	//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 queryValue = pageContentSection.find("textarea[name='query']").val();
+		queryValue = processSparqlDataGetterContent.encodeQuotes(queryValue);
+		var queryModel = pageContentSection.find("input[name='queryModel']").val();
+
+		//query model should also be an input
+		//set query model to query model here - vitro:contentDisplayModel
+		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 
+	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);
+		pageContentSection.find("input[name='queryModel']").val(queryModelValue);
+	},
+	//For the label of the content section for editing, need to add additional value
+	retrieveContentLabel:function() {
+		return i18nStringsSparqlQuery.sparqlResults;
+	},
+	//For the label of the content section for editing, need to add additional value
+	retrieveAdditionalLabelText:function(existingContentObject) {
+		var saveToVarValue = existingContentObject["saveToVar"];
+		return saveToVarValue;
+	},
+    //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
+    	var variableValue = pageContentSection.find("input[name='saveToVar']").val();
+    	if(variableValue == "") {
+    		validationError += pageContentSectionLabel + ": " + i18nStringsSparqlQuery.supplyQueryVariable + " <br />"
+    	}
+    	if(processSparqlDataGetterContent.stringHasSingleQuote(variableValue)) {
+    		validationError += pageContentSectionLabel + ": " + i18nStringsSparqlQuery.noApostrophes + " <br />";
+    	}
+    	if(processSparqlDataGetterContent.stringHasDoubleQuote(variableValue)) {
+    		validationError += pageContentSectionLabel + ": " + i18nStringsSparqlQuery.noDoubleQuotes + " <br />";
+    	}
+    	//Check that query  model does not have single or double quotes within it
+    	//Uncomment this/adapt this when we actually allow display the query model input
+    	/*
+    	var queryModelValue = pageContentSection.find("input[name='queryModel']").val();
+    	if(processSparqlDataGetterContent.stringHasSingleQuote(queryModelValue)) {
+    		validationError += pageContentSectionLabel + ": The query model should not have an apostrophe . <br />";
+
+    	}
+    	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 />";
+		}
+    	return validationError;
+    },
+    encodeQuotes:function(inputStr) {
+    	return inputStr.replace(/'/g, '&#39;').replace(/"/g, '&quot;');
+    },
+    //For the variable name, no single quote should be allowed
+    //This can be extended for other special characters
+    stringHasSingleQuote:function(inputStr) {
+    	return(inputStr.indexOf("'") != -1);
+    },
+    stringHasDoubleQuote:function(inputStr) {
+    	return(inputStr.indexOf("\"") != -1);
+    },
+    replaceEncodedWithEscapedQuotes: function(inputStr) {
+
+    	return inputStr.replace(/&#39;/g, "\'").replace(/&quot;/g, "\"");
+    }
+		
+		
 };
\ No newline at end of file
diff --git a/webapp/web/js/pageDeletion.js b/webapp/web/js/pageDeletion.js
index 49bff3a6b..27fcab2c7 100644
--- a/webapp/web/js/pageDeletion.js
+++ b/webapp/web/js/pageDeletion.js
@@ -1,51 +1,51 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-  
-$.extend(this, i18nStrings);
-
-var pageDeletion = {
-	// on initial page setup
-	onLoad:function(){
-		if (this.disableFormInUnsupportedBrowsers()) {
-            return;
-        }   
-		
-	    this.initObjects();
-	    this.bindEventListeners();
-	}, 
-	initObjects:function() {
-		this.deleteLinks = $("a[cmd='deletePage']");
-	},
-	bindEventListeners:function() {
-		this.deleteLinks.click(function(event) {
-			var href=$(this).attr("href");
-			var pageTitle = $(this).attr("pageTitle");
-			var confirmResult = confirm( i18nStrings.confirmPageDeletion + " " + pageTitle + "?");
-			if(confirmResult) {
-				//Continue with the link
-				return true;
-			} else {
-				event.preventDefault();
-				return false;
-			}
-		});
-	},
-	disableFormInUnsupportedBrowsers: function() {       
-        var disableWrapper = $('#ie67DisableWrapper');
-        
-        // Check for unsupported browsers only if the element exists on the page
-        if (disableWrapper.length) {
-            if (vitro.browserUtils.isIELessThan8()) {
-                disableWrapper.show();
-                $('.noIE67').hide();
-                return true;
-            }
-        }            
-        return false;      
-    }
-};
-
-$(document).ready(function() {
-   pageDeletion.onLoad();
-});
-
-
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+  
+$.extend(this, i18nStrings);
+
+var pageDeletion = {
+	// on initial page setup
+	onLoad:function(){
+		if (this.disableFormInUnsupportedBrowsers()) {
+            return;
+        }   
+		
+	    this.initObjects();
+	    this.bindEventListeners();
+	}, 
+	initObjects:function() {
+		this.deleteLinks = $("a[cmd='deletePage']");
+	},
+	bindEventListeners:function() {
+		this.deleteLinks.click(function(event) {
+			var href=$(this).attr("href");
+			var pageTitle = $(this).attr("pageTitle");
+			var confirmResult = confirm( i18nStrings.confirmPageDeletion + " " + pageTitle + "?");
+			if(confirmResult) {
+				//Continue with the link
+				return true;
+			} else {
+				event.preventDefault();
+				return false;
+			}
+		});
+	},
+	disableFormInUnsupportedBrowsers: function() {       
+        var disableWrapper = $('#ie67DisableWrapper');
+        
+        // Check for unsupported browsers only if the element exists on the page
+        if (disableWrapper.length) {
+            if (vitro.browserUtils.isIELessThan8()) {
+                disableWrapper.show();
+                $('.noIE67').hide();
+                return true;
+            }
+        }            
+        return false;      
+    }
+};
+
+$(document).ready(function() {
+   pageDeletion.onLoad();
+});
+
+
diff --git a/webapp/web/js/tiny_mce/jquery-tinymce.js b/webapp/web/js/tiny_mce/jquery-tinymce.js
index 9a9d76f6b..17551ffe4 100644
--- a/webapp/web/js/tiny_mce/jquery-tinymce.js
+++ b/webapp/web/js/tiny_mce/jquery-tinymce.js
@@ -1,18 +1,18 @@
-/**
- * jQuery TinyMCE (http://mktgdept.com/jquery-tinymce-plugin)
- * A jQuery plugin for unobtrusive TinyMCE
- *
- * v0.0.2 - 28 August 2009
- *
- * Copyright (c) 2009 Chad Smith (http://twitter.com/chadsmith)
- * Dual licensed under the MIT and GPL licenses.
- * http://www.opensource.org/licenses/mit-license.php
- * http://www.opensource.org/licenses/gpl-license.php
- *
- * Add TinyMCE to an element using: $(element).tinymce([settings]);
- * Note that TinyMCE has released a Jquery version of itself that includes a plugin for jquery
- * and we should probably use that instead but that would require overwriting the tiny mce javscript
- * that currently exists
- *
- **/
+/**
+ * jQuery TinyMCE (http://mktgdept.com/jquery-tinymce-plugin)
+ * A jQuery plugin for unobtrusive TinyMCE
+ *
+ * v0.0.2 - 28 August 2009
+ *
+ * Copyright (c) 2009 Chad Smith (http://twitter.com/chadsmith)
+ * Dual licensed under the MIT and GPL licenses.
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.opensource.org/licenses/gpl-license.php
+ *
+ * Add TinyMCE to an element using: $(element).tinymce([settings]);
+ * Note that TinyMCE has released a Jquery version of itself that includes a plugin for jquery
+ * and we should probably use that instead but that would require overwriting the tiny mce javscript
+ * that currently exists
+ *
+ **/
 ;jQuery.fn.tinymce=jQuery.fn.tinyMCE=jQuery.fn.TinyMCE=function(d,e){return this.each(function(i){var a,b,c=this.id=this.id||this.name||(this.className||'jMCE')+i;if(d&&Object===d.constructor){e=d;d=null}if(!d&&tinyMCE.get(c)){d='remove';b=true}switch(d){case'remove':a='mceRemoveControl';break;case'toggle':a='mceToggleEditor';break;default:a='mceAddControl'}tinyMCE.settings=e;tinyMCE.execCommand(a,false,c);if(b)$(this).tinyMCE(e)})};
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/langs/en.js b/webapp/web/js/tiny_mce/langs/en.js
index 8519b4de7..ef3e18afe 100755
--- a/webapp/web/js/tiny_mce/langs/en.js
+++ b/webapp/web/js/tiny_mce/langs/en.js
@@ -1,154 +1,154 @@
-tinyMCE.addI18n({en:{
-common:{
-edit_confirm:"Do you want to use the WYSIWYG mode for this textarea?",
-apply:"Apply",
-insert:"Insert",
-update:"Update",
-cancel:"Cancel",
-close:"Close",
-browse:"Browse",
-class_name:"Class",
-not_set:"-- Not set --",
-clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?",
-clipboard_no_support:"Currently not supported by your browser, use keyboard shortcuts instead.",
-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.",
-invalid_data:"Error: Invalid values entered, these are marked in red.",
-more_colors:"More colors"
-},
-contextmenu:{
-align:"Alignment",
-left:"Left",
-center:"Center",
-right:"Right",
-full:"Full"
-},
-insertdatetime:{
-date_fmt:"%Y-%m-%d",
-time_fmt:"%H:%M:%S",
-insertdate_desc:"Insert date",
-inserttime_desc:"Insert time",
-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"
-},
-print:{
-print_desc:"Print"
-},
-preview:{
-preview_desc:"Preview"
-},
-directionality:{
-ltr_desc:"Direction left to right",
-rtl_desc:"Direction right to left"
-},
-layer:{
-insertlayer_desc:"Insert new layer",
-forward_desc:"Move forward",
-backward_desc:"Move backward",
-absolute_desc:"Toggle absolute positioning",
-content:"New layer..."
-},
-save:{
-save_desc:"Save",
-cancel_desc:"Cancel all changes"
-},
-nonbreaking:{
-nonbreaking_desc:"Insert non-breaking space character"
-},
-iespell:{
-iespell_desc:"Run spell checking",
-download:"ieSpell not detected. Do you want to install it now?"
-},
-advhr:{
-advhr_desc:"Horizontal rule"
-},
-emotions:{
-emotions_desc:"Emotions"
-},
-searchreplace:{
-search_desc:"Find",
-replace_desc:"Find/Replace"
-},
-advimage:{
-image_desc:"Insert/edit image"
-},
-advlink:{
-link_desc:"Insert/edit link"
-},
-xhtmlxtras:{
-cite_desc:"Citation",
-abbr_desc:"Abbreviation",
-acronym_desc:"Acronym",
-del_desc:"Deletion",
-ins_desc:"Insertion",
-attribs_desc:"Insert/Edit Attributes"
-},
-style:{
-desc:"Edit CSS Style"
-},
-paste:{
-paste_text_desc:"Paste as Plain Text",
-paste_word_desc:"Paste from Word",
-selectall_desc:"Select All"
-},
-paste_dlg:{
-text_title:"Use CTRL+V on your keyboard to paste the text into the window.",
-text_linebreaks:"Keep linebreaks",
-word_title:"Use CTRL+V on your keyboard to paste the text into the window."
-},
-table:{
-desc:"Inserts a new table",
-row_before_desc:"Insert row before",
-row_after_desc:"Insert row after",
-delete_row_desc:"Delete row",
-col_before_desc:"Insert column before",
-col_after_desc:"Insert column after",
-delete_col_desc:"Remove column",
-split_cells_desc:"Split merged table cells",
-merge_cells_desc:"Merge table cells",
-row_desc:"Table row properties",
-cell_desc:"Table cell properties",
-props_desc:"Table properties",
-paste_row_before_desc:"Paste table row before",
-paste_row_after_desc:"Paste table row after",
-cut_row_desc:"Cut table row",
-copy_row_desc:"Copy table row",
-del:"Delete table",
-row:"Row",
-col:"Column",
-cell:"Cell"
-},
-autosave:{
-unload_msg:"The changes you made will be lost if you navigate away from this page."
-},
-fullscreen:{
-desc:"Toggle fullscreen mode"
-},
-media:{
-desc:"Insert / edit embedded media",
-edit:"Edit embedded media"
-},
-fullpage:{
-desc:"Document properties"
-},
-template:{
-desc:"Insert predefined template content"
-},
-visualchars:{
-desc:"Visual control characters on/off."
-},
-spellchecker:{
-desc:"Toggle spellchecker",
-menu:"Spellchecker 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."
-},
-pagebreak:{
-desc:"Insert page break."
+tinyMCE.addI18n({en:{
+common:{
+edit_confirm:"Do you want to use the WYSIWYG mode for this textarea?",
+apply:"Apply",
+insert:"Insert",
+update:"Update",
+cancel:"Cancel",
+close:"Close",
+browse:"Browse",
+class_name:"Class",
+not_set:"-- Not set --",
+clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?",
+clipboard_no_support:"Currently not supported by your browser, use keyboard shortcuts instead.",
+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.",
+invalid_data:"Error: Invalid values entered, these are marked in red.",
+more_colors:"More colors"
+},
+contextmenu:{
+align:"Alignment",
+left:"Left",
+center:"Center",
+right:"Right",
+full:"Full"
+},
+insertdatetime:{
+date_fmt:"%Y-%m-%d",
+time_fmt:"%H:%M:%S",
+insertdate_desc:"Insert date",
+inserttime_desc:"Insert time",
+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"
+},
+print:{
+print_desc:"Print"
+},
+preview:{
+preview_desc:"Preview"
+},
+directionality:{
+ltr_desc:"Direction left to right",
+rtl_desc:"Direction right to left"
+},
+layer:{
+insertlayer_desc:"Insert new layer",
+forward_desc:"Move forward",
+backward_desc:"Move backward",
+absolute_desc:"Toggle absolute positioning",
+content:"New layer..."
+},
+save:{
+save_desc:"Save",
+cancel_desc:"Cancel all changes"
+},
+nonbreaking:{
+nonbreaking_desc:"Insert non-breaking space character"
+},
+iespell:{
+iespell_desc:"Run spell checking",
+download:"ieSpell not detected. Do you want to install it now?"
+},
+advhr:{
+advhr_desc:"Horizontal rule"
+},
+emotions:{
+emotions_desc:"Emotions"
+},
+searchreplace:{
+search_desc:"Find",
+replace_desc:"Find/Replace"
+},
+advimage:{
+image_desc:"Insert/edit image"
+},
+advlink:{
+link_desc:"Insert/edit link"
+},
+xhtmlxtras:{
+cite_desc:"Citation",
+abbr_desc:"Abbreviation",
+acronym_desc:"Acronym",
+del_desc:"Deletion",
+ins_desc:"Insertion",
+attribs_desc:"Insert/Edit Attributes"
+},
+style:{
+desc:"Edit CSS Style"
+},
+paste:{
+paste_text_desc:"Paste as Plain Text",
+paste_word_desc:"Paste from Word",
+selectall_desc:"Select All"
+},
+paste_dlg:{
+text_title:"Use CTRL+V on your keyboard to paste the text into the window.",
+text_linebreaks:"Keep linebreaks",
+word_title:"Use CTRL+V on your keyboard to paste the text into the window."
+},
+table:{
+desc:"Inserts a new table",
+row_before_desc:"Insert row before",
+row_after_desc:"Insert row after",
+delete_row_desc:"Delete row",
+col_before_desc:"Insert column before",
+col_after_desc:"Insert column after",
+delete_col_desc:"Remove column",
+split_cells_desc:"Split merged table cells",
+merge_cells_desc:"Merge table cells",
+row_desc:"Table row properties",
+cell_desc:"Table cell properties",
+props_desc:"Table properties",
+paste_row_before_desc:"Paste table row before",
+paste_row_after_desc:"Paste table row after",
+cut_row_desc:"Cut table row",
+copy_row_desc:"Copy table row",
+del:"Delete table",
+row:"Row",
+col:"Column",
+cell:"Cell"
+},
+autosave:{
+unload_msg:"The changes you made will be lost if you navigate away from this page."
+},
+fullscreen:{
+desc:"Toggle fullscreen mode"
+},
+media:{
+desc:"Insert / edit embedded media",
+edit:"Edit embedded media"
+},
+fullpage:{
+desc:"Document properties"
+},
+template:{
+desc:"Insert predefined template content"
+},
+visualchars:{
+desc:"Visual control characters on/off."
+},
+spellchecker:{
+desc:"Toggle spellchecker",
+menu:"Spellchecker 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."
+},
+pagebreak:{
+desc:"Insert page break."
 }}});
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/license.txt b/webapp/web/js/tiny_mce/license.txt
index 60d6d4c8f..1837b0acb 100755
--- a/webapp/web/js/tiny_mce/license.txt
+++ b/webapp/web/js/tiny_mce/license.txt
@@ -1,504 +1,504 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-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
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
-
-
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+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
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+
diff --git a/webapp/web/js/tiny_mce/plugins/advhr/css/advhr.css b/webapp/web/js/tiny_mce/plugins/advhr/css/advhr.css
index 0e2283498..3fe369cb0 100755
--- a/webapp/web/js/tiny_mce/plugins/advhr/css/advhr.css
+++ b/webapp/web/js/tiny_mce/plugins/advhr/css/advhr.css
@@ -1,5 +1,5 @@
-input.radio {border:1px none #000; background:transparent; vertical-align:middle;}
-.panel_wrapper div.current {height:80px;}
-#width {width:50px; vertical-align:middle;}
-#width2 {width:50px; vertical-align:middle;}
-#size {width:100px;}
+input.radio {border:1px none #000; background:transparent; vertical-align:middle;}
+.panel_wrapper div.current {height:80px;}
+#width {width:50px; vertical-align:middle;}
+#width2 {width:50px; vertical-align:middle;}
+#size {width:100px;}
diff --git a/webapp/web/js/tiny_mce/plugins/advhr/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/advhr/editor_plugin_src.js
index 8a847532b..bd0adf1ab 100755
--- a/webapp/web/js/tiny_mce/plugins/advhr/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/advhr/editor_plugin_src.js
@@ -1,54 +1,54 @@
-/**
- * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.AdvancedHRPlugin', {
-		init : function(ed, url) {
-			// Register commands
-			ed.addCommand('mceAdvancedHr', function() {
-				ed.windowManager.open({
-					file : url + '/rule.htm',
-					width : 250 + parseInt(ed.getLang('advhr.delta_width', 0)),
-					height : 160 + parseInt(ed.getLang('advhr.delta_height', 0)),
-					inline : 1
-				}, {
-					plugin_url : url
-				});
-			});
-
-			// Register buttons
-			ed.addButton('advhr', {
-				title : 'advhr.advhr_desc',
-				cmd : 'mceAdvancedHr'
-			});
-
-			ed.onNodeChange.add(function(ed, cm, n) {
-				cm.setActive('advhr', n.nodeName == 'HR');
-			});
-
-			ed.onClick.add(function(ed, e) {
-				e = e.target;
-
-				if (e.nodeName === 'HR')
-					ed.selection.select(e);
-			});
-		},
-
-		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
-			};
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('advhr', tinymce.plugins.AdvancedHRPlugin);
+/**
+ * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.AdvancedHRPlugin', {
+		init : function(ed, url) {
+			// Register commands
+			ed.addCommand('mceAdvancedHr', function() {
+				ed.windowManager.open({
+					file : url + '/rule.htm',
+					width : 250 + parseInt(ed.getLang('advhr.delta_width', 0)),
+					height : 160 + parseInt(ed.getLang('advhr.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			// Register buttons
+			ed.addButton('advhr', {
+				title : 'advhr.advhr_desc',
+				cmd : 'mceAdvancedHr'
+			});
+
+			ed.onNodeChange.add(function(ed, cm, n) {
+				cm.setActive('advhr', n.nodeName == 'HR');
+			});
+
+			ed.onClick.add(function(ed, e) {
+				e = e.target;
+
+				if (e.nodeName === 'HR')
+					ed.selection.select(e);
+			});
+		},
+
+		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
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('advhr', tinymce.plugins.AdvancedHRPlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/advhr/js/rule.js b/webapp/web/js/tiny_mce/plugins/advhr/js/rule.js
index b6cbd66c7..a60c35fc3 100755
--- a/webapp/web/js/tiny_mce/plugins/advhr/js/rule.js
+++ b/webapp/web/js/tiny_mce/plugins/advhr/js/rule.js
@@ -1,43 +1,43 @@
-var AdvHRDialog = {
-	init : function(ed) {
-		var dom = ed.dom, f = document.forms[0], n = ed.selection.getNode(), w;
-
-		w = dom.getAttrib(n, 'width');
-		f.width.value = w ? parseInt(w) : (dom.getStyle('width') || '');
-		f.size.value = dom.getAttrib(n, 'size') || parseInt(dom.getStyle('height')) || '';
-		f.noshade.checked = !!dom.getAttrib(n, 'noshade') || !!dom.getStyle('border-width');
-		selectByValue(f, 'width2', w.indexOf('%') != -1 ? '%' : 'px');
-	},
-
-	update : function() {
-		var ed = tinyMCEPopup.editor, h, f = document.forms[0], st = '';
-
-		h = '<hr';
-
-		if (f.size.value) {
-			h += ' size="' + f.size.value + '"';
-			st += ' height:' + f.size.value + 'px;';
-		}
-
-		if (f.width.value) {
-			h += ' width="' + f.width.value + (f.width2.value == '%' ? '%' : '') + '"';
-			st += ' width:' + f.width.value + (f.width2.value == '%' ? '%' : 'px') + ';';
-		}
-
-		if (f.noshade.checked) {
-			h += ' noshade="noshade"';
-			st += ' border-width: 1px; border-style: solid; border-color: #CCCCCC; color: #ffffff;';
-		}
-
-		if (ed.settings.inline_styles)
-			h += ' style="' + tinymce.trim(st) + '"';
-
-		h += ' />';
-
-		ed.execCommand("mceInsertContent", false, h);
-		tinyMCEPopup.close();
-	}
-};
-
-tinyMCEPopup.requireLangPack();
-tinyMCEPopup.onInit.add(AdvHRDialog.init, AdvHRDialog);
+var AdvHRDialog = {
+	init : function(ed) {
+		var dom = ed.dom, f = document.forms[0], n = ed.selection.getNode(), w;
+
+		w = dom.getAttrib(n, 'width');
+		f.width.value = w ? parseInt(w) : (dom.getStyle('width') || '');
+		f.size.value = dom.getAttrib(n, 'size') || parseInt(dom.getStyle('height')) || '';
+		f.noshade.checked = !!dom.getAttrib(n, 'noshade') || !!dom.getStyle('border-width');
+		selectByValue(f, 'width2', w.indexOf('%') != -1 ? '%' : 'px');
+	},
+
+	update : function() {
+		var ed = tinyMCEPopup.editor, h, f = document.forms[0], st = '';
+
+		h = '<hr';
+
+		if (f.size.value) {
+			h += ' size="' + f.size.value + '"';
+			st += ' height:' + f.size.value + 'px;';
+		}
+
+		if (f.width.value) {
+			h += ' width="' + f.width.value + (f.width2.value == '%' ? '%' : '') + '"';
+			st += ' width:' + f.width.value + (f.width2.value == '%' ? '%' : 'px') + ';';
+		}
+
+		if (f.noshade.checked) {
+			h += ' noshade="noshade"';
+			st += ' border-width: 1px; border-style: solid; border-color: #CCCCCC; color: #ffffff;';
+		}
+
+		if (ed.settings.inline_styles)
+			h += ' style="' + tinymce.trim(st) + '"';
+
+		h += ' />';
+
+		ed.execCommand("mceInsertContent", false, h);
+		tinyMCEPopup.close();
+	}
+};
+
+tinyMCEPopup.requireLangPack();
+tinyMCEPopup.onInit.add(AdvHRDialog.init, AdvHRDialog);
diff --git a/webapp/web/js/tiny_mce/plugins/advhr/langs/en_dlg.js b/webapp/web/js/tiny_mce/plugins/advhr/langs/en_dlg.js
index 873bfd8d3..eec74dbd4 100755
--- a/webapp/web/js/tiny_mce/plugins/advhr/langs/en_dlg.js
+++ b/webapp/web/js/tiny_mce/plugins/advhr/langs/en_dlg.js
@@ -1,5 +1,5 @@
-tinyMCE.addI18n('en.advhr_dlg',{
-width:"Width",
-size:"Height",
-noshade:"No shadow"
+tinyMCE.addI18n('en.advhr_dlg',{
+width:"Width",
+size:"Height",
+noshade:"No shadow"
 });
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/advhr/rule.htm b/webapp/web/js/tiny_mce/plugins/advhr/rule.htm
index 8f20f7fa8..c42b9e15f 100755
--- a/webapp/web/js/tiny_mce/plugins/advhr/rule.htm
+++ b/webapp/web/js/tiny_mce/plugins/advhr/rule.htm
@@ -1,63 +1,63 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#advhr.advhr_desc}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="js/rule.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="../../utils/form_utils.js"></script>
-	<link href="css/advhr.css" rel="stylesheet" type="text/css" />
-	<base target="_self" />
-</head>
-<body>
-<form onsubmit="AdvHRDialog.update();return false;" action="#">
-	<div class="tabs">
-		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advhr.advhr_desc}</a></span></li>
-		</ul>
-	</div>
-
-	<div class="panel_wrapper">
-		<div id="general_panel" class="panel current">
-			<table border="0" cellpadding="4" cellspacing="0">
-                    <tr>
-                        <td><label for="width">{#advhr_dlg.width}</label></td>
-                        <td nowrap="nowrap">
-                            <input id="width" name="width" type="text" value="" class="mceFocus" />
-                            <select name="width2" id="width2">
-                                <option value="">px</option>
-                                <option value="%">%</option>
-                            </select>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td><label for="size">{#advhr_dlg.size}</label></td>
-                        <td><select id="size" name="size">
-                            <option value="">Normal</option>
-                            <option value="1">1</option>
-                            <option value="2">2</option>
-                            <option value="3">3</option>
-                            <option value="4">4</option>
-                            <option value="5">5</option>
-                        </select></td>
-                    </tr>
-                    <tr>
-                        <td><label for="noshade">{#advhr_dlg.noshade}</label></td>
-                        <td><input type="checkbox" name="noshade" id="noshade" class="radio" /></td>
-                    </tr>
-            </table>
-		</div>
-	</div>
-
-	<div class="mceActionPanel">
-		<div style="float: left">
-			<input type="submit" id="insert" name="insert" value="{#insert}" />
-		</div>
-
-		<div style="float: right">
-			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-		</div>
-	</div>
-</form>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#advhr.advhr_desc}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/rule.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<link href="css/advhr.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body>
+<form onsubmit="AdvHRDialog.update();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advhr.advhr_desc}</a></span></li>
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+			<table border="0" cellpadding="4" cellspacing="0">
+                    <tr>
+                        <td><label for="width">{#advhr_dlg.width}</label></td>
+                        <td nowrap="nowrap">
+                            <input id="width" name="width" type="text" value="" class="mceFocus" />
+                            <select name="width2" id="width2">
+                                <option value="">px</option>
+                                <option value="%">%</option>
+                            </select>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td><label for="size">{#advhr_dlg.size}</label></td>
+                        <td><select id="size" name="size">
+                            <option value="">Normal</option>
+                            <option value="1">1</option>
+                            <option value="2">2</option>
+                            <option value="3">3</option>
+                            <option value="4">4</option>
+                            <option value="5">5</option>
+                        </select></td>
+                    </tr>
+                    <tr>
+                        <td><label for="noshade">{#advhr_dlg.noshade}</label></td>
+                        <td><input type="checkbox" name="noshade" id="noshade" class="radio" /></td>
+                    </tr>
+            </table>
+		</div>
+	</div>
+
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="submit" id="insert" name="insert" value="{#insert}" />
+		</div>
+
+		<div style="float: right">
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+</form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/advimage/css/advimage.css b/webapp/web/js/tiny_mce/plugins/advimage/css/advimage.css
index 0a6251a69..228530f9e 100755
--- a/webapp/web/js/tiny_mce/plugins/advimage/css/advimage.css
+++ b/webapp/web/js/tiny_mce/plugins/advimage/css/advimage.css
@@ -1,13 +1,13 @@
-#src_list, #over_list, #out_list {width:280px;}
-.mceActionPanel {margin-top:7px;}
-.alignPreview {border:1px solid #000; width:140px; height:140px; overflow:hidden; padding:5px;}
-.checkbox {border:0;}
-.panel_wrapper div.current {height:305px;}
-#prev {margin:0; border:1px solid #000; width:428px; height:150px; overflow:auto;}
-#align, #classlist {width:150px;}
-#width, #height {vertical-align:middle; width:50px; text-align:center;}
-#vspace, #hspace, #border {vertical-align:middle; width:30px; text-align:center;}
-#class_list {width:180px;}
-input {width: 280px;}
-#constrain, #onmousemovecheck {width:auto;}
-#id, #dir, #lang, #usemap, #longdesc {width:200px;}
+#src_list, #over_list, #out_list {width:280px;}
+.mceActionPanel {margin-top:7px;}
+.alignPreview {border:1px solid #000; width:140px; height:140px; overflow:hidden; padding:5px;}
+.checkbox {border:0;}
+.panel_wrapper div.current {height:305px;}
+#prev {margin:0; border:1px solid #000; width:428px; height:150px; overflow:auto;}
+#align, #classlist {width:150px;}
+#width, #height {vertical-align:middle; width:50px; text-align:center;}
+#vspace, #hspace, #border {vertical-align:middle; width:30px; text-align:center;}
+#class_list {width:180px;}
+input {width: 280px;}
+#constrain, #onmousemovecheck {width:auto;}
+#id, #dir, #lang, #usemap, #longdesc {width:200px;}
diff --git a/webapp/web/js/tiny_mce/plugins/advimage/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/advimage/editor_plugin_src.js
index f526842e6..259a076d8 100755
--- a/webapp/web/js/tiny_mce/plugins/advimage/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/advimage/editor_plugin_src.js
@@ -1,47 +1,47 @@
-/**
- * $Id: editor_plugin_src.js 677 2008-03-07 13:52:41Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.AdvancedImagePlugin', {
-		init : function(ed, url) {
-			// Register commands
-			ed.addCommand('mceAdvImage', function() {
-				// Internal image object like a flash placeholder
-				if (ed.dom.getAttrib(ed.selection.getNode(), 'class').indexOf('mceItem') != -1)
-					return;
-
-				ed.windowManager.open({
-					file : url + '/image.htm',
-					width : 480 + parseInt(ed.getLang('advimage.delta_width', 0)),
-					height : 385 + parseInt(ed.getLang('advimage.delta_height', 0)),
-					inline : 1
-				}, {
-					plugin_url : url
-				});
-			});
-
-			// Register buttons
-			ed.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
-			};
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('advimage', tinymce.plugins.AdvancedImagePlugin);
+/**
+ * $Id: editor_plugin_src.js 677 2008-03-07 13:52:41Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.AdvancedImagePlugin', {
+		init : function(ed, url) {
+			// Register commands
+			ed.addCommand('mceAdvImage', function() {
+				// Internal image object like a flash placeholder
+				if (ed.dom.getAttrib(ed.selection.getNode(), 'class').indexOf('mceItem') != -1)
+					return;
+
+				ed.windowManager.open({
+					file : url + '/image.htm',
+					width : 480 + parseInt(ed.getLang('advimage.delta_width', 0)),
+					height : 385 + parseInt(ed.getLang('advimage.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			// Register buttons
+			ed.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
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('advimage', tinymce.plugins.AdvancedImagePlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/advimage/image.htm b/webapp/web/js/tiny_mce/plugins/advimage/image.htm
index dd84083f4..3cd7647c6 100755
--- a/webapp/web/js/tiny_mce/plugins/advimage/image.htm
+++ b/webapp/web/js/tiny_mce/plugins/advimage/image.htm
@@ -1,238 +1,238 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#advimage_dlg.dialog_title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="../../utils/form_utils.js"></script>
-	<script type="text/javascript" src="../../utils/validate.js"></script>
-	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
-	<script type="text/javascript" src="js/image.js"></script>
-	<link href="css/advimage.css" rel="stylesheet" type="text/css" />
-	<base target="_self" />
-</head>
-<body id="advimage" style="display: none">
-    <form onsubmit="ImageDialog.insert();return false;" action="#"> 
-		<div class="tabs">
-			<ul>
-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advimage_dlg.tab_general}</a></span></li>
-				<li id="appearance_tab"><span><a href="javascript:mcTabs.displayTab('appearance_tab','appearance_panel');" onmousedown="return false;">{#advimage_dlg.tab_appearance}</a></span></li>
-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#advimage_dlg.tab_advanced}</a></span></li>
-			</ul>
-		</div>
-
-		<div class="panel_wrapper">
-			<div id="general_panel" class="panel current">
-				<fieldset>
-						<legend>{#advimage_dlg.general}</legend>
-
-						<table class="properties">
-							<tr>
-								<td class="column1"><label id="srclabel" for="src">{#advimage_dlg.src}</label></td>
-								<td colspan="2"><table border="0" cellspacing="0" cellpadding="0">
-									<tr> 
-									  <td><input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" /></td> 
-									  <td id="srcbrowsercontainer">&nbsp;</td>
-									</tr>
-								  </table></td>
-							</tr>
-							<tr>
-								<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);"></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>
-						</table>
-				</fieldset>
-
-				<fieldset>
-					<legend>{#advimage_dlg.preview}</legend>
-					<div id="prev"></div>
-				</fieldset>
-			</div>
-
-			<div id="appearance_panel" class="panel">
-				<fieldset>
-					<legend>{#advimage_dlg.tab_appearance}</legend>
-
-					<table 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> 
-									<option value="baseline">{#advimage_dlg.align_baseline}</option>
-									<option value="top">{#advimage_dlg.align_top}</option>
-									<option value="middle">{#advimage_dlg.align_middle}</option>
-									<option value="bottom">{#advimage_dlg.align_bottom}</option>
-									<option value="text-top">{#advimage_dlg.align_texttop}</option>
-									<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> 
-							</td>
-							<td rowspan="6" valign="top">
-								<div class="alignPreview">
-									<img id="alignSampleImg" src="img/sample.gif" alt="{#advimage_dlg.example_img}" />
-									Lorem ipsum, Dolor sit amet, consectetuer adipiscing loreum ipsum edipiscing elit, sed diam
-									nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.Loreum ipsum
-									edipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam
-									erat volutpat.
-								</div>
-							</td>
-						</tr>
-
-						<tr>
-							<td class="column1"><label id="widthlabel" for="width">{#advimage_dlg.dimensions}</label></td>
-							<td nowrap="nowrap">
-								<input name="width" type="text" id="width" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeHeight();" /> x 
-								<input name="height" type="text" id="height" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeWidth();" /> px
-							</td>
-						</tr>
-
-						<tr>
-							<td>&nbsp;</td>
-							<td><table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="constrain" type="checkbox" name="constrain" class="checkbox" /></td>
-										<td><label id="constrainlabel" for="constrain">{#advimage_dlg.constrain_proportions}</label></td>
-									</tr>
-								</table></td>
-						</tr>
-
-						<tr>
-							<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>
-
-						<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> 
-						</tr>
-
-						<tr>
-							<td><label for="class_list">{#class_name}</label></td>
-							<td colspan="2"><select id="class_list" name="class_list" class="mceEditableSelect"></select></td>
-						</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> 
-						</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> 
-						</tr> -->
-					</table>
-				</fieldset>
-			</div>
-
-			<div id="advanced_panel" class="panel">
-				<fieldset>
-					<legend>{#advimage_dlg.swap_image}</legend>
-
-					<input type="checkbox" id="onmousemovecheck" name="onmousemovecheck" class="checkbox" onclick="ImageDialog.setSwapImage(this.checked);" />
-					<label id="onmousemovechecklabel" for="onmousemovecheck">{#advimage_dlg.alt_image}</label>
-
-					<table border="0" cellpadding="4" cellspacing="0" width="100%">
-							<tr>
-								<td class="column1"><label id="onmouseoversrclabel" for="onmouseoversrc">{#advimage_dlg.mouseover}</label></td> 
-								<td><table 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>
-							</tr>
-							<tr>
-								<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;"></select></td>
-							</tr>
-							<tr> 
-								<td class="column1"><label id="onmouseoutsrclabel" for="onmouseoutsrc">{#advimage_dlg.mouseout}</label></td> 
-								<td class="column2"><table 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>
-							<tr>
-								<td><label for="out_list">{#advimage_dlg.image_list}</label></td>
-								<td><select id="out_list" name="out_list" onchange="document.getElementById('onmouseoutsrc').value=this.options[this.selectedIndex].value;"></select></td>
-							</tr>
-					</table>
-				</fieldset>
-
-				<fieldset>
-					<legend>{#advimage_dlg.misc}</legend>
-
-					<table 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> 
-						</tr>
-
-						<tr>
-							<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>
-							</td> 
-						</tr>
-
-						<tr>
-							<td class="column1"><label id="langlabel" for="lang">{#advimage_dlg.langcode}</label></td> 
-							<td>
-								<input id="lang" name="lang" type="text" value="" />
-							</td> 
-						</tr>
-
-						<tr>
-							<td class="column1"><label id="usemaplabel" for="usemap">{#advimage_dlg.map}</label></td> 
-							<td>
-								<input id="usemap" name="usemap" type="text" value="" />
-							</td> 
-						</tr>
-
-						<tr>
-							<td class="column1"><label id="longdesclabel" for="longdesc">{#advimage_dlg.long_desc}</label></td>
-							<td><table border="0" cellspacing="0" cellpadding="0">
-									<tr>
-									  <td><input id="longdesc" name="longdesc" type="text" value="" /></td>
-									  <td id="longdesccontainer">&nbsp;</td>
-									</tr>
-								</table></td> 
-						</tr>
-					</table>
-				</fieldset>
-			</div>
-		</div>
-
-		<div class="mceActionPanel">
-			<div style="float: left">
-				<input type="submit" id="insert" name="insert" value="{#insert}" />
-			</div>
-
-			<div style="float: right">
-				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-			</div>
-		</div>
-    </form>
-</body> 
-</html> 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#advimage_dlg.dialog_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/validate.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="js/image.js"></script>
+	<link href="css/advimage.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body id="advimage" style="display: none">
+    <form onsubmit="ImageDialog.insert();return false;" action="#"> 
+		<div class="tabs">
+			<ul>
+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advimage_dlg.tab_general}</a></span></li>
+				<li id="appearance_tab"><span><a href="javascript:mcTabs.displayTab('appearance_tab','appearance_panel');" onmousedown="return false;">{#advimage_dlg.tab_appearance}</a></span></li>
+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#advimage_dlg.tab_advanced}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<fieldset>
+						<legend>{#advimage_dlg.general}</legend>
+
+						<table class="properties">
+							<tr>
+								<td class="column1"><label id="srclabel" for="src">{#advimage_dlg.src}</label></td>
+								<td colspan="2"><table border="0" cellspacing="0" cellpadding="0">
+									<tr> 
+									  <td><input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" /></td> 
+									  <td id="srcbrowsercontainer">&nbsp;</td>
+									</tr>
+								  </table></td>
+							</tr>
+							<tr>
+								<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);"></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>
+						</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{#advimage_dlg.preview}</legend>
+					<div id="prev"></div>
+				</fieldset>
+			</div>
+
+			<div id="appearance_panel" class="panel">
+				<fieldset>
+					<legend>{#advimage_dlg.tab_appearance}</legend>
+
+					<table 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> 
+									<option value="baseline">{#advimage_dlg.align_baseline}</option>
+									<option value="top">{#advimage_dlg.align_top}</option>
+									<option value="middle">{#advimage_dlg.align_middle}</option>
+									<option value="bottom">{#advimage_dlg.align_bottom}</option>
+									<option value="text-top">{#advimage_dlg.align_texttop}</option>
+									<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> 
+							</td>
+							<td rowspan="6" valign="top">
+								<div class="alignPreview">
+									<img id="alignSampleImg" src="img/sample.gif" alt="{#advimage_dlg.example_img}" />
+									Lorem ipsum, Dolor sit amet, consectetuer adipiscing loreum ipsum edipiscing elit, sed diam
+									nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.Loreum ipsum
+									edipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam
+									erat volutpat.
+								</div>
+							</td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label id="widthlabel" for="width">{#advimage_dlg.dimensions}</label></td>
+							<td nowrap="nowrap">
+								<input name="width" type="text" id="width" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeHeight();" /> x 
+								<input name="height" type="text" id="height" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeWidth();" /> px
+							</td>
+						</tr>
+
+						<tr>
+							<td>&nbsp;</td>
+							<td><table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="constrain" type="checkbox" name="constrain" class="checkbox" /></td>
+										<td><label id="constrainlabel" for="constrain">{#advimage_dlg.constrain_proportions}</label></td>
+									</tr>
+								</table></td>
+						</tr>
+
+						<tr>
+							<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>
+
+						<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> 
+						</tr>
+
+						<tr>
+							<td><label for="class_list">{#class_name}</label></td>
+							<td colspan="2"><select id="class_list" name="class_list" class="mceEditableSelect"></select></td>
+						</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> 
+						</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> 
+						</tr> -->
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="advanced_panel" class="panel">
+				<fieldset>
+					<legend>{#advimage_dlg.swap_image}</legend>
+
+					<input type="checkbox" id="onmousemovecheck" name="onmousemovecheck" class="checkbox" onclick="ImageDialog.setSwapImage(this.checked);" />
+					<label id="onmousemovechecklabel" for="onmousemovecheck">{#advimage_dlg.alt_image}</label>
+
+					<table border="0" cellpadding="4" cellspacing="0" width="100%">
+							<tr>
+								<td class="column1"><label id="onmouseoversrclabel" for="onmouseoversrc">{#advimage_dlg.mouseover}</label></td> 
+								<td><table 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>
+							</tr>
+							<tr>
+								<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;"></select></td>
+							</tr>
+							<tr> 
+								<td class="column1"><label id="onmouseoutsrclabel" for="onmouseoutsrc">{#advimage_dlg.mouseout}</label></td> 
+								<td class="column2"><table 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>
+							<tr>
+								<td><label for="out_list">{#advimage_dlg.image_list}</label></td>
+								<td><select id="out_list" name="out_list" onchange="document.getElementById('onmouseoutsrc').value=this.options[this.selectedIndex].value;"></select></td>
+							</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{#advimage_dlg.misc}</legend>
+
+					<table 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> 
+						</tr>
+
+						<tr>
+							<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>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label id="langlabel" for="lang">{#advimage_dlg.langcode}</label></td> 
+							<td>
+								<input id="lang" name="lang" type="text" value="" />
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label id="usemaplabel" for="usemap">{#advimage_dlg.map}</label></td> 
+							<td>
+								<input id="usemap" name="usemap" type="text" value="" />
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label id="longdesclabel" for="longdesc">{#advimage_dlg.long_desc}</label></td>
+							<td><table border="0" cellspacing="0" cellpadding="0">
+									<tr>
+									  <td><input id="longdesc" name="longdesc" type="text" value="" /></td>
+									  <td id="longdesccontainer">&nbsp;</td>
+									</tr>
+								</table></td> 
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div style="float: left">
+				<input type="submit" id="insert" name="insert" value="{#insert}" />
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+    </form>
+</body> 
+</html> 
diff --git a/webapp/web/js/tiny_mce/plugins/advimage/js/image.js b/webapp/web/js/tiny_mce/plugins/advimage/js/image.js
index 64fc6f677..df3959960 100755
--- a/webapp/web/js/tiny_mce/plugins/advimage/js/image.js
+++ b/webapp/web/js/tiny_mce/plugins/advimage/js/image.js
@@ -1,441 +1,441 @@
-var ImageDialog = {
-	preInit : function() {
-		var url;
-
-		tinyMCEPopup.requireLangPack();
-
-		if (url = tinyMCEPopup.getParam("external_image_list_url"))
-			document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
-	},
-
-	init : function(ed) {
-		var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, dom = ed.dom, n = ed.selection.getNode();
-
-		tinyMCEPopup.resizeToInnerSize();
-		this.fillClassList('class_list');
-		this.fillFileList('src_list', 'tinyMCEImageList');
-		this.fillFileList('over_list', 'tinyMCEImageList');
-		this.fillFileList('out_list', 'tinyMCEImageList');
-		TinyMCE_EditableSelects.init();
-
-		if (n.nodeName == 'IMG') {
-			nl.src.value = dom.getAttrib(n, 'src');
-			nl.width.value = dom.getAttrib(n, 'width');
-			nl.height.value = dom.getAttrib(n, 'height');
-			nl.alt.value = dom.getAttrib(n, 'alt');
-			nl.title.value = dom.getAttrib(n, 'title');
-			nl.vspace.value = this.getAttrib(n, 'vspace');
-			nl.hspace.value = this.getAttrib(n, 'hspace');
-			nl.border.value = this.getAttrib(n, 'border');
-			selectByValue(f, 'align', this.getAttrib(n, 'align'));
-			selectByValue(f, 'class_list', dom.getAttrib(n, 'class'), true, true);
-			nl.style.value = dom.getAttrib(n, 'style');
-			nl.id.value = dom.getAttrib(n, 'id');
-			nl.dir.value = dom.getAttrib(n, 'dir');
-			nl.lang.value = dom.getAttrib(n, 'lang');
-			nl.usemap.value = dom.getAttrib(n, 'usemap');
-			nl.longdesc.value = dom.getAttrib(n, 'longdesc');
-			nl.insert.value = ed.getLang('update');
-
-			if (/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/.test(dom.getAttrib(n, 'onmouseover')))
-				nl.onmouseoversrc.value = dom.getAttrib(n, 'onmouseover').replace(/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/, '$1');
-
-			if (/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/.test(dom.getAttrib(n, 'onmouseout')))
-				nl.onmouseoutsrc.value = dom.getAttrib(n, 'onmouseout').replace(/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/, '$1');
-
-			if (ed.settings.inline_styles) {
-				// Move attribs to styles
-				if (dom.getAttrib(n, 'align'))
-					this.updateStyle('align');
-
-				if (dom.getAttrib(n, 'hspace'))
-					this.updateStyle('hspace');
-
-				if (dom.getAttrib(n, 'border'))
-					this.updateStyle('border');
-
-				if (dom.getAttrib(n, 'vspace'))
-					this.updateStyle('vspace');
-			}
-		}
-
-		// Setup browse button
-		document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image');
-		if (isVisible('srcbrowser'))
-			document.getElementById('src').style.width = '260px';
-
-		// Setup browse button
-		document.getElementById('onmouseoversrccontainer').innerHTML = getBrowserHTML('overbrowser','onmouseoversrc','image','theme_advanced_image');
-		if (isVisible('overbrowser'))
-			document.getElementById('onmouseoversrc').style.width = '260px';
-
-		// Setup browse button
-		document.getElementById('onmouseoutsrccontainer').innerHTML = getBrowserHTML('outbrowser','onmouseoutsrc','image','theme_advanced_image');
-		if (isVisible('outbrowser'))
-			document.getElementById('onmouseoutsrc').style.width = '260px';
-
-		// If option enabled default contrain proportions to checked
-		if (ed.getParam("advimage_constrain_proportions", true))
-			f.constrain.checked = true;
-
-		// Check swap image if valid data
-		if (nl.onmouseoversrc.value || nl.onmouseoutsrc.value)
-			this.setSwapImage(true);
-		else
-			this.setSwapImage(false);
-
-		this.changeAppearance();
-		this.showPreviewImage(nl.src.value, 1);
-	},
-
-	insert : function(file, title) {
-		var ed = tinyMCEPopup.editor, t = this, f = document.forms[0];
-
-		if (f.src.value === '') {
-			if (ed.selection.getNode().nodeName == 'IMG') {
-				ed.dom.remove(ed.selection.getNode());
-				ed.execCommand('mceRepaint');
-			}
-
-			tinyMCEPopup.close();
-			return;
-		}
-
-		if (tinyMCEPopup.getParam("accessibility_warnings", 1)) {
-			if (!f.alt.value) {
-				tinyMCEPopup.confirm(tinyMCEPopup.getLang('advimage_dlg.missing_alt'), function(s) {
-					if (s)
-						t.insertAndClose();
-				});
-
-				return;
-			}
-		}
-
-		t.insertAndClose();
-	},
-
-	insertAndClose : function() {
-		var ed = tinyMCEPopup.editor, f = document.forms[0], nl = f.elements, v, args = {}, el;
-
-		tinyMCEPopup.restoreSelection();
-
-		// Fixes crash in Safari
-		if (tinymce.isWebKit)
-			ed.getWin().focus();
-
-		if (!ed.settings.inline_styles) {
-			args = {
-				vspace : nl.vspace.value,
-				hspace : nl.hspace.value,
-				border : nl.border.value,
-				align : getSelectValue(f, 'align')
-			};
-		} else {
-			// Remove deprecated values
-			args = {
-				vspace : '',
-				hspace : '',
-				border : '',
-				align : ''
-			};
-		}
-
-		tinymce.extend(args, {
-			src : nl.src.value,
-			width : nl.width.value,
-			height : nl.height.value,
-			alt : nl.alt.value,
-			title : nl.title.value,
-			'class' : getSelectValue(f, 'class_list'),
-			style : nl.style.value,
-			id : nl.id.value,
-			dir : nl.dir.value,
-			lang : nl.lang.value,
-			usemap : nl.usemap.value,
-			longdesc : nl.longdesc.value
-		});
-
-		args.onmouseover = args.onmouseout = '';
-
-		if (f.onmousemovecheck.checked) {
-			if (nl.onmouseoversrc.value)
-				args.onmouseover = "this.src='" + nl.onmouseoversrc.value + "';";
-
-			if (nl.onmouseoutsrc.value)
-				args.onmouseout = "this.src='" + nl.onmouseoutsrc.value + "';";
-		}
-
-		el = ed.selection.getNode();
-
-		if (el && el.nodeName == 'IMG') {
-			ed.dom.setAttribs(el, args);
-		} else {
-			ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});
-			ed.dom.setAttribs('__mce_tmp', args);
-			ed.dom.setAttrib('__mce_tmp', 'id', '');
-			ed.undoManager.add();
-		}
-
-		tinyMCEPopup.close();
-	},
-
-	getAttrib : function(e, at) {
-		var ed = tinyMCEPopup.editor, dom = ed.dom, v, v2;
-
-		if (ed.settings.inline_styles) {
-			switch (at) {
-				case 'align':
-					if (v = dom.getStyle(e, 'float'))
-						return v;
-
-					if (v = dom.getStyle(e, 'vertical-align'))
-						return v;
-
-					break;
-
-				case 'hspace':
-					v = dom.getStyle(e, 'margin-left')
-					v2 = dom.getStyle(e, 'margin-right');
-
-					if (v && v == v2)
-						return parseInt(v.replace(/[^0-9]/g, ''));
-
-					break;
-
-				case 'vspace':
-					v = dom.getStyle(e, 'margin-top')
-					v2 = dom.getStyle(e, 'margin-bottom');
-					if (v && v == v2)
-						return parseInt(v.replace(/[^0-9]/g, ''));
-
-					break;
-
-				case 'border':
-					v = 0;
-
-					tinymce.each(['top', 'right', 'bottom', 'left'], function(sv) {
-						sv = dom.getStyle(e, 'border-' + sv + '-width');
-
-						// False or not the same as prev
-						if (!sv || (sv != v && v !== 0)) {
-							v = 0;
-							return false;
-						}
-
-						if (sv)
-							v = sv;
-					});
-
-					if (v)
-						return parseInt(v.replace(/[^0-9]/g, ''));
-
-					break;
-			}
-		}
-
-		if (v = dom.getAttrib(e, at))
-			return v;
-
-		return '';
-	},
-
-	setSwapImage : function(st) {
-		var f = document.forms[0];
-
-		f.onmousemovecheck.checked = st;
-		setBrowserDisabled('overbrowser', !st);
-		setBrowserDisabled('outbrowser', !st);
-
-		if (f.over_list)
-			f.over_list.disabled = !st;
-
-		if (f.out_list)
-			f.out_list.disabled = !st;
-
-		f.onmouseoversrc.disabled = !st;
-		f.onmouseoutsrc.disabled  = !st;
-	},
-
-	fillClassList : function(id) {
-		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
-
-		if (v = tinyMCEPopup.getParam('theme_advanced_styles')) {
-			cl = [];
-
-			tinymce.each(v.split(';'), function(v) {
-				var p = v.split('=');
-
-				cl.push({'title' : p[0], 'class' : p[1]});
-			});
-		} else
-			cl = tinyMCEPopup.editor.dom.getClasses();
-
-		if (cl.length > 0) {
-			lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');
-
-			tinymce.each(cl, function(o) {
-				lst.options[lst.options.length] = new Option(o.title || o['class'], o['class']);
-			});
-		} else
-			dom.remove(dom.getParent(id, 'tr'));
-	},
-
-	fillFileList : function(id, l) {
-		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
-
-		l = window[l];
-
-		if (l && l.length > 0) {
-			lst.options[lst.options.length] = new Option('', '');
-
-			tinymce.each(l, function(o) {
-				lst.options[lst.options.length] = new Option(o[0], o[1]);
-			});
-		} else
-			dom.remove(dom.getParent(id, 'tr'));
-	},
-
-	resetImageData : function() {
-		var f = document.forms[0];
-
-		f.elements.width.value = f.elements.height.value = '';
-	},
-
-	updateImageData : function(img, st) {
-		var f = document.forms[0];
-
-		if (!st) {
-			f.elements.width.value = img.width;
-			f.elements.height.value = img.height;
-		}
-
-		this.preloadImg = img;
-	},
-
-	changeAppearance : function() {
-		var ed = tinyMCEPopup.editor, f = document.forms[0], img = document.getElementById('alignSampleImg');
-
-		if (img) {
-			if (ed.getParam('inline_styles')) {
-				ed.dom.setAttrib(img, 'style', f.style.value);
-			} else {
-				img.align = f.align.value;
-				img.border = f.border.value;
-				img.hspace = f.hspace.value;
-				img.vspace = f.vspace.value;
-			}
-		}
-	},
-
-	changeHeight : function() {
-		var f = document.forms[0], tp, t = this;
-
-		if (!f.constrain.checked || !t.preloadImg) {
-			return;
-		}
-
-		if (f.width.value == "" || f.height.value == "")
-			return;
-
-		tp = (parseInt(f.width.value) / parseInt(t.preloadImg.width)) * t.preloadImg.height;
-		f.height.value = tp.toFixed(0);
-	},
-
-	changeWidth : function() {
-		var f = document.forms[0], tp, t = this;
-
-		if (!f.constrain.checked || !t.preloadImg) {
-			return;
-		}
-
-		if (f.width.value == "" || f.height.value == "")
-			return;
-
-		tp = (parseInt(f.height.value) / parseInt(t.preloadImg.height)) * t.preloadImg.width;
-		f.width.value = tp.toFixed(0);
-	},
-
-	updateStyle : function(ty) {
-		var dom = tinyMCEPopup.dom, st, v, f = document.forms[0], img = dom.create('img', {style : dom.get('style').value});
-
-		if (tinyMCEPopup.editor.settings.inline_styles) {
-			// Handle align
-			if (ty == 'align') {
-				dom.setStyle(img, 'float', '');
-				dom.setStyle(img, 'vertical-align', '');
-
-				v = getSelectValue(f, 'align');
-				if (v) {
-					if (v == 'left' || v == 'right')
-						dom.setStyle(img, 'float', v);
-					else
-						img.style.verticalAlign = v;
-				}
-			}
-
-			// Handle border
-			if (ty == 'border') {
-				dom.setStyle(img, 'border', '');
-
-				v = f.border.value;
-				if (v || v == '0') {
-					if (v == '0')
-						img.style.border = '0';
-					else
-						img.style.border = v + 'px solid black';
-				}
-			}
-
-			// Handle hspace
-			if (ty == 'hspace') {
-				dom.setStyle(img, 'marginLeft', '');
-				dom.setStyle(img, 'marginRight', '');
-
-				v = f.hspace.value;
-				if (v) {
-					img.style.marginLeft = v + 'px';
-					img.style.marginRight = v + 'px';
-				}
-			}
-
-			// Handle vspace
-			if (ty == 'vspace') {
-				dom.setStyle(img, 'marginTop', '');
-				dom.setStyle(img, 'marginBottom', '');
-
-				v = f.vspace.value;
-				if (v) {
-					img.style.marginTop = v + 'px';
-					img.style.marginBottom = v + 'px';
-				}
-			}
-
-			// Merge
-			dom.get('style').value = dom.serializeStyle(dom.parseStyle(img.style.cssText));
-		}
-	},
-
-	changeMouseMove : function() {
-	},
-
-	showPreviewImage : function(u, st) {
-		if (!u) {
-			tinyMCEPopup.dom.setHTML('prev', '');
-			return;
-		}
-
-		if (!st && tinyMCEPopup.getParam("advimage_update_dimensions_onchange", true))
-			this.resetImageData();
-
-		u = tinyMCEPopup.editor.documentBaseURI.toAbsolute(u);
-
-		if (!st)
-			tinyMCEPopup.dom.setHTML('prev', '<img id="previewImg" src="' + u + '" border="0" onload="ImageDialog.updateImageData(this);" onerror="ImageDialog.resetImageData();" />');
-		else
-			tinyMCEPopup.dom.setHTML('prev', '<img id="previewImg" src="' + u + '" border="0" onload="ImageDialog.updateImageData(this, 1);" />');
-	}
-};
-
-ImageDialog.preInit();
-tinyMCEPopup.onInit.add(ImageDialog.init, ImageDialog);
+var ImageDialog = {
+	preInit : function() {
+		var url;
+
+		tinyMCEPopup.requireLangPack();
+
+		if (url = tinyMCEPopup.getParam("external_image_list_url"))
+			document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+	},
+
+	init : function(ed) {
+		var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, dom = ed.dom, n = ed.selection.getNode();
+
+		tinyMCEPopup.resizeToInnerSize();
+		this.fillClassList('class_list');
+		this.fillFileList('src_list', 'tinyMCEImageList');
+		this.fillFileList('over_list', 'tinyMCEImageList');
+		this.fillFileList('out_list', 'tinyMCEImageList');
+		TinyMCE_EditableSelects.init();
+
+		if (n.nodeName == 'IMG') {
+			nl.src.value = dom.getAttrib(n, 'src');
+			nl.width.value = dom.getAttrib(n, 'width');
+			nl.height.value = dom.getAttrib(n, 'height');
+			nl.alt.value = dom.getAttrib(n, 'alt');
+			nl.title.value = dom.getAttrib(n, 'title');
+			nl.vspace.value = this.getAttrib(n, 'vspace');
+			nl.hspace.value = this.getAttrib(n, 'hspace');
+			nl.border.value = this.getAttrib(n, 'border');
+			selectByValue(f, 'align', this.getAttrib(n, 'align'));
+			selectByValue(f, 'class_list', dom.getAttrib(n, 'class'), true, true);
+			nl.style.value = dom.getAttrib(n, 'style');
+			nl.id.value = dom.getAttrib(n, 'id');
+			nl.dir.value = dom.getAttrib(n, 'dir');
+			nl.lang.value = dom.getAttrib(n, 'lang');
+			nl.usemap.value = dom.getAttrib(n, 'usemap');
+			nl.longdesc.value = dom.getAttrib(n, 'longdesc');
+			nl.insert.value = ed.getLang('update');
+
+			if (/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/.test(dom.getAttrib(n, 'onmouseover')))
+				nl.onmouseoversrc.value = dom.getAttrib(n, 'onmouseover').replace(/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/, '$1');
+
+			if (/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/.test(dom.getAttrib(n, 'onmouseout')))
+				nl.onmouseoutsrc.value = dom.getAttrib(n, 'onmouseout').replace(/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/, '$1');
+
+			if (ed.settings.inline_styles) {
+				// Move attribs to styles
+				if (dom.getAttrib(n, 'align'))
+					this.updateStyle('align');
+
+				if (dom.getAttrib(n, 'hspace'))
+					this.updateStyle('hspace');
+
+				if (dom.getAttrib(n, 'border'))
+					this.updateStyle('border');
+
+				if (dom.getAttrib(n, 'vspace'))
+					this.updateStyle('vspace');
+			}
+		}
+
+		// Setup browse button
+		document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image');
+		if (isVisible('srcbrowser'))
+			document.getElementById('src').style.width = '260px';
+
+		// Setup browse button
+		document.getElementById('onmouseoversrccontainer').innerHTML = getBrowserHTML('overbrowser','onmouseoversrc','image','theme_advanced_image');
+		if (isVisible('overbrowser'))
+			document.getElementById('onmouseoversrc').style.width = '260px';
+
+		// Setup browse button
+		document.getElementById('onmouseoutsrccontainer').innerHTML = getBrowserHTML('outbrowser','onmouseoutsrc','image','theme_advanced_image');
+		if (isVisible('outbrowser'))
+			document.getElementById('onmouseoutsrc').style.width = '260px';
+
+		// If option enabled default contrain proportions to checked
+		if (ed.getParam("advimage_constrain_proportions", true))
+			f.constrain.checked = true;
+
+		// Check swap image if valid data
+		if (nl.onmouseoversrc.value || nl.onmouseoutsrc.value)
+			this.setSwapImage(true);
+		else
+			this.setSwapImage(false);
+
+		this.changeAppearance();
+		this.showPreviewImage(nl.src.value, 1);
+	},
+
+	insert : function(file, title) {
+		var ed = tinyMCEPopup.editor, t = this, f = document.forms[0];
+
+		if (f.src.value === '') {
+			if (ed.selection.getNode().nodeName == 'IMG') {
+				ed.dom.remove(ed.selection.getNode());
+				ed.execCommand('mceRepaint');
+			}
+
+			tinyMCEPopup.close();
+			return;
+		}
+
+		if (tinyMCEPopup.getParam("accessibility_warnings", 1)) {
+			if (!f.alt.value) {
+				tinyMCEPopup.confirm(tinyMCEPopup.getLang('advimage_dlg.missing_alt'), function(s) {
+					if (s)
+						t.insertAndClose();
+				});
+
+				return;
+			}
+		}
+
+		t.insertAndClose();
+	},
+
+	insertAndClose : function() {
+		var ed = tinyMCEPopup.editor, f = document.forms[0], nl = f.elements, v, args = {}, el;
+
+		tinyMCEPopup.restoreSelection();
+
+		// Fixes crash in Safari
+		if (tinymce.isWebKit)
+			ed.getWin().focus();
+
+		if (!ed.settings.inline_styles) {
+			args = {
+				vspace : nl.vspace.value,
+				hspace : nl.hspace.value,
+				border : nl.border.value,
+				align : getSelectValue(f, 'align')
+			};
+		} else {
+			// Remove deprecated values
+			args = {
+				vspace : '',
+				hspace : '',
+				border : '',
+				align : ''
+			};
+		}
+
+		tinymce.extend(args, {
+			src : nl.src.value,
+			width : nl.width.value,
+			height : nl.height.value,
+			alt : nl.alt.value,
+			title : nl.title.value,
+			'class' : getSelectValue(f, 'class_list'),
+			style : nl.style.value,
+			id : nl.id.value,
+			dir : nl.dir.value,
+			lang : nl.lang.value,
+			usemap : nl.usemap.value,
+			longdesc : nl.longdesc.value
+		});
+
+		args.onmouseover = args.onmouseout = '';
+
+		if (f.onmousemovecheck.checked) {
+			if (nl.onmouseoversrc.value)
+				args.onmouseover = "this.src='" + nl.onmouseoversrc.value + "';";
+
+			if (nl.onmouseoutsrc.value)
+				args.onmouseout = "this.src='" + nl.onmouseoutsrc.value + "';";
+		}
+
+		el = ed.selection.getNode();
+
+		if (el && el.nodeName == 'IMG') {
+			ed.dom.setAttribs(el, args);
+		} else {
+			ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});
+			ed.dom.setAttribs('__mce_tmp', args);
+			ed.dom.setAttrib('__mce_tmp', 'id', '');
+			ed.undoManager.add();
+		}
+
+		tinyMCEPopup.close();
+	},
+
+	getAttrib : function(e, at) {
+		var ed = tinyMCEPopup.editor, dom = ed.dom, v, v2;
+
+		if (ed.settings.inline_styles) {
+			switch (at) {
+				case 'align':
+					if (v = dom.getStyle(e, 'float'))
+						return v;
+
+					if (v = dom.getStyle(e, 'vertical-align'))
+						return v;
+
+					break;
+
+				case 'hspace':
+					v = dom.getStyle(e, 'margin-left')
+					v2 = dom.getStyle(e, 'margin-right');
+
+					if (v && v == v2)
+						return parseInt(v.replace(/[^0-9]/g, ''));
+
+					break;
+
+				case 'vspace':
+					v = dom.getStyle(e, 'margin-top')
+					v2 = dom.getStyle(e, 'margin-bottom');
+					if (v && v == v2)
+						return parseInt(v.replace(/[^0-9]/g, ''));
+
+					break;
+
+				case 'border':
+					v = 0;
+
+					tinymce.each(['top', 'right', 'bottom', 'left'], function(sv) {
+						sv = dom.getStyle(e, 'border-' + sv + '-width');
+
+						// False or not the same as prev
+						if (!sv || (sv != v && v !== 0)) {
+							v = 0;
+							return false;
+						}
+
+						if (sv)
+							v = sv;
+					});
+
+					if (v)
+						return parseInt(v.replace(/[^0-9]/g, ''));
+
+					break;
+			}
+		}
+
+		if (v = dom.getAttrib(e, at))
+			return v;
+
+		return '';
+	},
+
+	setSwapImage : function(st) {
+		var f = document.forms[0];
+
+		f.onmousemovecheck.checked = st;
+		setBrowserDisabled('overbrowser', !st);
+		setBrowserDisabled('outbrowser', !st);
+
+		if (f.over_list)
+			f.over_list.disabled = !st;
+
+		if (f.out_list)
+			f.out_list.disabled = !st;
+
+		f.onmouseoversrc.disabled = !st;
+		f.onmouseoutsrc.disabled  = !st;
+	},
+
+	fillClassList : function(id) {
+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
+
+		if (v = tinyMCEPopup.getParam('theme_advanced_styles')) {
+			cl = [];
+
+			tinymce.each(v.split(';'), function(v) {
+				var p = v.split('=');
+
+				cl.push({'title' : p[0], 'class' : p[1]});
+			});
+		} else
+			cl = tinyMCEPopup.editor.dom.getClasses();
+
+		if (cl.length > 0) {
+			lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');
+
+			tinymce.each(cl, function(o) {
+				lst.options[lst.options.length] = new Option(o.title || o['class'], o['class']);
+			});
+		} else
+			dom.remove(dom.getParent(id, 'tr'));
+	},
+
+	fillFileList : function(id, l) {
+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
+
+		l = window[l];
+
+		if (l && l.length > 0) {
+			lst.options[lst.options.length] = new Option('', '');
+
+			tinymce.each(l, function(o) {
+				lst.options[lst.options.length] = new Option(o[0], o[1]);
+			});
+		} else
+			dom.remove(dom.getParent(id, 'tr'));
+	},
+
+	resetImageData : function() {
+		var f = document.forms[0];
+
+		f.elements.width.value = f.elements.height.value = '';
+	},
+
+	updateImageData : function(img, st) {
+		var f = document.forms[0];
+
+		if (!st) {
+			f.elements.width.value = img.width;
+			f.elements.height.value = img.height;
+		}
+
+		this.preloadImg = img;
+	},
+
+	changeAppearance : function() {
+		var ed = tinyMCEPopup.editor, f = document.forms[0], img = document.getElementById('alignSampleImg');
+
+		if (img) {
+			if (ed.getParam('inline_styles')) {
+				ed.dom.setAttrib(img, 'style', f.style.value);
+			} else {
+				img.align = f.align.value;
+				img.border = f.border.value;
+				img.hspace = f.hspace.value;
+				img.vspace = f.vspace.value;
+			}
+		}
+	},
+
+	changeHeight : function() {
+		var f = document.forms[0], tp, t = this;
+
+		if (!f.constrain.checked || !t.preloadImg) {
+			return;
+		}
+
+		if (f.width.value == "" || f.height.value == "")
+			return;
+
+		tp = (parseInt(f.width.value) / parseInt(t.preloadImg.width)) * t.preloadImg.height;
+		f.height.value = tp.toFixed(0);
+	},
+
+	changeWidth : function() {
+		var f = document.forms[0], tp, t = this;
+
+		if (!f.constrain.checked || !t.preloadImg) {
+			return;
+		}
+
+		if (f.width.value == "" || f.height.value == "")
+			return;
+
+		tp = (parseInt(f.height.value) / parseInt(t.preloadImg.height)) * t.preloadImg.width;
+		f.width.value = tp.toFixed(0);
+	},
+
+	updateStyle : function(ty) {
+		var dom = tinyMCEPopup.dom, st, v, f = document.forms[0], img = dom.create('img', {style : dom.get('style').value});
+
+		if (tinyMCEPopup.editor.settings.inline_styles) {
+			// Handle align
+			if (ty == 'align') {
+				dom.setStyle(img, 'float', '');
+				dom.setStyle(img, 'vertical-align', '');
+
+				v = getSelectValue(f, 'align');
+				if (v) {
+					if (v == 'left' || v == 'right')
+						dom.setStyle(img, 'float', v);
+					else
+						img.style.verticalAlign = v;
+				}
+			}
+
+			// Handle border
+			if (ty == 'border') {
+				dom.setStyle(img, 'border', '');
+
+				v = f.border.value;
+				if (v || v == '0') {
+					if (v == '0')
+						img.style.border = '0';
+					else
+						img.style.border = v + 'px solid black';
+				}
+			}
+
+			// Handle hspace
+			if (ty == 'hspace') {
+				dom.setStyle(img, 'marginLeft', '');
+				dom.setStyle(img, 'marginRight', '');
+
+				v = f.hspace.value;
+				if (v) {
+					img.style.marginLeft = v + 'px';
+					img.style.marginRight = v + 'px';
+				}
+			}
+
+			// Handle vspace
+			if (ty == 'vspace') {
+				dom.setStyle(img, 'marginTop', '');
+				dom.setStyle(img, 'marginBottom', '');
+
+				v = f.vspace.value;
+				if (v) {
+					img.style.marginTop = v + 'px';
+					img.style.marginBottom = v + 'px';
+				}
+			}
+
+			// Merge
+			dom.get('style').value = dom.serializeStyle(dom.parseStyle(img.style.cssText));
+		}
+	},
+
+	changeMouseMove : function() {
+	},
+
+	showPreviewImage : function(u, st) {
+		if (!u) {
+			tinyMCEPopup.dom.setHTML('prev', '');
+			return;
+		}
+
+		if (!st && tinyMCEPopup.getParam("advimage_update_dimensions_onchange", true))
+			this.resetImageData();
+
+		u = tinyMCEPopup.editor.documentBaseURI.toAbsolute(u);
+
+		if (!st)
+			tinyMCEPopup.dom.setHTML('prev', '<img id="previewImg" src="' + u + '" border="0" onload="ImageDialog.updateImageData(this);" onerror="ImageDialog.resetImageData();" />');
+		else
+			tinyMCEPopup.dom.setHTML('prev', '<img id="previewImg" src="' + u + '" border="0" onload="ImageDialog.updateImageData(this, 1);" />');
+	}
+};
+
+ImageDialog.preInit();
+tinyMCEPopup.onInit.add(ImageDialog.init, ImageDialog);
diff --git a/webapp/web/js/tiny_mce/plugins/advimage/langs/en_dlg.js b/webapp/web/js/tiny_mce/plugins/advimage/langs/en_dlg.js
index f493d196f..ef81f78b4 100755
--- a/webapp/web/js/tiny_mce/plugins/advimage/langs/en_dlg.js
+++ b/webapp/web/js/tiny_mce/plugins/advimage/langs/en_dlg.js
@@ -1,43 +1,43 @@
-tinyMCE.addI18n('en.advimage_dlg',{
-tab_general:"General",
-tab_appearance:"Appearance",
-tab_advanced:"Advanced",
-general:"General",
-title:"Title",
-preview:"Preview",
-constrain_proportions:"Constrain proportions",
-langdir:"Language direction",
-langcode:"Language code",
-long_desc:"Long description link",
-style:"Style",
-classes:"Classes",
-ltr:"Left to right",
-rtl:"Right to left",
-id:"Id",
-map:"Image map",
-swap_image:"Swap image",
-alt_image:"Alternative image",
-mouseover:"for mouse over",
-mouseout:"for mouse out",
-misc:"Miscellaneous",
-example_img:"Appearance preview 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.",
-dialog_title:"Insert/edit image",
-src:"Image URL",
-alt:"Image description",
-list:"Image list",
-border:"Border",
-dimensions:"Dimensions",
-vspace:"Vertical space",
-hspace:"Horizontal space",
-align:"Alignment",
-align_baseline:"Baseline",
-align_top:"Top",
-align_middle:"Middle",
-align_bottom:"Bottom",
-align_texttop:"Text top",
-align_textbottom:"Text bottom",
-align_left:"Left",
-align_right:"Right",
-image_list:"Image list"
+tinyMCE.addI18n('en.advimage_dlg',{
+tab_general:"General",
+tab_appearance:"Appearance",
+tab_advanced:"Advanced",
+general:"General",
+title:"Title",
+preview:"Preview",
+constrain_proportions:"Constrain proportions",
+langdir:"Language direction",
+langcode:"Language code",
+long_desc:"Long description link",
+style:"Style",
+classes:"Classes",
+ltr:"Left to right",
+rtl:"Right to left",
+id:"Id",
+map:"Image map",
+swap_image:"Swap image",
+alt_image:"Alternative image",
+mouseover:"for mouse over",
+mouseout:"for mouse out",
+misc:"Miscellaneous",
+example_img:"Appearance preview 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.",
+dialog_title:"Insert/edit image",
+src:"Image URL",
+alt:"Image description",
+list:"Image list",
+border:"Border",
+dimensions:"Dimensions",
+vspace:"Vertical space",
+hspace:"Horizontal space",
+align:"Alignment",
+align_baseline:"Baseline",
+align_top:"Top",
+align_middle:"Middle",
+align_bottom:"Bottom",
+align_texttop:"Text top",
+align_textbottom:"Text bottom",
+align_left:"Left",
+align_right:"Right",
+image_list:"Image list"
 });
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/advlink/css/advlink.css b/webapp/web/js/tiny_mce/plugins/advlink/css/advlink.css
index 14364316a..66c654935 100755
--- a/webapp/web/js/tiny_mce/plugins/advlink/css/advlink.css
+++ b/webapp/web/js/tiny_mce/plugins/advlink/css/advlink.css
@@ -1,8 +1,8 @@
-.mceLinkList, .mceAnchorList, #targetlist {width:280px;}
-.mceActionPanel {margin-top:7px;}
-.panel_wrapper div.current {height:320px;}
-#classlist, #title, #href {width:280px;}
-#popupurl, #popupname {width:200px;}
-#popupwidth, #popupheight, #popupleft, #popuptop {width:30px;vertical-align:middle;text-align:center;}
-#id, #style, #classes, #target, #dir, #hreflang, #lang, #charset, #type, #rel, #rev, #tabindex, #accesskey {width:200px;}
-#events_panel input {width:200px;}
+.mceLinkList, .mceAnchorList, #targetlist {width:280px;}
+.mceActionPanel {margin-top:7px;}
+.panel_wrapper div.current {height:320px;}
+#classlist, #title, #href {width:280px;}
+#popupurl, #popupname {width:200px;}
+#popupwidth, #popupheight, #popupleft, #popuptop {width:30px;vertical-align:middle;text-align:center;}
+#id, #style, #classes, #target, #dir, #hreflang, #lang, #charset, #type, #rel, #rev, #tabindex, #accesskey {width:200px;}
+#events_panel input {width:200px;}
diff --git a/webapp/web/js/tiny_mce/plugins/advlink/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/advlink/editor_plugin_src.js
index fc5325a96..7081e7242 100755
--- a/webapp/web/js/tiny_mce/plugins/advlink/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/advlink/editor_plugin_src.js
@@ -1,58 +1,58 @@
-/**
- * $Id: editor_plugin_src.js 539 2008-01-14 19:08:58Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.AdvancedLinkPlugin', {
-		init : function(ed, url) {
-			this.editor = ed;
-
-			// Register commands
-			ed.addCommand('mceAdvLink', function() {
-				var se = ed.selection;
-
-				// No selection and not in link
-				if (se.isCollapsed() && !ed.dom.getParent(se.getNode(), 'A'))
-					return;
-
-				ed.windowManager.open({
-					file : url + '/link.htm',
-					width : 480 + parseInt(ed.getLang('advlink.delta_width', 0)),
-					height : 400 + parseInt(ed.getLang('advlink.delta_height', 0)),
-					inline : 1
-				}, {
-					plugin_url : url
-				});
-			});
-
-			// Register buttons
-			ed.addButton('link', {
-				title : 'advlink.link_desc',
-				cmd : 'mceAdvLink'
-			});
-
-			ed.addShortcut('ctrl+k', 'advlink.advlink_desc', 'mceAdvLink');
-
-			ed.onNodeChange.add(function(ed, cm, n, co) {
-				cm.setDisabled('link', co && n.nodeName != 'A');
-				cm.setActive('link', n.nodeName == 'A' && !n.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
-			};
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('advlink', tinymce.plugins.AdvancedLinkPlugin);
+/**
+ * $Id: editor_plugin_src.js 539 2008-01-14 19:08:58Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.AdvancedLinkPlugin', {
+		init : function(ed, url) {
+			this.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceAdvLink', function() {
+				var se = ed.selection;
+
+				// No selection and not in link
+				if (se.isCollapsed() && !ed.dom.getParent(se.getNode(), 'A'))
+					return;
+
+				ed.windowManager.open({
+					file : url + '/link.htm',
+					width : 480 + parseInt(ed.getLang('advlink.delta_width', 0)),
+					height : 400 + parseInt(ed.getLang('advlink.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			// Register buttons
+			ed.addButton('link', {
+				title : 'advlink.link_desc',
+				cmd : 'mceAdvLink'
+			});
+
+			ed.addShortcut('ctrl+k', 'advlink.advlink_desc', 'mceAdvLink');
+
+			ed.onNodeChange.add(function(ed, cm, n, co) {
+				cm.setDisabled('link', co && n.nodeName != 'A');
+				cm.setActive('link', n.nodeName == 'A' && !n.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
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('advlink', tinymce.plugins.AdvancedLinkPlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/advlink/js/advlink.js b/webapp/web/js/tiny_mce/plugins/advlink/js/advlink.js
index a89625014..c8d19835f 100755
--- a/webapp/web/js/tiny_mce/plugins/advlink/js/advlink.js
+++ b/webapp/web/js/tiny_mce/plugins/advlink/js/advlink.js
@@ -1,527 +1,527 @@
-/* Functions for the advlink plugin popup */
-
-tinyMCEPopup.requireLangPack();
-
-var templates = {
-	"window.open" : "window.open('${url}','${target}','${options}')"
-};
-
-function preinit() {
-	var url;
-
-	if (url = tinyMCEPopup.getParam("external_link_list_url"))
-		document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
-}
-
-function changeClass() {
-	var f = document.forms[0];
-
-	f.classes.value = getSelectValue(f, 'classlist');
-}
-
-function init() {
-	tinyMCEPopup.resizeToInnerSize();
-
-	var formObj = document.forms[0];
-	var inst = tinyMCEPopup.editor;
-	var elm = inst.selection.getNode();
-	var action = "insert";
-	var html;
-
-	document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser','href','file','advlink');
-	document.getElementById('popupurlbrowsercontainer').innerHTML = getBrowserHTML('popupurlbrowser','popupurl','file','advlink');
-	document.getElementById('linklisthrefcontainer').innerHTML = getLinkListHTML('linklisthref','href');
-	document.getElementById('anchorlistcontainer').innerHTML = getAnchorListHTML('anchorlist','href');
-	document.getElementById('targetlistcontainer').innerHTML = getTargetListHTML('targetlist','target');
-
-	// Link list
-	html = getLinkListHTML('linklisthref','href');
-	if (html == "")
-		document.getElementById("linklisthrefrow").style.display = 'none';
-	else
-		document.getElementById("linklisthrefcontainer").innerHTML = html;
-
-	// Resize some elements
-	if (isVisible('hrefbrowser'))
-		document.getElementById('href').style.width = '260px';
-
-	if (isVisible('popupurlbrowser'))
-		document.getElementById('popupurl').style.width = '180px';
-
-	elm = inst.dom.getParent(elm, "A");
-	if (elm != null && elm.nodeName == "A")
-		action = "update";
-
-	formObj.insert.value = tinyMCEPopup.getLang(action, 'Insert', true); 
-
-	setPopupControlsDisabled(true);
-
-	if (action == "update") {
-		var href = inst.dom.getAttrib(elm, 'href');
-		var onclick = inst.dom.getAttrib(elm, 'onclick');
-
-		// Setup form data
-		setFormValue('href', href);
-		setFormValue('title', inst.dom.getAttrib(elm, 'title'));
-		setFormValue('id', inst.dom.getAttrib(elm, 'id'));
-		setFormValue('style', inst.dom.getAttrib(elm, "style"));
-		setFormValue('rel', inst.dom.getAttrib(elm, 'rel'));
-		setFormValue('rev', inst.dom.getAttrib(elm, 'rev'));
-		setFormValue('charset', inst.dom.getAttrib(elm, 'charset'));
-		setFormValue('hreflang', inst.dom.getAttrib(elm, 'hreflang'));
-		setFormValue('dir', inst.dom.getAttrib(elm, 'dir'));
-		setFormValue('lang', inst.dom.getAttrib(elm, 'lang'));
-		setFormValue('tabindex', inst.dom.getAttrib(elm, 'tabindex', typeof(elm.tabindex) != "undefined" ? elm.tabindex : ""));
-		setFormValue('accesskey', inst.dom.getAttrib(elm, 'accesskey', typeof(elm.accesskey) != "undefined" ? elm.accesskey : ""));
-		setFormValue('type', inst.dom.getAttrib(elm, 'type'));
-		setFormValue('onfocus', inst.dom.getAttrib(elm, 'onfocus'));
-		setFormValue('onblur', inst.dom.getAttrib(elm, 'onblur'));
-		setFormValue('onclick', onclick);
-		setFormValue('ondblclick', inst.dom.getAttrib(elm, 'ondblclick'));
-		setFormValue('onmousedown', inst.dom.getAttrib(elm, 'onmousedown'));
-		setFormValue('onmouseup', inst.dom.getAttrib(elm, 'onmouseup'));
-		setFormValue('onmouseover', inst.dom.getAttrib(elm, 'onmouseover'));
-		setFormValue('onmousemove', inst.dom.getAttrib(elm, 'onmousemove'));
-		setFormValue('onmouseout', inst.dom.getAttrib(elm, 'onmouseout'));
-		setFormValue('onkeypress', inst.dom.getAttrib(elm, 'onkeypress'));
-		setFormValue('onkeydown', inst.dom.getAttrib(elm, 'onkeydown'));
-		setFormValue('onkeyup', inst.dom.getAttrib(elm, 'onkeyup'));
-		setFormValue('target', inst.dom.getAttrib(elm, 'target'));
-		setFormValue('classes', inst.dom.getAttrib(elm, 'class'));
-
-		// Parse onclick data
-		if (onclick != null && onclick.indexOf('window.open') != -1)
-			parseWindowOpen(onclick);
-		else
-			parseFunction(onclick);
-
-		// Select by the values
-		selectByValue(formObj, 'dir', inst.dom.getAttrib(elm, 'dir'));
-		selectByValue(formObj, 'rel', inst.dom.getAttrib(elm, 'rel'));
-		selectByValue(formObj, 'rev', inst.dom.getAttrib(elm, 'rev'));
-		selectByValue(formObj, 'linklisthref', href);
-
-		if (href.charAt(0) == '#')
-			selectByValue(formObj, 'anchorlist', href);
-
-		addClassesToList('classlist', 'advlink_styles');
-
-		selectByValue(formObj, 'classlist', inst.dom.getAttrib(elm, 'class'), true);
-		selectByValue(formObj, 'targetlist', inst.dom.getAttrib(elm, 'target'), true);
-	} else
-		addClassesToList('classlist', 'advlink_styles');
-}
-
-function checkPrefix(n) {
-	if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_email')))
-		n.value = 'mailto:' + n.value;
-
-	if (/^\s*www./i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_external')))
-		n.value = 'http://' + n.value;
-}
-
-function setFormValue(name, value) {
-	document.forms[0].elements[name].value = value;
-}
-
-function parseWindowOpen(onclick) {
-	var formObj = document.forms[0];
-
-	// Preprocess center code
-	if (onclick.indexOf('return false;') != -1) {
-		formObj.popupreturn.checked = true;
-		onclick = onclick.replace('return false;', '');
-	} else
-		formObj.popupreturn.checked = false;
-
-	var onClickData = parseLink(onclick);
-
-	if (onClickData != null) {
-		formObj.ispopup.checked = true;
-		setPopupControlsDisabled(false);
-
-		var onClickWindowOptions = parseOptions(onClickData['options']);
-		var url = onClickData['url'];
-
-		formObj.popupname.value = onClickData['target'];
-		formObj.popupurl.value = url;
-		formObj.popupwidth.value = getOption(onClickWindowOptions, 'width');
-		formObj.popupheight.value = getOption(onClickWindowOptions, 'height');
-
-		formObj.popupleft.value = getOption(onClickWindowOptions, 'left');
-		formObj.popuptop.value = getOption(onClickWindowOptions, 'top');
-
-		if (formObj.popupleft.value.indexOf('screen') != -1)
-			formObj.popupleft.value = "c";
-
-		if (formObj.popuptop.value.indexOf('screen') != -1)
-			formObj.popuptop.value = "c";
-
-		formObj.popuplocation.checked = getOption(onClickWindowOptions, 'location') == "yes";
-		formObj.popupscrollbars.checked = getOption(onClickWindowOptions, 'scrollbars') == "yes";
-		formObj.popupmenubar.checked = getOption(onClickWindowOptions, 'menubar') == "yes";
-		formObj.popupresizable.checked = getOption(onClickWindowOptions, 'resizable') == "yes";
-		formObj.popuptoolbar.checked = getOption(onClickWindowOptions, 'toolbar') == "yes";
-		formObj.popupstatus.checked = getOption(onClickWindowOptions, 'status') == "yes";
-		formObj.popupdependent.checked = getOption(onClickWindowOptions, 'dependent') == "yes";
-
-		buildOnClick();
-	}
-}
-
-function parseFunction(onclick) {
-	var formObj = document.forms[0];
-	var onClickData = parseLink(onclick);
-
-	// TODO: Add stuff here
-}
-
-function getOption(opts, name) {
-	return typeof(opts[name]) == "undefined" ? "" : opts[name];
-}
-
-function setPopupControlsDisabled(state) {
-	var formObj = document.forms[0];
-
-	formObj.popupname.disabled = state;
-	formObj.popupurl.disabled = state;
-	formObj.popupwidth.disabled = state;
-	formObj.popupheight.disabled = state;
-	formObj.popupleft.disabled = state;
-	formObj.popuptop.disabled = state;
-	formObj.popuplocation.disabled = state;
-	formObj.popupscrollbars.disabled = state;
-	formObj.popupmenubar.disabled = state;
-	formObj.popupresizable.disabled = state;
-	formObj.popuptoolbar.disabled = state;
-	formObj.popupstatus.disabled = state;
-	formObj.popupreturn.disabled = state;
-	formObj.popupdependent.disabled = state;
-
-	setBrowserDisabled('popupurlbrowser', state);
-}
-
-function parseLink(link) {
-	link = link.replace(new RegExp('&#39;', 'g'), "'");
-
-	var fnName = link.replace(new RegExp("\\s*([A-Za-z0-9\.]*)\\s*\\(.*", "gi"), "$1");
-
-	// Is function name a template function
-	var template = templates[fnName];
-	if (template) {
-		// Build regexp
-		var variableNames = template.match(new RegExp("'?\\$\\{[A-Za-z0-9\.]*\\}'?", "gi"));
-		var regExp = "\\s*[A-Za-z0-9\.]*\\s*\\(";
-		var replaceStr = "";
-		for (var i=0; i<variableNames.length; i++) {
-			// Is string value
-			if (variableNames[i].indexOf("'${") != -1)
-				regExp += "'(.*)'";
-			else // Number value
-				regExp += "([0-9]*)";
-
-			replaceStr += "$" + (i+1);
-
-			// Cleanup variable name
-			variableNames[i] = variableNames[i].replace(new RegExp("[^A-Za-z0-9]", "gi"), "");
-
-			if (i != variableNames.length-1) {
-				regExp += "\\s*,\\s*";
-				replaceStr += "<delim>";
-			} else
-				regExp += ".*";
-		}
-
-		regExp += "\\);?";
-
-		// Build variable array
-		var variables = [];
-		variables["_function"] = fnName;
-		var variableValues = link.replace(new RegExp(regExp, "gi"), replaceStr).split('<delim>');
-		for (var i=0; i<variableNames.length; i++)
-			variables[variableNames[i]] = variableValues[i];
-
-		return variables;
-	}
-
-	return null;
-}
-
-function parseOptions(opts) {
-	if (opts == null || opts == "")
-		return [];
-
-	// Cleanup the options
-	opts = opts.toLowerCase();
-	opts = opts.replace(/;/g, ",");
-	opts = opts.replace(/[^0-9a-z=,]/g, "");
-
-	var optionChunks = opts.split(',');
-	var options = [];
-
-	for (var i=0; i<optionChunks.length; i++) {
-		var parts = optionChunks[i].split('=');
-
-		if (parts.length == 2)
-			options[parts[0]] = parts[1];
-	}
-
-	return options;
-}
-
-function buildOnClick() {
-	var formObj = document.forms[0];
-
-	if (!formObj.ispopup.checked) {
-		formObj.onclick.value = "";
-		return;
-	}
-
-	var onclick = "window.open('";
-	var url = formObj.popupurl.value;
-
-	onclick += url + "','";
-	onclick += formObj.popupname.value + "','";
-
-	if (formObj.popuplocation.checked)
-		onclick += "location=yes,";
-
-	if (formObj.popupscrollbars.checked)
-		onclick += "scrollbars=yes,";
-
-	if (formObj.popupmenubar.checked)
-		onclick += "menubar=yes,";
-
-	if (formObj.popupresizable.checked)
-		onclick += "resizable=yes,";
-
-	if (formObj.popuptoolbar.checked)
-		onclick += "toolbar=yes,";
-
-	if (formObj.popupstatus.checked)
-		onclick += "status=yes,";
-
-	if (formObj.popupdependent.checked)
-		onclick += "dependent=yes,";
-
-	if (formObj.popupwidth.value != "")
-		onclick += "width=" + formObj.popupwidth.value + ",";
-
-	if (formObj.popupheight.value != "")
-		onclick += "height=" + formObj.popupheight.value + ",";
-
-	if (formObj.popupleft.value != "") {
-		if (formObj.popupleft.value != "c")
-			onclick += "left=" + formObj.popupleft.value + ",";
-		else
-			onclick += "left='+(screen.availWidth/2-" + (formObj.popupwidth.value/2) + ")+',";
-	}
-
-	if (formObj.popuptop.value != "") {
-		if (formObj.popuptop.value != "c")
-			onclick += "top=" + formObj.popuptop.value + ",";
-		else
-			onclick += "top='+(screen.availHeight/2-" + (formObj.popupheight.value/2) + ")+',";
-	}
-
-	if (onclick.charAt(onclick.length-1) == ',')
-		onclick = onclick.substring(0, onclick.length-1);
-
-	onclick += "');";
-
-	if (formObj.popupreturn.checked)
-		onclick += "return false;";
-
-	// tinyMCE.debug(onclick);
-
-	formObj.onclick.value = onclick;
-
-	if (formObj.href.value == "")
-		formObj.href.value = url;
-}
-
-function setAttrib(elm, attrib, value) {
-	var formObj = document.forms[0];
-	var valueElm = formObj.elements[attrib.toLowerCase()];
-	var dom = tinyMCEPopup.editor.dom;
-
-	if (typeof(value) == "undefined" || value == null) {
-		value = "";
-
-		if (valueElm)
-			value = valueElm.value;
-	}
-
-	// Clean up the style
-	if (attrib == 'style')
-		value = dom.serializeStyle(dom.parseStyle(value));
-
-	dom.setAttrib(elm, attrib, value);
-}
-
-function getAnchorListHTML(id, target) {
-	var inst = tinyMCEPopup.editor;
-	var nodes = inst.dom.select('a.mceItemAnchor,img.mceItemAnchor'), name, i;
-	var html = "";
-
-	html += '<select id="' + id + '" name="' + id + '" class="mceAnchorList" o2nfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target + '.value=';
-	html += 'this.options[this.selectedIndex].value;">';
-	html += '<option value="">---</option>';
-
-	for (i=0; i<nodes.length; i++) {
-		if ((name = inst.dom.getAttrib(nodes[i], "name")) != "")
-			html += '<option value="#' + name + '">' + name + '</option>';
-	}
-
-	html += '</select>';
-
-	return html;
-}
-
-function insertAction() {
-	var inst = tinyMCEPopup.editor;
-	var elm, elementArray, i;
-
-	elm = inst.selection.getNode();
-	checkPrefix(document.forms[0].href);
-
-	elm = inst.dom.getParent(elm, "A");
-
-	// Remove element if there is no href
-	if (!document.forms[0].href.value) {
-		tinyMCEPopup.execCommand("mceBeginUndoLevel");
-		i = inst.selection.getBookmark();
-		inst.dom.remove(elm, 1);
-		inst.selection.moveToBookmark(i);
-		tinyMCEPopup.execCommand("mceEndUndoLevel");
-		tinyMCEPopup.close();
-		return;
-	}
-
-	tinyMCEPopup.execCommand("mceBeginUndoLevel");
-
-	// Create new anchor elements
-	if (elm == null) {
-		tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});
-
-		elementArray = tinymce.grep(inst.dom.select("a"), function(n) {return inst.dom.getAttrib(n, 'href') == '#mce_temp_url#';});
-		for (i=0; i<elementArray.length; i++)
-			setAllAttribs(elm = elementArray[i]);
-	} else
-		setAllAttribs(elm);
-
-	// Don't move caret if selection was image
-	if (elm.childNodes.length != 1 || elm.firstChild.nodeName != 'IMG') {
-		inst.focus();
-		inst.selection.select(elm);
-		inst.selection.collapse(0);
-		tinyMCEPopup.storeSelection();
-	}
-
-	tinyMCEPopup.execCommand("mceEndUndoLevel");
-	tinyMCEPopup.close();
-}
-
-function setAllAttribs(elm) {
-	var formObj = document.forms[0];
-	var href = formObj.href.value;
-	var target = getSelectValue(formObj, 'targetlist');
-
-	setAttrib(elm, 'href', href);
-	setAttrib(elm, 'title');
-	setAttrib(elm, 'target', target == '_self' ? '' : target);
-	setAttrib(elm, 'id');
-	setAttrib(elm, 'style');
-	setAttrib(elm, 'class', getSelectValue(formObj, 'classlist'));
-	setAttrib(elm, 'rel');
-	setAttrib(elm, 'rev');
-	setAttrib(elm, 'charset');
-	setAttrib(elm, 'hreflang');
-	setAttrib(elm, 'dir');
-	setAttrib(elm, 'lang');
-	setAttrib(elm, 'tabindex');
-	setAttrib(elm, 'accesskey');
-	setAttrib(elm, 'type');
-	setAttrib(elm, 'onfocus');
-	setAttrib(elm, 'onblur');
-	setAttrib(elm, 'onclick');
-	setAttrib(elm, 'ondblclick');
-	setAttrib(elm, 'onmousedown');
-	setAttrib(elm, 'onmouseup');
-	setAttrib(elm, 'onmouseover');
-	setAttrib(elm, 'onmousemove');
-	setAttrib(elm, 'onmouseout');
-	setAttrib(elm, 'onkeypress');
-	setAttrib(elm, 'onkeydown');
-	setAttrib(elm, 'onkeyup');
-
-	// Refresh in old MSIE
-	if (tinyMCE.isMSIE5)
-		elm.outerHTML = elm.outerHTML;
-}
-
-function getSelectValue(form_obj, field_name) {
-	var elm = form_obj.elements[field_name];
-
-	if (!elm || elm.options == null || elm.selectedIndex == -1)
-		return "";
-
-	return elm.options[elm.selectedIndex].value;
-}
-
-function getLinkListHTML(elm_id, target_form_element, onchange_func) {
-	if (typeof(tinyMCELinkList) == "undefined" || tinyMCELinkList.length == 0)
-		return "";
-
-	var html = "";
-
-	html += '<select id="' + elm_id + '" name="' + elm_id + '"';
-	html += ' class="mceLinkList" onfoc2us="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
-	html += 'this.options[this.selectedIndex].value;';
-
-	if (typeof(onchange_func) != "undefined")
-		html += onchange_func + '(\'' + target_form_element + '\',this.options[this.selectedIndex].text,this.options[this.selectedIndex].value);';
-
-	html += '"><option value="">---</option>';
-
-	for (var i=0; i<tinyMCELinkList.length; i++)
-		html += '<option value="' + tinyMCELinkList[i][1] + '">' + tinyMCELinkList[i][0] + '</option>';
-
-	html += '</select>';
-
-	return html;
-
-	// tinyMCE.debug('-- image list start --', html, '-- image list end --');
-}
-
-function getTargetListHTML(elm_id, target_form_element) {
-	var targets = tinyMCEPopup.getParam('theme_advanced_link_targets', '').split(';');
-	var html = '';
-
-	html += '<select id="' + elm_id + '" name="' + elm_id + '" onf2ocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
-	html += 'this.options[this.selectedIndex].value;">';
-	html += '<option value="_self">' + tinyMCEPopup.getLang('advlink_dlg.target_same') + '</option>';
-	html += '<option value="_blank">' + tinyMCEPopup.getLang('advlink_dlg.target_blank') + ' (_blank)</option>';
-	html += '<option value="_parent">' + tinyMCEPopup.getLang('advlink_dlg.target_parent') + ' (_parent)</option>';
-	html += '<option value="_top">' + tinyMCEPopup.getLang('advlink_dlg.target_top') + ' (_top)</option>';
-
-	for (var i=0; i<targets.length; i++) {
-		var key, value;
-
-		if (targets[i] == "")
-			continue;
-
-		key = targets[i].split('=')[0];
-		value = targets[i].split('=')[1];
-
-		html += '<option value="' + key + '">' + value + ' (' + key + ')</option>';
-	}
-
-	html += '</select>';
-
-	return html;
-}
-
-// While loading
-preinit();
-tinyMCEPopup.onInit.add(init);
+/* Functions for the advlink plugin popup */
+
+tinyMCEPopup.requireLangPack();
+
+var templates = {
+	"window.open" : "window.open('${url}','${target}','${options}')"
+};
+
+function preinit() {
+	var url;
+
+	if (url = tinyMCEPopup.getParam("external_link_list_url"))
+		document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+}
+
+function changeClass() {
+	var f = document.forms[0];
+
+	f.classes.value = getSelectValue(f, 'classlist');
+}
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	var formObj = document.forms[0];
+	var inst = tinyMCEPopup.editor;
+	var elm = inst.selection.getNode();
+	var action = "insert";
+	var html;
+
+	document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser','href','file','advlink');
+	document.getElementById('popupurlbrowsercontainer').innerHTML = getBrowserHTML('popupurlbrowser','popupurl','file','advlink');
+	document.getElementById('linklisthrefcontainer').innerHTML = getLinkListHTML('linklisthref','href');
+	document.getElementById('anchorlistcontainer').innerHTML = getAnchorListHTML('anchorlist','href');
+	document.getElementById('targetlistcontainer').innerHTML = getTargetListHTML('targetlist','target');
+
+	// Link list
+	html = getLinkListHTML('linklisthref','href');
+	if (html == "")
+		document.getElementById("linklisthrefrow").style.display = 'none';
+	else
+		document.getElementById("linklisthrefcontainer").innerHTML = html;
+
+	// Resize some elements
+	if (isVisible('hrefbrowser'))
+		document.getElementById('href').style.width = '260px';
+
+	if (isVisible('popupurlbrowser'))
+		document.getElementById('popupurl').style.width = '180px';
+
+	elm = inst.dom.getParent(elm, "A");
+	if (elm != null && elm.nodeName == "A")
+		action = "update";
+
+	formObj.insert.value = tinyMCEPopup.getLang(action, 'Insert', true); 
+
+	setPopupControlsDisabled(true);
+
+	if (action == "update") {
+		var href = inst.dom.getAttrib(elm, 'href');
+		var onclick = inst.dom.getAttrib(elm, 'onclick');
+
+		// Setup form data
+		setFormValue('href', href);
+		setFormValue('title', inst.dom.getAttrib(elm, 'title'));
+		setFormValue('id', inst.dom.getAttrib(elm, 'id'));
+		setFormValue('style', inst.dom.getAttrib(elm, "style"));
+		setFormValue('rel', inst.dom.getAttrib(elm, 'rel'));
+		setFormValue('rev', inst.dom.getAttrib(elm, 'rev'));
+		setFormValue('charset', inst.dom.getAttrib(elm, 'charset'));
+		setFormValue('hreflang', inst.dom.getAttrib(elm, 'hreflang'));
+		setFormValue('dir', inst.dom.getAttrib(elm, 'dir'));
+		setFormValue('lang', inst.dom.getAttrib(elm, 'lang'));
+		setFormValue('tabindex', inst.dom.getAttrib(elm, 'tabindex', typeof(elm.tabindex) != "undefined" ? elm.tabindex : ""));
+		setFormValue('accesskey', inst.dom.getAttrib(elm, 'accesskey', typeof(elm.accesskey) != "undefined" ? elm.accesskey : ""));
+		setFormValue('type', inst.dom.getAttrib(elm, 'type'));
+		setFormValue('onfocus', inst.dom.getAttrib(elm, 'onfocus'));
+		setFormValue('onblur', inst.dom.getAttrib(elm, 'onblur'));
+		setFormValue('onclick', onclick);
+		setFormValue('ondblclick', inst.dom.getAttrib(elm, 'ondblclick'));
+		setFormValue('onmousedown', inst.dom.getAttrib(elm, 'onmousedown'));
+		setFormValue('onmouseup', inst.dom.getAttrib(elm, 'onmouseup'));
+		setFormValue('onmouseover', inst.dom.getAttrib(elm, 'onmouseover'));
+		setFormValue('onmousemove', inst.dom.getAttrib(elm, 'onmousemove'));
+		setFormValue('onmouseout', inst.dom.getAttrib(elm, 'onmouseout'));
+		setFormValue('onkeypress', inst.dom.getAttrib(elm, 'onkeypress'));
+		setFormValue('onkeydown', inst.dom.getAttrib(elm, 'onkeydown'));
+		setFormValue('onkeyup', inst.dom.getAttrib(elm, 'onkeyup'));
+		setFormValue('target', inst.dom.getAttrib(elm, 'target'));
+		setFormValue('classes', inst.dom.getAttrib(elm, 'class'));
+
+		// Parse onclick data
+		if (onclick != null && onclick.indexOf('window.open') != -1)
+			parseWindowOpen(onclick);
+		else
+			parseFunction(onclick);
+
+		// Select by the values
+		selectByValue(formObj, 'dir', inst.dom.getAttrib(elm, 'dir'));
+		selectByValue(formObj, 'rel', inst.dom.getAttrib(elm, 'rel'));
+		selectByValue(formObj, 'rev', inst.dom.getAttrib(elm, 'rev'));
+		selectByValue(formObj, 'linklisthref', href);
+
+		if (href.charAt(0) == '#')
+			selectByValue(formObj, 'anchorlist', href);
+
+		addClassesToList('classlist', 'advlink_styles');
+
+		selectByValue(formObj, 'classlist', inst.dom.getAttrib(elm, 'class'), true);
+		selectByValue(formObj, 'targetlist', inst.dom.getAttrib(elm, 'target'), true);
+	} else
+		addClassesToList('classlist', 'advlink_styles');
+}
+
+function checkPrefix(n) {
+	if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_email')))
+		n.value = 'mailto:' + n.value;
+
+	if (/^\s*www./i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_external')))
+		n.value = 'http://' + n.value;
+}
+
+function setFormValue(name, value) {
+	document.forms[0].elements[name].value = value;
+}
+
+function parseWindowOpen(onclick) {
+	var formObj = document.forms[0];
+
+	// Preprocess center code
+	if (onclick.indexOf('return false;') != -1) {
+		formObj.popupreturn.checked = true;
+		onclick = onclick.replace('return false;', '');
+	} else
+		formObj.popupreturn.checked = false;
+
+	var onClickData = parseLink(onclick);
+
+	if (onClickData != null) {
+		formObj.ispopup.checked = true;
+		setPopupControlsDisabled(false);
+
+		var onClickWindowOptions = parseOptions(onClickData['options']);
+		var url = onClickData['url'];
+
+		formObj.popupname.value = onClickData['target'];
+		formObj.popupurl.value = url;
+		formObj.popupwidth.value = getOption(onClickWindowOptions, 'width');
+		formObj.popupheight.value = getOption(onClickWindowOptions, 'height');
+
+		formObj.popupleft.value = getOption(onClickWindowOptions, 'left');
+		formObj.popuptop.value = getOption(onClickWindowOptions, 'top');
+
+		if (formObj.popupleft.value.indexOf('screen') != -1)
+			formObj.popupleft.value = "c";
+
+		if (formObj.popuptop.value.indexOf('screen') != -1)
+			formObj.popuptop.value = "c";
+
+		formObj.popuplocation.checked = getOption(onClickWindowOptions, 'location') == "yes";
+		formObj.popupscrollbars.checked = getOption(onClickWindowOptions, 'scrollbars') == "yes";
+		formObj.popupmenubar.checked = getOption(onClickWindowOptions, 'menubar') == "yes";
+		formObj.popupresizable.checked = getOption(onClickWindowOptions, 'resizable') == "yes";
+		formObj.popuptoolbar.checked = getOption(onClickWindowOptions, 'toolbar') == "yes";
+		formObj.popupstatus.checked = getOption(onClickWindowOptions, 'status') == "yes";
+		formObj.popupdependent.checked = getOption(onClickWindowOptions, 'dependent') == "yes";
+
+		buildOnClick();
+	}
+}
+
+function parseFunction(onclick) {
+	var formObj = document.forms[0];
+	var onClickData = parseLink(onclick);
+
+	// TODO: Add stuff here
+}
+
+function getOption(opts, name) {
+	return typeof(opts[name]) == "undefined" ? "" : opts[name];
+}
+
+function setPopupControlsDisabled(state) {
+	var formObj = document.forms[0];
+
+	formObj.popupname.disabled = state;
+	formObj.popupurl.disabled = state;
+	formObj.popupwidth.disabled = state;
+	formObj.popupheight.disabled = state;
+	formObj.popupleft.disabled = state;
+	formObj.popuptop.disabled = state;
+	formObj.popuplocation.disabled = state;
+	formObj.popupscrollbars.disabled = state;
+	formObj.popupmenubar.disabled = state;
+	formObj.popupresizable.disabled = state;
+	formObj.popuptoolbar.disabled = state;
+	formObj.popupstatus.disabled = state;
+	formObj.popupreturn.disabled = state;
+	formObj.popupdependent.disabled = state;
+
+	setBrowserDisabled('popupurlbrowser', state);
+}
+
+function parseLink(link) {
+	link = link.replace(new RegExp('&#39;', 'g'), "'");
+
+	var fnName = link.replace(new RegExp("\\s*([A-Za-z0-9\.]*)\\s*\\(.*", "gi"), "$1");
+
+	// Is function name a template function
+	var template = templates[fnName];
+	if (template) {
+		// Build regexp
+		var variableNames = template.match(new RegExp("'?\\$\\{[A-Za-z0-9\.]*\\}'?", "gi"));
+		var regExp = "\\s*[A-Za-z0-9\.]*\\s*\\(";
+		var replaceStr = "";
+		for (var i=0; i<variableNames.length; i++) {
+			// Is string value
+			if (variableNames[i].indexOf("'${") != -1)
+				regExp += "'(.*)'";
+			else // Number value
+				regExp += "([0-9]*)";
+
+			replaceStr += "$" + (i+1);
+
+			// Cleanup variable name
+			variableNames[i] = variableNames[i].replace(new RegExp("[^A-Za-z0-9]", "gi"), "");
+
+			if (i != variableNames.length-1) {
+				regExp += "\\s*,\\s*";
+				replaceStr += "<delim>";
+			} else
+				regExp += ".*";
+		}
+
+		regExp += "\\);?";
+
+		// Build variable array
+		var variables = [];
+		variables["_function"] = fnName;
+		var variableValues = link.replace(new RegExp(regExp, "gi"), replaceStr).split('<delim>');
+		for (var i=0; i<variableNames.length; i++)
+			variables[variableNames[i]] = variableValues[i];
+
+		return variables;
+	}
+
+	return null;
+}
+
+function parseOptions(opts) {
+	if (opts == null || opts == "")
+		return [];
+
+	// Cleanup the options
+	opts = opts.toLowerCase();
+	opts = opts.replace(/;/g, ",");
+	opts = opts.replace(/[^0-9a-z=,]/g, "");
+
+	var optionChunks = opts.split(',');
+	var options = [];
+
+	for (var i=0; i<optionChunks.length; i++) {
+		var parts = optionChunks[i].split('=');
+
+		if (parts.length == 2)
+			options[parts[0]] = parts[1];
+	}
+
+	return options;
+}
+
+function buildOnClick() {
+	var formObj = document.forms[0];
+
+	if (!formObj.ispopup.checked) {
+		formObj.onclick.value = "";
+		return;
+	}
+
+	var onclick = "window.open('";
+	var url = formObj.popupurl.value;
+
+	onclick += url + "','";
+	onclick += formObj.popupname.value + "','";
+
+	if (formObj.popuplocation.checked)
+		onclick += "location=yes,";
+
+	if (formObj.popupscrollbars.checked)
+		onclick += "scrollbars=yes,";
+
+	if (formObj.popupmenubar.checked)
+		onclick += "menubar=yes,";
+
+	if (formObj.popupresizable.checked)
+		onclick += "resizable=yes,";
+
+	if (formObj.popuptoolbar.checked)
+		onclick += "toolbar=yes,";
+
+	if (formObj.popupstatus.checked)
+		onclick += "status=yes,";
+
+	if (formObj.popupdependent.checked)
+		onclick += "dependent=yes,";
+
+	if (formObj.popupwidth.value != "")
+		onclick += "width=" + formObj.popupwidth.value + ",";
+
+	if (formObj.popupheight.value != "")
+		onclick += "height=" + formObj.popupheight.value + ",";
+
+	if (formObj.popupleft.value != "") {
+		if (formObj.popupleft.value != "c")
+			onclick += "left=" + formObj.popupleft.value + ",";
+		else
+			onclick += "left='+(screen.availWidth/2-" + (formObj.popupwidth.value/2) + ")+',";
+	}
+
+	if (formObj.popuptop.value != "") {
+		if (formObj.popuptop.value != "c")
+			onclick += "top=" + formObj.popuptop.value + ",";
+		else
+			onclick += "top='+(screen.availHeight/2-" + (formObj.popupheight.value/2) + ")+',";
+	}
+
+	if (onclick.charAt(onclick.length-1) == ',')
+		onclick = onclick.substring(0, onclick.length-1);
+
+	onclick += "');";
+
+	if (formObj.popupreturn.checked)
+		onclick += "return false;";
+
+	// tinyMCE.debug(onclick);
+
+	formObj.onclick.value = onclick;
+
+	if (formObj.href.value == "")
+		formObj.href.value = url;
+}
+
+function setAttrib(elm, attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib.toLowerCase()];
+	var dom = tinyMCEPopup.editor.dom;
+
+	if (typeof(value) == "undefined" || value == null) {
+		value = "";
+
+		if (valueElm)
+			value = valueElm.value;
+	}
+
+	// Clean up the style
+	if (attrib == 'style')
+		value = dom.serializeStyle(dom.parseStyle(value));
+
+	dom.setAttrib(elm, attrib, value);
+}
+
+function getAnchorListHTML(id, target) {
+	var inst = tinyMCEPopup.editor;
+	var nodes = inst.dom.select('a.mceItemAnchor,img.mceItemAnchor'), name, i;
+	var html = "";
+
+	html += '<select id="' + id + '" name="' + id + '" class="mceAnchorList" o2nfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target + '.value=';
+	html += 'this.options[this.selectedIndex].value;">';
+	html += '<option value="">---</option>';
+
+	for (i=0; i<nodes.length; i++) {
+		if ((name = inst.dom.getAttrib(nodes[i], "name")) != "")
+			html += '<option value="#' + name + '">' + name + '</option>';
+	}
+
+	html += '</select>';
+
+	return html;
+}
+
+function insertAction() {
+	var inst = tinyMCEPopup.editor;
+	var elm, elementArray, i;
+
+	elm = inst.selection.getNode();
+	checkPrefix(document.forms[0].href);
+
+	elm = inst.dom.getParent(elm, "A");
+
+	// Remove element if there is no href
+	if (!document.forms[0].href.value) {
+		tinyMCEPopup.execCommand("mceBeginUndoLevel");
+		i = inst.selection.getBookmark();
+		inst.dom.remove(elm, 1);
+		inst.selection.moveToBookmark(i);
+		tinyMCEPopup.execCommand("mceEndUndoLevel");
+		tinyMCEPopup.close();
+		return;
+	}
+
+	tinyMCEPopup.execCommand("mceBeginUndoLevel");
+
+	// Create new anchor elements
+	if (elm == null) {
+		tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});
+
+		elementArray = tinymce.grep(inst.dom.select("a"), function(n) {return inst.dom.getAttrib(n, 'href') == '#mce_temp_url#';});
+		for (i=0; i<elementArray.length; i++)
+			setAllAttribs(elm = elementArray[i]);
+	} else
+		setAllAttribs(elm);
+
+	// Don't move caret if selection was image
+	if (elm.childNodes.length != 1 || elm.firstChild.nodeName != 'IMG') {
+		inst.focus();
+		inst.selection.select(elm);
+		inst.selection.collapse(0);
+		tinyMCEPopup.storeSelection();
+	}
+
+	tinyMCEPopup.execCommand("mceEndUndoLevel");
+	tinyMCEPopup.close();
+}
+
+function setAllAttribs(elm) {
+	var formObj = document.forms[0];
+	var href = formObj.href.value;
+	var target = getSelectValue(formObj, 'targetlist');
+
+	setAttrib(elm, 'href', href);
+	setAttrib(elm, 'title');
+	setAttrib(elm, 'target', target == '_self' ? '' : target);
+	setAttrib(elm, 'id');
+	setAttrib(elm, 'style');
+	setAttrib(elm, 'class', getSelectValue(formObj, 'classlist'));
+	setAttrib(elm, 'rel');
+	setAttrib(elm, 'rev');
+	setAttrib(elm, 'charset');
+	setAttrib(elm, 'hreflang');
+	setAttrib(elm, 'dir');
+	setAttrib(elm, 'lang');
+	setAttrib(elm, 'tabindex');
+	setAttrib(elm, 'accesskey');
+	setAttrib(elm, 'type');
+	setAttrib(elm, 'onfocus');
+	setAttrib(elm, 'onblur');
+	setAttrib(elm, 'onclick');
+	setAttrib(elm, 'ondblclick');
+	setAttrib(elm, 'onmousedown');
+	setAttrib(elm, 'onmouseup');
+	setAttrib(elm, 'onmouseover');
+	setAttrib(elm, 'onmousemove');
+	setAttrib(elm, 'onmouseout');
+	setAttrib(elm, 'onkeypress');
+	setAttrib(elm, 'onkeydown');
+	setAttrib(elm, 'onkeyup');
+
+	// Refresh in old MSIE
+	if (tinyMCE.isMSIE5)
+		elm.outerHTML = elm.outerHTML;
+}
+
+function getSelectValue(form_obj, field_name) {
+	var elm = form_obj.elements[field_name];
+
+	if (!elm || elm.options == null || elm.selectedIndex == -1)
+		return "";
+
+	return elm.options[elm.selectedIndex].value;
+}
+
+function getLinkListHTML(elm_id, target_form_element, onchange_func) {
+	if (typeof(tinyMCELinkList) == "undefined" || tinyMCELinkList.length == 0)
+		return "";
+
+	var html = "";
+
+	html += '<select id="' + elm_id + '" name="' + elm_id + '"';
+	html += ' class="mceLinkList" onfoc2us="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
+	html += 'this.options[this.selectedIndex].value;';
+
+	if (typeof(onchange_func) != "undefined")
+		html += onchange_func + '(\'' + target_form_element + '\',this.options[this.selectedIndex].text,this.options[this.selectedIndex].value);';
+
+	html += '"><option value="">---</option>';
+
+	for (var i=0; i<tinyMCELinkList.length; i++)
+		html += '<option value="' + tinyMCELinkList[i][1] + '">' + tinyMCELinkList[i][0] + '</option>';
+
+	html += '</select>';
+
+	return html;
+
+	// tinyMCE.debug('-- image list start --', html, '-- image list end --');
+}
+
+function getTargetListHTML(elm_id, target_form_element) {
+	var targets = tinyMCEPopup.getParam('theme_advanced_link_targets', '').split(';');
+	var html = '';
+
+	html += '<select id="' + elm_id + '" name="' + elm_id + '" onf2ocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';
+	html += 'this.options[this.selectedIndex].value;">';
+	html += '<option value="_self">' + tinyMCEPopup.getLang('advlink_dlg.target_same') + '</option>';
+	html += '<option value="_blank">' + tinyMCEPopup.getLang('advlink_dlg.target_blank') + ' (_blank)</option>';
+	html += '<option value="_parent">' + tinyMCEPopup.getLang('advlink_dlg.target_parent') + ' (_parent)</option>';
+	html += '<option value="_top">' + tinyMCEPopup.getLang('advlink_dlg.target_top') + ' (_top)</option>';
+
+	for (var i=0; i<targets.length; i++) {
+		var key, value;
+
+		if (targets[i] == "")
+			continue;
+
+		key = targets[i].split('=')[0];
+		value = targets[i].split('=')[1];
+
+		html += '<option value="' + key + '">' + value + ' (' + key + ')</option>';
+	}
+
+	html += '</select>';
+
+	return html;
+}
+
+// While loading
+preinit();
+tinyMCEPopup.onInit.add(init);
diff --git a/webapp/web/js/tiny_mce/plugins/advlink/langs/en_dlg.js b/webapp/web/js/tiny_mce/plugins/advlink/langs/en_dlg.js
index c71ffbd0f..8ef9c792b 100755
--- a/webapp/web/js/tiny_mce/plugins/advlink/langs/en_dlg.js
+++ b/webapp/web/js/tiny_mce/plugins/advlink/langs/en_dlg.js
@@ -1,52 +1,52 @@
-tinyMCE.addI18n('en.advlink_dlg',{
-title:"Insert/edit link",
-url:"Link URL",
-target:"Target",
-titlefield:"Title",
-is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?",
-is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?",
-list:"Link list",
-general_tab:"General",
-popup_tab:"Popup",
-events_tab:"Events",
-advanced_tab:"Advanced",
-general_props:"General properties",
-popup_props:"Popup properties",
-event_props:"Events",
-advanced_props:"Advanced properties",
-popup_opts:"Options",
-anchor_names:"Anchors",
-target_same:"Open in this window / frame",
-target_parent:"Open in parent window / frame",
-target_top:"Open in top frame (replaces all frames)",
-target_blank:"Open in new window",
-popup:"Javascript popup",
-popup_url:"Popup URL",
-popup_name:"Window name",
-popup_return:"Insert 'return false'",
-popup_scrollbars:"Show scrollbars",
-popup_statusbar:"Show status bar",
-popup_toolbar:"Show toolbars",
-popup_menubar:"Show menu bar",
-popup_location:"Show location bar",
-popup_resizable:"Make window resizable",
-popup_dependent:"Dependent (Mozilla/Firefox only)",
-popup_size:"Size",
-popup_position:"Position (X/Y)",
-id:"Id",
-style:"Style",
-classes:"Classes",
-target_name:"Target name",
-langdir:"Language direction",
-target_langcode:"Target language",
-langcode:"Language code",
-encoding:"Target character encoding",
-mime:"Target MIME type",
-rel:"Relationship page to target",
-rev:"Relationship target to page",
-tabindex:"Tabindex",
-accesskey:"Accesskey",
-ltr:"Left to right",
-rtl:"Right to left",
-link_list:"Link list"
+tinyMCE.addI18n('en.advlink_dlg',{
+title:"Insert/edit link",
+url:"Link URL",
+target:"Target",
+titlefield:"Title",
+is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?",
+is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?",
+list:"Link list",
+general_tab:"General",
+popup_tab:"Popup",
+events_tab:"Events",
+advanced_tab:"Advanced",
+general_props:"General properties",
+popup_props:"Popup properties",
+event_props:"Events",
+advanced_props:"Advanced properties",
+popup_opts:"Options",
+anchor_names:"Anchors",
+target_same:"Open in this window / frame",
+target_parent:"Open in parent window / frame",
+target_top:"Open in top frame (replaces all frames)",
+target_blank:"Open in new window",
+popup:"Javascript popup",
+popup_url:"Popup URL",
+popup_name:"Window name",
+popup_return:"Insert 'return false'",
+popup_scrollbars:"Show scrollbars",
+popup_statusbar:"Show status bar",
+popup_toolbar:"Show toolbars",
+popup_menubar:"Show menu bar",
+popup_location:"Show location bar",
+popup_resizable:"Make window resizable",
+popup_dependent:"Dependent (Mozilla/Firefox only)",
+popup_size:"Size",
+popup_position:"Position (X/Y)",
+id:"Id",
+style:"Style",
+classes:"Classes",
+target_name:"Target name",
+langdir:"Language direction",
+target_langcode:"Target language",
+langcode:"Language code",
+encoding:"Target character encoding",
+mime:"Target MIME type",
+rel:"Relationship page to target",
+rev:"Relationship target to page",
+tabindex:"Tabindex",
+accesskey:"Accesskey",
+ltr:"Left to right",
+rtl:"Right to left",
+link_list:"Link list"
 });
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/advlink/link.htm b/webapp/web/js/tiny_mce/plugins/advlink/link.htm
index f46e8f832..bb8e6543b 100755
--- a/webapp/web/js/tiny_mce/plugins/advlink/link.htm
+++ b/webapp/web/js/tiny_mce/plugins/advlink/link.htm
@@ -1,339 +1,339 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#advlink_dlg.title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="../../utils/form_utils.js"></script>
-	<script type="text/javascript" src="../../utils/validate.js"></script>
-	<script type="text/javascript" src="js/advlink.js"></script>
-	<link href="css/advlink.css" rel="stylesheet" type="text/css" />
-	<base target="_self" />
-</head>
-<body id="advlink" style="display: none">
-    <form onsubmit="insertAction();return false;" action="#">
-		<div class="tabs">
-			<ul>
-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advlink_dlg.general_tab}</a></span></li>
-				<li id="popup_tab"><span><a href="javascript:mcTabs.displayTab('popup_tab','popup_panel');" onmousedown="return false;">{#advlink_dlg.popup_tab}</a></span></li>
-				<li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#advlink_dlg.events_tab}</a></span></li>
-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#advlink_dlg.advanced_tab}</a></span></li>
-			</ul>
-		</div>
-
-		<div class="panel_wrapper">
-			<div id="general_panel" class="panel current">
-				<fieldset>
-					<legend>{#advlink_dlg.general_props}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-						  <td nowrap="nowrap"><label id="hreflabel" for="href">{#advlink_dlg.url}</label></td>
-						  <td><table border="0" cellspacing="0" cellpadding="0">
-								<tr>
-								  <td><input id="href" name="href" type="text" class="mceFocus" value="" onchange="selectByValue(this.form,'linklisthref',this.value);" /></td>
-								  <td id="hrefbrowsercontainer">&nbsp;</td>
-								</tr>
-							  </table></td>
-						</tr>
-						<tr id="linklisthrefrow">
-							<td class="column1"><label for="linklisthref">{#advlink_dlg.list}</label></td>
-							<td colspan="2" id="linklisthrefcontainer">&nbsp;</td>
-						</tr>
-						<tr>
-							<td class="column1"><label for="anchorlist">{#advlink_dlg.anchor_names}</label></td>
-							<td colspan="2" id="anchorlistcontainer">&nbsp;</td>
-						</tr>
-						<tr>
-							<td><label id="targetlistlabel" for="targetlist">{#advlink_dlg.target}</label></td>
-							<td id="targetlistcontainer">&nbsp;</td>
-						</tr>
-						<tr>
-							<td nowrap="nowrap"><label id="titlelabel" for="title">{#advlink_dlg.titlefield}</label></td>
-							<td><input id="title" name="title" type="text" value="" /></td>
-						</tr>
-						<tr>
-							<td><label id="classlabel" for="classlist">{#class_name}</label></td>
-							<td>
-								 <select id="classlist" name="classlist" onchange="changeClass();">
-									<option value="" selected>{#not_set}</option>
-								 </select>
-							</td>
-						</tr>
-					</table>
-				</fieldset>
-			</div>
-
-			<div id="popup_panel" class="panel">
-				<fieldset>
-					<legend>{#advlink_dlg.popup_props}</legend>
-
-					<input type="checkbox" id="ispopup" name="ispopup" class="radio" onclick="setPopupControlsDisabled(!this.checked);buildOnClick();" />
-					<label id="ispopuplabel" for="ispopup">{#advlink_dlg.popup}</label>
-
-					<table border="0" cellpadding="0" cellspacing="4">
-						<tr>
-							<td nowrap="nowrap"><label for="popupurl">{#advlink_dlg.popup_url}</label>&nbsp;</td>
-							<td>
-								<table border="0" cellspacing="0" cellpadding="0">
-									<tr>
-										<td><input type="text" name="popupurl" id="popupurl" value="" onchange="buildOnClick();" /></td>
-										<td id="popupurlbrowsercontainer">&nbsp;</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-						<tr>
-							<td nowrap="nowrap"><label for="popupname">{#advlink_dlg.popup_name}</label>&nbsp;</td>
-							<td><input type="text" name="popupname" id="popupname" value="" onchange="buildOnClick();" /></td>
-						</tr>
-						<tr>
-							<td nowrap="nowrap"><label>{#advlink_dlg.popup_size}</label>&nbsp;</td>
-							<td nowrap="nowrap">
-								<input type="text" id="popupwidth" name="popupwidth" value="" onchange="buildOnClick();" /> x
-								<input type="text" id="popupheight" name="popupheight" value="" onchange="buildOnClick();" /> px
-							</td>
-						</tr>
-						<tr>
-							<td nowrap="nowrap" id="labelleft"><label>{#advlink_dlg.popup_position}</label>&nbsp;</td>
-							<td nowrap="nowrap">
-								<input type="text" id="popupleft" name="popupleft" value="" onchange="buildOnClick();" /> /                                
-								<input type="text" id="popuptop" name="popuptop" value="" onchange="buildOnClick();" /> (c /c = center)
-							</td>
-						</tr>
-					</table>
-
-					<fieldset>
-						<legend>{#advlink_dlg.popup_opts}</legend>
-
-						<table border="0" cellpadding="0" cellspacing="4">
-							<tr>
-								<td><input type="checkbox" id="popuplocation" name="popuplocation" class="checkbox" onchange="buildOnClick();" /></td>
-								<td nowrap="nowrap"><label id="popuplocationlabel" for="popuplocation">{#advlink_dlg.popup_location}</label></td>
-								<td><input type="checkbox" id="popupscrollbars" name="popupscrollbars" class="checkbox" onchange="buildOnClick();" /></td>
-								<td nowrap="nowrap"><label id="popupscrollbarslabel" for="popupscrollbars">{#advlink_dlg.popup_scrollbars}</label></td>
-							</tr>
-							<tr>
-								<td><input type="checkbox" id="popupmenubar" name="popupmenubar" class="checkbox" onchange="buildOnClick();" /></td>
-								<td nowrap="nowrap"><label id="popupmenubarlabel" for="popupmenubar">{#advlink_dlg.popup_menubar}</label></td>
-								<td><input type="checkbox" id="popupresizable" name="popupresizable" class="checkbox" onchange="buildOnClick();" /></td>
-								<td nowrap="nowrap"><label id="popupresizablelabel" for="popupresizable">{#advlink_dlg.popup_resizable}</label></td>
-							</tr>
-							<tr>
-								<td><input type="checkbox" id="popuptoolbar" name="popuptoolbar" class="checkbox" onchange="buildOnClick();" /></td>
-								<td nowrap="nowrap"><label id="popuptoolbarlabel" for="popuptoolbar">{#advlink_dlg.popup_toolbar}</label></td>
-								<td><input type="checkbox" id="popupdependent" name="popupdependent" class="checkbox" onchange="buildOnClick();" /></td>
-								<td nowrap="nowrap"><label id="popupdependentlabel" for="popupdependent">{#advlink_dlg.popup_dependent}</label></td>
-							</tr>
-							<tr>
-								<td><input type="checkbox" id="popupstatus" name="popupstatus" class="checkbox" onchange="buildOnClick();" /></td>
-								<td nowrap="nowrap"><label id="popupstatuslabel" for="popupstatus">{#advlink_dlg.popup_statusbar}</label></td>
-								<td><input type="checkbox" id="popupreturn" name="popupreturn" class="checkbox" onchange="buildOnClick();" checked="checked" /></td>
-								<td nowrap="nowrap"><label id="popupreturnlabel" for="popupreturn">{#advlink_dlg.popup_return}</label></td>
-							</tr>
-						</table>
-					</fieldset>
-				</fieldset>
-			</div>
-
-			<div id="advanced_panel" class="panel">
-			<fieldset>
-					<legend>{#advlink_dlg.advanced_props}</legend>
-
-					<table border="0" cellpadding="0" cellspacing="4">
-						<tr>
-							<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>
-							<td><label id="stylelabel" for="style">{#advlink_dlg.style}</label></td>
-							<td><input type="text" id="style" name="style" value="" /></td>
-						</tr>
-
-						<tr>
-							<td><label id="classeslabel" for="classes">{#advlink_dlg.classes}</label></td>
-							<td><input type="text" id="classes" name="classes" value="" onchange="selectByValue(this.form,'classlist',this.value,true);" /></td>
-						</tr>
-
-						<tr>
-							<td><label id="targetlabel" for="target">{#advlink_dlg.target_name}</label></td>
-							<td><input type="text" id="target" name="target" value="" onchange="selectByValue(this.form,'targetlist',this.value,true);" /></td>
-						</tr>
-
-						<tr>
-							<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>
-							</td> 
-						</tr>
-
-						<tr>
-							<td><label id="hreflanglabel" for="hreflang">{#advlink_dlg.target_langcode}</label></td>
-							<td><input type="text" id="hreflang" name="hreflang" value="" /></td>
-						</tr>
-
-						<tr>
-							<td class="column1"><label id="langlabel" for="lang">{#advlink_dlg.langcode}</label></td> 
-							<td>
-								<input id="lang" name="lang" type="text" value="" />
-							</td> 
-						</tr>
-
-						<tr>
-							<td><label id="charsetlabel" for="charset">{#advlink_dlg.encoding}</label></td>
-							<td><input type="text" id="charset" name="charset" value="" /></td>
-						</tr>
-
-						<tr>
-							<td><label id="typelabel" for="type">{#advlink_dlg.mime}</label></td>
-							<td><input type="text" id="type" name="type" value="" /></td>
-						</tr>
-
-						<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> 
-									<option value="bookmark">Bookmark</option>
-									<option value="nofollow">No Follow</option>
-									<option value="tag">Tag</option>
-								</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>
-						</tr>
-
-						<tr>
-							<td><label id="tabindexlabel" for="tabindex">{#advlink_dlg.tabindex}</label></td>
-							<td><input type="text" id="tabindex" name="tabindex" value="" /></td>
-						</tr>
-
-						<tr>
-							<td><label id="accesskeylabel" for="accesskey">{#advlink_dlg.accesskey}</label></td>
-							<td><input type="text" id="accesskey" name="accesskey" value="" /></td>
-						</tr>
-					</table>
-				</fieldset>
-			</div>
-
-			<div id="events_panel" class="panel">
-			<fieldset>
-					<legend>{#advlink_dlg.event_props}</legend>
-
-					<table border="0" cellpadding="0" cellspacing="4">
-						<tr>
-							<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> 
-						</tr>
-
-						<tr>
-							<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> 
-						</tr>
-
-						<tr>
-							<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> 
-						</tr>
-
-						<tr>
-							<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> 
-						</tr>
-
-						<tr>
-							<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> 
-						</tr>
-
-						<tr>
-							<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> 
-						</tr>
-					</table>
-				</fieldset>
-			</div>
-		</div>
-
-		<div class="mceActionPanel">
-			<div style="float: left">
-				<input type="submit" id="insert" name="insert" value="{#insert}" />
-			</div>
-
-			<div style="float: right">
-				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-			</div>
-		</div>
-    </form>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#advlink_dlg.title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/validate.js"></script>
+	<script type="text/javascript" src="js/advlink.js"></script>
+	<link href="css/advlink.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body id="advlink" style="display: none">
+    <form onsubmit="insertAction();return false;" action="#">
+		<div class="tabs">
+			<ul>
+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advlink_dlg.general_tab}</a></span></li>
+				<li id="popup_tab"><span><a href="javascript:mcTabs.displayTab('popup_tab','popup_panel');" onmousedown="return false;">{#advlink_dlg.popup_tab}</a></span></li>
+				<li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#advlink_dlg.events_tab}</a></span></li>
+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#advlink_dlg.advanced_tab}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<fieldset>
+					<legend>{#advlink_dlg.general_props}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+						  <td nowrap="nowrap"><label id="hreflabel" for="href">{#advlink_dlg.url}</label></td>
+						  <td><table border="0" cellspacing="0" cellpadding="0">
+								<tr>
+								  <td><input id="href" name="href" type="text" class="mceFocus" value="" onchange="selectByValue(this.form,'linklisthref',this.value);" /></td>
+								  <td id="hrefbrowsercontainer">&nbsp;</td>
+								</tr>
+							  </table></td>
+						</tr>
+						<tr id="linklisthrefrow">
+							<td class="column1"><label for="linklisthref">{#advlink_dlg.list}</label></td>
+							<td colspan="2" id="linklisthrefcontainer">&nbsp;</td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="anchorlist">{#advlink_dlg.anchor_names}</label></td>
+							<td colspan="2" id="anchorlistcontainer">&nbsp;</td>
+						</tr>
+						<tr>
+							<td><label id="targetlistlabel" for="targetlist">{#advlink_dlg.target}</label></td>
+							<td id="targetlistcontainer">&nbsp;</td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label id="titlelabel" for="title">{#advlink_dlg.titlefield}</label></td>
+							<td><input id="title" name="title" type="text" value="" /></td>
+						</tr>
+						<tr>
+							<td><label id="classlabel" for="classlist">{#class_name}</label></td>
+							<td>
+								 <select id="classlist" name="classlist" onchange="changeClass();">
+									<option value="" selected>{#not_set}</option>
+								 </select>
+							</td>
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="popup_panel" class="panel">
+				<fieldset>
+					<legend>{#advlink_dlg.popup_props}</legend>
+
+					<input type="checkbox" id="ispopup" name="ispopup" class="radio" onclick="setPopupControlsDisabled(!this.checked);buildOnClick();" />
+					<label id="ispopuplabel" for="ispopup">{#advlink_dlg.popup}</label>
+
+					<table border="0" cellpadding="0" cellspacing="4">
+						<tr>
+							<td nowrap="nowrap"><label for="popupurl">{#advlink_dlg.popup_url}</label>&nbsp;</td>
+							<td>
+								<table border="0" cellspacing="0" cellpadding="0">
+									<tr>
+										<td><input type="text" name="popupurl" id="popupurl" value="" onchange="buildOnClick();" /></td>
+										<td id="popupurlbrowsercontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label for="popupname">{#advlink_dlg.popup_name}</label>&nbsp;</td>
+							<td><input type="text" name="popupname" id="popupname" value="" onchange="buildOnClick();" /></td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label>{#advlink_dlg.popup_size}</label>&nbsp;</td>
+							<td nowrap="nowrap">
+								<input type="text" id="popupwidth" name="popupwidth" value="" onchange="buildOnClick();" /> x
+								<input type="text" id="popupheight" name="popupheight" value="" onchange="buildOnClick();" /> px
+							</td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap" id="labelleft"><label>{#advlink_dlg.popup_position}</label>&nbsp;</td>
+							<td nowrap="nowrap">
+								<input type="text" id="popupleft" name="popupleft" value="" onchange="buildOnClick();" /> /                                
+								<input type="text" id="popuptop" name="popuptop" value="" onchange="buildOnClick();" /> (c /c = center)
+							</td>
+						</tr>
+					</table>
+
+					<fieldset>
+						<legend>{#advlink_dlg.popup_opts}</legend>
+
+						<table border="0" cellpadding="0" cellspacing="4">
+							<tr>
+								<td><input type="checkbox" id="popuplocation" name="popuplocation" class="checkbox" onchange="buildOnClick();" /></td>
+								<td nowrap="nowrap"><label id="popuplocationlabel" for="popuplocation">{#advlink_dlg.popup_location}</label></td>
+								<td><input type="checkbox" id="popupscrollbars" name="popupscrollbars" class="checkbox" onchange="buildOnClick();" /></td>
+								<td nowrap="nowrap"><label id="popupscrollbarslabel" for="popupscrollbars">{#advlink_dlg.popup_scrollbars}</label></td>
+							</tr>
+							<tr>
+								<td><input type="checkbox" id="popupmenubar" name="popupmenubar" class="checkbox" onchange="buildOnClick();" /></td>
+								<td nowrap="nowrap"><label id="popupmenubarlabel" for="popupmenubar">{#advlink_dlg.popup_menubar}</label></td>
+								<td><input type="checkbox" id="popupresizable" name="popupresizable" class="checkbox" onchange="buildOnClick();" /></td>
+								<td nowrap="nowrap"><label id="popupresizablelabel" for="popupresizable">{#advlink_dlg.popup_resizable}</label></td>
+							</tr>
+							<tr>
+								<td><input type="checkbox" id="popuptoolbar" name="popuptoolbar" class="checkbox" onchange="buildOnClick();" /></td>
+								<td nowrap="nowrap"><label id="popuptoolbarlabel" for="popuptoolbar">{#advlink_dlg.popup_toolbar}</label></td>
+								<td><input type="checkbox" id="popupdependent" name="popupdependent" class="checkbox" onchange="buildOnClick();" /></td>
+								<td nowrap="nowrap"><label id="popupdependentlabel" for="popupdependent">{#advlink_dlg.popup_dependent}</label></td>
+							</tr>
+							<tr>
+								<td><input type="checkbox" id="popupstatus" name="popupstatus" class="checkbox" onchange="buildOnClick();" /></td>
+								<td nowrap="nowrap"><label id="popupstatuslabel" for="popupstatus">{#advlink_dlg.popup_statusbar}</label></td>
+								<td><input type="checkbox" id="popupreturn" name="popupreturn" class="checkbox" onchange="buildOnClick();" checked="checked" /></td>
+								<td nowrap="nowrap"><label id="popupreturnlabel" for="popupreturn">{#advlink_dlg.popup_return}</label></td>
+							</tr>
+						</table>
+					</fieldset>
+				</fieldset>
+			</div>
+
+			<div id="advanced_panel" class="panel">
+			<fieldset>
+					<legend>{#advlink_dlg.advanced_props}</legend>
+
+					<table border="0" cellpadding="0" cellspacing="4">
+						<tr>
+							<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>
+							<td><label id="stylelabel" for="style">{#advlink_dlg.style}</label></td>
+							<td><input type="text" id="style" name="style" value="" /></td>
+						</tr>
+
+						<tr>
+							<td><label id="classeslabel" for="classes">{#advlink_dlg.classes}</label></td>
+							<td><input type="text" id="classes" name="classes" value="" onchange="selectByValue(this.form,'classlist',this.value,true);" /></td>
+						</tr>
+
+						<tr>
+							<td><label id="targetlabel" for="target">{#advlink_dlg.target_name}</label></td>
+							<td><input type="text" id="target" name="target" value="" onchange="selectByValue(this.form,'targetlist',this.value,true);" /></td>
+						</tr>
+
+						<tr>
+							<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>
+							</td> 
+						</tr>
+
+						<tr>
+							<td><label id="hreflanglabel" for="hreflang">{#advlink_dlg.target_langcode}</label></td>
+							<td><input type="text" id="hreflang" name="hreflang" value="" /></td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label id="langlabel" for="lang">{#advlink_dlg.langcode}</label></td> 
+							<td>
+								<input id="lang" name="lang" type="text" value="" />
+							</td> 
+						</tr>
+
+						<tr>
+							<td><label id="charsetlabel" for="charset">{#advlink_dlg.encoding}</label></td>
+							<td><input type="text" id="charset" name="charset" value="" /></td>
+						</tr>
+
+						<tr>
+							<td><label id="typelabel" for="type">{#advlink_dlg.mime}</label></td>
+							<td><input type="text" id="type" name="type" value="" /></td>
+						</tr>
+
+						<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> 
+									<option value="bookmark">Bookmark</option>
+									<option value="nofollow">No Follow</option>
+									<option value="tag">Tag</option>
+								</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>
+						</tr>
+
+						<tr>
+							<td><label id="tabindexlabel" for="tabindex">{#advlink_dlg.tabindex}</label></td>
+							<td><input type="text" id="tabindex" name="tabindex" value="" /></td>
+						</tr>
+
+						<tr>
+							<td><label id="accesskeylabel" for="accesskey">{#advlink_dlg.accesskey}</label></td>
+							<td><input type="text" id="accesskey" name="accesskey" value="" /></td>
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="events_panel" class="panel">
+			<fieldset>
+					<legend>{#advlink_dlg.event_props}</legend>
+
+					<table border="0" cellpadding="0" cellspacing="4">
+						<tr>
+							<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> 
+						</tr>
+
+						<tr>
+							<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> 
+						</tr>
+
+						<tr>
+							<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> 
+						</tr>
+
+						<tr>
+							<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> 
+						</tr>
+
+						<tr>
+							<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> 
+						</tr>
+
+						<tr>
+							<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> 
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div style="float: left">
+				<input type="submit" id="insert" name="insert" value="{#insert}" />
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+    </form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/autosave/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/autosave/editor_plugin_src.js
index 3c4325abe..2e9cd0a55 100755
--- a/webapp/web/js/tiny_mce/plugins/autosave/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/autosave/editor_plugin_src.js
@@ -1,51 +1,51 @@
-/**
- * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.AutoSavePlugin', {
-		init : function(ed, url) {
-			var t = this;
-
-			t.editor = ed;
-
-			window.onbeforeunload = tinymce.plugins.AutoSavePlugin._beforeUnloadHandler;
-		},
-
-		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 : tinymce.majorVersion + "." + tinymce.minorVersion
-			};
-		},
-
-		// Private plugin internal methods
-
-		'static' : {
-			_beforeUnloadHandler : function() {
-				var msg;
-
-				tinymce.each(tinyMCE.editors, function(ed) {
-					if (ed.getParam("fullscreen_is_enabled"))
-						return;
-
-					if (ed.isDirty()) {
-						msg = ed.getLang("autosave.unload_msg");
-						return false;
-					}
-				});
-
-				return msg;
-			}
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('autosave', tinymce.plugins.AutoSavePlugin);
+/**
+ * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.AutoSavePlugin', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			window.onbeforeunload = tinymce.plugins.AutoSavePlugin._beforeUnloadHandler;
+		},
+
+		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 : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private plugin internal methods
+
+		'static' : {
+			_beforeUnloadHandler : function() {
+				var msg;
+
+				tinymce.each(tinyMCE.editors, function(ed) {
+					if (ed.getParam("fullscreen_is_enabled"))
+						return;
+
+					if (ed.isDirty()) {
+						msg = ed.getLang("autosave.unload_msg");
+						return false;
+					}
+				});
+
+				return msg;
+			}
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('autosave', tinymce.plugins.AutoSavePlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/bbcode/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/bbcode/editor_plugin_src.js
index 1d7493e26..55afbd0b2 100755
--- a/webapp/web/js/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -1,117 +1,117 @@
-/**
- * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.BBCodePlugin', {
-		init : function(ed, url) {
-			var t = this, dialect = ed.getParam('bbcode_dialect', 'punbb').toLowerCase();
-
-			ed.onBeforeSetContent.add(function(ed, o) {
-				o.content = t['_' + dialect + '_bbcode2html'](o.content);
-			});
-
-			ed.onPostProcess.add(function(ed, o) {
-				if (o.set)
-					o.content = t['_' + dialect + '_bbcode2html'](o.content);
-
-				if (o.get)
-					o.content = t['_' + dialect + '_html2bbcode'](o.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
-			};
-		},
-
-		// Private methods
-
-		// HTML -> BBCode in PunBB dialect
-		_punbb_html2bbcode : function(s) {
-			s = tinymce.trim(s);
-
-			function rep(re, str) {
-				s = s.replace(re, str);
-			};
-
-			// example: <strong> to [b]
-			rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");
-			rep(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");
-			rep(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");
-			rep(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");
-			rep(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");
-			rep(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");
-			rep(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");
-			rep(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");
-			rep(/<font>(.*?)<\/font>/gi,"$1");
-			rep(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");
-			rep(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");
-			rep(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");
-			rep(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");
-			rep(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");
-			rep(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");
-			rep(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");
-			rep(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");
-			rep(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");
-			rep(/<\/(strong|b)>/gi,"[/b]");
-			rep(/<(strong|b)>/gi,"[b]");
-			rep(/<\/(em|i)>/gi,"[/i]");
-			rep(/<(em|i)>/gi,"[i]");
-			rep(/<\/u>/gi,"[/u]");
-			rep(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");
-			rep(/<u>/gi,"[u]");
-			rep(/<blockquote[^>]*>/gi,"[quote]");
-			rep(/<\/blockquote>/gi,"[/quote]");
-			rep(/<br \/>/gi,"\n");
-			rep(/<br\/>/gi,"\n");
-			rep(/<br>/gi,"\n");
-			rep(/<p>/gi,"");
-			rep(/<\/p>/gi,"\n");
-			rep(/&nbsp;/gi," ");
-			rep(/&quot;/gi,"\"");
-			rep(/&lt;/gi,"<");
-			rep(/&gt;/gi,">");
-			rep(/&amp;/gi,"&");
-
-			return s; 
-		},
-
-		// BBCode -> HTML from PunBB dialect
-		_punbb_bbcode2html : function(s) {
-			s = tinymce.trim(s);
-
-			function rep(re, str) {
-				s = s.replace(re, str);
-			};
-
-			// example: [b] to <strong>
-			rep(/\n/gi,"<br />");
-			rep(/\[b\]/gi,"<strong>");
-			rep(/\[\/b\]/gi,"</strong>");
-			rep(/\[i\]/gi,"<em>");
-			rep(/\[\/i\]/gi,"</em>");
-			rep(/\[u\]/gi,"<u>");
-			rep(/\[\/u\]/gi,"</u>");
-			rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");
-			rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");
-			rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");
-			rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<font color=\"$1\">$2</font>");
-			rep(/\[code\](.*?)\[\/code\]/gi,"<span class=\"codeStyle\">$1</span>&nbsp;");
-			rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<span class=\"quoteStyle\">$1</span>&nbsp;");
-
-			return s; 
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('bbcode', tinymce.plugins.BBCodePlugin);
+/**
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.BBCodePlugin', {
+		init : function(ed, url) {
+			var t = this, dialect = ed.getParam('bbcode_dialect', 'punbb').toLowerCase();
+
+			ed.onBeforeSetContent.add(function(ed, o) {
+				o.content = t['_' + dialect + '_bbcode2html'](o.content);
+			});
+
+			ed.onPostProcess.add(function(ed, o) {
+				if (o.set)
+					o.content = t['_' + dialect + '_bbcode2html'](o.content);
+
+				if (o.get)
+					o.content = t['_' + dialect + '_html2bbcode'](o.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
+			};
+		},
+
+		// Private methods
+
+		// HTML -> BBCode in PunBB dialect
+		_punbb_html2bbcode : function(s) {
+			s = tinymce.trim(s);
+
+			function rep(re, str) {
+				s = s.replace(re, str);
+			};
+
+			// example: <strong> to [b]
+			rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");
+			rep(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");
+			rep(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");
+			rep(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");
+			rep(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");
+			rep(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");
+			rep(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");
+			rep(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");
+			rep(/<font>(.*?)<\/font>/gi,"$1");
+			rep(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");
+			rep(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");
+			rep(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");
+			rep(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");
+			rep(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");
+			rep(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");
+			rep(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");
+			rep(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");
+			rep(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");
+			rep(/<\/(strong|b)>/gi,"[/b]");
+			rep(/<(strong|b)>/gi,"[b]");
+			rep(/<\/(em|i)>/gi,"[/i]");
+			rep(/<(em|i)>/gi,"[i]");
+			rep(/<\/u>/gi,"[/u]");
+			rep(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");
+			rep(/<u>/gi,"[u]");
+			rep(/<blockquote[^>]*>/gi,"[quote]");
+			rep(/<\/blockquote>/gi,"[/quote]");
+			rep(/<br \/>/gi,"\n");
+			rep(/<br\/>/gi,"\n");
+			rep(/<br>/gi,"\n");
+			rep(/<p>/gi,"");
+			rep(/<\/p>/gi,"\n");
+			rep(/&nbsp;/gi," ");
+			rep(/&quot;/gi,"\"");
+			rep(/&lt;/gi,"<");
+			rep(/&gt;/gi,">");
+			rep(/&amp;/gi,"&");
+
+			return s; 
+		},
+
+		// BBCode -> HTML from PunBB dialect
+		_punbb_bbcode2html : function(s) {
+			s = tinymce.trim(s);
+
+			function rep(re, str) {
+				s = s.replace(re, str);
+			};
+
+			// example: [b] to <strong>
+			rep(/\n/gi,"<br />");
+			rep(/\[b\]/gi,"<strong>");
+			rep(/\[\/b\]/gi,"</strong>");
+			rep(/\[i\]/gi,"<em>");
+			rep(/\[\/i\]/gi,"</em>");
+			rep(/\[u\]/gi,"<u>");
+			rep(/\[\/u\]/gi,"</u>");
+			rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");
+			rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");
+			rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");
+			rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<font color=\"$1\">$2</font>");
+			rep(/\[code\](.*?)\[\/code\]/gi,"<span class=\"codeStyle\">$1</span>&nbsp;");
+			rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<span class=\"quoteStyle\">$1</span>&nbsp;");
+
+			return s; 
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('bbcode', tinymce.plugins.BBCodePlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/compat2x/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/compat2x/editor_plugin_src.js
index 60d4f2d03..8f6e02ff3 100755
--- a/webapp/web/js/tiny_mce/plugins/compat2x/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/compat2x/editor_plugin_src.js
@@ -1,616 +1,616 @@
-/**
- * $Id: editor_plugin_src.js 264 2007-04-26 20:53:09Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, is = tinymce.is;
-
-	tinymce.create('tinymce.plugins.Compat2x', {
-		getInfo : function() {
-			return {
-				longname : 'Compat2x',
-				author : 'Moxiecode Systems AB',
-				authorurl : 'http://tinymce.moxiecode.com',
-				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/compat2x',
-				version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
-			};
-		}
-	});
-
-	(function() {
-		// Extend tinyMCE/EditorManager
-		tinymce.extend(tinyMCE, {
-			addToLang : function(p, l) {
-				each(l, function(v, k) {
-					tinyMCE.i18n[(tinyMCE.settings.language || 'en') + '.' + (p ? p + '_' : '') + k] = v;
-				});
-			},
-
-			getInstanceById : function(n) {
-				return this.get(n);
-			}
-		});
-	})();
-
-	(function() {
-		var EditorManager = tinymce.EditorManager;
-
-		tinyMCE.instances = {};
-		tinyMCE.plugins = {};
-		tinymce.PluginManager.onAdd.add(function(pm, n, p) {
-			tinyMCE.plugins[n] = p;
-		});
-
-		tinyMCE.majorVersion = tinymce.majorVersion;
-		tinyMCE.minorVersion = tinymce.minorVersion;
-		tinyMCE.releaseDate = tinymce.releaseDate;
-		tinyMCE.baseURL = tinymce.baseURL;
-		tinyMCE.isIE = tinyMCE.isMSIE = tinymce.isIE || tinymce.isOpera;
-		tinyMCE.isMSIE5 = tinymce.isIE;
-		tinyMCE.isMSIE5_0 = tinymce.isIE;
-		tinyMCE.isMSIE7 = tinymce.isIE;
-		tinyMCE.isGecko = tinymce.isGecko;
-		tinyMCE.isSafari = tinymce.isWebKit;
-		tinyMCE.isOpera = tinymce.isOpera;
-		tinyMCE.isMac = false;
-		tinyMCE.isNS7 = false;
-		tinyMCE.isNS71 = false;
-		tinyMCE.compat = true;
-
-		// Extend tinyMCE class
-		TinyMCE_Engine = tinyMCE;
-		tinymce.extend(tinyMCE, {
-			getParam : function(n, dv) {
-				return this.activeEditor.getParam(n, dv);
-			},
-
-			addEvent : function(e, na, f, sc) {
-				tinymce.dom.Event.add(e, na, f, sc || this);
-			},
-
-			getControlHTML : function(n) {
-				return EditorManager.activeEditor.controlManager.createControl(n);
-			},
-
-			loadCSS : function(u) {
-				tinymce.DOM.loadCSS(u);
-			},
-
-			importCSS : function(doc, u) {
-				if (doc == document)
-					this.loadCSS(u);
-				else
-					new tinymce.dom.DOMUtils(doc).loadCSS(u);
-			},
-
-			log : function() {
-				console.debug.apply(console, arguments);
-			},
-
-			getLang : function(n, dv) {
-				var v = EditorManager.activeEditor.getLang(n.replace(/^lang_/g, ''), dv);
-
-				// Is number
-				if (/^[0-9\-.]+$/g.test(v))
-					return parseInt(v);
-
-				return v;
-			},
-
-			isInstance : function(o) {
-				return o != null && typeof(o) == "object" && o.execCommand;
-			},
-
-			triggerNodeChange : function() {
-				EditorManager.activeEditor.nodeChanged();
-			},
-
-			regexpReplace : function(in_str, reg_exp, replace_str, opts) {
-				var re;
-
-				if (in_str == null)
-					return in_str;
-
-				if (typeof(opts) == "undefined")
-					opts = 'g';
-
-				re = new RegExp(reg_exp, opts);
-
-				return in_str.replace(re, replace_str);
-			},
-
-			trim : function(s) {
-				return tinymce.trim(s);
-			},
-
-			xmlEncode : function(s) {
-				return tinymce.DOM.encode(s);
-			},
-
-			explode : function(s, d) {
-				var o = [];
-
-				tinymce.each(s.split(d), function(v) {
-					if (v != '')
-						o.push(v);
-				});
-
-				return o;
-			},
-
-			switchClass : function(id, cls) {
-				var b;
-
-				if (/^mceButton/.test(cls)) {
-					b = EditorManager.activeEditor.controlManager.get(id);
-
-					if (!b)
-						return;
-
-					switch (cls) {
-						case "mceButtonNormal":
-							b.setDisabled(false);
-							b.setActive(false);
-							return;
-
-						case "mceButtonDisabled":
-							b.setDisabled(true);
-							return;
-
-						case "mceButtonSelected":
-							b.setActive(true);
-							b.setDisabled(false);
-							return;
-					}
-				}
-			},
-
-			addCSSClass : function(e, n, b) {
-				return tinymce.DOM.addClass(e, n, b);
-			},
-
-			hasCSSClass : function(e, n) {
-				return tinymce.DOM.hasClass(e, n);
-			},
-
-			removeCSSClass : function(e, n) {
-				return tinymce.DOM.removeClass(e, n);
-			},
-
-			getCSSClasses : function() {
-				var cl = EditorManager.activeEditor.dom.getClasses(), o = [];
-
-				each(cl, function(c) {
-					o.push(c['class']);
-				});
-
-				return o;
-			},
-
-			setWindowArg : function(n, v) {
-				EditorManager.activeEditor.windowManager.params[n] = v;
-			},
-
-			getWindowArg : function(n, dv) {
-				var wm = EditorManager.activeEditor.windowManager, v;
-
-				v = wm.getParam(n);
-				if (v === '')
-					return '';
-
-				return v || wm.getFeature(n) || dv;
-			},
-
-			getParentNode : function(n, f) {
-				return this._getDOM().getParent(n, f);
-			},
-
-			selectElements : function(n, na, f) {
-				var i, a = [], nl, x;
-
-				for (x=0, na = na.split(','); x<na.length; x++)
-					for (i=0, nl = n.getElementsByTagName(na[x]); i<nl.length; i++)
-						(!f || f(nl[i])) && a.push(nl[i]);
-
-				return a;
-			},
-
-			getNodeTree : function(n, na, t, nn) {
-				return this.selectNodes(n, function(n) {
-					return (!t || n.nodeType == t) && (!nn || n.nodeName == nn);
-				}, na ? na : []);
-			},
-
-			getAttrib : function(e, n, dv) {
-				return this._getDOM().getAttrib(e, n, dv);
-			},
-
-			setAttrib : function(e, n, v) {
-				return this._getDOM().setAttrib(e, n, v);
-			},
-
-			getElementsByAttributeValue : function(n, e, a, v) {
-				var i, nl = n.getElementsByTagName(e), o = [];
-
-				for (i=0; i<nl.length; i++) {
-					if (tinyMCE.getAttrib(nl[i], a).indexOf(v) != -1)
-						o[o.length] = nl[i];
-				}
-
-				return o;
-			},
-
-			selectNodes : function(n, f, a) {
-				var i;
-
-				if (!a)
-					a = [];
-
-				if (f(n))
-					a[a.length] = n;
-
-				if (n.hasChildNodes()) {
-					for (i=0; i<n.childNodes.length; i++)
-						tinyMCE.selectNodes(n.childNodes[i], f, a);
-				}
-
-				return a;
-			},
-
-			getContent : function() {
-				return EditorManager.activeEditor.getContent();
-			},
-
-			getParentElement : function(n, na, f) {
-				if (na)
-					na = new RegExp('^(' + na.toUpperCase().replace(/,/g, '|') + ')$', 'g');
-
-				return this._getDOM().getParent(n, function(n) {
-					return n.nodeType == 1 && (!na || na.test(n.nodeName)) && (!f || f(n));
-				}, this.activeEditor.getBody());
-			},
-
-			importPluginLanguagePack : function(n) {
-				tinymce.PluginManager.requireLangPack(n);
-			},
-
-			getButtonHTML : function(cn, lang, img, c, u, v) {
-				var ed = EditorManager.activeEditor;
-
-				img = img.replace(/\{\$pluginurl\}/g, tinyMCE.pluginURL);
-				img = img.replace(/\{\$themeurl\}/g, tinyMCE.themeURL);
-				lang = lang.replace(/^lang_/g, '');
-
-				return ed.controlManager.createButton(cn, {
-					title : lang,
-					command : c,
-					ui : u,
-					value : v,
-					scope : this,
-					'class' : 'compat',
-					image : img
-				});
-			},
-
-			addSelectAccessibility : function(e, s, w) {
-				// Add event handlers 
-				if (!s._isAccessible) {
-					s.onkeydown = tinyMCE.accessibleEventHandler;
-					s.onblur = tinyMCE.accessibleEventHandler;
-					s._isAccessible = true;
-					s._win = w;
-				}
-
-				return false;
-			},
-
-			accessibleEventHandler : function(e) {
-				var elm, win = this._win;
-
-				e = tinymce.isIE ? win.event : e;
-				elm = tinymce.isIE ? e.srcElement : e.target;
-
-				// Unpiggyback onchange on blur
-				if (e.type == "blur") {
-					if (elm.oldonchange) {
-						elm.onchange = elm.oldonchange;
-						elm.oldonchange = null;
-					}
-
-					return true;
-				}
-
-				// Piggyback onchange
-				if (elm.nodeName == "SELECT" && !elm.oldonchange) {
-					elm.oldonchange = elm.onchange;
-					elm.onchange = null;
-				}
-
-				// Execute onchange and remove piggyback
-				if (e.keyCode == 13 || e.keyCode == 32) {
-					elm.onchange = elm.oldonchange;
-					elm.onchange();
-					elm.oldonchange = null;
-
-					tinyMCE.cancelEvent(e);
-					return false;
-				}
-
-				return true;
-			},
-
-			cancelEvent : function(e) {
-				return tinymce.dom.Event.cancel(e);
-			},
-
-			handleVisualAid : function(e) {
-				EditorManager.activeEditor.addVisual(e);
-			},
-
-			getAbsPosition : function(n, r) {
-				return tinymce.DOM.getPos(n, r);
-			},
-
-			cleanupEventStr : function(s) {
-				s = "" + s;
-				s = s.replace('function anonymous()\n{\n', '');
-				s = s.replace('\n}', '');
-				s = s.replace(/^return true;/gi, ''); // Remove event blocker
-
-				return s;
-			},
-
-			getVisualAidClass : function(s) {
-				// TODO: Implement
-				return s;
-			},
-
-			parseStyle : function(s) {
-				return this._getDOM().parseStyle(s);
-			},
-
-			serializeStyle : function(s) {
-				return this._getDOM().serializeStyle(s);
-			},
-
-			openWindow : function(tpl, args) {
-				var ed = EditorManager.activeEditor, o = {}, n;
-
-				// Convert name/value array to object
-				for (n in tpl)
-					o[n] = tpl[n];
-
-				tpl = o;
-
-				args = args || {};
-				tpl.url = new tinymce.util.URI(tinymce.ThemeManager.themeURLs[ed.settings.theme]).toAbsolute(tpl.file);
-				tpl.inline = tpl.inline || args.inline;
-
-				ed.windowManager.open(tpl, args);
-			},
-
-			closeWindow : function(win) {
-				EditorManager.activeEditor.windowManager.close(win);
-			},
-
-			getOuterHTML : function(e) {
-				return tinymce.DOM.getOuterHTML(e);
-			},
-
-			setOuterHTML : function(e, h, d) {
-				return tinymce.DOM.setOuterHTML(e, h, d);
-			},
-
-			hasPlugin : function(n) {
-				return tinymce.PluginManager.get(n) != null;
-			},
-
-			_setEventsEnabled : function() {
-				// Ignore it!!
-			},
-
-			addPlugin : function(pn, f) {
-				var t = this;
-
-				function PluginWrapper(ed) {
-					tinyMCE.selectedInstance = ed;
-
-					ed.onInit.add(function() {
-						t.settings = ed.settings;
-						t.settings['base_href'] = tinyMCE.documentBasePath;
-						tinyMCE.settings = t.settings;
-						tinyMCE.documentBasePath = ed.documentBasePath;
-						//ed.formElement = DOM.get(ed.id);
-
-						if (f.initInstance)
-							f.initInstance(ed);
-
-						ed.contentDocument = ed.getDoc();
-						ed.contentWindow = ed.getWin();
-						ed.undoRedo = ed.undoManager;
-						ed.startContent = ed.getContent({format : 'raw'});
-
-						tinyMCE.instances[ed.id] = ed;
-						tinyMCE.loadedFiles = [];
-					});
-
-					ed.onActivate.add(function() {
-						tinyMCE.settings = ed.settings;
-						tinyMCE.selectedInstance = ed;
-					});
-
-				/*	if (f.removeInstance) {
-						ed.onDestroy.add(function() {
-							return f.removeInstance(ed.id);
-						});
-					}*/
-
-					if (f.handleNodeChange) {
-						ed.onNodeChange.add(function(ed, cm, n) {
-							f.handleNodeChange(ed.id, n, 0, 0, false, !ed.selection.isCollapsed());
-						});
-					}
-
-					if (f.onChange) {
-						ed.onChange.add(function(ed, n) {
-							return f.onChange(ed);
-						});
-					}
-
-					if (f.cleanup) {
-						ed.onGetContent.add(function() {
-							//f.cleanup(type, content, inst);
-						});
-					}
-
-					this.getInfo = function() {
-						return f.getInfo();
-					};
-
-					this.createControl = function(n) {
-						tinyMCE.pluginURL = tinymce.baseURL + '/plugins/' + pn;
-						tinyMCE.themeURL = tinymce.baseURL + '/themes/' + tinyMCE.activeEditor.settings.theme;
-
-						if (f.getControlHTML)
-							return f.getControlHTML(n);
-
-						return null;
-					};
-
-					this.execCommand = function(cmd, ui, val) {
-						if (f.execCommand)
-							return f.execCommand(ed.id, ed.getBody(), cmd, ui, val);
-
-						return false;
-					};
-				};
-
-				tinymce.PluginManager.add(pn, PluginWrapper);
-			},
-
-			_getDOM : function() {
-				return tinyMCE.activeEditor ? tinyMCE.activeEditor.dom : tinymce.DOM;
-			},
-
-			convertRelativeToAbsoluteURL : function(b, u) {
-				return new tinymce.util.URI(b).toAbsolute(u);
-			},
-
-			convertAbsoluteURLToRelativeURL : function(b, u) {
-				return new tinymce.util.URI(b).toRelative(u);
-			}
-		});
-
-		// Extend Editor class
-		tinymce.extend(tinymce.Editor.prototype, {
-			getFocusElement : function() {
-				return this.selection.getNode();
-			},
-
-			getData : function(n) {
-				if (!this.data)
-					this.data = [];
-
-				if (!this.data[n])
-					this.data[n] = [];
-
-				return this.data[n];
-			},
-
-			hasPlugin : function(n) {
-				return this.plugins[n] != null;
-			},
-
-			getContainerWin : function() {
-				return window;
-			},
-
-			getHTML : function(raw) {
-				return this.getContent({ format : raw ? 'raw' : 'html'});
-			},
-
-			setHTML : function(h) {
-				this.setContent(h);
-			},
-
-			getSel : function() {
-				return this.selection.getSel();
-			},
-
-			getRng : function() {
-				return this.selection.getRng();
-			},
-
-			isHidden : function() {
-				var s;
-
-				if (!tinymce.isGecko)
-					return false;
-
-				s = this.getSel();
-
-				// Weird, wheres that cursor selection?
-				return (!s || !s.rangeCount || s.rangeCount == 0);
-			},
-
-			translate : function(s) {
-				var c = this.settings.language, o;
-
-				if (!s)
-					return s;
-
-				o = tinymce.EditorManager.i18n[c + '.' + s] || s.replace(/{\#([^}]+)\}/g, function(a, b) {
-					return tinymce.EditorManager.i18n[c + '.' + b] || '{#' + b + '}';
-				});
-
-				o = o.replace(/{\$lang_([^}]+)\}/g, function(a, b) {
-					return tinymce.EditorManager.i18n[c + '.' + b] || '{$lang_' + b + '}';
-				});
-
-				return o;
-			},
-
-			repaint : function() {
-				this.execCommand('mceRepaint');
-			}
-		});
-
-		// Extend selection
-		tinymce.extend(tinymce.dom.Selection.prototype, {
-			getSelectedText : function() {
-				return this.getContent({format : 'text'});
-			},
-
-			getSelectedHTML : function() {
-				return this.getContent({format : 'html'});
-			},
-
-			getFocusElement : function() {
-				return this.getNode();
-			},
-
-			selectNode : function(node, collapse, select_text_node, to_start) {
-				var t = this;
-
-				t.select(node, select_text_node || 0);
-
-				if (!is(collapse))
-					collapse = true;
-
-				if (collapse) {
-					if (!is(to_start))
-						to_start = true;
-
-					t.collapse(to_start);
-				}
-			}
-		});
-	}).call(this);
-
-	// Register plugin
-	tinymce.PluginManager.add('compat2x', tinymce.plugins.Compat2x);
-})();
-
+/**
+ * $Id: editor_plugin_src.js 264 2007-04-26 20:53:09Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, is = tinymce.is;
+
+	tinymce.create('tinymce.plugins.Compat2x', {
+		getInfo : function() {
+			return {
+				longname : 'Compat2x',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/compat2x',
+				version : tinyMCE.majorVersion + "." + tinyMCE.minorVersion
+			};
+		}
+	});
+
+	(function() {
+		// Extend tinyMCE/EditorManager
+		tinymce.extend(tinyMCE, {
+			addToLang : function(p, l) {
+				each(l, function(v, k) {
+					tinyMCE.i18n[(tinyMCE.settings.language || 'en') + '.' + (p ? p + '_' : '') + k] = v;
+				});
+			},
+
+			getInstanceById : function(n) {
+				return this.get(n);
+			}
+		});
+	})();
+
+	(function() {
+		var EditorManager = tinymce.EditorManager;
+
+		tinyMCE.instances = {};
+		tinyMCE.plugins = {};
+		tinymce.PluginManager.onAdd.add(function(pm, n, p) {
+			tinyMCE.plugins[n] = p;
+		});
+
+		tinyMCE.majorVersion = tinymce.majorVersion;
+		tinyMCE.minorVersion = tinymce.minorVersion;
+		tinyMCE.releaseDate = tinymce.releaseDate;
+		tinyMCE.baseURL = tinymce.baseURL;
+		tinyMCE.isIE = tinyMCE.isMSIE = tinymce.isIE || tinymce.isOpera;
+		tinyMCE.isMSIE5 = tinymce.isIE;
+		tinyMCE.isMSIE5_0 = tinymce.isIE;
+		tinyMCE.isMSIE7 = tinymce.isIE;
+		tinyMCE.isGecko = tinymce.isGecko;
+		tinyMCE.isSafari = tinymce.isWebKit;
+		tinyMCE.isOpera = tinymce.isOpera;
+		tinyMCE.isMac = false;
+		tinyMCE.isNS7 = false;
+		tinyMCE.isNS71 = false;
+		tinyMCE.compat = true;
+
+		// Extend tinyMCE class
+		TinyMCE_Engine = tinyMCE;
+		tinymce.extend(tinyMCE, {
+			getParam : function(n, dv) {
+				return this.activeEditor.getParam(n, dv);
+			},
+
+			addEvent : function(e, na, f, sc) {
+				tinymce.dom.Event.add(e, na, f, sc || this);
+			},
+
+			getControlHTML : function(n) {
+				return EditorManager.activeEditor.controlManager.createControl(n);
+			},
+
+			loadCSS : function(u) {
+				tinymce.DOM.loadCSS(u);
+			},
+
+			importCSS : function(doc, u) {
+				if (doc == document)
+					this.loadCSS(u);
+				else
+					new tinymce.dom.DOMUtils(doc).loadCSS(u);
+			},
+
+			log : function() {
+				console.debug.apply(console, arguments);
+			},
+
+			getLang : function(n, dv) {
+				var v = EditorManager.activeEditor.getLang(n.replace(/^lang_/g, ''), dv);
+
+				// Is number
+				if (/^[0-9\-.]+$/g.test(v))
+					return parseInt(v);
+
+				return v;
+			},
+
+			isInstance : function(o) {
+				return o != null && typeof(o) == "object" && o.execCommand;
+			},
+
+			triggerNodeChange : function() {
+				EditorManager.activeEditor.nodeChanged();
+			},
+
+			regexpReplace : function(in_str, reg_exp, replace_str, opts) {
+				var re;
+
+				if (in_str == null)
+					return in_str;
+
+				if (typeof(opts) == "undefined")
+					opts = 'g';
+
+				re = new RegExp(reg_exp, opts);
+
+				return in_str.replace(re, replace_str);
+			},
+
+			trim : function(s) {
+				return tinymce.trim(s);
+			},
+
+			xmlEncode : function(s) {
+				return tinymce.DOM.encode(s);
+			},
+
+			explode : function(s, d) {
+				var o = [];
+
+				tinymce.each(s.split(d), function(v) {
+					if (v != '')
+						o.push(v);
+				});
+
+				return o;
+			},
+
+			switchClass : function(id, cls) {
+				var b;
+
+				if (/^mceButton/.test(cls)) {
+					b = EditorManager.activeEditor.controlManager.get(id);
+
+					if (!b)
+						return;
+
+					switch (cls) {
+						case "mceButtonNormal":
+							b.setDisabled(false);
+							b.setActive(false);
+							return;
+
+						case "mceButtonDisabled":
+							b.setDisabled(true);
+							return;
+
+						case "mceButtonSelected":
+							b.setActive(true);
+							b.setDisabled(false);
+							return;
+					}
+				}
+			},
+
+			addCSSClass : function(e, n, b) {
+				return tinymce.DOM.addClass(e, n, b);
+			},
+
+			hasCSSClass : function(e, n) {
+				return tinymce.DOM.hasClass(e, n);
+			},
+
+			removeCSSClass : function(e, n) {
+				return tinymce.DOM.removeClass(e, n);
+			},
+
+			getCSSClasses : function() {
+				var cl = EditorManager.activeEditor.dom.getClasses(), o = [];
+
+				each(cl, function(c) {
+					o.push(c['class']);
+				});
+
+				return o;
+			},
+
+			setWindowArg : function(n, v) {
+				EditorManager.activeEditor.windowManager.params[n] = v;
+			},
+
+			getWindowArg : function(n, dv) {
+				var wm = EditorManager.activeEditor.windowManager, v;
+
+				v = wm.getParam(n);
+				if (v === '')
+					return '';
+
+				return v || wm.getFeature(n) || dv;
+			},
+
+			getParentNode : function(n, f) {
+				return this._getDOM().getParent(n, f);
+			},
+
+			selectElements : function(n, na, f) {
+				var i, a = [], nl, x;
+
+				for (x=0, na = na.split(','); x<na.length; x++)
+					for (i=0, nl = n.getElementsByTagName(na[x]); i<nl.length; i++)
+						(!f || f(nl[i])) && a.push(nl[i]);
+
+				return a;
+			},
+
+			getNodeTree : function(n, na, t, nn) {
+				return this.selectNodes(n, function(n) {
+					return (!t || n.nodeType == t) && (!nn || n.nodeName == nn);
+				}, na ? na : []);
+			},
+
+			getAttrib : function(e, n, dv) {
+				return this._getDOM().getAttrib(e, n, dv);
+			},
+
+			setAttrib : function(e, n, v) {
+				return this._getDOM().setAttrib(e, n, v);
+			},
+
+			getElementsByAttributeValue : function(n, e, a, v) {
+				var i, nl = n.getElementsByTagName(e), o = [];
+
+				for (i=0; i<nl.length; i++) {
+					if (tinyMCE.getAttrib(nl[i], a).indexOf(v) != -1)
+						o[o.length] = nl[i];
+				}
+
+				return o;
+			},
+
+			selectNodes : function(n, f, a) {
+				var i;
+
+				if (!a)
+					a = [];
+
+				if (f(n))
+					a[a.length] = n;
+
+				if (n.hasChildNodes()) {
+					for (i=0; i<n.childNodes.length; i++)
+						tinyMCE.selectNodes(n.childNodes[i], f, a);
+				}
+
+				return a;
+			},
+
+			getContent : function() {
+				return EditorManager.activeEditor.getContent();
+			},
+
+			getParentElement : function(n, na, f) {
+				if (na)
+					na = new RegExp('^(' + na.toUpperCase().replace(/,/g, '|') + ')$', 'g');
+
+				return this._getDOM().getParent(n, function(n) {
+					return n.nodeType == 1 && (!na || na.test(n.nodeName)) && (!f || f(n));
+				}, this.activeEditor.getBody());
+			},
+
+			importPluginLanguagePack : function(n) {
+				tinymce.PluginManager.requireLangPack(n);
+			},
+
+			getButtonHTML : function(cn, lang, img, c, u, v) {
+				var ed = EditorManager.activeEditor;
+
+				img = img.replace(/\{\$pluginurl\}/g, tinyMCE.pluginURL);
+				img = img.replace(/\{\$themeurl\}/g, tinyMCE.themeURL);
+				lang = lang.replace(/^lang_/g, '');
+
+				return ed.controlManager.createButton(cn, {
+					title : lang,
+					command : c,
+					ui : u,
+					value : v,
+					scope : this,
+					'class' : 'compat',
+					image : img
+				});
+			},
+
+			addSelectAccessibility : function(e, s, w) {
+				// Add event handlers 
+				if (!s._isAccessible) {
+					s.onkeydown = tinyMCE.accessibleEventHandler;
+					s.onblur = tinyMCE.accessibleEventHandler;
+					s._isAccessible = true;
+					s._win = w;
+				}
+
+				return false;
+			},
+
+			accessibleEventHandler : function(e) {
+				var elm, win = this._win;
+
+				e = tinymce.isIE ? win.event : e;
+				elm = tinymce.isIE ? e.srcElement : e.target;
+
+				// Unpiggyback onchange on blur
+				if (e.type == "blur") {
+					if (elm.oldonchange) {
+						elm.onchange = elm.oldonchange;
+						elm.oldonchange = null;
+					}
+
+					return true;
+				}
+
+				// Piggyback onchange
+				if (elm.nodeName == "SELECT" && !elm.oldonchange) {
+					elm.oldonchange = elm.onchange;
+					elm.onchange = null;
+				}
+
+				// Execute onchange and remove piggyback
+				if (e.keyCode == 13 || e.keyCode == 32) {
+					elm.onchange = elm.oldonchange;
+					elm.onchange();
+					elm.oldonchange = null;
+
+					tinyMCE.cancelEvent(e);
+					return false;
+				}
+
+				return true;
+			},
+
+			cancelEvent : function(e) {
+				return tinymce.dom.Event.cancel(e);
+			},
+
+			handleVisualAid : function(e) {
+				EditorManager.activeEditor.addVisual(e);
+			},
+
+			getAbsPosition : function(n, r) {
+				return tinymce.DOM.getPos(n, r);
+			},
+
+			cleanupEventStr : function(s) {
+				s = "" + s;
+				s = s.replace('function anonymous()\n{\n', '');
+				s = s.replace('\n}', '');
+				s = s.replace(/^return true;/gi, ''); // Remove event blocker
+
+				return s;
+			},
+
+			getVisualAidClass : function(s) {
+				// TODO: Implement
+				return s;
+			},
+
+			parseStyle : function(s) {
+				return this._getDOM().parseStyle(s);
+			},
+
+			serializeStyle : function(s) {
+				return this._getDOM().serializeStyle(s);
+			},
+
+			openWindow : function(tpl, args) {
+				var ed = EditorManager.activeEditor, o = {}, n;
+
+				// Convert name/value array to object
+				for (n in tpl)
+					o[n] = tpl[n];
+
+				tpl = o;
+
+				args = args || {};
+				tpl.url = new tinymce.util.URI(tinymce.ThemeManager.themeURLs[ed.settings.theme]).toAbsolute(tpl.file);
+				tpl.inline = tpl.inline || args.inline;
+
+				ed.windowManager.open(tpl, args);
+			},
+
+			closeWindow : function(win) {
+				EditorManager.activeEditor.windowManager.close(win);
+			},
+
+			getOuterHTML : function(e) {
+				return tinymce.DOM.getOuterHTML(e);
+			},
+
+			setOuterHTML : function(e, h, d) {
+				return tinymce.DOM.setOuterHTML(e, h, d);
+			},
+
+			hasPlugin : function(n) {
+				return tinymce.PluginManager.get(n) != null;
+			},
+
+			_setEventsEnabled : function() {
+				// Ignore it!!
+			},
+
+			addPlugin : function(pn, f) {
+				var t = this;
+
+				function PluginWrapper(ed) {
+					tinyMCE.selectedInstance = ed;
+
+					ed.onInit.add(function() {
+						t.settings = ed.settings;
+						t.settings['base_href'] = tinyMCE.documentBasePath;
+						tinyMCE.settings = t.settings;
+						tinyMCE.documentBasePath = ed.documentBasePath;
+						//ed.formElement = DOM.get(ed.id);
+
+						if (f.initInstance)
+							f.initInstance(ed);
+
+						ed.contentDocument = ed.getDoc();
+						ed.contentWindow = ed.getWin();
+						ed.undoRedo = ed.undoManager;
+						ed.startContent = ed.getContent({format : 'raw'});
+
+						tinyMCE.instances[ed.id] = ed;
+						tinyMCE.loadedFiles = [];
+					});
+
+					ed.onActivate.add(function() {
+						tinyMCE.settings = ed.settings;
+						tinyMCE.selectedInstance = ed;
+					});
+
+				/*	if (f.removeInstance) {
+						ed.onDestroy.add(function() {
+							return f.removeInstance(ed.id);
+						});
+					}*/
+
+					if (f.handleNodeChange) {
+						ed.onNodeChange.add(function(ed, cm, n) {
+							f.handleNodeChange(ed.id, n, 0, 0, false, !ed.selection.isCollapsed());
+						});
+					}
+
+					if (f.onChange) {
+						ed.onChange.add(function(ed, n) {
+							return f.onChange(ed);
+						});
+					}
+
+					if (f.cleanup) {
+						ed.onGetContent.add(function() {
+							//f.cleanup(type, content, inst);
+						});
+					}
+
+					this.getInfo = function() {
+						return f.getInfo();
+					};
+
+					this.createControl = function(n) {
+						tinyMCE.pluginURL = tinymce.baseURL + '/plugins/' + pn;
+						tinyMCE.themeURL = tinymce.baseURL + '/themes/' + tinyMCE.activeEditor.settings.theme;
+
+						if (f.getControlHTML)
+							return f.getControlHTML(n);
+
+						return null;
+					};
+
+					this.execCommand = function(cmd, ui, val) {
+						if (f.execCommand)
+							return f.execCommand(ed.id, ed.getBody(), cmd, ui, val);
+
+						return false;
+					};
+				};
+
+				tinymce.PluginManager.add(pn, PluginWrapper);
+			},
+
+			_getDOM : function() {
+				return tinyMCE.activeEditor ? tinyMCE.activeEditor.dom : tinymce.DOM;
+			},
+
+			convertRelativeToAbsoluteURL : function(b, u) {
+				return new tinymce.util.URI(b).toAbsolute(u);
+			},
+
+			convertAbsoluteURLToRelativeURL : function(b, u) {
+				return new tinymce.util.URI(b).toRelative(u);
+			}
+		});
+
+		// Extend Editor class
+		tinymce.extend(tinymce.Editor.prototype, {
+			getFocusElement : function() {
+				return this.selection.getNode();
+			},
+
+			getData : function(n) {
+				if (!this.data)
+					this.data = [];
+
+				if (!this.data[n])
+					this.data[n] = [];
+
+				return this.data[n];
+			},
+
+			hasPlugin : function(n) {
+				return this.plugins[n] != null;
+			},
+
+			getContainerWin : function() {
+				return window;
+			},
+
+			getHTML : function(raw) {
+				return this.getContent({ format : raw ? 'raw' : 'html'});
+			},
+
+			setHTML : function(h) {
+				this.setContent(h);
+			},
+
+			getSel : function() {
+				return this.selection.getSel();
+			},
+
+			getRng : function() {
+				return this.selection.getRng();
+			},
+
+			isHidden : function() {
+				var s;
+
+				if (!tinymce.isGecko)
+					return false;
+
+				s = this.getSel();
+
+				// Weird, wheres that cursor selection?
+				return (!s || !s.rangeCount || s.rangeCount == 0);
+			},
+
+			translate : function(s) {
+				var c = this.settings.language, o;
+
+				if (!s)
+					return s;
+
+				o = tinymce.EditorManager.i18n[c + '.' + s] || s.replace(/{\#([^}]+)\}/g, function(a, b) {
+					return tinymce.EditorManager.i18n[c + '.' + b] || '{#' + b + '}';
+				});
+
+				o = o.replace(/{\$lang_([^}]+)\}/g, function(a, b) {
+					return tinymce.EditorManager.i18n[c + '.' + b] || '{$lang_' + b + '}';
+				});
+
+				return o;
+			},
+
+			repaint : function() {
+				this.execCommand('mceRepaint');
+			}
+		});
+
+		// Extend selection
+		tinymce.extend(tinymce.dom.Selection.prototype, {
+			getSelectedText : function() {
+				return this.getContent({format : 'text'});
+			},
+
+			getSelectedHTML : function() {
+				return this.getContent({format : 'html'});
+			},
+
+			getFocusElement : function() {
+				return this.getNode();
+			},
+
+			selectNode : function(node, collapse, select_text_node, to_start) {
+				var t = this;
+
+				t.select(node, select_text_node || 0);
+
+				if (!is(collapse))
+					collapse = true;
+
+				if (collapse) {
+					if (!is(to_start))
+						to_start = true;
+
+					t.collapse(to_start);
+				}
+			}
+		});
+	}).call(this);
+
+	// Register plugin
+	tinymce.PluginManager.add('compat2x', tinymce.plugins.Compat2x);
+})();
+
diff --git a/webapp/web/js/tiny_mce/plugins/contextmenu/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/contextmenu/editor_plugin_src.js
index a2c1866ba..c0961cd81 100755
--- a/webapp/web/js/tiny_mce/plugins/contextmenu/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/contextmenu/editor_plugin_src.js
@@ -1,95 +1,95 @@
-/**
- * $Id: editor_plugin_src.js 848 2008-05-15 11:54:40Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	var Event = tinymce.dom.Event, each = tinymce.each, DOM = tinymce.DOM;
-
-	tinymce.create('tinymce.plugins.ContextMenu', {
-		init : function(ed) {
-			var t = this;
-
-			t.editor = ed;
-			t.onContextMenu = new tinymce.util.Dispatcher(this);
-
-			ed.onContextMenu.add(function(ed, e) {
-				if (!e.ctrlKey) {
-					t._getMenu(ed).showMenu(e.clientX, e.clientY);
-					Event.add(ed.getDoc(), 'click', hide);
-					Event.cancel(e);
-				}
-			});
-
-			function hide() {
-				if (t._menu) {
-					t._menu.removeAll();
-					t._menu.destroy();
-					Event.remove(ed.getDoc(), 'click', hide);
-				}
-			};
-
-			ed.onMouseDown.add(hide);
-			ed.onKeyDown.add(hide);
-		},
-
-		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(ed) {
-			var t = this, m = t._menu, se = ed.selection, col = se.isCollapsed(), el = se.getNode() || ed.getBody(), am, p1, p2;
-
-			if (m) {
-				m.removeAll();
-				m.destroy();
-			}
-
-			p1 = DOM.getPos(ed.getContentAreaContainer());
-			p2 = DOM.getPos(ed.getContainer());
-
-			m = ed.controlManager.createDropMenu('contextmenu', {
-				offset_x : p1.x + ed.getParam('contextmenu_offset_x', 0),
-				offset_y : p1.y + ed.getParam('contextmenu_offset_y', 0),
-				constrain : 1
-			});
-
-			t._menu = m;
-
-			m.add({title : 'advanced.cut_desc', icon : 'cut', cmd : 'Cut'}).setDisabled(col);
-			m.add({title : 'advanced.copy_desc', icon : 'copy', cmd : 'Copy'}).setDisabled(col);
-			m.add({title : 'advanced.paste_desc', icon : 'paste', cmd : 'Paste'});
-
-			if ((el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) || !col) {
-				m.addSeparator();
-				m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});
-				m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});
-			}
-
-			m.addSeparator();
-			m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});
-
-			m.addSeparator();
-			am = m.addMenu({title : 'contextmenu.align'});
-			am.add({title : 'contextmenu.left', icon : 'justifyleft', cmd : 'JustifyLeft'});
-			am.add({title : 'contextmenu.center', icon : 'justifycenter', cmd : 'JustifyCenter'});
-			am.add({title : 'contextmenu.right', icon : 'justifyright', cmd : 'JustifyRight'});
-			am.add({title : 'contextmenu.full', icon : 'justifyfull', cmd : 'JustifyFull'});
-
-			t.onContextMenu.dispatch(t, m, el, col);
-
-			return m;
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('contextmenu', tinymce.plugins.ContextMenu);
+/**
+ * $Id: editor_plugin_src.js 848 2008-05-15 11:54:40Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var Event = tinymce.dom.Event, each = tinymce.each, DOM = tinymce.DOM;
+
+	tinymce.create('tinymce.plugins.ContextMenu', {
+		init : function(ed) {
+			var t = this;
+
+			t.editor = ed;
+			t.onContextMenu = new tinymce.util.Dispatcher(this);
+
+			ed.onContextMenu.add(function(ed, e) {
+				if (!e.ctrlKey) {
+					t._getMenu(ed).showMenu(e.clientX, e.clientY);
+					Event.add(ed.getDoc(), 'click', hide);
+					Event.cancel(e);
+				}
+			});
+
+			function hide() {
+				if (t._menu) {
+					t._menu.removeAll();
+					t._menu.destroy();
+					Event.remove(ed.getDoc(), 'click', hide);
+				}
+			};
+
+			ed.onMouseDown.add(hide);
+			ed.onKeyDown.add(hide);
+		},
+
+		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(ed) {
+			var t = this, m = t._menu, se = ed.selection, col = se.isCollapsed(), el = se.getNode() || ed.getBody(), am, p1, p2;
+
+			if (m) {
+				m.removeAll();
+				m.destroy();
+			}
+
+			p1 = DOM.getPos(ed.getContentAreaContainer());
+			p2 = DOM.getPos(ed.getContainer());
+
+			m = ed.controlManager.createDropMenu('contextmenu', {
+				offset_x : p1.x + ed.getParam('contextmenu_offset_x', 0),
+				offset_y : p1.y + ed.getParam('contextmenu_offset_y', 0),
+				constrain : 1
+			});
+
+			t._menu = m;
+
+			m.add({title : 'advanced.cut_desc', icon : 'cut', cmd : 'Cut'}).setDisabled(col);
+			m.add({title : 'advanced.copy_desc', icon : 'copy', cmd : 'Copy'}).setDisabled(col);
+			m.add({title : 'advanced.paste_desc', icon : 'paste', cmd : 'Paste'});
+
+			if ((el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) || !col) {
+				m.addSeparator();
+				m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});
+				m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});
+			}
+
+			m.addSeparator();
+			m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});
+
+			m.addSeparator();
+			am = m.addMenu({title : 'contextmenu.align'});
+			am.add({title : 'contextmenu.left', icon : 'justifyleft', cmd : 'JustifyLeft'});
+			am.add({title : 'contextmenu.center', icon : 'justifycenter', cmd : 'JustifyCenter'});
+			am.add({title : 'contextmenu.right', icon : 'justifyright', cmd : 'JustifyRight'});
+			am.add({title : 'contextmenu.full', icon : 'justifyfull', cmd : 'JustifyFull'});
+
+			t.onContextMenu.dispatch(t, m, el, col);
+
+			return m;
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('contextmenu', tinymce.plugins.ContextMenu);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/directionality/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/directionality/editor_plugin_src.js
index 81818e37c..7572bed21 100755
--- a/webapp/web/js/tiny_mce/plugins/directionality/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/directionality/editor_plugin_src.js
@@ -1,79 +1,79 @@
-/**
- * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.Directionality', {
-		init : function(ed, url) {
-			var t = this;
-
-			t.editor = ed;
-
-			ed.addCommand('mceDirectionLTR', function() {
-				var e = ed.dom.getParent(ed.selection.getNode(), ed.dom.isBlock);
-
-				if (e) {
-					if (ed.dom.getAttrib(e, "dir") != "ltr")
-						ed.dom.setAttrib(e, "dir", "ltr");
-					else
-						ed.dom.setAttrib(e, "dir", "");
-				}
-
-				ed.nodeChanged();
-			});
-
-			ed.addCommand('mceDirectionRTL', function() {
-				var e = ed.dom.getParent(ed.selection.getNode(), ed.dom.isBlock);
-
-				if (e) {
-					if (ed.dom.getAttrib(e, "dir") != "rtl")
-						ed.dom.setAttrib(e, "dir", "rtl");
-					else
-						ed.dom.setAttrib(e, "dir", "");
-				}
-
-				ed.nodeChanged();
-			});
-
-			ed.addButton('ltr', {title : 'directionality.ltr_desc', cmd : 'mceDirectionLTR'});
-			ed.addButton('rtl', {title : 'directionality.rtl_desc', cmd : 'mceDirectionRTL'});
-
-			ed.onNodeChange.add(t._nodeChange, t);
-		},
-
-		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
-			};
-		},
-
-		// Private methods
-
-		_nodeChange : function(ed, cm, n) {
-			var dom = ed.dom, dir;
-
-			n = dom.getParent(n, dom.isBlock);
-			if (!n) {
-				cm.setDisabled('ltr', 1);
-				cm.setDisabled('rtl', 1);
-				return;
-			}
-
-			dir = dom.getAttrib(n, 'dir');
-			cm.setActive('ltr', dir == "ltr");
-			cm.setDisabled('ltr', 0);
-			cm.setActive('rtl', dir == "rtl");
-			cm.setDisabled('rtl', 0);
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('directionality', tinymce.plugins.Directionality);
+/**
+ * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Directionality', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			ed.addCommand('mceDirectionLTR', function() {
+				var e = ed.dom.getParent(ed.selection.getNode(), ed.dom.isBlock);
+
+				if (e) {
+					if (ed.dom.getAttrib(e, "dir") != "ltr")
+						ed.dom.setAttrib(e, "dir", "ltr");
+					else
+						ed.dom.setAttrib(e, "dir", "");
+				}
+
+				ed.nodeChanged();
+			});
+
+			ed.addCommand('mceDirectionRTL', function() {
+				var e = ed.dom.getParent(ed.selection.getNode(), ed.dom.isBlock);
+
+				if (e) {
+					if (ed.dom.getAttrib(e, "dir") != "rtl")
+						ed.dom.setAttrib(e, "dir", "rtl");
+					else
+						ed.dom.setAttrib(e, "dir", "");
+				}
+
+				ed.nodeChanged();
+			});
+
+			ed.addButton('ltr', {title : 'directionality.ltr_desc', cmd : 'mceDirectionLTR'});
+			ed.addButton('rtl', {title : 'directionality.rtl_desc', cmd : 'mceDirectionRTL'});
+
+			ed.onNodeChange.add(t._nodeChange, t);
+		},
+
+		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
+			};
+		},
+
+		// Private methods
+
+		_nodeChange : function(ed, cm, n) {
+			var dom = ed.dom, dir;
+
+			n = dom.getParent(n, dom.isBlock);
+			if (!n) {
+				cm.setDisabled('ltr', 1);
+				cm.setDisabled('rtl', 1);
+				return;
+			}
+
+			dir = dom.getAttrib(n, 'dir');
+			cm.setActive('ltr', dir == "ltr");
+			cm.setDisabled('ltr', 0);
+			cm.setActive('rtl', dir == "rtl");
+			cm.setDisabled('rtl', 0);
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('directionality', tinymce.plugins.Directionality);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/emotions/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/emotions/editor_plugin_src.js
index df0d370ae..86269edb7 100755
--- a/webapp/web/js/tiny_mce/plugins/emotions/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/emotions/editor_plugin_src.js
@@ -1,40 +1,40 @@
-/**
- * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.EmotionsPlugin', {
-		init : function(ed, url) {
-			// Register commands
-			ed.addCommand('mceEmotion', function() {
-				ed.windowManager.open({
-					file : url + '/emotions.htm',
-					width : 250 + parseInt(ed.getLang('emotions.delta_width', 0)),
-					height : 160 + parseInt(ed.getLang('emotions.delta_height', 0)),
-					inline : 1
-				}, {
-					plugin_url : url
-				});
-			});
-
-			// Register buttons
-			ed.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 : tinymce.majorVersion + "." + tinymce.minorVersion
-			};
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('emotions', tinymce.plugins.EmotionsPlugin);
+/**
+ * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.EmotionsPlugin', {
+		init : function(ed, url) {
+			// Register commands
+			ed.addCommand('mceEmotion', function() {
+				ed.windowManager.open({
+					file : url + '/emotions.htm',
+					width : 250 + parseInt(ed.getLang('emotions.delta_width', 0)),
+					height : 160 + parseInt(ed.getLang('emotions.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			// Register buttons
+			ed.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 : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('emotions', tinymce.plugins.EmotionsPlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/emotions/emotions.htm b/webapp/web/js/tiny_mce/plugins/emotions/emotions.htm
index 8110ee029..332327ff0 100755
--- a/webapp/web/js/tiny_mce/plugins/emotions/emotions.htm
+++ b/webapp/web/js/tiny_mce/plugins/emotions/emotions.htm
@@ -1,41 +1,41 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#emotions_dlg.title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="js/emotions.js"></script>
-	<base target="_self" />
-</head>
-<body style="display: none">
-	<div align="center">
-		<div class="title">{#emotions_dlg.title}:<br /><br /></div>
-
-		<table border="0" cellspacing="0" cellpadding="4">
-		  <tr>
-			<td><a href="javascript:EmotionsDialog.insert('smiley-cool.gif','emotions_dlg.cool');"><img src="img/smiley-cool.gif" width="18" height="18" border="0" alt="{#emotions_dlg.cool}" title="{#emotions_dlg.cool}" /></a></td>
-			<td><a href="javascript:EmotionsDialog.insert('smiley-cry.gif','emotions_dlg.cry');"><img src="img/smiley-cry.gif" width="18" height="18" border="0" alt="{#emotions_dlg.cry}" title="{#emotions_dlg.cry}" /></a></td>
-			<td><a href="javascript:EmotionsDialog.insert('smiley-embarassed.gif','emotions_dlg.embarassed');"><img src="img/smiley-embarassed.gif" width="18" height="18" border="0" alt="{#emotions_dlg.embarassed}" title="{#emotions_dlg.embarassed}" /></a></td>
-			<td><a href="javascript:EmotionsDialog.insert('smiley-foot-in-mouth.gif','emotions_dlg.foot_in_mouth');"><img src="img/smiley-foot-in-mouth.gif" width="18" height="18" border="0" alt="{#emotions_dlg.foot_in_mouth}" title="{#emotions_dlg.foot_in_mouth}" /></a></td>
-		  </tr>
-		  <tr>
-			<td><a href="javascript:EmotionsDialog.insert('smiley-frown.gif','emotions_dlg.frown');"><img src="img/smiley-frown.gif" width="18" height="18" border="0" alt="{#emotions_dlg.frown}" title="{#emotions_dlg.frown}" /></a></td>
-			<td><a href="javascript:EmotionsDialog.insert('smiley-innocent.gif','emotions_dlg.innocent');"><img src="img/smiley-innocent.gif" width="18" height="18" border="0" alt="{#emotions_dlg.innocent}" title="{#emotions_dlg.innocent}" /></a></td>
-			<td><a href="javascript:EmotionsDialog.insert('smiley-kiss.gif','emotions_dlg.kiss');"><img src="img/smiley-kiss.gif" width="18" height="18" border="0" alt="{#emotions_dlg.kiss}" title="{#emotions_dlg.kiss}" /></a></td>
-			<td><a href="javascript:EmotionsDialog.insert('smiley-laughing.gif','emotions_dlg.laughing');"><img src="img/smiley-laughing.gif" width="18" height="18" border="0" alt="{#emotions_dlg.laughing}" title="{#emotions_dlg.laughing}" /></a></td>
-		  </tr>
-		  <tr>
-			<td><a href="javascript:EmotionsDialog.insert('smiley-money-mouth.gif','emotions_dlg.money_mouth');"><img src="img/smiley-money-mouth.gif" width="18" height="18" border="0" alt="{#emotions_dlg.money_mouth}" title="{#emotions_dlg.money_mouth}" /></a></td>
-			<td><a href="javascript:EmotionsDialog.insert('smiley-sealed.gif','emotions_dlg.sealed');"><img src="img/smiley-sealed.gif" width="18" height="18" border="0" alt="{#emotions_dlg.sealed}" title="{#emotions_dlg.sealed}" /></a></td>
-			<td><a href="javascript:EmotionsDialog.insert('smiley-smile.gif','emotions_dlg.smile');"><img src="img/smiley-smile.gif" width="18" height="18" border="0" alt="{#emotions_dlg.smile}" title="{#emotions_dlg.smile}" /></a></td>
-			<td><a href="javascript:EmotionsDialog.insert('smiley-surprised.gif','emotions_dlg.surprised');"><img src="img/smiley-surprised.gif" width="18" height="18" border="0" alt="{#emotions_dlg.surprised}" title="{#emotions_dlg.surprised}" /></a></td>
-		  </tr>
-		  <tr>
-			<td><a href="javascript:EmotionsDialog.insert('smiley-tongue-out.gif','emotions_dlg.tongue_out');"><img src="img/smiley-tongue-out.gif" width="18" height="18" border="0" alt="{#emotions_dlg.tongue-out}" title="{#emotions_dlg.tongue_out}" /></a></td>
-			<td><a href="javascript:EmotionsDialog.insert('smiley-undecided.gif','emotions_dlg.undecided');"><img src="img/smiley-undecided.gif" width="18" height="18" border="0" alt="{#emotions_dlg.undecided}" title="{#emotions_dlg.undecided}" /></a></td>
-			<td><a href="javascript:EmotionsDialog.insert('smiley-wink.gif','emotions_dlg.wink');"><img src="img/smiley-wink.gif" width="18" height="18" border="0" alt="{#emotions_dlg.wink}" title="{#emotions_dlg.wink}" /></a></td>
-			<td><a href="javascript:EmotionsDialog.insert('smiley-yell.gif','emotions_dlg.yell');"><img src="img/smiley-yell.gif" width="18" height="18" border="0" alt="{#emotions_dlg.yell}" title="{#emotions_dlg.yell}" /></a></td>
-		  </tr>
-		</table>
-	</div>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#emotions_dlg.title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/emotions.js"></script>
+	<base target="_self" />
+</head>
+<body style="display: none">
+	<div align="center">
+		<div class="title">{#emotions_dlg.title}:<br /><br /></div>
+
+		<table border="0" cellspacing="0" cellpadding="4">
+		  <tr>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-cool.gif','emotions_dlg.cool');"><img src="img/smiley-cool.gif" width="18" height="18" border="0" alt="{#emotions_dlg.cool}" title="{#emotions_dlg.cool}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-cry.gif','emotions_dlg.cry');"><img src="img/smiley-cry.gif" width="18" height="18" border="0" alt="{#emotions_dlg.cry}" title="{#emotions_dlg.cry}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-embarassed.gif','emotions_dlg.embarassed');"><img src="img/smiley-embarassed.gif" width="18" height="18" border="0" alt="{#emotions_dlg.embarassed}" title="{#emotions_dlg.embarassed}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-foot-in-mouth.gif','emotions_dlg.foot_in_mouth');"><img src="img/smiley-foot-in-mouth.gif" width="18" height="18" border="0" alt="{#emotions_dlg.foot_in_mouth}" title="{#emotions_dlg.foot_in_mouth}" /></a></td>
+		  </tr>
+		  <tr>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-frown.gif','emotions_dlg.frown');"><img src="img/smiley-frown.gif" width="18" height="18" border="0" alt="{#emotions_dlg.frown}" title="{#emotions_dlg.frown}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-innocent.gif','emotions_dlg.innocent');"><img src="img/smiley-innocent.gif" width="18" height="18" border="0" alt="{#emotions_dlg.innocent}" title="{#emotions_dlg.innocent}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-kiss.gif','emotions_dlg.kiss');"><img src="img/smiley-kiss.gif" width="18" height="18" border="0" alt="{#emotions_dlg.kiss}" title="{#emotions_dlg.kiss}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-laughing.gif','emotions_dlg.laughing');"><img src="img/smiley-laughing.gif" width="18" height="18" border="0" alt="{#emotions_dlg.laughing}" title="{#emotions_dlg.laughing}" /></a></td>
+		  </tr>
+		  <tr>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-money-mouth.gif','emotions_dlg.money_mouth');"><img src="img/smiley-money-mouth.gif" width="18" height="18" border="0" alt="{#emotions_dlg.money_mouth}" title="{#emotions_dlg.money_mouth}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-sealed.gif','emotions_dlg.sealed');"><img src="img/smiley-sealed.gif" width="18" height="18" border="0" alt="{#emotions_dlg.sealed}" title="{#emotions_dlg.sealed}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-smile.gif','emotions_dlg.smile');"><img src="img/smiley-smile.gif" width="18" height="18" border="0" alt="{#emotions_dlg.smile}" title="{#emotions_dlg.smile}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-surprised.gif','emotions_dlg.surprised');"><img src="img/smiley-surprised.gif" width="18" height="18" border="0" alt="{#emotions_dlg.surprised}" title="{#emotions_dlg.surprised}" /></a></td>
+		  </tr>
+		  <tr>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-tongue-out.gif','emotions_dlg.tongue_out');"><img src="img/smiley-tongue-out.gif" width="18" height="18" border="0" alt="{#emotions_dlg.tongue-out}" title="{#emotions_dlg.tongue_out}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-undecided.gif','emotions_dlg.undecided');"><img src="img/smiley-undecided.gif" width="18" height="18" border="0" alt="{#emotions_dlg.undecided}" title="{#emotions_dlg.undecided}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-wink.gif','emotions_dlg.wink');"><img src="img/smiley-wink.gif" width="18" height="18" border="0" alt="{#emotions_dlg.wink}" title="{#emotions_dlg.wink}" /></a></td>
+			<td><a href="javascript:EmotionsDialog.insert('smiley-yell.gif','emotions_dlg.yell');"><img src="img/smiley-yell.gif" width="18" height="18" border="0" alt="{#emotions_dlg.yell}" title="{#emotions_dlg.yell}" /></a></td>
+		  </tr>
+		</table>
+	</div>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/emotions/js/emotions.js b/webapp/web/js/tiny_mce/plugins/emotions/js/emotions.js
index c54936709..e5c950fc4 100755
--- a/webapp/web/js/tiny_mce/plugins/emotions/js/emotions.js
+++ b/webapp/web/js/tiny_mce/plugins/emotions/js/emotions.js
@@ -1,22 +1,22 @@
-tinyMCEPopup.requireLangPack();
-
-var EmotionsDialog = {
-	init : function(ed) {
-		tinyMCEPopup.resizeToInnerSize();
-	},
-
-	insert : function(file, title) {
-		var ed = tinyMCEPopup.editor, dom = ed.dom;
-
-		tinyMCEPopup.execCommand('mceInsertContent', false, dom.createHTML('img', {
-			src : tinyMCEPopup.getWindowArg('plugin_url') + '/img/' + file,
-			alt : ed.getLang(title),
-			title : ed.getLang(title),
-			border : 0
-		}));
-
-		tinyMCEPopup.close();
-	}
-};
-
-tinyMCEPopup.onInit.add(EmotionsDialog.init, EmotionsDialog);
+tinyMCEPopup.requireLangPack();
+
+var EmotionsDialog = {
+	init : function(ed) {
+		tinyMCEPopup.resizeToInnerSize();
+	},
+
+	insert : function(file, title) {
+		var ed = tinyMCEPopup.editor, dom = ed.dom;
+
+		tinyMCEPopup.execCommand('mceInsertContent', false, dom.createHTML('img', {
+			src : tinyMCEPopup.getWindowArg('plugin_url') + '/img/' + file,
+			alt : ed.getLang(title),
+			title : ed.getLang(title),
+			border : 0
+		}));
+
+		tinyMCEPopup.close();
+	}
+};
+
+tinyMCEPopup.onInit.add(EmotionsDialog.init, EmotionsDialog);
diff --git a/webapp/web/js/tiny_mce/plugins/emotions/langs/en_dlg.js b/webapp/web/js/tiny_mce/plugins/emotions/langs/en_dlg.js
index 3b57ad9e3..f6d5f4ba8 100755
--- a/webapp/web/js/tiny_mce/plugins/emotions/langs/en_dlg.js
+++ b/webapp/web/js/tiny_mce/plugins/emotions/langs/en_dlg.js
@@ -1,20 +1,20 @@
-tinyMCE.addI18n('en.emotions_dlg',{
-title:"Insert emotion",
-desc:"Emotions",
-cool:"Cool",
-cry:"Cry",
-embarassed:"Embarassed",
-foot_in_mouth:"Foot in mouth",
-frown:"Frown",
-innocent:"Innocent",
-kiss:"Kiss",
-laughing:"Laughing",
-money_mouth:"Money mouth",
-sealed:"Sealed",
-smile:"Smile",
-surprised:"Surprised",
-tongue_out:"Tongue out",
-undecided:"Undecided",
-wink:"Wink",
-yell:"Yell"
+tinyMCE.addI18n('en.emotions_dlg',{
+title:"Insert emotion",
+desc:"Emotions",
+cool:"Cool",
+cry:"Cry",
+embarassed:"Embarassed",
+foot_in_mouth:"Foot in mouth",
+frown:"Frown",
+innocent:"Innocent",
+kiss:"Kiss",
+laughing:"Laughing",
+money_mouth:"Money mouth",
+sealed:"Sealed",
+smile:"Smile",
+surprised:"Surprised",
+tongue_out:"Tongue out",
+undecided:"Undecided",
+wink:"Wink",
+yell:"Yell"
 });
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/example/dialog.htm b/webapp/web/js/tiny_mce/plugins/example/dialog.htm
index b4c62840e..58edf9a50 100755
--- a/webapp/web/js/tiny_mce/plugins/example/dialog.htm
+++ b/webapp/web/js/tiny_mce/plugins/example/dialog.htm
@@ -1,27 +1,27 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#example_dlg.title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="js/dialog.js"></script>
-</head>
-<body>
-
-<form onsubmit="ExampleDialog.insert();return false;" action="#">
-	<p>Here is a example dialog.</p>
-	<p>Selected text: <input id="someval" name="someval" type="text" class="text" /></p>
-	<p>Custom arg: <input id="somearg" name="somearg" type="text" class="text" /></p>
-
-	<div class="mceActionPanel">
-		<div style="float: left">
-			<input type="button" id="insert" name="insert" value="{#insert}" onclick="ExampleDialog.insert();" />
-		</div>
-
-		<div style="float: right">
-			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-		</div>
-	</div>
-</form>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#example_dlg.title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/dialog.js"></script>
+</head>
+<body>
+
+<form onsubmit="ExampleDialog.insert();return false;" action="#">
+	<p>Here is a example dialog.</p>
+	<p>Selected text: <input id="someval" name="someval" type="text" class="text" /></p>
+	<p>Custom arg: <input id="somearg" name="somearg" type="text" class="text" /></p>
+
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="button" id="insert" name="insert" value="{#insert}" onclick="ExampleDialog.insert();" />
+		</div>
+
+		<div style="float: right">
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+</form>
+
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/example/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/example/editor_plugin_src.js
index 50505504d..d0b5ff2f4 100755
--- a/webapp/web/js/tiny_mce/plugins/example/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/example/editor_plugin_src.js
@@ -1,81 +1,81 @@
-/**
- * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	// Load plugin specific language pack
-	tinymce.PluginManager.requireLangPack('example');
-
-	tinymce.create('tinymce.plugins.ExamplePlugin', {
-		/**
-		 * Initializes the plugin, this will be executed after the plugin has been created.
-		 * This call is done before the editor instance has finished it's initialization so use the onInit event
-		 * of the editor instance to intercept that event.
-		 *
-		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
-		 * @param {string} url Absolute URL to where the plugin is located.
-		 */
-		init : function(ed, url) {
-			// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
-			ed.addCommand('mceExample', function() {
-				ed.windowManager.open({
-					file : url + '/dialog.htm',
-					width : 320 + parseInt(ed.getLang('example.delta_width', 0)),
-					height : 120 + parseInt(ed.getLang('example.delta_height', 0)),
-					inline : 1
-				}, {
-					plugin_url : url, // Plugin absolute URL
-					some_custom_arg : 'custom arg' // Custom argument
-				});
-			});
-
-			// Register example button
-			ed.addButton('example', {
-				title : 'example.desc',
-				cmd : 'mceExample',
-				image : url + '/img/example.gif'
-			});
-
-			// Add a node change handler, selects the button in the UI when a image is selected
-			ed.onNodeChange.add(function(ed, cm, n) {
-				cm.setActive('example', n.nodeName == 'IMG');
-			});
-		},
-
-		/**
-		 * Creates control instances based in the incomming name. This method is normally not
-		 * needed since the addButton method of the tinymce.Editor class is a more easy way of adding buttons
-		 * but you sometimes need to create more complex controls like listboxes, split buttons etc then this
-		 * method can be used to create those.
-		 *
-		 * @param {String} n Name of the control to create.
-		 * @param {tinymce.ControlManager} cm Control manager to use inorder to create new control.
-		 * @return {tinymce.ui.Control} New control instance or null if no control was created.
-		 */
-		createControl : function(n, cm) {
-			return null;
-		},
-
-		/**
-		 * Returns information about the plugin as a name/value array.
-		 * The current keys are longname, author, authorurl, infourl and version.
-		 *
-		 * @return {Object} Name/value array containing information about the plugin.
-		 */
-		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"
-			};
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('example', tinymce.plugins.ExamplePlugin);
+/**
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	// Load plugin specific language pack
+	tinymce.PluginManager.requireLangPack('example');
+
+	tinymce.create('tinymce.plugins.ExamplePlugin', {
+		/**
+		 * Initializes the plugin, this will be executed after the plugin has been created.
+		 * This call is done before the editor instance has finished it's initialization so use the onInit event
+		 * of the editor instance to intercept that event.
+		 *
+		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+		 * @param {string} url Absolute URL to where the plugin is located.
+		 */
+		init : function(ed, url) {
+			// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
+			ed.addCommand('mceExample', function() {
+				ed.windowManager.open({
+					file : url + '/dialog.htm',
+					width : 320 + parseInt(ed.getLang('example.delta_width', 0)),
+					height : 120 + parseInt(ed.getLang('example.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url, // Plugin absolute URL
+					some_custom_arg : 'custom arg' // Custom argument
+				});
+			});
+
+			// Register example button
+			ed.addButton('example', {
+				title : 'example.desc',
+				cmd : 'mceExample',
+				image : url + '/img/example.gif'
+			});
+
+			// Add a node change handler, selects the button in the UI when a image is selected
+			ed.onNodeChange.add(function(ed, cm, n) {
+				cm.setActive('example', n.nodeName == 'IMG');
+			});
+		},
+
+		/**
+		 * Creates control instances based in the incomming name. This method is normally not
+		 * needed since the addButton method of the tinymce.Editor class is a more easy way of adding buttons
+		 * but you sometimes need to create more complex controls like listboxes, split buttons etc then this
+		 * method can be used to create those.
+		 *
+		 * @param {String} n Name of the control to create.
+		 * @param {tinymce.ControlManager} cm Control manager to use inorder to create new control.
+		 * @return {tinymce.ui.Control} New control instance or null if no control was created.
+		 */
+		createControl : function(n, cm) {
+			return null;
+		},
+
+		/**
+		 * Returns information about the plugin as a name/value array.
+		 * The current keys are longname, author, authorurl, infourl and version.
+		 *
+		 * @return {Object} Name/value array containing information about the plugin.
+		 */
+		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"
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('example', tinymce.plugins.ExamplePlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/example/js/dialog.js b/webapp/web/js/tiny_mce/plugins/example/js/dialog.js
index fa8341132..a7ee507e0 100755
--- a/webapp/web/js/tiny_mce/plugins/example/js/dialog.js
+++ b/webapp/web/js/tiny_mce/plugins/example/js/dialog.js
@@ -1,19 +1,19 @@
-tinyMCEPopup.requireLangPack();
-
-var ExampleDialog = {
-	init : function() {
-		var f = document.forms[0];
-
-		// Get the selected contents as text and place it in the input
-		f.someval.value = tinyMCEPopup.editor.selection.getContent({format : 'text'});
-		f.somearg.value = tinyMCEPopup.getWindowArg('some_custom_arg');
-	},
-
-	insert : function() {
-		// Insert the contents from the input into the document
-		tinyMCEPopup.editor.execCommand('mceInsertContent', false, document.forms[0].someval.value);
-		tinyMCEPopup.close();
-	}
-};
-
-tinyMCEPopup.onInit.add(ExampleDialog.init, ExampleDialog);
+tinyMCEPopup.requireLangPack();
+
+var ExampleDialog = {
+	init : function() {
+		var f = document.forms[0];
+
+		// Get the selected contents as text and place it in the input
+		f.someval.value = tinyMCEPopup.editor.selection.getContent({format : 'text'});
+		f.somearg.value = tinyMCEPopup.getWindowArg('some_custom_arg');
+	},
+
+	insert : function() {
+		// Insert the contents from the input into the document
+		tinyMCEPopup.editor.execCommand('mceInsertContent', false, document.forms[0].someval.value);
+		tinyMCEPopup.close();
+	}
+};
+
+tinyMCEPopup.onInit.add(ExampleDialog.init, ExampleDialog);
diff --git a/webapp/web/js/tiny_mce/plugins/example/langs/en.js b/webapp/web/js/tiny_mce/plugins/example/langs/en.js
index e0784f80f..f3721d3a3 100755
--- a/webapp/web/js/tiny_mce/plugins/example/langs/en.js
+++ b/webapp/web/js/tiny_mce/plugins/example/langs/en.js
@@ -1,3 +1,3 @@
-tinyMCE.addI18n('en.example',{
-	desc : 'This is just a template button'
-});
+tinyMCE.addI18n('en.example',{
+	desc : 'This is just a template button'
+});
diff --git a/webapp/web/js/tiny_mce/plugins/example/langs/en_dlg.js b/webapp/web/js/tiny_mce/plugins/example/langs/en_dlg.js
index ebcf948da..a9cd65f8c 100755
--- a/webapp/web/js/tiny_mce/plugins/example/langs/en_dlg.js
+++ b/webapp/web/js/tiny_mce/plugins/example/langs/en_dlg.js
@@ -1,3 +1,3 @@
-tinyMCE.addI18n('en.example_dlg',{
-	title : 'This is just a example title'
-});
+tinyMCE.addI18n('en.example_dlg',{
+	title : 'This is just a example title'
+});
diff --git a/webapp/web/js/tiny_mce/plugins/fullpage/css/fullpage.css b/webapp/web/js/tiny_mce/plugins/fullpage/css/fullpage.css
index 7a3334f08..1854eca94 100755
--- a/webapp/web/js/tiny_mce/plugins/fullpage/css/fullpage.css
+++ b/webapp/web/js/tiny_mce/plugins/fullpage/css/fullpage.css
@@ -1,182 +1,182 @@
-/* Hide the advanced tab */
-#advanced_tab {
-	display: none;
-}
-
-#metatitle, #metakeywords, #metadescription, #metaauthor, #metacopyright {
-	width: 280px;
-}
-
-#doctype, #docencoding {
-	width: 200px;
-}
-
-#langcode {
-	width: 30px;
-}
-
-#bgimage {
-	width: 220px;	
-}
-
-#fontface {
-	width: 240px;
-}
-
-#leftmargin, #rightmargin, #topmargin, #bottommargin {
-	width: 50px;
-}
-
-.panel_wrapper div.current {
-	height: 400px;
-}
-
-#stylesheet, #style {
-	width: 240px;
-}
-
-/* Head list classes */
-
-.headlistwrapper {
-	width: 100%;
-}
-
-.addbutton, .removebutton, .moveupbutton, .movedownbutton {
-	border-top: 1px solid;
-	border-left: 1px solid;
-	border-bottom: 1px solid;
-	border-right: 1px solid;
-	border-color: #F0F0EE;
-	cursor: default;
-	display: block;
-	width: 20px;
-	height: 20px;
-}
-
-#doctypes {
-	width: 200px;
-}
-
-.addbutton:hover, .removebutton:hover, .moveupbutton:hover, .movedownbutton:hover {
-	border: 1px solid #0A246A;
-	background-color: #B6BDD2;
-}
-
-.addbutton {
-	background-image: url('../images/add.gif');
-	float: left;
-	margin-right: 3px;
-}
-
-.removebutton {
-	background-image: url('../images/remove.gif');
-	float: left;
-}
-
-.moveupbutton {
-	background-image: url('../images/move_up.gif');
-	float: left;
-	margin-right: 3px;
-}
-
-.movedownbutton {
-	background-image: url('../images/move_down.gif');
-	float: left;
-}
-
-.selected {
-	border: 1px solid #0A246A;
-	background-color: #B6BDD2;
-}
-
-.toolbar {
-	width: 100%;
-}
-
-#headlist {
-	width: 100%;
-	margin-top: 3px;
-	font-size: 11px;
-}
-
-#info, #title_element, #meta_element, #script_element, #style_element, #base_element, #link_element, #comment_element, #unknown_element {
-	display: none;
-}
-
-#addmenu {
-	position: absolute;
-	border: 1px solid gray;
-	display: none;
-	z-index: 100;
-	background-color: white;
-}
-
-#addmenu a {
-	display: block;
-	width: 100%;
-	line-height: 20px;
-	text-decoration: none;
-	background-color: white;
-}
-
-#addmenu a:hover {
-	background-color: #B6BDD2;
-	color: black;
-}
-
-#addmenu span {
-	padding-left: 10px;
-	padding-right: 10px;
-}
-
-#updateElementPanel {
-	display: none;
-}
-
-#script_element .panel_wrapper div.current {
-	height: 108px;
-}
-
-#style_element .panel_wrapper div.current {
-	height: 108px;
-}
-
-#link_element  .panel_wrapper div.current {
-	height: 140px;
-}
-
-#element_script_value {
-	width: 100%;
-	height: 100px;
-}
-
-#element_comment_value {
-	width: 100%;
-	height: 120px;
-}
-
-#element_style_value {
-	width: 100%;
-	height: 100px;
-}
-
-#element_title, #element_script_src, #element_meta_name, #element_meta_content, #element_base_href, #element_link_href, #element_link_title {
-	width: 250px;
-}
-
-.updateElementButton {
-	margin-top: 3px;
-}
-
-/* MSIE specific styles */
-
-* html .addbutton, * html .removebutton, * html .moveupbutton, * html .movedownbutton {
-	width: 22px;
-	height: 22px;
-}
-
-textarea {
-	height: 55px;
-}
-
+/* Hide the advanced tab */
+#advanced_tab {
+	display: none;
+}
+
+#metatitle, #metakeywords, #metadescription, #metaauthor, #metacopyright {
+	width: 280px;
+}
+
+#doctype, #docencoding {
+	width: 200px;
+}
+
+#langcode {
+	width: 30px;
+}
+
+#bgimage {
+	width: 220px;	
+}
+
+#fontface {
+	width: 240px;
+}
+
+#leftmargin, #rightmargin, #topmargin, #bottommargin {
+	width: 50px;
+}
+
+.panel_wrapper div.current {
+	height: 400px;
+}
+
+#stylesheet, #style {
+	width: 240px;
+}
+
+/* Head list classes */
+
+.headlistwrapper {
+	width: 100%;
+}
+
+.addbutton, .removebutton, .moveupbutton, .movedownbutton {
+	border-top: 1px solid;
+	border-left: 1px solid;
+	border-bottom: 1px solid;
+	border-right: 1px solid;
+	border-color: #F0F0EE;
+	cursor: default;
+	display: block;
+	width: 20px;
+	height: 20px;
+}
+
+#doctypes {
+	width: 200px;
+}
+
+.addbutton:hover, .removebutton:hover, .moveupbutton:hover, .movedownbutton:hover {
+	border: 1px solid #0A246A;
+	background-color: #B6BDD2;
+}
+
+.addbutton {
+	background-image: url('../images/add.gif');
+	float: left;
+	margin-right: 3px;
+}
+
+.removebutton {
+	background-image: url('../images/remove.gif');
+	float: left;
+}
+
+.moveupbutton {
+	background-image: url('../images/move_up.gif');
+	float: left;
+	margin-right: 3px;
+}
+
+.movedownbutton {
+	background-image: url('../images/move_down.gif');
+	float: left;
+}
+
+.selected {
+	border: 1px solid #0A246A;
+	background-color: #B6BDD2;
+}
+
+.toolbar {
+	width: 100%;
+}
+
+#headlist {
+	width: 100%;
+	margin-top: 3px;
+	font-size: 11px;
+}
+
+#info, #title_element, #meta_element, #script_element, #style_element, #base_element, #link_element, #comment_element, #unknown_element {
+	display: none;
+}
+
+#addmenu {
+	position: absolute;
+	border: 1px solid gray;
+	display: none;
+	z-index: 100;
+	background-color: white;
+}
+
+#addmenu a {
+	display: block;
+	width: 100%;
+	line-height: 20px;
+	text-decoration: none;
+	background-color: white;
+}
+
+#addmenu a:hover {
+	background-color: #B6BDD2;
+	color: black;
+}
+
+#addmenu span {
+	padding-left: 10px;
+	padding-right: 10px;
+}
+
+#updateElementPanel {
+	display: none;
+}
+
+#script_element .panel_wrapper div.current {
+	height: 108px;
+}
+
+#style_element .panel_wrapper div.current {
+	height: 108px;
+}
+
+#link_element  .panel_wrapper div.current {
+	height: 140px;
+}
+
+#element_script_value {
+	width: 100%;
+	height: 100px;
+}
+
+#element_comment_value {
+	width: 100%;
+	height: 120px;
+}
+
+#element_style_value {
+	width: 100%;
+	height: 100px;
+}
+
+#element_title, #element_script_src, #element_meta_name, #element_meta_content, #element_base_href, #element_link_href, #element_link_title {
+	width: 250px;
+}
+
+.updateElementButton {
+	margin-top: 3px;
+}
+
+/* MSIE specific styles */
+
+* html .addbutton, * html .removebutton, * html .moveupbutton, * html .movedownbutton {
+	width: 22px;
+	height: 22px;
+}
+
+textarea {
+	height: 55px;
+}
+
 .panel_wrapper div.current {height:420px;}
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/fullpage/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/fullpage/editor_plugin_src.js
index b91fb2975..b0d720c98 100755
--- a/webapp/web/js/tiny_mce/plugins/fullpage/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/fullpage/editor_plugin_src.js
@@ -1,140 +1,140 @@
-/**
- * $Id: editor_plugin_src.js 827 2008-04-29 15:02:42Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.FullPagePlugin', {
-		init : function(ed, url) {
-			var t = this;
-
-			t.editor = ed;
-
-			// Register commands
-			ed.addCommand('mceFullPageProperties', function() {
-				ed.windowManager.open({
-					file : url + '/fullpage.htm',
-					width : 430 + parseInt(ed.getLang('fullpage.delta_width', 0)),
-					height : 495 + parseInt(ed.getLang('fullpage.delta_height', 0)),
-					inline : 1
-				}, {
-					plugin_url : url,
-					head_html : t.head
-				});
-			});
-
-			// Register buttons
-			ed.addButton('fullpage', {title : 'fullpage.desc', cmd : 'mceFullPageProperties'});
-
-			ed.onBeforeSetContent.add(t._setContent, t);
-			ed.onSetContent.add(t._setBodyAttribs, t);
-			ed.onGetContent.add(t._getContent, t);
-		},
-
-		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
-			};
-		},
-
-		// Private plugin internal methods
-
-		_setBodyAttribs : function(ed, o) {
-			var bdattr, i, len, kv, k, v, t, attr = this.head.match(/body(.*?)>/i);
-
-			if (attr && attr[1]) {
-				bdattr = attr[1].match(/\s*(\w+\s*=\s*".*?"|\w+\s*=\s*'.*?'|\w+\s*=\s*\w+|\w+)\s*/g);
-
-				for(i = 0, len = bdattr.length; i < len; i++) {
-					kv = bdattr[i].split('=');
-					k = kv[0].replace(/\s/,'');
-					v = kv[1];
-
-					if (v) {
-						v = v.replace(/^\s+/,'').replace(/\s+$/,'');
-						t = v.match(/^["'](.*)["']$/);
-
-						if (t)
-							v = t[1];
-					} else
-						v = k;
-
-					ed.dom.setAttrib(ed.getBody(), 'style', v);
-				}
-			}
-		},
-
-		_createSerializer : function() {
-			return new tinymce.dom.Serializer({
-				dom : this.editor.dom,
-				apply_source_formatting : true
-			});
-		},
-
-		_setContent : function(ed, o) {
-			var t = this, sp, ep, c = o.content, v, st = '';
-
-			// Parse out head, body and footer
-			c = c.replace(/<(\/?)BODY/gi, '<$1body');
-			sp = c.indexOf('<body');
-
-			if (sp != -1) {
-				sp = c.indexOf('>', sp);
-				t.head = c.substring(0, sp + 1);
-
-				ep = c.indexOf('</body', sp);
-				if (ep == -1)
-					ep = c.indexOf('</body', ep);
-
-				o.content = c.substring(sp + 1, ep);
-				t.foot = c.substring(ep);
-
-				function low(s) {
-					return s.replace(/<\/?[A-Z]+/g, function(a) {
-						return a.toLowerCase();
-					})
-				};
-
-				t.head = low(t.head);
-				t.foot = low(t.foot);
-			} else {
-				t.head = '';
-				if (ed.getParam('fullpage_default_xml_pi'))
-					t.head += '<?xml version="1.0" encoding="' + ed.getParam('fullpage_default_encoding', 'ISO-8859-1') + '" ?>\n';
-
-				t.head += ed.getParam('fullpage_default_doctype', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');
-				t.head += '\n<html>\n<head>\n<title>' + ed.getParam('fullpage_default_title', 'Untitled document') + '</title>\n';
-
-				if (v = ed.getParam('fullpage_default_encoding'))
-					t.head += '<meta http-equiv="Content-Type" content="' + v + '" />\n';
-
-				if (v = ed.getParam('fullpage_default_font_family'))
-					st += 'font-family: ' + v + ';';
-
-				if (v = ed.getParam('fullpage_default_font_size'))
-					st += 'font-size: ' + v + ';';
-
-				if (v = ed.getParam('fullpage_default_text_color'))
-					st += 'color: ' + v + ';';
-
-				t.head += '</head>\n<body' + (st ? ' style="' + st + '"' : '') + '>\n';
-				t.foot = '\n</body>\n</html>';
-			}
-		},
-
-		_getContent : function(ed, o) {
-			var t = this;
-
-			o.content = tinymce.trim(t.head) + '\n' + tinymce.trim(o.content) + '\n' + tinymce.trim(t.foot);
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('fullpage', tinymce.plugins.FullPagePlugin);
+/**
+ * $Id: editor_plugin_src.js 827 2008-04-29 15:02:42Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.FullPagePlugin', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceFullPageProperties', function() {
+				ed.windowManager.open({
+					file : url + '/fullpage.htm',
+					width : 430 + parseInt(ed.getLang('fullpage.delta_width', 0)),
+					height : 495 + parseInt(ed.getLang('fullpage.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url,
+					head_html : t.head
+				});
+			});
+
+			// Register buttons
+			ed.addButton('fullpage', {title : 'fullpage.desc', cmd : 'mceFullPageProperties'});
+
+			ed.onBeforeSetContent.add(t._setContent, t);
+			ed.onSetContent.add(t._setBodyAttribs, t);
+			ed.onGetContent.add(t._getContent, t);
+		},
+
+		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
+			};
+		},
+
+		// Private plugin internal methods
+
+		_setBodyAttribs : function(ed, o) {
+			var bdattr, i, len, kv, k, v, t, attr = this.head.match(/body(.*?)>/i);
+
+			if (attr && attr[1]) {
+				bdattr = attr[1].match(/\s*(\w+\s*=\s*".*?"|\w+\s*=\s*'.*?'|\w+\s*=\s*\w+|\w+)\s*/g);
+
+				for(i = 0, len = bdattr.length; i < len; i++) {
+					kv = bdattr[i].split('=');
+					k = kv[0].replace(/\s/,'');
+					v = kv[1];
+
+					if (v) {
+						v = v.replace(/^\s+/,'').replace(/\s+$/,'');
+						t = v.match(/^["'](.*)["']$/);
+
+						if (t)
+							v = t[1];
+					} else
+						v = k;
+
+					ed.dom.setAttrib(ed.getBody(), 'style', v);
+				}
+			}
+		},
+
+		_createSerializer : function() {
+			return new tinymce.dom.Serializer({
+				dom : this.editor.dom,
+				apply_source_formatting : true
+			});
+		},
+
+		_setContent : function(ed, o) {
+			var t = this, sp, ep, c = o.content, v, st = '';
+
+			// Parse out head, body and footer
+			c = c.replace(/<(\/?)BODY/gi, '<$1body');
+			sp = c.indexOf('<body');
+
+			if (sp != -1) {
+				sp = c.indexOf('>', sp);
+				t.head = c.substring(0, sp + 1);
+
+				ep = c.indexOf('</body', sp);
+				if (ep == -1)
+					ep = c.indexOf('</body', ep);
+
+				o.content = c.substring(sp + 1, ep);
+				t.foot = c.substring(ep);
+
+				function low(s) {
+					return s.replace(/<\/?[A-Z]+/g, function(a) {
+						return a.toLowerCase();
+					})
+				};
+
+				t.head = low(t.head);
+				t.foot = low(t.foot);
+			} else {
+				t.head = '';
+				if (ed.getParam('fullpage_default_xml_pi'))
+					t.head += '<?xml version="1.0" encoding="' + ed.getParam('fullpage_default_encoding', 'ISO-8859-1') + '" ?>\n';
+
+				t.head += ed.getParam('fullpage_default_doctype', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');
+				t.head += '\n<html>\n<head>\n<title>' + ed.getParam('fullpage_default_title', 'Untitled document') + '</title>\n';
+
+				if (v = ed.getParam('fullpage_default_encoding'))
+					t.head += '<meta http-equiv="Content-Type" content="' + v + '" />\n';
+
+				if (v = ed.getParam('fullpage_default_font_family'))
+					st += 'font-family: ' + v + ';';
+
+				if (v = ed.getParam('fullpage_default_font_size'))
+					st += 'font-size: ' + v + ';';
+
+				if (v = ed.getParam('fullpage_default_text_color'))
+					st += 'color: ' + v + ';';
+
+				t.head += '</head>\n<body' + (st ? ' style="' + st + '"' : '') + '>\n';
+				t.foot = '\n</body>\n</html>';
+			}
+		},
+
+		_getContent : function(ed, o) {
+			var t = this;
+
+			o.content = tinymce.trim(t.head) + '\n' + tinymce.trim(o.content) + '\n' + tinymce.trim(t.foot);
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('fullpage', tinymce.plugins.FullPagePlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/fullpage/fullpage.htm b/webapp/web/js/tiny_mce/plugins/fullpage/fullpage.htm
index d74da0d76..eabc82377 100755
--- a/webapp/web/js/tiny_mce/plugins/fullpage/fullpage.htm
+++ b/webapp/web/js/tiny_mce/plugins/fullpage/fullpage.htm
@@ -1,577 +1,577 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#fullpage_dlg.title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="../../utils/form_utils.js"></script>
-	<script type="text/javascript" src="js/fullpage.js"></script>
-	<link href="css/fullpage.css" rel="stylesheet" type="text/css" />
-	<base target="_self" />
-</head>
-<body id="advlink" style="display: none">
-    <form onsubmit="updateAction();return false;" name="fullpage" action="#">
-		<div class="tabs">
-			<ul>
-				<li id="meta_tab" class="current"><span><a href="javascript:mcTabs.displayTab('meta_tab','meta_panel');" onmousedown="return false;">{#fullpage_dlg.meta_tab}</a></span></li>
-				<li id="appearance_tab"><span><a href="javascript:mcTabs.displayTab('appearance_tab','appearance_panel');" onmousedown="return false;">{#fullpage_dlg.appearance_tab}</a></span></li>
-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#fullpage_dlg.advanced_tab}</a></span></li>
-			</ul>
-		</div>
-
-		<div class="panel_wrapper">
-			<div id="meta_panel" class="panel current">
-				<fieldset>
-					<legend>{#fullpage_dlg.meta_props}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td nowrap="nowrap"><label for="metatitle">{#fullpage_dlg.meta_title}</label>&nbsp;</td>
-							<td><input type="text" id="metatitle" name="metatitle" value="" class="mceFocus" /></td>
-						</tr>
-						<tr>
-							<td nowrap="nowrap"><label for="metakeywords">{#fullpage_dlg.meta_keywords}</label>&nbsp;</td>
-							<td><textarea id="metakeywords" name="metakeywords" rows="4"></textarea></td>
-						</tr>
-						<tr>
-							<td nowrap="nowrap"><label for="metadescription">{#fullpage_dlg.meta_description}</label>&nbsp;</td>
-							<td><textarea id="metadescription" name="metadescription" rows="4"></textarea></td>
-						</tr>
-						<tr>
-							<td nowrap="nowrap"><label for="metaauthor">{#fullpage_dlg.author}</label>&nbsp;</td>
-							<td><input type="text" id="metaauthor" name="metaauthor" value="" /></td>
-						</tr>
-						<tr>
-							<td nowrap="nowrap"><label for="metacopyright">{#fullpage_dlg.copyright}</label>&nbsp;</td>
-							<td><input type="text" id="metacopyright" name="metacopyright" value="" /></td>
-						</tr>
-						<tr>
-							<td nowrap="nowrap"><label for="metarobots">{#fullpage_dlg.meta_robots}</label>&nbsp;</td>
-							<td>
-								<select id="metarobots" name="metarobots">
-											<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>
-											<option value="noindex,nofollow">{#fullpage_dlg.meta_noindex_nofollow}</option>
-								</select>
-							</td>
-						</tr>
-					</table>
-				</fieldset>
-
-				<fieldset>
-					<legend>{#fullpage_dlg.langprops}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td class="column1"><label for="docencoding">{#fullpage_dlg.encoding}</label></td> 
-							<td>
-								<select id="docencoding" name="docencoding"> 
-										<option value="">{#not_set}</option>
-								</select>
-							</td> 
-						</tr>
-						<tr>
-							<td nowrap="nowrap"><label for="doctypes">{#fullpage_dlg.doctypes}</label>&nbsp;</td>
-							<td>
-								<select id="doctypes" name="doctypes">
-										<option value="">{#not_set}</option>
-								</select>
-							</td>
-						</tr>
-						<tr>
-							<td nowrap="nowrap"><label for="langcode">{#fullpage_dlg.langcode}</label>&nbsp;</td>
-							<td><input type="text" id="langcode" name="langcode" value="" /></td>
-						</tr>
-						<tr>
-							<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>
-							</td> 
-						</tr>
-						<tr>
-							<td nowrap="nowrap"><label for="xml_pi">{#fullpage_dlg.xml_pi}</label>&nbsp;</td>
-							<td><input type="checkbox" id="xml_pi" name="xml_pi" class="checkbox" /></td>
-						</tr>
-					</table>
-				</fieldset>
-			</div>
-
-			<div id="appearance_panel" class="panel">
-				<fieldset>
-					<legend>{#fullpage_dlg.appearance_textprops}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td class="column1"><label for="fontface">{#fullpage_dlg.fontface}</label></td> 
-							<td>
-								<select id="fontface" name="fontface" onchange="changedStyleField(this);">
-										<option value="">{#not_set}</option>
-								</select>
-							</td> 
-						</tr>
-
-						<tr>
-							<td class="column1"><label for="fontsize">{#fullpage_dlg.fontsize}</label></td> 
-							<td>
-								<select id="fontsize" name="fontsize" onchange="changedStyleField(this);">
-										<option value="">{#not_set}</option>
-								</select>
-							</td>
-						</tr>
-
-						<tr>
-							<td class="column1"><label for="textcolor">{#fullpage_dlg.textcolor}</label></td> 
-							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="textcolor" name="textcolor" type="text" value="" size="9" onchange="updateColor('textcolor_pick','textcolor');changedStyleField(this);" /></td>
-										<td id="textcolor_pickcontainer">&nbsp;</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</fieldset>
-
-				<fieldset>
-					<legend>{#fullpage_dlg.appearance_bgprops}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td class="column1"><label for="bgimage">{#fullpage_dlg.bgimage}</label></td> 
-							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="bgimage" name="bgimage" type="text" value="" onchange="changedStyleField(this);" /></td>
-										<td id="bgimage_pickcontainer">&nbsp;</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-						<tr>
-							<td class="column1"><label for="bgcolor">{#fullpage_dlg.bgcolor}</label></td> 
-							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedStyleField(this);" /></td>
-										<td id="bgcolor_pickcontainer">&nbsp;</td>
-									</tr>
-								</table>
-							</td> 
-						</tr>
-					</table>
-				</fieldset>
-
-				<fieldset>
-					<legend>{#fullpage_dlg.appearance_marginprops}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td class="column1"><label for="leftmargin">{#fullpage_dlg.left_margin}</label></td> 
-							<td><input id="leftmargin" name="leftmargin" type="text" value="" onchange="changedStyleField(this);" /></td>
-							<td class="column1"><label for="rightmargin">{#fullpage_dlg.right_margin}</label></td> 
-							<td><input id="rightmargin" name="rightmargin" type="text" value="" onchange="changedStyleField(this);" /></td>
-						</tr>
-						<tr>
-							<td class="column1"><label for="topmargin">{#fullpage_dlg.top_margin}</label></td> 
-							<td><input id="topmargin" name="topmargin" type="text" value="" onchange="changedStyleField(this);" /></td>
-							<td class="column1"><label for="bottommargin">{#fullpage_dlg.bottom_margin}</label></td> 
-							<td><input id="bottommargin" name="bottommargin" type="text" value="" onchange="changedStyleField(this);" /></td>
-						</tr>
-					</table>
-				</fieldset>
-
-				<fieldset>
-					<legend>{#fullpage_dlg.appearance_linkprops}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td class="column1"><label for="link_color">{#fullpage_dlg.link_color}</label></td> 
-							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="link_color" name="link_color" type="text" value="" size="9" onchange="updateColor('link_color_pick','link_color');changedStyleField(this);" /></td>
-										<td id="link_color_pickcontainer">&nbsp;</td>
-									</tr>
-								</table>
-							</td>
-
-							<td class="column1"><label for="visited_color">{#fullpage_dlg.visited_color}</label></td> 
-							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="visited_color" name="visited_color" type="text" value="" size="9" onchange="updateColor('visited_color_pick','visited_color');changedStyleField(this);" /></td>
-										<td id="visited_color_pickcontainer">&nbsp;</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td class="column1"><label for="active_color">{#fullpage_dlg.active_color}</label></td> 
-							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="active_color" name="active_color" type="text" value="" size="9" onchange="updateColor('active_color_pick','active_color');changedStyleField(this);" /></td>
-										<td id="active_color_pickcontainer">&nbsp;</td>
-									</tr>
-								</table>
-							</td>
-
-							<td>&nbsp;</td>
-							<td>&nbsp;</td>
-
-<!--							<td class="column1"><label for="hover_color">{#fullpage_dlg.hover_color}</label></td> 
-							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="hover_color" name="hover_color" type="text" value="" size="9" onchange="changedStyleField(this);" /></td>
-										<td id="hover_color_pickcontainer">&nbsp;</td>
-									</tr>
-								</table>
-							</td> -->
-						</tr>
-					</table>
-				</fieldset>
-
-				<fieldset>
-					<legend>{#fullpage_dlg.appearance_style}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<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>
-										<td id="stylesheet_browsercontainer">&nbsp;</td>
-									</tr>
-								</table></td>
-						</tr>
-						<tr>
-							<td class="column1"><label for="style">{#fullpage_dlg.style}</label></td> 
-							<td><input id="style" name="style" type="text" value="" onchange="changedStyleField(this);" /></td>
-						</tr>
-					</table>
-				</fieldset>
-			</div>
-
-			<div id="advanced_panel" class="panel">
-				<div id="addmenu">
-					<table border="0" cellpadding="0" cellspacing="0">
-						<tr><td><a href="javascript:addHeadElm('title');" onmousedown="return false;"><span>{#fullpage_dlg.add_title}</span></a></td></tr>
-						<tr><td><a href="javascript:addHeadElm('meta');" onmousedown="return false;"><span>{#fullpage_dlg.add_meta}</span></a></td></tr>
-						<tr><td><a href="javascript:addHeadElm('script');" onmousedown="return false;"><span>{#fullpage_dlg.add_script}</span></a></td></tr>
-						<tr><td><a href="javascript:addHeadElm('style');" onmousedown="return false;"><span>{#fullpage_dlg.add_style}</span></a></td></tr>
-						<tr><td><a href="javascript:addHeadElm('link');" onmousedown="return false;"><span>{#fullpage_dlg.add_link}</span></a></td></tr>
-						<tr><td><a href="javascript:addHeadElm('base');" onmousedown="return false;"><span>{#fullpage_dlg.add_base}</span></a></td></tr>
-						<tr><td><a href="javascript:addHeadElm('comment');" onmousedown="return false;"><span>{#fullpage_dlg.add_comment}</span></a></td></tr>
-					</table>
-				</div>
-
-				<fieldset>
-					<legend>{#fullpage_dlg.head_elements}</legend>
-
-					<div class="headlistwrapper">
-						<div class="toolbar">
-							<div style="float: left">
-								<a id="addbutton" href="javascript:showAddMenu();" onmousedown="return false;" class="addbutton" title="{#fullpage_dlg.add}"></a>
-								<a href="#" onmousedown="return false;" class="removebutton" title="{#fullpage_dlg.remove}"></a>
-							</div>
-							<div style="float: right">
-								<a href="#" onmousedown="return false;" class="moveupbutton" title="{#fullpage_dlg.moveup}"></a>
-								<a href="#" onmousedown="return false;" class="movedownbutton" title="{#fullpage_dlg.movedown}"></a>
-							</div>
-							<br style="clear: both" />
-						</div>
-						<select id="headlist" size="26" onchange="updateHeadElm(this.options[this.selectedIndex].value);">
-							<option value="title_0">&lt;title&gt;Some title bla bla bla&lt;/title&gt;</option>
-							<option value="meta_1">&lt;meta name="keywords"&gt;Some bla bla bla&lt;/meta&gt;</option>
-							<option value="meta_2">&lt;meta name="description"&gt;Some bla bla bla bla bla bla bla bla bla&lt;/meta&gt;</option>
-							<option value="script_3">&lt;script language=&quot;javascript&quot;&gt;...&lt;/script&gt;</option>
-							<option value="style_4">&lt;style&gt;...&lt;/style&gt;</option>
-							<option value="base_5">&lt;base href="." /&gt;</option>
-							<option value="comment_6">&lt;!-- ... --&gt;</option>
-							<option value="link_7">&lt;link href="." /&gt;</option>
-						</select>
-					</div>
-				</fieldset>
-
-				<fieldset id="meta_element">
-					<legend>{#fullpage_dlg.meta_element}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td class="column1"><label for="element_meta_type">{#fullpage_dlg.type}</label></td> 
-							<td><select id="element_meta_type">
-										<option value="name">name</option>
-										<option value="http-equiv">http-equiv</option>
-								</select></td>
-						</tr>
-						<tr>
-							<td class="column1"><label for="element_meta_name">{#fullpage_dlg.name}</label></td> 
-							<td><input id="element_meta_name" name="element_meta_name" type="text" value="" /></td>
-						</tr>
-						<tr>
-							<td class="column1"><label for="element_meta_content">{#fullpage_dlg.content}</label></td> 
-							<td><input id="element_meta_content" name="element_meta_content" type="text" value="" /></td>
-						</tr>
-					</table>
-
-					<input type="button" id="meta_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
-				</fieldset>
-
-				<fieldset id="title_element">
-					<legend>{#fullpage_dlg.title_element}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td class="column1"><label for="element_title">{#fullpage_dlg.meta_title}</label></td> 
-							<td><input id="element_title" name="element_title" type="text" value="" /></td>
-						</tr>
-					</table>
-
-					<input type="button" id="title_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
-				</fieldset>
-
-				<fieldset id="script_element">
-					<legend>{#fullpage_dlg.script_element}</legend>
-
-					<div class="tabs">
-						<ul>
-							<li id="script_props_tab" class="current"><span><a href="javascript:mcTabs.displayTab('script_props_tab','script_props_panel');" onmousedown="return false;">{#fullpage_dlg.properties}</a></span></li>
-							<li id="script_value_tab"><span><a href="javascript:mcTabs.displayTab('script_value_tab','script_value_panel');" onmousedown="return false;">{#fullpage_dlg.value}</a></span></li>
-						</ul>
-					</div>
-
-					<br style="clear: both" />
-
-					<div class="panel_wrapper">
-						<div id="script_props_panel" class="panel current">
-							<table border="0" cellpadding="4" cellspacing="0">
-								<tr>
-									<td class="column1"><label for="element_script_type">{#fullpage_dlg.type}</label></td> 
-									<td><select id="element_script_type">
-										<option value="text/javascript">text/javascript</option>
-										<option value="text/jscript">text/jscript</option>
-										<option value="text/vbscript">text/vbscript</option>
-										<option value="text/vbs">text/vbs</option>
-										<option value="text/ecmascript">text/ecmascript</option>
-										<option value="text/xml">text/xml</option>
-									</select></td>
-								</tr>
-								<tr>
-									<td class="column1"><label for="element_script_src">{#fullpage_dlg.src}</label></td> 
-									<td><table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="element_script_src" name="element_script_src" type="text" value="" /></td>
-										<td id="script_src_pickcontainer">&nbsp;</td>
-									</tr>
-								</table></td>
-								</tr>
-								<tr>
-									<td class="column1"><label for="element_script_charset">{#fullpage_dlg.charset}</label></td> 
-									<td><select id="element_script_charset"><option value="">{#not_set}</option></select></td>
-								</tr>
-								<tr>
-									<td class="column1"><label for="element_script_defer">{#fullpage_dlg.defer}</label></td> 
-									<td><input type="checkbox" id="element_script_defer" name="element_script_defer" class="checkbox" /></td>
-								</tr>
-							</table>
-						</div>
-
-						<div id="script_value_panel" class="panel">
-							<textarea id="element_script_value"></textarea>
-						</div>
-					</div>
-
-					<input type="button" id="script_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
-				</fieldset>
-
-				<fieldset id="style_element">
-					<legend>{#fullpage_dlg.style_element}</legend>
-
-					<div class="tabs">
-						<ul>
-							<li id="style_props_tab" class="current"><span><a href="javascript:mcTabs.displayTab('style_props_tab','style_props_panel');" onmousedown="return false;">{#fullpage_dlg.properties}</a></span></li>
-							<li id="style_value_tab"><span><a href="javascript:mcTabs.displayTab('style_value_tab','style_value_panel');" onmousedown="return false;">{#fullpage_dlg.value}</a></span></li>
-						</ul>
-					</div>
-
-					<br style="clear: both" />
-
-					<div class="panel_wrapper">
-						<div id="style_props_panel" class="panel current">
-							<table border="0" cellpadding="4" cellspacing="0">
-								<tr>
-									<td class="column1"><label for="element_style_type">{#fullpage_dlg.type}</label></td> 
-									<td><select id="element_style_type">
-										<option value="text/css">text/css</option>
-									</select></td>
-								</tr>
-								<tr>
-									<td class="column1"><label for="element_style_media">{#fullpage_dlg.media}</label></td> 
-									<td><select id="element_style_media"></select></td>
-								</tr>
-							</table>
-						</div>
-
-						<div id="style_value_panel" class="panel">
-							<textarea id="element_style_value"></textarea>
-						</div>
-					</div>
-
-					<input type="button" id="style_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
-				</fieldset>
-
-				<fieldset id="base_element">
-					<legend>{#fullpage_dlg.base_element}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td class="column1"><label for="element_base_href">{#fullpage_dlg.href}</label></td> 
-							<td><input id="element_base_href" name="element_base_href" type="text" value="" /></td>
-						</tr>
-						<tr>
-							<td class="column1"><label for="element_base_target">{#fullpage_dlg.target}</label></td> 
-							<td><input id="element_base_target" name="element_base_target" type="text" value="" /></td>
-						</tr>
-					</table>
-
-					<input type="button" id="base_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
-				</fieldset>
-
-				<fieldset id="link_element">
-					<legend>{#fullpage_dlg.link_element}</legend>
-
-					<div class="tabs">
-						<ul>
-							<li id="link_general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('link_general_tab','link_general_panel');" onmousedown="return false;">{#fullpage_dlg.general_props}</a></span></li>
-							<li id="link_advanced_tab"><span><a href="javascript:mcTabs.displayTab('link_advanced_tab','link_advanced_panel');" onmousedown="return false;">{#fullpage_dlg.advanced_props}</a></span></li>
-						</ul>
-					</div>
-
-					<br style="clear: both" />
-
-					<div class="panel_wrapper">
-						<div id="link_general_panel" class="panel current">
-							<table border="0" cellpadding="4" cellspacing="0">
-								<tr>
-									<td class="column1"><label for="element_link_href">{#fullpage_dlg.href}</label></td> 
-									<td><table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="element_link_href" name="element_link_href" type="text" value="" /></td>
-										<td id="link_href_pickcontainer">&nbsp;</td>
-									</tr>
-								</table></td>
-								</tr>
-								<tr>
-									<td class="column1"><label for="element_link_title">{#fullpage_dlg.meta_title}</label></td> 
-									<td><input id="element_link_title" name="element_link_title" type="text" value="" /></td>
-								</tr>
-								<tr>
-									<td class="column1"><label for="element_link_type">{#fullpage_dlg.type}</label></td> 
-									<td><select id="element_link_type" name="element_link_type">
-										<option value="text/css">text/css</option>
-										<option value="text/javascript">text/javascript</option>
-									</select></td>
-								</tr>
-								<tr>
-									<td class="column1"><label for="element_link_media">{#fullpage_dlg.media}</label></td> 
-									<td><select id="element_link_media" name="element_link_media"></select></td>
-								</tr>
-								<tr>
-									<td><label for="element_style_rel">{#fullpage_dlg.rel}</label></td>
-									<td><select id="element_style_rel" name="element_style_rel"> 
-											<option value="">{#not_set}</option> 
-											<option value="stylesheet">Stylesheet</option>
-											<option value="alternate">Alternate</option>
-											<option value="designates">Designates</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>
-							</table>
-						</div>
-
-						<div id="link_advanced_panel" class="panel">
-							<table border="0" cellpadding="4" cellspacing="0">
-								<tr>
-									<td class="column1"><label for="element_link_charset">{#fullpage_dlg.charset}</label></td> 
-									<td><select id="element_link_charset"><option value="">{#not_set}</option></select></td>
-								</tr>
-								<tr>
-									<td class="column1"><label for="element_link_hreflang">{#fullpage_dlg.hreflang}</label></td> 
-									<td><input id="element_link_hreflang" name="element_link_hreflang" type="text" value="" /></td>
-								</tr>
-								<tr>
-									<td class="column1"><label for="element_link_target">{#fullpage_dlg.target}</label></td> 
-									<td><input id="element_link_target" name="element_link_target" type="text" value="" /></td>
-								</tr>
-								<tr>
-									<td><label for="element_style_rev">{#fullpage_dlg.rev}</label></td>
-									<td><select id="element_style_rev" name="element_style_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>
-							</table>
-						</div>
-					</div>
-
-					<input type="button" id="link_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
-				</fieldset>
-
-				<fieldset id="comment_element">
-					<legend>{#fullpage_dlg.comment_element}</legend>
-
-					<textarea id="element_comment_value"></textarea>
-
-					<input type="button" id="comment_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
-				</fieldset>
-			</div>
-		</div>
-
-		<div class="mceActionPanel">
-			<div style="float: left">
-				<input type="submit" id="insert" name="update" value="{#update}" />
-			</div>
-
-			<div style="float: right">
-				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-			</div>
-		</div>
-    </form>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#fullpage_dlg.title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="js/fullpage.js"></script>
+	<link href="css/fullpage.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body id="advlink" style="display: none">
+    <form onsubmit="updateAction();return false;" name="fullpage" action="#">
+		<div class="tabs">
+			<ul>
+				<li id="meta_tab" class="current"><span><a href="javascript:mcTabs.displayTab('meta_tab','meta_panel');" onmousedown="return false;">{#fullpage_dlg.meta_tab}</a></span></li>
+				<li id="appearance_tab"><span><a href="javascript:mcTabs.displayTab('appearance_tab','appearance_panel');" onmousedown="return false;">{#fullpage_dlg.appearance_tab}</a></span></li>
+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#fullpage_dlg.advanced_tab}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="meta_panel" class="panel current">
+				<fieldset>
+					<legend>{#fullpage_dlg.meta_props}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td nowrap="nowrap"><label for="metatitle">{#fullpage_dlg.meta_title}</label>&nbsp;</td>
+							<td><input type="text" id="metatitle" name="metatitle" value="" class="mceFocus" /></td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label for="metakeywords">{#fullpage_dlg.meta_keywords}</label>&nbsp;</td>
+							<td><textarea id="metakeywords" name="metakeywords" rows="4"></textarea></td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label for="metadescription">{#fullpage_dlg.meta_description}</label>&nbsp;</td>
+							<td><textarea id="metadescription" name="metadescription" rows="4"></textarea></td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label for="metaauthor">{#fullpage_dlg.author}</label>&nbsp;</td>
+							<td><input type="text" id="metaauthor" name="metaauthor" value="" /></td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label for="metacopyright">{#fullpage_dlg.copyright}</label>&nbsp;</td>
+							<td><input type="text" id="metacopyright" name="metacopyright" value="" /></td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label for="metarobots">{#fullpage_dlg.meta_robots}</label>&nbsp;</td>
+							<td>
+								<select id="metarobots" name="metarobots">
+											<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>
+											<option value="noindex,nofollow">{#fullpage_dlg.meta_noindex_nofollow}</option>
+								</select>
+							</td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{#fullpage_dlg.langprops}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="docencoding">{#fullpage_dlg.encoding}</label></td> 
+							<td>
+								<select id="docencoding" name="docencoding"> 
+										<option value="">{#not_set}</option>
+								</select>
+							</td> 
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label for="doctypes">{#fullpage_dlg.doctypes}</label>&nbsp;</td>
+							<td>
+								<select id="doctypes" name="doctypes">
+										<option value="">{#not_set}</option>
+								</select>
+							</td>
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label for="langcode">{#fullpage_dlg.langcode}</label>&nbsp;</td>
+							<td><input type="text" id="langcode" name="langcode" value="" /></td>
+						</tr>
+						<tr>
+							<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>
+							</td> 
+						</tr>
+						<tr>
+							<td nowrap="nowrap"><label for="xml_pi">{#fullpage_dlg.xml_pi}</label>&nbsp;</td>
+							<td><input type="checkbox" id="xml_pi" name="xml_pi" class="checkbox" /></td>
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="appearance_panel" class="panel">
+				<fieldset>
+					<legend>{#fullpage_dlg.appearance_textprops}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="fontface">{#fullpage_dlg.fontface}</label></td> 
+							<td>
+								<select id="fontface" name="fontface" onchange="changedStyleField(this);">
+										<option value="">{#not_set}</option>
+								</select>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="fontsize">{#fullpage_dlg.fontsize}</label></td> 
+							<td>
+								<select id="fontsize" name="fontsize" onchange="changedStyleField(this);">
+										<option value="">{#not_set}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="textcolor">{#fullpage_dlg.textcolor}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="textcolor" name="textcolor" type="text" value="" size="9" onchange="updateColor('textcolor_pick','textcolor');changedStyleField(this);" /></td>
+										<td id="textcolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{#fullpage_dlg.appearance_bgprops}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="bgimage">{#fullpage_dlg.bgimage}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bgimage" name="bgimage" type="text" value="" onchange="changedStyleField(this);" /></td>
+										<td id="bgimage_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="bgcolor">{#fullpage_dlg.bgcolor}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedStyleField(this);" /></td>
+										<td id="bgcolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{#fullpage_dlg.appearance_marginprops}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="leftmargin">{#fullpage_dlg.left_margin}</label></td> 
+							<td><input id="leftmargin" name="leftmargin" type="text" value="" onchange="changedStyleField(this);" /></td>
+							<td class="column1"><label for="rightmargin">{#fullpage_dlg.right_margin}</label></td> 
+							<td><input id="rightmargin" name="rightmargin" type="text" value="" onchange="changedStyleField(this);" /></td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="topmargin">{#fullpage_dlg.top_margin}</label></td> 
+							<td><input id="topmargin" name="topmargin" type="text" value="" onchange="changedStyleField(this);" /></td>
+							<td class="column1"><label for="bottommargin">{#fullpage_dlg.bottom_margin}</label></td> 
+							<td><input id="bottommargin" name="bottommargin" type="text" value="" onchange="changedStyleField(this);" /></td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{#fullpage_dlg.appearance_linkprops}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="link_color">{#fullpage_dlg.link_color}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="link_color" name="link_color" type="text" value="" size="9" onchange="updateColor('link_color_pick','link_color');changedStyleField(this);" /></td>
+										<td id="link_color_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+
+							<td class="column1"><label for="visited_color">{#fullpage_dlg.visited_color}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="visited_color" name="visited_color" type="text" value="" size="9" onchange="updateColor('visited_color_pick','visited_color');changedStyleField(this);" /></td>
+										<td id="visited_color_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="active_color">{#fullpage_dlg.active_color}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="active_color" name="active_color" type="text" value="" size="9" onchange="updateColor('active_color_pick','active_color');changedStyleField(this);" /></td>
+										<td id="active_color_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+
+							<td>&nbsp;</td>
+							<td>&nbsp;</td>
+
+<!--							<td class="column1"><label for="hover_color">{#fullpage_dlg.hover_color}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="hover_color" name="hover_color" type="text" value="" size="9" onchange="changedStyleField(this);" /></td>
+										<td id="hover_color_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> -->
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{#fullpage_dlg.appearance_style}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<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>
+										<td id="stylesheet_browsercontainer">&nbsp;</td>
+									</tr>
+								</table></td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="style">{#fullpage_dlg.style}</label></td> 
+							<td><input id="style" name="style" type="text" value="" onchange="changedStyleField(this);" /></td>
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="advanced_panel" class="panel">
+				<div id="addmenu">
+					<table border="0" cellpadding="0" cellspacing="0">
+						<tr><td><a href="javascript:addHeadElm('title');" onmousedown="return false;"><span>{#fullpage_dlg.add_title}</span></a></td></tr>
+						<tr><td><a href="javascript:addHeadElm('meta');" onmousedown="return false;"><span>{#fullpage_dlg.add_meta}</span></a></td></tr>
+						<tr><td><a href="javascript:addHeadElm('script');" onmousedown="return false;"><span>{#fullpage_dlg.add_script}</span></a></td></tr>
+						<tr><td><a href="javascript:addHeadElm('style');" onmousedown="return false;"><span>{#fullpage_dlg.add_style}</span></a></td></tr>
+						<tr><td><a href="javascript:addHeadElm('link');" onmousedown="return false;"><span>{#fullpage_dlg.add_link}</span></a></td></tr>
+						<tr><td><a href="javascript:addHeadElm('base');" onmousedown="return false;"><span>{#fullpage_dlg.add_base}</span></a></td></tr>
+						<tr><td><a href="javascript:addHeadElm('comment');" onmousedown="return false;"><span>{#fullpage_dlg.add_comment}</span></a></td></tr>
+					</table>
+				</div>
+
+				<fieldset>
+					<legend>{#fullpage_dlg.head_elements}</legend>
+
+					<div class="headlistwrapper">
+						<div class="toolbar">
+							<div style="float: left">
+								<a id="addbutton" href="javascript:showAddMenu();" onmousedown="return false;" class="addbutton" title="{#fullpage_dlg.add}"></a>
+								<a href="#" onmousedown="return false;" class="removebutton" title="{#fullpage_dlg.remove}"></a>
+							</div>
+							<div style="float: right">
+								<a href="#" onmousedown="return false;" class="moveupbutton" title="{#fullpage_dlg.moveup}"></a>
+								<a href="#" onmousedown="return false;" class="movedownbutton" title="{#fullpage_dlg.movedown}"></a>
+							</div>
+							<br style="clear: both" />
+						</div>
+						<select id="headlist" size="26" onchange="updateHeadElm(this.options[this.selectedIndex].value);">
+							<option value="title_0">&lt;title&gt;Some title bla bla bla&lt;/title&gt;</option>
+							<option value="meta_1">&lt;meta name="keywords"&gt;Some bla bla bla&lt;/meta&gt;</option>
+							<option value="meta_2">&lt;meta name="description"&gt;Some bla bla bla bla bla bla bla bla bla&lt;/meta&gt;</option>
+							<option value="script_3">&lt;script language=&quot;javascript&quot;&gt;...&lt;/script&gt;</option>
+							<option value="style_4">&lt;style&gt;...&lt;/style&gt;</option>
+							<option value="base_5">&lt;base href="." /&gt;</option>
+							<option value="comment_6">&lt;!-- ... --&gt;</option>
+							<option value="link_7">&lt;link href="." /&gt;</option>
+						</select>
+					</div>
+				</fieldset>
+
+				<fieldset id="meta_element">
+					<legend>{#fullpage_dlg.meta_element}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="element_meta_type">{#fullpage_dlg.type}</label></td> 
+							<td><select id="element_meta_type">
+										<option value="name">name</option>
+										<option value="http-equiv">http-equiv</option>
+								</select></td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="element_meta_name">{#fullpage_dlg.name}</label></td> 
+							<td><input id="element_meta_name" name="element_meta_name" type="text" value="" /></td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="element_meta_content">{#fullpage_dlg.content}</label></td> 
+							<td><input id="element_meta_content" name="element_meta_content" type="text" value="" /></td>
+						</tr>
+					</table>
+
+					<input type="button" id="meta_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
+				</fieldset>
+
+				<fieldset id="title_element">
+					<legend>{#fullpage_dlg.title_element}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="element_title">{#fullpage_dlg.meta_title}</label></td> 
+							<td><input id="element_title" name="element_title" type="text" value="" /></td>
+						</tr>
+					</table>
+
+					<input type="button" id="title_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
+				</fieldset>
+
+				<fieldset id="script_element">
+					<legend>{#fullpage_dlg.script_element}</legend>
+
+					<div class="tabs">
+						<ul>
+							<li id="script_props_tab" class="current"><span><a href="javascript:mcTabs.displayTab('script_props_tab','script_props_panel');" onmousedown="return false;">{#fullpage_dlg.properties}</a></span></li>
+							<li id="script_value_tab"><span><a href="javascript:mcTabs.displayTab('script_value_tab','script_value_panel');" onmousedown="return false;">{#fullpage_dlg.value}</a></span></li>
+						</ul>
+					</div>
+
+					<br style="clear: both" />
+
+					<div class="panel_wrapper">
+						<div id="script_props_panel" class="panel current">
+							<table border="0" cellpadding="4" cellspacing="0">
+								<tr>
+									<td class="column1"><label for="element_script_type">{#fullpage_dlg.type}</label></td> 
+									<td><select id="element_script_type">
+										<option value="text/javascript">text/javascript</option>
+										<option value="text/jscript">text/jscript</option>
+										<option value="text/vbscript">text/vbscript</option>
+										<option value="text/vbs">text/vbs</option>
+										<option value="text/ecmascript">text/ecmascript</option>
+										<option value="text/xml">text/xml</option>
+									</select></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_script_src">{#fullpage_dlg.src}</label></td> 
+									<td><table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="element_script_src" name="element_script_src" type="text" value="" /></td>
+										<td id="script_src_pickcontainer">&nbsp;</td>
+									</tr>
+								</table></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_script_charset">{#fullpage_dlg.charset}</label></td> 
+									<td><select id="element_script_charset"><option value="">{#not_set}</option></select></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_script_defer">{#fullpage_dlg.defer}</label></td> 
+									<td><input type="checkbox" id="element_script_defer" name="element_script_defer" class="checkbox" /></td>
+								</tr>
+							</table>
+						</div>
+
+						<div id="script_value_panel" class="panel">
+							<textarea id="element_script_value"></textarea>
+						</div>
+					</div>
+
+					<input type="button" id="script_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
+				</fieldset>
+
+				<fieldset id="style_element">
+					<legend>{#fullpage_dlg.style_element}</legend>
+
+					<div class="tabs">
+						<ul>
+							<li id="style_props_tab" class="current"><span><a href="javascript:mcTabs.displayTab('style_props_tab','style_props_panel');" onmousedown="return false;">{#fullpage_dlg.properties}</a></span></li>
+							<li id="style_value_tab"><span><a href="javascript:mcTabs.displayTab('style_value_tab','style_value_panel');" onmousedown="return false;">{#fullpage_dlg.value}</a></span></li>
+						</ul>
+					</div>
+
+					<br style="clear: both" />
+
+					<div class="panel_wrapper">
+						<div id="style_props_panel" class="panel current">
+							<table border="0" cellpadding="4" cellspacing="0">
+								<tr>
+									<td class="column1"><label for="element_style_type">{#fullpage_dlg.type}</label></td> 
+									<td><select id="element_style_type">
+										<option value="text/css">text/css</option>
+									</select></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_style_media">{#fullpage_dlg.media}</label></td> 
+									<td><select id="element_style_media"></select></td>
+								</tr>
+							</table>
+						</div>
+
+						<div id="style_value_panel" class="panel">
+							<textarea id="element_style_value"></textarea>
+						</div>
+					</div>
+
+					<input type="button" id="style_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
+				</fieldset>
+
+				<fieldset id="base_element">
+					<legend>{#fullpage_dlg.base_element}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td class="column1"><label for="element_base_href">{#fullpage_dlg.href}</label></td> 
+							<td><input id="element_base_href" name="element_base_href" type="text" value="" /></td>
+						</tr>
+						<tr>
+							<td class="column1"><label for="element_base_target">{#fullpage_dlg.target}</label></td> 
+							<td><input id="element_base_target" name="element_base_target" type="text" value="" /></td>
+						</tr>
+					</table>
+
+					<input type="button" id="base_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
+				</fieldset>
+
+				<fieldset id="link_element">
+					<legend>{#fullpage_dlg.link_element}</legend>
+
+					<div class="tabs">
+						<ul>
+							<li id="link_general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('link_general_tab','link_general_panel');" onmousedown="return false;">{#fullpage_dlg.general_props}</a></span></li>
+							<li id="link_advanced_tab"><span><a href="javascript:mcTabs.displayTab('link_advanced_tab','link_advanced_panel');" onmousedown="return false;">{#fullpage_dlg.advanced_props}</a></span></li>
+						</ul>
+					</div>
+
+					<br style="clear: both" />
+
+					<div class="panel_wrapper">
+						<div id="link_general_panel" class="panel current">
+							<table border="0" cellpadding="4" cellspacing="0">
+								<tr>
+									<td class="column1"><label for="element_link_href">{#fullpage_dlg.href}</label></td> 
+									<td><table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="element_link_href" name="element_link_href" type="text" value="" /></td>
+										<td id="link_href_pickcontainer">&nbsp;</td>
+									</tr>
+								</table></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_link_title">{#fullpage_dlg.meta_title}</label></td> 
+									<td><input id="element_link_title" name="element_link_title" type="text" value="" /></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_link_type">{#fullpage_dlg.type}</label></td> 
+									<td><select id="element_link_type" name="element_link_type">
+										<option value="text/css">text/css</option>
+										<option value="text/javascript">text/javascript</option>
+									</select></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_link_media">{#fullpage_dlg.media}</label></td> 
+									<td><select id="element_link_media" name="element_link_media"></select></td>
+								</tr>
+								<tr>
+									<td><label for="element_style_rel">{#fullpage_dlg.rel}</label></td>
+									<td><select id="element_style_rel" name="element_style_rel"> 
+											<option value="">{#not_set}</option> 
+											<option value="stylesheet">Stylesheet</option>
+											<option value="alternate">Alternate</option>
+											<option value="designates">Designates</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>
+							</table>
+						</div>
+
+						<div id="link_advanced_panel" class="panel">
+							<table border="0" cellpadding="4" cellspacing="0">
+								<tr>
+									<td class="column1"><label for="element_link_charset">{#fullpage_dlg.charset}</label></td> 
+									<td><select id="element_link_charset"><option value="">{#not_set}</option></select></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_link_hreflang">{#fullpage_dlg.hreflang}</label></td> 
+									<td><input id="element_link_hreflang" name="element_link_hreflang" type="text" value="" /></td>
+								</tr>
+								<tr>
+									<td class="column1"><label for="element_link_target">{#fullpage_dlg.target}</label></td> 
+									<td><input id="element_link_target" name="element_link_target" type="text" value="" /></td>
+								</tr>
+								<tr>
+									<td><label for="element_style_rev">{#fullpage_dlg.rev}</label></td>
+									<td><select id="element_style_rev" name="element_style_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>
+							</table>
+						</div>
+					</div>
+
+					<input type="button" id="link_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
+				</fieldset>
+
+				<fieldset id="comment_element">
+					<legend>{#fullpage_dlg.comment_element}</legend>
+
+					<textarea id="element_comment_value"></textarea>
+
+					<input type="button" id="comment_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div style="float: left">
+				<input type="submit" id="insert" name="update" value="{#update}" />
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+    </form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/fullpage/js/fullpage.js b/webapp/web/js/tiny_mce/plugins/fullpage/js/fullpage.js
index 89059ef66..6c994e9ca 100755
--- a/webapp/web/js/tiny_mce/plugins/fullpage/js/fullpage.js
+++ b/webapp/web/js/tiny_mce/plugins/fullpage/js/fullpage.js
@@ -1,461 +1,461 @@
-tinyMCEPopup.requireLangPack();
-
-var doc;
-
-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">,' +
-	'XHTML 1.1=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">,' +
-	'HTML 4.01 Transitional=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">,' +
-	'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 = 
-	'Western european (iso-8859-1)=iso-8859-1,' +
-	'Central European (iso-8859-2)=iso-8859-2,' +
-	'Unicode (UTF-8)=utf-8,' +
-	'Chinese traditional (Big5)=big5,' +
-	'Cyrillic (iso-8859-5)=iso-8859-5,' +
-	'Japanese (iso-2022-jp)=iso-2022-jp,' +
-	'Greek (iso-8859-7)=iso-8859-7,' +
-	'Korean (iso-2022-kr)=iso-2022-kr,' +
-	'ASCII (us-ascii)=us-ascii';
-
-var defaultMediaTypes = 
-	'all=all,' +
-	'screen=screen,' +
-	'print=print,' +
-	'tty=tty,' +
-	'tv=tv,' +
-	'projection=projection,' +
-	'handheld=handheld,' +
-	'braille=braille,' +
-	'aural=aural';
-
-var defaultFontNames = 'Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings';
-var defaultFontSizes = '10px,11px,12px,13px,14px,15px,16px';
-
-function init() {
-	var f = document.forms['fullpage'], el = f.elements, e, i, p, doctypes, encodings, mediaTypes, fonts, ed = tinyMCEPopup.editor, dom = tinyMCEPopup.dom, style;
-
-	// Setup doctype select box
-	doctypes = ed.getParam("fullpage_doctypes", defaultDocTypes).split(',');
-	for (i=0; i<doctypes.length; i++) {
-		p = doctypes[i].split('=');
-
-		if (p.length > 1)
-			addSelectValue(f, 'doctypes', p[0], p[1]);
-	}
-
-	// Setup fonts select box
-	fonts = ed.getParam("fullpage_fonts", defaultFontNames).split(';');
-	for (i=0; i<fonts.length; i++) {
-		p = fonts[i].split('=');
-
-		if (p.length > 1)
-			addSelectValue(f, 'fontface', p[0], p[1]);
-	}
-
-	// Setup fontsize select box
-	fonts = ed.getParam("fullpage_fontsizes", defaultFontSizes).split(',');
-	for (i=0; i<fonts.length; i++)
-		addSelectValue(f, 'fontsize', fonts[i], fonts[i]);
-
-	// Setup mediatype select boxs
-	mediaTypes = ed.getParam("fullpage_media_types", defaultMediaTypes).split(',');
-	for (i=0; i<mediaTypes.length; i++) {
-		p = mediaTypes[i].split('=');
-
-		if (p.length > 1) {
-			addSelectValue(f, 'element_style_media', p[0], p[1]);
-			addSelectValue(f, 'element_link_media', p[0], p[1]);
-		}
-	}
-
-	// Setup encodings select box
-	encodings = ed.getParam("fullpage_encodings", defaultEncodings).split(',');
-	for (i=0; i<encodings.length; i++) {
-		p = encodings[i].split('=');
-
-		if (p.length > 1) {
-			addSelectValue(f, 'docencoding', p[0], p[1]);
-			addSelectValue(f, 'element_script_charset', p[0], p[1]);
-			addSelectValue(f, 'element_link_charset', p[0], p[1]);
-		}
-	}
-
-	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
-	document.getElementById('link_color_pickcontainer').innerHTML = getColorPickerHTML('link_color_pick','link_color');
-	//document.getElementById('hover_color_pickcontainer').innerHTML = getColorPickerHTML('hover_color_pick','hover_color');
-	document.getElementById('visited_color_pickcontainer').innerHTML = getColorPickerHTML('visited_color_pick','visited_color');
-	document.getElementById('active_color_pickcontainer').innerHTML = getColorPickerHTML('active_color_pick','active_color');
-	document.getElementById('textcolor_pickcontainer').innerHTML = getColorPickerHTML('textcolor_pick','textcolor');
-	document.getElementById('stylesheet_browsercontainer').innerHTML = getBrowserHTML('stylesheetbrowser','stylesheet','file','fullpage');
-	document.getElementById('link_href_pickcontainer').innerHTML = getBrowserHTML('link_href_browser','element_link_href','file','fullpage');
-	document.getElementById('script_src_pickcontainer').innerHTML = getBrowserHTML('script_src_browser','element_script_src','file','fullpage');
-	document.getElementById('bgimage_pickcontainer').innerHTML = getBrowserHTML('bgimage_browser','bgimage','image','fullpage');
-
-	// Resize some elements
-	if (isVisible('stylesheetbrowser'))
-		document.getElementById('stylesheet').style.width = '220px';
-
-	if (isVisible('link_href_browser'))
-		document.getElementById('element_link_href').style.width = '230px';
-
-	if (isVisible('bgimage_browser'))
-		document.getElementById('bgimage').style.width = '210px';
-
-	// Add iframe
-	dom.add(document.body, 'iframe', {id : 'documentIframe', src : 'javascript:""', style : {display : 'none'}});
-	doc = dom.get('documentIframe').contentWindow.document;
-	h = tinyMCEPopup.getWindowArg('head_html');
-
-	// Preprocess the HTML disable scripts and urls
-	h = h.replace(/<script>/gi, '<script type="text/javascript">');
-	h = h.replace(/type=([\"\'])?/gi, 'type=$1-mce-');
-	h = h.replace(/(src=|href=)/g, 'mce_$1');
-
-	// Write in the content in the iframe
-	doc.write(h + '</body></html>');
-	doc.close();
-
-	// Parse xml and doctype
-	xmlVer = getReItem(/<\?\s*?xml.*?version\s*?=\s*?"(.*?)".*?\?>/gi, h, 1);
-	xmlEnc = getReItem(/<\?\s*?xml.*?encoding\s*?=\s*?"(.*?)".*?\?>/gi, h, 1);
-	docType = getReItem(/<\!DOCTYPE.*?>/gi, h, 0);
-	f.langcode.value = getReItem(/lang="(.*?)"/gi, h, 1);
-
-	// Parse title
-	if (e = doc.getElementsByTagName('title')[0])
-		el.metatitle.value = e.textContent || e.text;
-
-	// Parse meta
-	tinymce.each(doc.getElementsByTagName('meta'), function(n) {
-		var na = (n.getAttribute('name', 2) || '').toLowerCase(), va = n.getAttribute('content', 2), eq = n.getAttribute('httpEquiv', 2) || '';
-
-		e = el['meta' + na];
-
-		if (na == 'robots') {
-			selectByValue(f, 'metarobots', tinymce.trim(va), true, true);
-			return;
-		}
-
-		switch (eq.toLowerCase()) {
-			case "content-type":
-				tmp = getReItem(/charset\s*=\s*(.*)\s*/gi, va, 1);
-
-				// Override XML encoding
-				if (tmp != "")
-					xmlEnc = tmp;
-
-				return;
-		}
-
-		if (e)
-			e.value = va;
-	});
-
-	selectByValue(f, 'doctypes', docType, true, true);
-	selectByValue(f, 'docencoding', xmlEnc, true, true);
-	selectByValue(f, 'langdir', doc.body.getAttribute('dir', 2) || '', true, true);
-
-	if (xmlVer != '')
-		el.xml_pi.checked = true;
-
-	// Parse appearance
-
-	// Parse primary stylesheet
-	tinymce.each(doc.getElementsByTagName("link"), function(l) {
-		var m = l.getAttribute('media', 2) || '', t = l.getAttribute('type', 2) || '';
-
-		if (t == "-mce-text/css" && (m == "" || m == "screen" || m == "all") && (l.getAttribute('rel', 2) || '') == "stylesheet") {
-			f.stylesheet.value = l.getAttribute('mce_href', 2) || '';
-			return false;
-		}
-	});
-
-	// Get from style elements
-	tinymce.each(doc.getElementsByTagName("style"), function(st) {
-		var tmp = parseStyleElement(st);
-
-		for (x=0; x<tmp.length; x++) {
-			if (tmp[x].rule.indexOf('a:visited') != -1 && tmp[x].data['color'])
-				f.visited_color.value = tmp[x].data['color'];
-
-			if (tmp[x].rule.indexOf('a:link') != -1 && tmp[x].data['color'])
-				f.link_color.value = tmp[x].data['color'];
-
-			if (tmp[x].rule.indexOf('a:active') != -1 && tmp[x].data['color'])
-				f.active_color.value = tmp[x].data['color'];
-		}
-	});
-
-	f.textcolor.value = tinyMCEPopup.dom.getAttrib(doc.body, "text");
-	f.active_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "alink");
-	f.link_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "link");
-	f.visited_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "vlink");
-	f.bgcolor.value = tinyMCEPopup.dom.getAttrib(doc.body, "bgcolor");
-	f.bgimage.value = tinyMCEPopup.dom.getAttrib(doc.body, "background");
-
-	// Get from style info
-	style = tinyMCEPopup.dom.parseStyle(tinyMCEPopup.dom.getAttrib(doc.body, 'style'));
-
-	if (style['font-family'])
-		selectByValue(f, 'fontface', style['font-family'], true, true);
-	else
-		selectByValue(f, 'fontface', ed.getParam("fullpage_default_fontface", ""), true, true);
-
-	if (style['font-size'])
-		selectByValue(f, 'fontsize', style['font-size'], true, true);
-	else
-		selectByValue(f, 'fontsize', ed.getParam("fullpage_default_fontsize", ""), true, true);
-
-	if (style['color'])
-		f.textcolor.value = convertRGBToHex(style['color']);
-
-	if (style['background-image'])
-		f.bgimage.value = style['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
-
-	if (style['background-color'])
-		f.bgcolor.value = style['background-color'];
-
-	if (style['margin']) {
-		tmp = style['margin'].replace(/[^0-9 ]/g, '');
-		tmp = tmp.split(/ +/);
-		f.topmargin.value = tmp.length > 0 ? tmp[0] : '';
-		f.rightmargin.value = tmp.length > 1 ? tmp[1] : tmp[0];
-		f.bottommargin.value = tmp.length > 2 ? tmp[2] : tmp[0];
-		f.leftmargin.value = tmp.length > 3 ? tmp[3] : tmp[0];
-	}
-
-	if (style['margin-left'])
-		f.leftmargin.value = style['margin-left'].replace(/[^0-9]/g, '');
-
-	if (style['margin-right'])
-		f.rightmargin.value = style['margin-right'].replace(/[^0-9]/g, '');
-
-	if (style['margin-top'])
-		f.topmargin.value = style['margin-top'].replace(/[^0-9]/g, '');
-
-	if (style['margin-bottom'])
-		f.bottommargin.value = style['margin-bottom'].replace(/[^0-9]/g, '');
-
-	f.style.value = tinyMCEPopup.dom.serializeStyle(style);
-
-	// Update colors
-	updateColor('textcolor_pick', 'textcolor');
-	updateColor('bgcolor_pick', 'bgcolor');
-	updateColor('visited_color_pick', 'visited_color');
-	updateColor('active_color_pick', 'active_color');
-	updateColor('link_color_pick', 'link_color');
-}
-
-function getReItem(r, s, i) {
-	var c = r.exec(s);
-
-	if (c && c.length > i)
-		return c[i];
-
-	return '';
-}
-
-function updateAction() {
-	var f = document.forms[0], nl, i, h, v, s, head, html, l, tmp, addlink = true, ser;
-
-	head = doc.getElementsByTagName('head')[0];
-
-	// Fix scripts without a type
-	nl = doc.getElementsByTagName('script');
-	for (i=0; i<nl.length; i++) {
-		if (tinyMCEPopup.dom.getAttrib(nl[i], 'mce_type') == '')
-			nl[i].setAttribute('mce_type', 'text/javascript');
-	}
-
-	// Get primary stylesheet
-	nl = doc.getElementsByTagName("link");
-	for (i=0; i<nl.length; i++) {
-		l = nl[i];
-
-		tmp = tinyMCEPopup.dom.getAttrib(l, 'media');
-
-		if (tinyMCEPopup.dom.getAttrib(l, 'mce_type') == "text/css" && (tmp == "" || tmp == "screen" || tmp == "all") && tinyMCEPopup.dom.getAttrib(l, 'rel') == "stylesheet") {
-			addlink = false;
-
-			if (f.stylesheet.value == '')
-				l.parentNode.removeChild(l);
-			else
-				l.setAttribute('mce_href', f.stylesheet.value);
-
-			break;
-		}
-	}
-
-	// Add new link
-	if (f.stylesheet.value != '') {
-		l = doc.createElement('link');
-
-		l.setAttribute('type', 'text/css');
-		l.setAttribute('mce_href', f.stylesheet.value);
-		l.setAttribute('rel', 'stylesheet');
-
-		head.appendChild(l);
-	}
-
-	setMeta(head, 'keywords', f.metakeywords.value);
-	setMeta(head, 'description', f.metadescription.value);
-	setMeta(head, 'author', f.metaauthor.value);
-	setMeta(head, 'copyright', f.metacopyright.value);
-	setMeta(head, 'robots', getSelectValue(f, 'metarobots'));
-	setMeta(head, 'Content-Type', getSelectValue(f, 'docencoding'));
-
-	doc.body.dir = getSelectValue(f, 'langdir');
-	doc.body.style.cssText = f.style.value;
-
-	doc.body.setAttribute('vLink', f.visited_color.value);
-	doc.body.setAttribute('link', f.link_color.value);
-	doc.body.setAttribute('text', f.textcolor.value);
-	doc.body.setAttribute('aLink', f.active_color.value);
-
-	doc.body.style.fontFamily = getSelectValue(f, 'fontface');
-	doc.body.style.fontSize = getSelectValue(f, 'fontsize');
-	doc.body.style.backgroundColor = f.bgcolor.value;
-
-	if (f.leftmargin.value != '')
-		doc.body.style.marginLeft = f.leftmargin.value + 'px';
-
-	if (f.rightmargin.value != '')
-		doc.body.style.marginRight = f.rightmargin.value + 'px';
-
-	if (f.bottommargin.value != '')
-		doc.body.style.marginBottom = f.bottommargin.value + 'px';
-
-	if (f.topmargin.value != '')
-		doc.body.style.marginTop = f.topmargin.value + 'px';
-
-	html = doc.getElementsByTagName('html')[0];
-	html.setAttribute('lang', f.langcode.value);
-	html.setAttribute('xml:lang', f.langcode.value);
-
-	if (f.bgimage.value != '')
-		doc.body.style.backgroundImage = "url('" + f.bgimage.value + "')";
-	else
-		doc.body.style.backgroundImage = '';
-
-	ser = tinyMCEPopup.editor.plugins.fullpage._createSerializer();
-	ser.setRules('-title,meta[http-equiv|name|content],base[href|target],link[href|rel|type|title|media],style[type],script[type|language|src],html[lang|xml::lang|xmlns],body[style|dir|vlink|link|text|alink],head');
-
-	h = ser.serialize(doc.documentElement);
-	h = h.substring(0, h.lastIndexOf('</body>'));
-
-	if (h.indexOf('<title>') == -1)
-		h = h.replace(/<head.*?>/, '$&\n' + '<title>' + tinyMCEPopup.dom.encode(f.metatitle.value) + '</title>');
-	else
-		h = h.replace(/<title>(.*?)<\/title>/, '<title>' + tinyMCEPopup.dom.encode(f.metatitle.value) + '</title>');
-
-	if ((v = getSelectValue(f, 'doctypes')) != '')
-		h = v + '\n' + h;
-
-	if (f.xml_pi.checked) {
-		s = '<?xml version="1.0"';
-
-		if ((v = getSelectValue(f, 'docencoding')) != '')
-			s += ' encoding="' + v + '"';
-
-		s += '?>\n';
-		h = s + h;
-	}
-
-	h = h.replace(/type=\"\-mce\-/gi, 'type="');
-
-	tinyMCEPopup.editor.plugins.fullpage.head = h;
-	tinyMCEPopup.editor.plugins.fullpage._setBodyAttribs(tinyMCEPopup.editor, {});
-	tinyMCEPopup.close();
-}
-
-function changedStyleField(field) {
-}
-
-function setMeta(he, k, v) {
-	var nl, i, m;
-
-	nl = he.getElementsByTagName('meta');
-	for (i=0; i<nl.length; i++) {
-		if (k == 'Content-Type' && tinyMCEPopup.dom.getAttrib(nl[i], 'http-equiv') == k) {
-			if (v == '')
-				nl[i].parentNode.removeChild(nl[i]);
-			else
-				nl[i].setAttribute('content', "text/html; charset=" + v);
-
-			return;
-		}
-
-		if (tinyMCEPopup.dom.getAttrib(nl[i], 'name') == k) {
-			if (v == '')
-				nl[i].parentNode.removeChild(nl[i]);
-			else
-				nl[i].setAttribute('content', v);
-			return;
-		}
-	}
-
-	if (v == '')
-		return;
-
-	m = doc.createElement('meta');
-
-	if (k == 'Content-Type')
-		m.httpEquiv = k;
-	else
-		m.setAttribute('name', k);
-
-	m.setAttribute('content', v);
-	he.appendChild(m);
-}
-
-function parseStyleElement(e) {
-	var v = e.innerHTML;
-	var p, i, r;
-
-	v = v.replace(/<!--/gi, '');
-	v = v.replace(/-->/gi, '');
-	v = v.replace(/[\n\r]/gi, '');
-	v = v.replace(/\s+/gi, ' ');
-
-	r = [];
-	p = v.split(/{|}/);
-
-	for (i=0; i<p.length; i+=2) {
-		if (p[i] != "")
-			r[r.length] = {rule : tinymce.trim(p[i]), data : tinyMCEPopup.dom.parseStyle(p[i+1])};
-	}
-
-	return r;
-}
-
-function serializeStyleElement(d) {
-	var i, s, st;
-
-	s = '<!--\n';
-
-	for (i=0; i<d.length; i++) {
-		s += d[i].rule + ' {\n';
-
-		st = tinyMCE.serializeStyle(d[i].data);
-
-		if (st != '')
-			st += ';';
-
-		s += st.replace(/;/g, ';\n');
-		s += '}\n';
-
-		if (i != d.length - 1)
-			s += '\n';
-	}
-
-	s += '\n-->';
-
-	return s;
-}
-
-tinyMCEPopup.onInit.add(init);
+tinyMCEPopup.requireLangPack();
+
+var doc;
+
+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">,' +
+	'XHTML 1.1=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">,' +
+	'HTML 4.01 Transitional=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">,' +
+	'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 = 
+	'Western european (iso-8859-1)=iso-8859-1,' +
+	'Central European (iso-8859-2)=iso-8859-2,' +
+	'Unicode (UTF-8)=utf-8,' +
+	'Chinese traditional (Big5)=big5,' +
+	'Cyrillic (iso-8859-5)=iso-8859-5,' +
+	'Japanese (iso-2022-jp)=iso-2022-jp,' +
+	'Greek (iso-8859-7)=iso-8859-7,' +
+	'Korean (iso-2022-kr)=iso-2022-kr,' +
+	'ASCII (us-ascii)=us-ascii';
+
+var defaultMediaTypes = 
+	'all=all,' +
+	'screen=screen,' +
+	'print=print,' +
+	'tty=tty,' +
+	'tv=tv,' +
+	'projection=projection,' +
+	'handheld=handheld,' +
+	'braille=braille,' +
+	'aural=aural';
+
+var defaultFontNames = 'Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings';
+var defaultFontSizes = '10px,11px,12px,13px,14px,15px,16px';
+
+function init() {
+	var f = document.forms['fullpage'], el = f.elements, e, i, p, doctypes, encodings, mediaTypes, fonts, ed = tinyMCEPopup.editor, dom = tinyMCEPopup.dom, style;
+
+	// Setup doctype select box
+	doctypes = ed.getParam("fullpage_doctypes", defaultDocTypes).split(',');
+	for (i=0; i<doctypes.length; i++) {
+		p = doctypes[i].split('=');
+
+		if (p.length > 1)
+			addSelectValue(f, 'doctypes', p[0], p[1]);
+	}
+
+	// Setup fonts select box
+	fonts = ed.getParam("fullpage_fonts", defaultFontNames).split(';');
+	for (i=0; i<fonts.length; i++) {
+		p = fonts[i].split('=');
+
+		if (p.length > 1)
+			addSelectValue(f, 'fontface', p[0], p[1]);
+	}
+
+	// Setup fontsize select box
+	fonts = ed.getParam("fullpage_fontsizes", defaultFontSizes).split(',');
+	for (i=0; i<fonts.length; i++)
+		addSelectValue(f, 'fontsize', fonts[i], fonts[i]);
+
+	// Setup mediatype select boxs
+	mediaTypes = ed.getParam("fullpage_media_types", defaultMediaTypes).split(',');
+	for (i=0; i<mediaTypes.length; i++) {
+		p = mediaTypes[i].split('=');
+
+		if (p.length > 1) {
+			addSelectValue(f, 'element_style_media', p[0], p[1]);
+			addSelectValue(f, 'element_link_media', p[0], p[1]);
+		}
+	}
+
+	// Setup encodings select box
+	encodings = ed.getParam("fullpage_encodings", defaultEncodings).split(',');
+	for (i=0; i<encodings.length; i++) {
+		p = encodings[i].split('=');
+
+		if (p.length > 1) {
+			addSelectValue(f, 'docencoding', p[0], p[1]);
+			addSelectValue(f, 'element_script_charset', p[0], p[1]);
+			addSelectValue(f, 'element_link_charset', p[0], p[1]);
+		}
+	}
+
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+	document.getElementById('link_color_pickcontainer').innerHTML = getColorPickerHTML('link_color_pick','link_color');
+	//document.getElementById('hover_color_pickcontainer').innerHTML = getColorPickerHTML('hover_color_pick','hover_color');
+	document.getElementById('visited_color_pickcontainer').innerHTML = getColorPickerHTML('visited_color_pick','visited_color');
+	document.getElementById('active_color_pickcontainer').innerHTML = getColorPickerHTML('active_color_pick','active_color');
+	document.getElementById('textcolor_pickcontainer').innerHTML = getColorPickerHTML('textcolor_pick','textcolor');
+	document.getElementById('stylesheet_browsercontainer').innerHTML = getBrowserHTML('stylesheetbrowser','stylesheet','file','fullpage');
+	document.getElementById('link_href_pickcontainer').innerHTML = getBrowserHTML('link_href_browser','element_link_href','file','fullpage');
+	document.getElementById('script_src_pickcontainer').innerHTML = getBrowserHTML('script_src_browser','element_script_src','file','fullpage');
+	document.getElementById('bgimage_pickcontainer').innerHTML = getBrowserHTML('bgimage_browser','bgimage','image','fullpage');
+
+	// Resize some elements
+	if (isVisible('stylesheetbrowser'))
+		document.getElementById('stylesheet').style.width = '220px';
+
+	if (isVisible('link_href_browser'))
+		document.getElementById('element_link_href').style.width = '230px';
+
+	if (isVisible('bgimage_browser'))
+		document.getElementById('bgimage').style.width = '210px';
+
+	// Add iframe
+	dom.add(document.body, 'iframe', {id : 'documentIframe', src : 'javascript:""', style : {display : 'none'}});
+	doc = dom.get('documentIframe').contentWindow.document;
+	h = tinyMCEPopup.getWindowArg('head_html');
+
+	// Preprocess the HTML disable scripts and urls
+	h = h.replace(/<script>/gi, '<script type="text/javascript">');
+	h = h.replace(/type=([\"\'])?/gi, 'type=$1-mce-');
+	h = h.replace(/(src=|href=)/g, 'mce_$1');
+
+	// Write in the content in the iframe
+	doc.write(h + '</body></html>');
+	doc.close();
+
+	// Parse xml and doctype
+	xmlVer = getReItem(/<\?\s*?xml.*?version\s*?=\s*?"(.*?)".*?\?>/gi, h, 1);
+	xmlEnc = getReItem(/<\?\s*?xml.*?encoding\s*?=\s*?"(.*?)".*?\?>/gi, h, 1);
+	docType = getReItem(/<\!DOCTYPE.*?>/gi, h, 0);
+	f.langcode.value = getReItem(/lang="(.*?)"/gi, h, 1);
+
+	// Parse title
+	if (e = doc.getElementsByTagName('title')[0])
+		el.metatitle.value = e.textContent || e.text;
+
+	// Parse meta
+	tinymce.each(doc.getElementsByTagName('meta'), function(n) {
+		var na = (n.getAttribute('name', 2) || '').toLowerCase(), va = n.getAttribute('content', 2), eq = n.getAttribute('httpEquiv', 2) || '';
+
+		e = el['meta' + na];
+
+		if (na == 'robots') {
+			selectByValue(f, 'metarobots', tinymce.trim(va), true, true);
+			return;
+		}
+
+		switch (eq.toLowerCase()) {
+			case "content-type":
+				tmp = getReItem(/charset\s*=\s*(.*)\s*/gi, va, 1);
+
+				// Override XML encoding
+				if (tmp != "")
+					xmlEnc = tmp;
+
+				return;
+		}
+
+		if (e)
+			e.value = va;
+	});
+
+	selectByValue(f, 'doctypes', docType, true, true);
+	selectByValue(f, 'docencoding', xmlEnc, true, true);
+	selectByValue(f, 'langdir', doc.body.getAttribute('dir', 2) || '', true, true);
+
+	if (xmlVer != '')
+		el.xml_pi.checked = true;
+
+	// Parse appearance
+
+	// Parse primary stylesheet
+	tinymce.each(doc.getElementsByTagName("link"), function(l) {
+		var m = l.getAttribute('media', 2) || '', t = l.getAttribute('type', 2) || '';
+
+		if (t == "-mce-text/css" && (m == "" || m == "screen" || m == "all") && (l.getAttribute('rel', 2) || '') == "stylesheet") {
+			f.stylesheet.value = l.getAttribute('mce_href', 2) || '';
+			return false;
+		}
+	});
+
+	// Get from style elements
+	tinymce.each(doc.getElementsByTagName("style"), function(st) {
+		var tmp = parseStyleElement(st);
+
+		for (x=0; x<tmp.length; x++) {
+			if (tmp[x].rule.indexOf('a:visited') != -1 && tmp[x].data['color'])
+				f.visited_color.value = tmp[x].data['color'];
+
+			if (tmp[x].rule.indexOf('a:link') != -1 && tmp[x].data['color'])
+				f.link_color.value = tmp[x].data['color'];
+
+			if (tmp[x].rule.indexOf('a:active') != -1 && tmp[x].data['color'])
+				f.active_color.value = tmp[x].data['color'];
+		}
+	});
+
+	f.textcolor.value = tinyMCEPopup.dom.getAttrib(doc.body, "text");
+	f.active_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "alink");
+	f.link_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "link");
+	f.visited_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "vlink");
+	f.bgcolor.value = tinyMCEPopup.dom.getAttrib(doc.body, "bgcolor");
+	f.bgimage.value = tinyMCEPopup.dom.getAttrib(doc.body, "background");
+
+	// Get from style info
+	style = tinyMCEPopup.dom.parseStyle(tinyMCEPopup.dom.getAttrib(doc.body, 'style'));
+
+	if (style['font-family'])
+		selectByValue(f, 'fontface', style['font-family'], true, true);
+	else
+		selectByValue(f, 'fontface', ed.getParam("fullpage_default_fontface", ""), true, true);
+
+	if (style['font-size'])
+		selectByValue(f, 'fontsize', style['font-size'], true, true);
+	else
+		selectByValue(f, 'fontsize', ed.getParam("fullpage_default_fontsize", ""), true, true);
+
+	if (style['color'])
+		f.textcolor.value = convertRGBToHex(style['color']);
+
+	if (style['background-image'])
+		f.bgimage.value = style['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+
+	if (style['background-color'])
+		f.bgcolor.value = style['background-color'];
+
+	if (style['margin']) {
+		tmp = style['margin'].replace(/[^0-9 ]/g, '');
+		tmp = tmp.split(/ +/);
+		f.topmargin.value = tmp.length > 0 ? tmp[0] : '';
+		f.rightmargin.value = tmp.length > 1 ? tmp[1] : tmp[0];
+		f.bottommargin.value = tmp.length > 2 ? tmp[2] : tmp[0];
+		f.leftmargin.value = tmp.length > 3 ? tmp[3] : tmp[0];
+	}
+
+	if (style['margin-left'])
+		f.leftmargin.value = style['margin-left'].replace(/[^0-9]/g, '');
+
+	if (style['margin-right'])
+		f.rightmargin.value = style['margin-right'].replace(/[^0-9]/g, '');
+
+	if (style['margin-top'])
+		f.topmargin.value = style['margin-top'].replace(/[^0-9]/g, '');
+
+	if (style['margin-bottom'])
+		f.bottommargin.value = style['margin-bottom'].replace(/[^0-9]/g, '');
+
+	f.style.value = tinyMCEPopup.dom.serializeStyle(style);
+
+	// Update colors
+	updateColor('textcolor_pick', 'textcolor');
+	updateColor('bgcolor_pick', 'bgcolor');
+	updateColor('visited_color_pick', 'visited_color');
+	updateColor('active_color_pick', 'active_color');
+	updateColor('link_color_pick', 'link_color');
+}
+
+function getReItem(r, s, i) {
+	var c = r.exec(s);
+
+	if (c && c.length > i)
+		return c[i];
+
+	return '';
+}
+
+function updateAction() {
+	var f = document.forms[0], nl, i, h, v, s, head, html, l, tmp, addlink = true, ser;
+
+	head = doc.getElementsByTagName('head')[0];
+
+	// Fix scripts without a type
+	nl = doc.getElementsByTagName('script');
+	for (i=0; i<nl.length; i++) {
+		if (tinyMCEPopup.dom.getAttrib(nl[i], 'mce_type') == '')
+			nl[i].setAttribute('mce_type', 'text/javascript');
+	}
+
+	// Get primary stylesheet
+	nl = doc.getElementsByTagName("link");
+	for (i=0; i<nl.length; i++) {
+		l = nl[i];
+
+		tmp = tinyMCEPopup.dom.getAttrib(l, 'media');
+
+		if (tinyMCEPopup.dom.getAttrib(l, 'mce_type') == "text/css" && (tmp == "" || tmp == "screen" || tmp == "all") && tinyMCEPopup.dom.getAttrib(l, 'rel') == "stylesheet") {
+			addlink = false;
+
+			if (f.stylesheet.value == '')
+				l.parentNode.removeChild(l);
+			else
+				l.setAttribute('mce_href', f.stylesheet.value);
+
+			break;
+		}
+	}
+
+	// Add new link
+	if (f.stylesheet.value != '') {
+		l = doc.createElement('link');
+
+		l.setAttribute('type', 'text/css');
+		l.setAttribute('mce_href', f.stylesheet.value);
+		l.setAttribute('rel', 'stylesheet');
+
+		head.appendChild(l);
+	}
+
+	setMeta(head, 'keywords', f.metakeywords.value);
+	setMeta(head, 'description', f.metadescription.value);
+	setMeta(head, 'author', f.metaauthor.value);
+	setMeta(head, 'copyright', f.metacopyright.value);
+	setMeta(head, 'robots', getSelectValue(f, 'metarobots'));
+	setMeta(head, 'Content-Type', getSelectValue(f, 'docencoding'));
+
+	doc.body.dir = getSelectValue(f, 'langdir');
+	doc.body.style.cssText = f.style.value;
+
+	doc.body.setAttribute('vLink', f.visited_color.value);
+	doc.body.setAttribute('link', f.link_color.value);
+	doc.body.setAttribute('text', f.textcolor.value);
+	doc.body.setAttribute('aLink', f.active_color.value);
+
+	doc.body.style.fontFamily = getSelectValue(f, 'fontface');
+	doc.body.style.fontSize = getSelectValue(f, 'fontsize');
+	doc.body.style.backgroundColor = f.bgcolor.value;
+
+	if (f.leftmargin.value != '')
+		doc.body.style.marginLeft = f.leftmargin.value + 'px';
+
+	if (f.rightmargin.value != '')
+		doc.body.style.marginRight = f.rightmargin.value + 'px';
+
+	if (f.bottommargin.value != '')
+		doc.body.style.marginBottom = f.bottommargin.value + 'px';
+
+	if (f.topmargin.value != '')
+		doc.body.style.marginTop = f.topmargin.value + 'px';
+
+	html = doc.getElementsByTagName('html')[0];
+	html.setAttribute('lang', f.langcode.value);
+	html.setAttribute('xml:lang', f.langcode.value);
+
+	if (f.bgimage.value != '')
+		doc.body.style.backgroundImage = "url('" + f.bgimage.value + "')";
+	else
+		doc.body.style.backgroundImage = '';
+
+	ser = tinyMCEPopup.editor.plugins.fullpage._createSerializer();
+	ser.setRules('-title,meta[http-equiv|name|content],base[href|target],link[href|rel|type|title|media],style[type],script[type|language|src],html[lang|xml::lang|xmlns],body[style|dir|vlink|link|text|alink],head');
+
+	h = ser.serialize(doc.documentElement);
+	h = h.substring(0, h.lastIndexOf('</body>'));
+
+	if (h.indexOf('<title>') == -1)
+		h = h.replace(/<head.*?>/, '$&\n' + '<title>' + tinyMCEPopup.dom.encode(f.metatitle.value) + '</title>');
+	else
+		h = h.replace(/<title>(.*?)<\/title>/, '<title>' + tinyMCEPopup.dom.encode(f.metatitle.value) + '</title>');
+
+	if ((v = getSelectValue(f, 'doctypes')) != '')
+		h = v + '\n' + h;
+
+	if (f.xml_pi.checked) {
+		s = '<?xml version="1.0"';
+
+		if ((v = getSelectValue(f, 'docencoding')) != '')
+			s += ' encoding="' + v + '"';
+
+		s += '?>\n';
+		h = s + h;
+	}
+
+	h = h.replace(/type=\"\-mce\-/gi, 'type="');
+
+	tinyMCEPopup.editor.plugins.fullpage.head = h;
+	tinyMCEPopup.editor.plugins.fullpage._setBodyAttribs(tinyMCEPopup.editor, {});
+	tinyMCEPopup.close();
+}
+
+function changedStyleField(field) {
+}
+
+function setMeta(he, k, v) {
+	var nl, i, m;
+
+	nl = he.getElementsByTagName('meta');
+	for (i=0; i<nl.length; i++) {
+		if (k == 'Content-Type' && tinyMCEPopup.dom.getAttrib(nl[i], 'http-equiv') == k) {
+			if (v == '')
+				nl[i].parentNode.removeChild(nl[i]);
+			else
+				nl[i].setAttribute('content', "text/html; charset=" + v);
+
+			return;
+		}
+
+		if (tinyMCEPopup.dom.getAttrib(nl[i], 'name') == k) {
+			if (v == '')
+				nl[i].parentNode.removeChild(nl[i]);
+			else
+				nl[i].setAttribute('content', v);
+			return;
+		}
+	}
+
+	if (v == '')
+		return;
+
+	m = doc.createElement('meta');
+
+	if (k == 'Content-Type')
+		m.httpEquiv = k;
+	else
+		m.setAttribute('name', k);
+
+	m.setAttribute('content', v);
+	he.appendChild(m);
+}
+
+function parseStyleElement(e) {
+	var v = e.innerHTML;
+	var p, i, r;
+
+	v = v.replace(/<!--/gi, '');
+	v = v.replace(/-->/gi, '');
+	v = v.replace(/[\n\r]/gi, '');
+	v = v.replace(/\s+/gi, ' ');
+
+	r = [];
+	p = v.split(/{|}/);
+
+	for (i=0; i<p.length; i+=2) {
+		if (p[i] != "")
+			r[r.length] = {rule : tinymce.trim(p[i]), data : tinyMCEPopup.dom.parseStyle(p[i+1])};
+	}
+
+	return r;
+}
+
+function serializeStyleElement(d) {
+	var i, s, st;
+
+	s = '<!--\n';
+
+	for (i=0; i<d.length; i++) {
+		s += d[i].rule + ' {\n';
+
+		st = tinyMCE.serializeStyle(d[i].data);
+
+		if (st != '')
+			st += ';';
+
+		s += st.replace(/;/g, ';\n');
+		s += '}\n';
+
+		if (i != d.length - 1)
+			s += '\n';
+	}
+
+	s += '\n-->';
+
+	return s;
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/webapp/web/js/tiny_mce/plugins/fullpage/langs/en_dlg.js b/webapp/web/js/tiny_mce/plugins/fullpage/langs/en_dlg.js
index f5801b8b3..d1cd21955 100755
--- a/webapp/web/js/tiny_mce/plugins/fullpage/langs/en_dlg.js
+++ b/webapp/web/js/tiny_mce/plugins/fullpage/langs/en_dlg.js
@@ -1,85 +1,85 @@
-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:"Src",
-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"
+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:"Src",
+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
diff --git a/webapp/web/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js
index a330582ea..82e97f2a9 100755
--- a/webapp/web/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/fullscreen/editor_plugin_src.js
@@ -1,141 +1,141 @@
-/**
- * $Id: editor_plugin_src.js 885 2008-06-22 19:23:20Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	var DOM = tinymce.DOM;
-
-	tinymce.create('tinymce.plugins.FullScreenPlugin', {
-		init : function(ed, url) {
-			var t = this, s = {}, vp;
-
-			t.editor = ed;
-
-			// Register commands
-			ed.addCommand('mceFullScreen', function() {
-				var win, de = DOM.doc.documentElement;
-
-				if (ed.getParam('fullscreen_is_enabled')) {
-					if (ed.getParam('fullscreen_new_window'))
-						closeFullscreen(); // Call to close in new window
-					else {
-						DOM.win.setTimeout(function() {
-							tinymce.dom.Event.remove(DOM.win, 'resize', t.resizeFunc);
-							tinyMCE.get(ed.getParam('fullscreen_editor_id')).setContent(ed.getContent({format : 'raw'}), {format : 'raw'});
-							tinyMCE.remove(ed);
-							DOM.remove('mce_fullscreen_container');
-							de.style.overflow = ed.getParam('fullscreen_html_overflow');
-							DOM.setStyle(DOM.doc.body, 'overflow', ed.getParam('fullscreen_overflow'));
-							DOM.win.scrollTo(ed.getParam('fullscreen_scrollx'), ed.getParam('fullscreen_scrolly'));
-							tinyMCE.settings = tinyMCE.oldSettings; // Restore old settings
-						}, 10);
-					}
-
-					return;
-				}
-
-				if (ed.getParam('fullscreen_new_window')) {
-					win = DOM.win.open(url + "/fullscreen.htm", "mceFullScreenPopup", "fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width=" + screen.availWidth + ",height=" + screen.availHeight);
-					try {
-						win.resizeTo(screen.availWidth, screen.availHeight);
-					} catch (e) {
-						// Ignore
-					}
-				} else {
-					tinyMCE.oldSettings = tinyMCE.settings; // Store old settings
-					s.fullscreen_overflow = DOM.getStyle(DOM.doc.body, 'overflow', 1) || 'auto';
-					s.fullscreen_html_overflow = DOM.getStyle(de, 'overflow', 1);
-					vp = DOM.getViewPort();
-					s.fullscreen_scrollx = vp.x;
-					s.fullscreen_scrolly = vp.y;
-
-					// Fixes an Opera bug where the scrollbars doesn't reappear
-					if (tinymce.isOpera && s.fullscreen_overflow == 'visible')
-						s.fullscreen_overflow = 'auto';
-
-					// Fixes an IE bug where horizontal scrollbars would appear
-					if (tinymce.isIE && s.fullscreen_overflow == 'scroll')
-						s.fullscreen_overflow = 'auto';
-
-					if (s.fullscreen_overflow == '0px')
-						s.fullscreen_overflow = '';
-
-					DOM.setStyle(DOM.doc.body, 'overflow', 'hidden');
-					de.style.overflow = 'hidden'; //Fix for IE6/7
-					vp = DOM.getViewPort();
-					DOM.win.scrollTo(0, 0);
-
-					if (tinymce.isIE)
-						vp.h -= 1;
-
-					n = DOM.add(DOM.doc.body, 'div', {id : 'mce_fullscreen_container', style : 'position:' + (tinymce.isIE6 || (tinymce.isIE && !DOM.boxModel) ? 'absolute' : 'fixed') + ';top:0;left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:200000;'});
-					DOM.add(n, 'div', {id : 'mce_fullscreen'});
-
-					tinymce.each(ed.settings, function(v, n) {
-						s[n] = v;
-					});
-
-					s.id = 'mce_fullscreen';
-					s.width = n.clientWidth;
-					s.height = n.clientHeight - 15;
-					s.fullscreen_is_enabled = true;
-					s.fullscreen_editor_id = ed.id;
-					s.theme_advanced_resizing = false;
-					s.save_onsavecallback = function() {
-						ed.setContent(tinyMCE.get(s.id).getContent({format : 'raw'}), {format : 'raw'});
-						ed.execCommand('mceSave');
-					};
-
-					tinymce.each(ed.getParam('fullscreen_settings'), function(v, k) {
-						s[k] = v;
-					});
-
-					if (s.theme_advanced_toolbar_location === 'external')
-						s.theme_advanced_toolbar_location = 'top';
-
-					t.fullscreenEditor = new tinymce.Editor('mce_fullscreen', s);
-					t.fullscreenEditor.onInit.add(function() {
-						t.fullscreenEditor.setContent(ed.getContent());
-						t.fullscreenEditor.focus();
-					});
-
-					t.fullscreenEditor.render();
-					tinyMCE.add(t.fullscreenEditor);
-
-					t.fullscreenElement = new tinymce.dom.Element('mce_fullscreen_container');
-					t.fullscreenElement.update();
-					//document.body.overflow = 'hidden';
-
-					t.resizeFunc = tinymce.dom.Event.add(DOM.win, 'resize', function() {
-						var vp = tinymce.DOM.getViewPort();
-
-						t.fullscreenEditor.theme.resizeTo(vp.w, vp.h);
-					});
-				}
-			});
-
-			// Register buttons
-			ed.addButton('fullscreen', {title : 'fullscreen.desc', cmd : 'mceFullScreen'});
-
-			ed.onNodeChange.add(function(ed, cm) {
-				cm.setActive('fullscreen', ed.getParam('fullscreen_is_enabled'));
-			});
-		},
-
-		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
-			};
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('fullscreen', tinymce.plugins.FullScreenPlugin);
+/**
+ * $Id: editor_plugin_src.js 885 2008-06-22 19:23:20Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var DOM = tinymce.DOM;
+
+	tinymce.create('tinymce.plugins.FullScreenPlugin', {
+		init : function(ed, url) {
+			var t = this, s = {}, vp;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceFullScreen', function() {
+				var win, de = DOM.doc.documentElement;
+
+				if (ed.getParam('fullscreen_is_enabled')) {
+					if (ed.getParam('fullscreen_new_window'))
+						closeFullscreen(); // Call to close in new window
+					else {
+						DOM.win.setTimeout(function() {
+							tinymce.dom.Event.remove(DOM.win, 'resize', t.resizeFunc);
+							tinyMCE.get(ed.getParam('fullscreen_editor_id')).setContent(ed.getContent({format : 'raw'}), {format : 'raw'});
+							tinyMCE.remove(ed);
+							DOM.remove('mce_fullscreen_container');
+							de.style.overflow = ed.getParam('fullscreen_html_overflow');
+							DOM.setStyle(DOM.doc.body, 'overflow', ed.getParam('fullscreen_overflow'));
+							DOM.win.scrollTo(ed.getParam('fullscreen_scrollx'), ed.getParam('fullscreen_scrolly'));
+							tinyMCE.settings = tinyMCE.oldSettings; // Restore old settings
+						}, 10);
+					}
+
+					return;
+				}
+
+				if (ed.getParam('fullscreen_new_window')) {
+					win = DOM.win.open(url + "/fullscreen.htm", "mceFullScreenPopup", "fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width=" + screen.availWidth + ",height=" + screen.availHeight);
+					try {
+						win.resizeTo(screen.availWidth, screen.availHeight);
+					} catch (e) {
+						// Ignore
+					}
+				} else {
+					tinyMCE.oldSettings = tinyMCE.settings; // Store old settings
+					s.fullscreen_overflow = DOM.getStyle(DOM.doc.body, 'overflow', 1) || 'auto';
+					s.fullscreen_html_overflow = DOM.getStyle(de, 'overflow', 1);
+					vp = DOM.getViewPort();
+					s.fullscreen_scrollx = vp.x;
+					s.fullscreen_scrolly = vp.y;
+
+					// Fixes an Opera bug where the scrollbars doesn't reappear
+					if (tinymce.isOpera && s.fullscreen_overflow == 'visible')
+						s.fullscreen_overflow = 'auto';
+
+					// Fixes an IE bug where horizontal scrollbars would appear
+					if (tinymce.isIE && s.fullscreen_overflow == 'scroll')
+						s.fullscreen_overflow = 'auto';
+
+					if (s.fullscreen_overflow == '0px')
+						s.fullscreen_overflow = '';
+
+					DOM.setStyle(DOM.doc.body, 'overflow', 'hidden');
+					de.style.overflow = 'hidden'; //Fix for IE6/7
+					vp = DOM.getViewPort();
+					DOM.win.scrollTo(0, 0);
+
+					if (tinymce.isIE)
+						vp.h -= 1;
+
+					n = DOM.add(DOM.doc.body, 'div', {id : 'mce_fullscreen_container', style : 'position:' + (tinymce.isIE6 || (tinymce.isIE && !DOM.boxModel) ? 'absolute' : 'fixed') + ';top:0;left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:200000;'});
+					DOM.add(n, 'div', {id : 'mce_fullscreen'});
+
+					tinymce.each(ed.settings, function(v, n) {
+						s[n] = v;
+					});
+
+					s.id = 'mce_fullscreen';
+					s.width = n.clientWidth;
+					s.height = n.clientHeight - 15;
+					s.fullscreen_is_enabled = true;
+					s.fullscreen_editor_id = ed.id;
+					s.theme_advanced_resizing = false;
+					s.save_onsavecallback = function() {
+						ed.setContent(tinyMCE.get(s.id).getContent({format : 'raw'}), {format : 'raw'});
+						ed.execCommand('mceSave');
+					};
+
+					tinymce.each(ed.getParam('fullscreen_settings'), function(v, k) {
+						s[k] = v;
+					});
+
+					if (s.theme_advanced_toolbar_location === 'external')
+						s.theme_advanced_toolbar_location = 'top';
+
+					t.fullscreenEditor = new tinymce.Editor('mce_fullscreen', s);
+					t.fullscreenEditor.onInit.add(function() {
+						t.fullscreenEditor.setContent(ed.getContent());
+						t.fullscreenEditor.focus();
+					});
+
+					t.fullscreenEditor.render();
+					tinyMCE.add(t.fullscreenEditor);
+
+					t.fullscreenElement = new tinymce.dom.Element('mce_fullscreen_container');
+					t.fullscreenElement.update();
+					//document.body.overflow = 'hidden';
+
+					t.resizeFunc = tinymce.dom.Event.add(DOM.win, 'resize', function() {
+						var vp = tinymce.DOM.getViewPort();
+
+						t.fullscreenEditor.theme.resizeTo(vp.w, vp.h);
+					});
+				}
+			});
+
+			// Register buttons
+			ed.addButton('fullscreen', {title : 'fullscreen.desc', cmd : 'mceFullScreen'});
+
+			ed.onNodeChange.add(function(ed, cm) {
+				cm.setActive('fullscreen', ed.getParam('fullscreen_is_enabled'));
+			});
+		},
+
+		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
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('fullscreen', tinymce.plugins.FullScreenPlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/fullscreen/fullscreen.htm b/webapp/web/js/tiny_mce/plugins/fullscreen/fullscreen.htm
index 4b081cac1..0abe43506 100755
--- a/webapp/web/js/tiny_mce/plugins/fullscreen/fullscreen.htm
+++ b/webapp/web/js/tiny_mce/plugins/fullscreen/fullscreen.htm
@@ -1,111 +1,111 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title></title>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-	<script type="text/javascript" src="../../tiny_mce.js"></script>
-	<script type="text/javascript">
-		function patchCallback(settings, key) {
-			if (settings[key])
-				settings[key] = "window.opener." + settings[key];
-		}
-
-		var settings = {}, paSe = window.opener.tinyMCE.activeEditor.settings, oeID = window.opener.tinyMCE.activeEditor.id;
-
-		// Clone array
-		for (var n in paSe)
-			settings[n] = paSe[n];
-
-		// Override options for fullscreen
-		for (var n in paSe.fullscreen_settings)
-			settings[n] = paSe.fullscreen_settings[n];
-
-		// Patch callbacks, make them point to window.opener
-		patchCallback(settings, 'urlconverter_callback');
-		patchCallback(settings, 'insertlink_callback');
-		patchCallback(settings, 'insertimage_callback');
-		patchCallback(settings, 'setupcontent_callback');
-		patchCallback(settings, 'save_callback');
-		patchCallback(settings, 'onchange_callback');
-		patchCallback(settings, 'init_instance_callback');
-		patchCallback(settings, 'file_browser_callback');
-		patchCallback(settings, 'cleanup_callback');
-		patchCallback(settings, 'execcommand_callback');
-		patchCallback(settings, 'oninit');
-
-		// Set options
-		delete settings.id;
-		settings['mode'] = 'exact';
-		settings['elements'] = 'fullscreenarea';
-		settings['add_unload_trigger'] = false;
-		settings['ask'] = false;
-		settings['document_base_url'] = window.opener.tinyMCE.activeEditor.documentBaseURI.getURI();
-		settings['fullscreen_is_enabled'] = true;
-		settings['fullscreen_editor_id'] = oeID;
-		settings['theme_advanced_resizing'] = false;
-		settings['strict_loading_mode'] = true;
-
-		settings.save_onsavecallback = function() {
-			window.opener.tinyMCE.get(oeID).setContent(tinyMCE.get('fullscreenarea').getContent({format : 'raw'}), {format : 'raw'});
-			window.opener.tinyMCE.get(oeID).execCommand('mceSave');
-			window.close();
-		};
-
-		function unloadHandler(e) {
-			moveContent();
-		}
-
-		function moveContent() {
-			window.opener.tinyMCE.get(oeID).setContent(tinyMCE.activeEditor.getContent());
-		}
-
-		function closeFullscreen() {
-			moveContent();
-			window.close();
-		}
-
-		function doParentSubmit() {
-			moveContent();
-
-			if (window.opener.tinyMCE.selectedInstance.formElement.form)
-				window.opener.tinyMCE.selectedInstance.formElement.form.submit();
-
-			window.close();
-
-			return false;
-		}
-
-		function render() {
-			var e = document.getElementById('fullscreenarea'), vp, ed, ow, oh, dom = tinymce.DOM;
-
-			e.value = window.opener.tinyMCE.get(oeID).getContent();
-
-			vp = dom.getViewPort();
-			settings.width = vp.w;
-			settings.height = vp.h - 15;
-
-			tinymce.dom.Event.add(window, 'resize', function() {
-				var vp = dom.getViewPort();
-
-				tinyMCE.activeEditor.theme.resizeTo(vp.w, vp.h);
-			});
-
-			tinyMCE.init(settings);
-		}
-
-		// Add onunload
-		tinymce.dom.Event.add(window, "beforeunload", unloadHandler);
-	</script>
-	<base target="_self" />
-</head>
-<body style="margin:0;overflow:hidden;width:100%;height:100%" scrolling="no" scroll="no">
-<form onsubmit="doParentSubmit();">
-<textarea id="fullscreenarea" style="width:100%; height:100%"></textarea>
-</form>
-
-<script type="text/javascript">
-	render();
-</script>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<script type="text/javascript" src="../../tiny_mce.js"></script>
+	<script type="text/javascript">
+		function patchCallback(settings, key) {
+			if (settings[key])
+				settings[key] = "window.opener." + settings[key];
+		}
+
+		var settings = {}, paSe = window.opener.tinyMCE.activeEditor.settings, oeID = window.opener.tinyMCE.activeEditor.id;
+
+		// Clone array
+		for (var n in paSe)
+			settings[n] = paSe[n];
+
+		// Override options for fullscreen
+		for (var n in paSe.fullscreen_settings)
+			settings[n] = paSe.fullscreen_settings[n];
+
+		// Patch callbacks, make them point to window.opener
+		patchCallback(settings, 'urlconverter_callback');
+		patchCallback(settings, 'insertlink_callback');
+		patchCallback(settings, 'insertimage_callback');
+		patchCallback(settings, 'setupcontent_callback');
+		patchCallback(settings, 'save_callback');
+		patchCallback(settings, 'onchange_callback');
+		patchCallback(settings, 'init_instance_callback');
+		patchCallback(settings, 'file_browser_callback');
+		patchCallback(settings, 'cleanup_callback');
+		patchCallback(settings, 'execcommand_callback');
+		patchCallback(settings, 'oninit');
+
+		// Set options
+		delete settings.id;
+		settings['mode'] = 'exact';
+		settings['elements'] = 'fullscreenarea';
+		settings['add_unload_trigger'] = false;
+		settings['ask'] = false;
+		settings['document_base_url'] = window.opener.tinyMCE.activeEditor.documentBaseURI.getURI();
+		settings['fullscreen_is_enabled'] = true;
+		settings['fullscreen_editor_id'] = oeID;
+		settings['theme_advanced_resizing'] = false;
+		settings['strict_loading_mode'] = true;
+
+		settings.save_onsavecallback = function() {
+			window.opener.tinyMCE.get(oeID).setContent(tinyMCE.get('fullscreenarea').getContent({format : 'raw'}), {format : 'raw'});
+			window.opener.tinyMCE.get(oeID).execCommand('mceSave');
+			window.close();
+		};
+
+		function unloadHandler(e) {
+			moveContent();
+		}
+
+		function moveContent() {
+			window.opener.tinyMCE.get(oeID).setContent(tinyMCE.activeEditor.getContent());
+		}
+
+		function closeFullscreen() {
+			moveContent();
+			window.close();
+		}
+
+		function doParentSubmit() {
+			moveContent();
+
+			if (window.opener.tinyMCE.selectedInstance.formElement.form)
+				window.opener.tinyMCE.selectedInstance.formElement.form.submit();
+
+			window.close();
+
+			return false;
+		}
+
+		function render() {
+			var e = document.getElementById('fullscreenarea'), vp, ed, ow, oh, dom = tinymce.DOM;
+
+			e.value = window.opener.tinyMCE.get(oeID).getContent();
+
+			vp = dom.getViewPort();
+			settings.width = vp.w;
+			settings.height = vp.h - 15;
+
+			tinymce.dom.Event.add(window, 'resize', function() {
+				var vp = dom.getViewPort();
+
+				tinyMCE.activeEditor.theme.resizeTo(vp.w, vp.h);
+			});
+
+			tinyMCE.init(settings);
+		}
+
+		// Add onunload
+		tinymce.dom.Event.add(window, "beforeunload", unloadHandler);
+	</script>
+	<base target="_self" />
+</head>
+<body style="margin:0;overflow:hidden;width:100%;height:100%" scrolling="no" scroll="no">
+<form onsubmit="doParentSubmit();">
+<textarea id="fullscreenarea" style="width:100%; height:100%"></textarea>
+</form>
+
+<script type="text/javascript">
+	render();
+</script>
+
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/iespell/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/iespell/editor_plugin_src.js
index a68f69a23..2bdd3195f 100755
--- a/webapp/web/js/tiny_mce/plugins/iespell/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/iespell/editor_plugin_src.js
@@ -1,51 +1,51 @@
-/**
- * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.IESpell', {
-		init : function(ed, url) {
-			var t = this, sp;
-
-			if (!tinymce.isIE)
-				return;
-
-			t.editor = ed;
-
-			// Register commands
-			ed.addCommand('mceIESpell', function() {
-				try {
-					sp = new ActiveXObject("ieSpell.ieSpellExtension");
-					sp.CheckDocumentNode(ed.getDoc().documentElement);
-				} catch (e) {
-					if (e.number == -2146827859) {
-						ed.windowManager.confirm(ed.getLang("iespell.download"), function(s) {
-							if (s)
-								window.open('http://www.iespell.com/download.php', 'ieSpellDownload', '');
-						});
-					} else
-						ed.windowManager.alert("Error Loading ieSpell: Exception " + e.number);
-				}
-			});
-
-			// Register buttons
-			ed.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
-			};
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('iespell', tinymce.plugins.IESpell);
+/**
+ * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.IESpell', {
+		init : function(ed, url) {
+			var t = this, sp;
+
+			if (!tinymce.isIE)
+				return;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceIESpell', function() {
+				try {
+					sp = new ActiveXObject("ieSpell.ieSpellExtension");
+					sp.CheckDocumentNode(ed.getDoc().documentElement);
+				} catch (e) {
+					if (e.number == -2146827859) {
+						ed.windowManager.confirm(ed.getLang("iespell.download"), function(s) {
+							if (s)
+								window.open('http://www.iespell.com/download.php', 'ieSpellDownload', '');
+						});
+					} else
+						ed.windowManager.alert("Error Loading ieSpell: Exception " + e.number);
+				}
+			});
+
+			// Register buttons
+			ed.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
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('iespell', tinymce.plugins.IESpell);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/inlinepopups/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
index 569819ed7..00b3495dc 100755
--- a/webapp/web/js/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/inlinepopups/editor_plugin_src.js
@@ -1,630 +1,630 @@
-/**
- * $Id: editor_plugin_src.js 898 2008-07-12 15:01:39Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	var DOM = tinymce.DOM, Element = tinymce.dom.Element, Event = tinymce.dom.Event, each = tinymce.each, is = tinymce.is;
-
-	tinymce.create('tinymce.plugins.InlinePopups', {
-		init : function(ed, url) {
-			// Replace window manager
-			ed.onBeforeRenderUI.add(function() {
-				ed.windowManager = new tinymce.InlineWindowManager(ed);
-				DOM.loadCSS(url + '/skins/' + (ed.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(ed) {
-			var t = this;
-
-			t.parent(ed);
-			t.zIndex = 300000;
-			t.count = 0;
-		},
-
-		open : function(f, p) {
-			var t = this, id, opt = '', ed = t.editor, dw = 0, dh = 0, vp, po, mdf, clf, we, w, u;
-
-			f = f || {};
-			p = p || {};
-
-			// Run native windows
-			if (!f.inline)
-				return t.parent(f, p);
-
-			// Only store selection if the type is a normal window
-			if (!f.type)
-				t.bookmark = ed.selection.getBookmark('simple');
-
-			id = DOM.uniqueId();
-			vp = DOM.getViewPort();
-			f.width = parseInt(f.width || 320);
-			f.height = parseInt(f.height || 240) + (tinymce.isIE ? 8 : 0);
-			f.min_width = parseInt(f.min_width || 150);
-			f.min_height = parseInt(f.min_height || 100);
-			f.max_width = parseInt(f.max_width || 2000);
-			f.max_height = parseInt(f.max_height || 2000);
-			f.left = f.left || Math.round(Math.max(vp.x, vp.x + (vp.w / 2.0) - (f.width / 2.0)));
-			f.top = f.top || Math.round(Math.max(vp.y, vp.y + (vp.h / 2.0) - (f.height / 2.0)));
-			f.movable = f.resizable = true;
-			p.mce_width = f.width;
-			p.mce_height = f.height;
-			p.mce_inline = true;
-			p.mce_window_id = id;
-			p.mce_auto_focus = f.auto_focus;
-
-			// Transpose
-//			po = DOM.getPos(ed.getContainer());
-//			f.left -= po.x;
-//			f.top -= po.y;
-
-			t.features = f;
-			t.params = p;
-			t.onOpen.dispatch(t, f, p);
-
-			if (f.type) {
-				opt += ' mceModal';
-
-				if (f.type)
-					opt += ' mce' + f.type.substring(0, 1).toUpperCase() + f.type.substring(1);
-
-				f.resizable = false;
-			}
-
-			if (f.statusbar)
-				opt += ' mceStatusbar';
-
-			if (f.resizable)
-				opt += ' mceResizable';
-
-			if (f.minimizable)
-				opt += ' mceMinimizable';
-
-			if (f.maximizable)
-				opt += ' mceMaximizable';
-
-			if (f.movable)
-				opt += ' mceMovable';
-
-			// Create DOM objects
-			t._addAll(DOM.doc.body, 
-				['div', {id : id, 'class' : ed.settings.inlinepopups_skin || 'clearlooks2', style : 'width:100px;height:100px'}, 
-					['div', {id : id + '_wrapper', 'class' : 'mceWrapper' + opt},
-						['div', {id : id + '_top', 'class' : 'mceTop'}, 
-							['div', {'class' : 'mceLeft'}],
-							['div', {'class' : 'mceCenter'}],
-							['div', {'class' : 'mceRight'}],
-							['span', {id : id + '_title'}, f.title || '']
-						],
-
-						['div', {id : id + '_middle', 'class' : 'mceMiddle'}, 
-							['div', {id : id + '_left', 'class' : 'mceLeft'}],
-							['span', {id : id + '_content'}],
-							['div', {id : id + '_right', 'class' : 'mceRight'}]
-						],
-
-						['div', {id : id + '_bottom', 'class' : 'mceBottom'},
-							['div', {'class' : 'mceLeft'}],
-							['div', {'class' : 'mceCenter'}],
-							['div', {'class' : 'mceRight'}],
-							['span', {id : id + '_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 : id + '_resize_n', 'class' : 'mceResize mceResizeN', tabindex : '-1', href : 'javascript:;'}],
-						['a', {id : id + '_resize_s', 'class' : 'mceResize mceResizeS', tabindex : '-1', href : 'javascript:;'}],
-						['a', {id : id + '_resize_w', 'class' : 'mceResize mceResizeW', tabindex : '-1', href : 'javascript:;'}],
-						['a', {id : id + '_resize_e', 'class' : 'mceResize mceResizeE', tabindex : '-1', href : 'javascript:;'}],
-						['a', {id : id + '_resize_nw', 'class' : 'mceResize mceResizeNW', tabindex : '-1', href : 'javascript:;'}],
-						['a', {id : id + '_resize_ne', 'class' : 'mceResize mceResizeNE', tabindex : '-1', href : 'javascript:;'}],
-						['a', {id : id + '_resize_sw', 'class' : 'mceResize mceResizeSW', tabindex : '-1', href : 'javascript:;'}],
-						['a', {id : id + '_resize_se', 'class' : 'mceResize mceResizeSE', tabindex : '-1', href : 'javascript:;'}]
-					]
-				]
-			);
-
-			DOM.setStyles(id, {top : -10000, left : -10000});
-
-			// Fix gecko rendering bug, where the editors iframe messed with window contents
-			if (tinymce.isGecko)
-				DOM.setStyle(id, 'overflow', 'auto');
-
-			// Measure borders
-			if (!f.type) {
-				dw += DOM.get(id + '_left').clientWidth;
-				dw += DOM.get(id + '_right').clientWidth;
-				dh += DOM.get(id + '_top').clientHeight;
-				dh += DOM.get(id + '_bottom').clientHeight;
-			}
-
-			// Resize window
-			DOM.setStyles(id, {top : f.top, left : f.left, width : f.width + dw, height : f.height + dh});
-
-			u = f.url || f.file;
-			if (u) {
-				if (tinymce.relaxedDomain)
-					u += (u.indexOf('?') == -1 ? '?' : '&') + 'mce_rdomain=' + tinymce.relaxedDomain;
-
-				u = tinymce._addVer(u);
-			}
-
-			if (!f.type) {
-				DOM.add(id + '_content', 'iframe', {id : id + '_ifr', src : 'javascript:""', frameBorder : 0, style : 'border:0;width:10px;height:10px'});
-				DOM.setStyles(id + '_ifr', {width : f.width, height : f.height});
-				DOM.setAttrib(id + '_ifr', 'src', u);
-			} else {
-				DOM.add(id + '_wrapper', 'a', {id : id + '_ok', 'class' : 'mceButton mceOk', href : 'javascript:;', onmousedown : 'return false;'}, 'Ok');
-
-				if (f.type == 'confirm')
-					DOM.add(id + '_wrapper', 'a', {'class' : 'mceButton mceCancel', href : 'javascript:;', onmousedown : 'return false;'}, 'Cancel');
-
-				DOM.add(id + '_middle', 'div', {'class' : 'mceIcon'});
-				DOM.setHTML(id + '_content', f.content.replace('\n', '<br />'));
-			}
-
-			// Register events
-			mdf = Event.add(id, 'mousedown', function(e) {
-				var n = e.target, w, vp;
-
-				w = t.windows[id];
-				t.focus(id);
-
-				if (n.nodeName == 'A' || n.nodeName == 'a') {
-					if (n.className == 'mceMax') {
-						w.oldPos = w.element.getXY();
-						w.oldSize = w.element.getSize();
-
-						vp = DOM.getViewPort();
-
-						// Reduce viewport size to avoid scrollbars
-						vp.w -= 2;
-						vp.h -= 2;
-
-						w.element.moveTo(vp.x, vp.y);
-						w.element.resizeTo(vp.w, vp.h);
-						DOM.setStyles(id + '_ifr', {width : vp.w - w.deltaWidth, height : vp.h - w.deltaHeight});
-						DOM.addClass(id + '_wrapper', 'mceMaximized');
-					} else if (n.className == 'mceMed') {
-						// Reset to old size
-						w.element.moveTo(w.oldPos.x, w.oldPos.y);
-						w.element.resizeTo(w.oldSize.w, w.oldSize.h);
-						w.iframeElement.resizeTo(w.oldSize.w - w.deltaWidth, w.oldSize.h - w.deltaHeight);
-
-						DOM.removeClass(id + '_wrapper', 'mceMaximized');
-					} else if (n.className == 'mceMove')
-						return t._startDrag(id, e, n.className);
-					else if (DOM.hasClass(n, 'mceResize'))
-						return t._startDrag(id, e, n.className.substring(13));
-				}
-			});
-
-			clf = Event.add(id, 'click', function(e) {
-				var n = e.target;
-
-				t.focus(id);
-
-				if (n.nodeName == 'A' || n.nodeName == 'a') {
-					switch (n.className) {
-						case 'mceClose':
-							t.close(null, id);
-							return Event.cancel(e);
-
-						case 'mceButton mceOk':
-						case 'mceButton mceCancel':
-							f.button_func(n.className == 'mceButton mceOk');
-							return Event.cancel(e);
-					}
-				}
-			});
-
-			// Add window
-			t.windows = t.windows || {};
-			w = t.windows[id] = {
-				id : id,
-				mousedown_func : mdf,
-				click_func : clf,
-				element : new Element(id, {blocker : 1, container : ed.getContainer()}),
-				iframeElement : new Element(id + '_ifr'),
-				features : f,
-				deltaWidth : dw,
-				deltaHeight : dh
-			};
-
-			w.iframeElement.on('focus', function() {
-				t.focus(id);
-			});
-
-			// Setup blocker
-			if (t.count == 0 && t.editor.getParam('dialog_type', 'modal') == 'modal') {
-				DOM.add(DOM.doc.body, 'div', {
-					id : 'mceModalBlocker',
-					'class' : (t.editor.settings.inlinepopups_skin || 'clearlooks2') + '_modalBlocker',
-					style : {left : vp.x, top : vp.y, zIndex : t.zIndex - 1}
-				});
-
-				DOM.show('mceModalBlocker'); // Reduces flicker in IE
-			} else
-				DOM.setStyle('mceModalBlocker', 'z-index', t.zIndex - 1);
-
-			if (tinymce.isIE6 || (tinymce.isIE && !DOM.boxModel))
-				DOM.setStyles('mceModalBlocker', {position : 'absolute', width : vp.w - 2, height : vp.h - 2});
-
-			t.focus(id);
-			t._fixIELayout(id, 1);
-
-			// Focus ok button
-			if (DOM.get(id + '_ok'))
-				DOM.get(id + '_ok').focus();
-
-			t.count++;
-
-			return w;
-		},
-
-		focus : function(id) {
-			var t = this, w = t.windows[id];
-
-			w.zIndex = this.zIndex++;
-			w.element.setStyle('zIndex', w.zIndex);
-			w.element.update();
-
-			id = id + '_wrapper';
-			DOM.removeClass(t.lastId, 'mceFocus');
-			DOM.addClass(id, 'mceFocus');
-			t.lastId = id;
-		},
-
-		_addAll : function(te, ne) {
-			var i, n, t = this, dom = tinymce.DOM;
-
-			if (is(ne, 'string'))
-				te.appendChild(dom.doc.createTextNode(ne));
-			else if (ne.length) {
-				te = te.appendChild(dom.create(ne[0], ne[1]));
-
-				for (i=2; i<ne.length; i++)
-					t._addAll(te, ne[i]);
-			}
-		},
-
-		_startDrag : function(id, se, ac) {
-			var t = this, mu, mm, d = DOM.doc, eb, w = t.windows[id], we = w.element, sp = we.getXY(), p, sz, ph, cp, vp, sx, sy, sex, sey, dx, dy, dw, dh;
-
-			// Get positons and sizes
-//			cp = DOM.getPos(t.editor.getContainer());
-			cp = {x : 0, y : 0};
-			vp = DOM.getViewPort();
-
-			// Reduce viewport size to avoid scrollbars while dragging
-			vp.w -= 2;
-			vp.h -= 2;
-
-			sex = se.screenX;
-			sey = se.screenY;
-			dx = dy = dw = dh = 0;
-
-			// Handle mouse up
-			mu = Event.add(d, 'mouseup', function(e) {
-				Event.remove(d, 'mouseup', mu);
-				Event.remove(d, 'mousemove', mm);
-
-				if (eb)
-					eb.remove();
-
-				we.moveBy(dx, dy);
-				we.resizeBy(dw, dh);
-				sz = we.getSize();
-				DOM.setStyles(id + '_ifr', {width : sz.w - w.deltaWidth, height : sz.h - w.deltaHeight});
-				t._fixIELayout(id, 1);
-
-				return Event.cancel(e);
-			});
-
-			if (ac != 'Move')
-				startMove();
-
-			function startMove() {
-				if (eb)
-					return;
-
-				t._fixIELayout(id, 0);
-
-				// Setup event blocker
-				DOM.add(d.body, 'div', {
-					id : 'mceEventBlocker',
-					'class' : 'mceEventBlocker ' + (t.editor.settings.inlinepopups_skin || 'clearlooks2'),
-					style : {left : vp.x, top : vp.y, zIndex : t.zIndex + 1}
-				});
-
-				if (tinymce.isIE6 || (tinymce.isIE && !DOM.boxModel))
-					DOM.setStyles('mceEventBlocker', {position : 'absolute', width : vp.w - 2, height : vp.h - 2});
-
-				eb = new Element('mceEventBlocker');
-				eb.update();
-
-				// Setup placeholder
-				p = we.getXY();
-				sz = we.getSize();
-				sx = cp.x + p.x - vp.x;
-				sy = cp.y + p.y - vp.y;
-				DOM.add(eb.get(), 'div', {id : 'mcePlaceHolder', 'class' : 'mcePlaceHolder', style : {left : sx, top : sy, width : sz.w, height : sz.h}});
-				ph = new Element('mcePlaceHolder');
-			};
-
-			// Handle mouse move/drag
-			mm = Event.add(d, 'mousemove', function(e) {
-				var x, y, v;
-
-				startMove();
-
-				x = e.screenX - sex;
-				y = e.screenY - sey;
-
-				switch (ac) {
-					case 'ResizeW':
-						dx = x;
-						dw = 0 - x;
-						break;
-
-					case 'ResizeE':
-						dw = x;
-						break;
-
-					case 'ResizeN':
-					case 'ResizeNW':
-					case 'ResizeNE':
-						if (ac == "ResizeNW") {
-							dx = x;
-							dw = 0 - x;
-						} else if (ac == "ResizeNE")
-							dw = x;
-
-						dy = y;
-						dh = 0 - y;
-						break;
-
-					case 'ResizeS':
-					case 'ResizeSW':
-					case 'ResizeSE':
-						if (ac == "ResizeSW") {
-							dx = x;
-							dw = 0 - x;
-						} else if (ac == "ResizeSE")
-							dw = x;
-
-						dh = y;
-						break;
-
-					case 'mceMove':
-						dx = x;
-						dy = y;
-						break;
-				}
-
-				// Boundary check
-				if (dw < (v = w.features.min_width - sz.w)) {
-					if (dx !== 0)
-						dx += dw - v;
-
-					dw = v;
-				}
-	
-				if (dh < (v = w.features.min_height - sz.h)) {
-					if (dy !== 0)
-						dy += dh - v;
-
-					dh = v;
-				}
-
-				dw = Math.min(dw, w.features.max_width - sz.w);
-				dh = Math.min(dh, w.features.max_height - sz.h);
-				dx = Math.max(dx, vp.x - (sx + vp.x));
-				dy = Math.max(dy, vp.y - (sy + vp.y));
-				dx = Math.min(dx, (vp.w + vp.x) - (sx + sz.w + vp.x));
-				dy = Math.min(dy, (vp.h + vp.y) - (sy + sz.h + vp.y));
-
-				// Move if needed
-				if (dx + dy !== 0) {
-					if (sx + dx < 0)
-						dx = 0;
-	
-					if (sy + dy < 0)
-						dy = 0;
-
-					ph.moveTo(sx + dx, sy + dy);
-				}
-
-				// Resize if needed
-				if (dw + dh !== 0)
-					ph.resizeTo(sz.w + dw, sz.h + dh);
-
-				return Event.cancel(e);
-			});
-
-			return Event.cancel(se);
-		},
-
-		resizeBy : function(dw, dh, id) {
-			var w = this.windows[id];
-
-			if (w) {
-				w.element.resizeBy(dw, dh);
-				w.iframeElement.resizeBy(dw, dh);
-			}
-		},
-
-		close : function(win, id) {
-			var t = this, w, d = DOM.doc, ix = 0, fw, id;
-
-			id = t._findId(id || win);
-
-			t.count--;
-
-			if (t.count == 0)
-				DOM.remove('mceModalBlocker');
-
-			// Probably not inline
-			if (!id && win) {
-				t.parent(win);
-				return;
-			}
-
-			if (w = t.windows[id]) {
-				t.onClose.dispatch(t);
-				Event.remove(d, 'mousedown', w.mousedownFunc);
-				Event.remove(d, 'click', w.clickFunc);
-				Event.clear(id);
-				Event.clear(id + '_ifr');
-
-				DOM.setAttrib(id + '_ifr', 'src', 'javascript:""'); // Prevent leak
-				w.element.remove();
-				delete t.windows[id];
-
-				// Find front most window and focus that
-				each (t.windows, function(w) {
-					if (w.zIndex > ix) {
-						fw = w;
-						ix = w.zIndex;
-					}
-				});
-
-				if (fw)
-					t.focus(fw.id);
-			}
-		},
-
-		setTitle : function(w, ti) {
-			var e;
-
-			w = this._findId(w);
-
-			if (e = DOM.get(w + '_title'))
-				e.innerHTML = DOM.encode(ti);
-		},
-
-		alert : function(txt, cb, s) {
-			var t = this, w;
-
-			w = t.open({
-				title : t,
-				type : 'alert',
-				button_func : function(s) {
-					if (cb)
-						cb.call(s || t, s);
-
-					t.close(null, w.id);
-				},
-				content : DOM.encode(t.editor.getLang(txt, txt)),
-				inline : 1,
-				width : 400,
-				height : 130
-			});
-		},
-
-		confirm : function(txt, cb, s) {
-			var t = this, w;
-
-			w = t.open({
-				title : t,
-				type : 'confirm',
-				button_func : function(s) {
-					if (cb)
-						cb.call(s || t, s);
-
-					t.close(null, w.id);
-				},
-				content : DOM.encode(t.editor.getLang(txt, txt)),
-				inline : 1,
-				width : 400,
-				height : 130
-			});
-		},
-
-		// Internal functions
-
-		_findId : function(w) {
-			var t = this;
-
-			if (typeof(w) == 'string')
-				return w;
-
-			each(t.windows, function(wo) {
-				var ifr = DOM.get(wo.id + '_ifr');
-
-				if (ifr && w == ifr.contentWindow) {
-					w = wo.id;
-					return false;
-				}
-			});
-
-			return w;
-		},
-
-		_fixIELayout : function(id, s) {
-			var w, img;
-
-			if (!tinymce.isIE6)
-				return;
-
-			// Fixes the bug where hover flickers and does odd things in IE6
-			each(['n','s','w','e','nw','ne','sw','se'], function(v) {
-				var e = DOM.get(id + '_resize_' + v);
-
-				DOM.setStyles(e, {
-					width : s ? e.clientWidth : '',
-					height : s ? e.clientHeight : '',
-					cursor : DOM.getStyle(e, 'cursor', 1)
-				});
-
-				DOM.setStyle(id + "_bottom", 'bottom', '-1px');
-
-				e = 0;
-			});
-
-			// Fixes graphics glitch
-			if (w = this.windows[id]) {
-				// Fixes rendering bug after resize
-				w.element.hide();
-				w.element.show();
-
-				// Forced a repaint of the window
-				//DOM.get(id).style.filter = '';
-
-				// IE has a bug where images used in CSS won't get loaded
-				// sometimes when the cache in the browser is disabled
-				// This fix tries to solve it by loading the images using the image object
-				each(DOM.select('div,a', id), function(e, i) {
-					if (e.currentStyle.backgroundImage != 'none') {
-						img = new Image();
-						img.src = e.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/, '$1');
-					}
-				});
-
-				DOM.get(id).style.filter = '';
-			}
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('inlinepopups', tinymce.plugins.InlinePopups);
-})();
-
+/**
+ * $Id: editor_plugin_src.js 898 2008-07-12 15:01:39Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var DOM = tinymce.DOM, Element = tinymce.dom.Element, Event = tinymce.dom.Event, each = tinymce.each, is = tinymce.is;
+
+	tinymce.create('tinymce.plugins.InlinePopups', {
+		init : function(ed, url) {
+			// Replace window manager
+			ed.onBeforeRenderUI.add(function() {
+				ed.windowManager = new tinymce.InlineWindowManager(ed);
+				DOM.loadCSS(url + '/skins/' + (ed.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(ed) {
+			var t = this;
+
+			t.parent(ed);
+			t.zIndex = 300000;
+			t.count = 0;
+		},
+
+		open : function(f, p) {
+			var t = this, id, opt = '', ed = t.editor, dw = 0, dh = 0, vp, po, mdf, clf, we, w, u;
+
+			f = f || {};
+			p = p || {};
+
+			// Run native windows
+			if (!f.inline)
+				return t.parent(f, p);
+
+			// Only store selection if the type is a normal window
+			if (!f.type)
+				t.bookmark = ed.selection.getBookmark('simple');
+
+			id = DOM.uniqueId();
+			vp = DOM.getViewPort();
+			f.width = parseInt(f.width || 320);
+			f.height = parseInt(f.height || 240) + (tinymce.isIE ? 8 : 0);
+			f.min_width = parseInt(f.min_width || 150);
+			f.min_height = parseInt(f.min_height || 100);
+			f.max_width = parseInt(f.max_width || 2000);
+			f.max_height = parseInt(f.max_height || 2000);
+			f.left = f.left || Math.round(Math.max(vp.x, vp.x + (vp.w / 2.0) - (f.width / 2.0)));
+			f.top = f.top || Math.round(Math.max(vp.y, vp.y + (vp.h / 2.0) - (f.height / 2.0)));
+			f.movable = f.resizable = true;
+			p.mce_width = f.width;
+			p.mce_height = f.height;
+			p.mce_inline = true;
+			p.mce_window_id = id;
+			p.mce_auto_focus = f.auto_focus;
+
+			// Transpose
+//			po = DOM.getPos(ed.getContainer());
+//			f.left -= po.x;
+//			f.top -= po.y;
+
+			t.features = f;
+			t.params = p;
+			t.onOpen.dispatch(t, f, p);
+
+			if (f.type) {
+				opt += ' mceModal';
+
+				if (f.type)
+					opt += ' mce' + f.type.substring(0, 1).toUpperCase() + f.type.substring(1);
+
+				f.resizable = false;
+			}
+
+			if (f.statusbar)
+				opt += ' mceStatusbar';
+
+			if (f.resizable)
+				opt += ' mceResizable';
+
+			if (f.minimizable)
+				opt += ' mceMinimizable';
+
+			if (f.maximizable)
+				opt += ' mceMaximizable';
+
+			if (f.movable)
+				opt += ' mceMovable';
+
+			// Create DOM objects
+			t._addAll(DOM.doc.body, 
+				['div', {id : id, 'class' : ed.settings.inlinepopups_skin || 'clearlooks2', style : 'width:100px;height:100px'}, 
+					['div', {id : id + '_wrapper', 'class' : 'mceWrapper' + opt},
+						['div', {id : id + '_top', 'class' : 'mceTop'}, 
+							['div', {'class' : 'mceLeft'}],
+							['div', {'class' : 'mceCenter'}],
+							['div', {'class' : 'mceRight'}],
+							['span', {id : id + '_title'}, f.title || '']
+						],
+
+						['div', {id : id + '_middle', 'class' : 'mceMiddle'}, 
+							['div', {id : id + '_left', 'class' : 'mceLeft'}],
+							['span', {id : id + '_content'}],
+							['div', {id : id + '_right', 'class' : 'mceRight'}]
+						],
+
+						['div', {id : id + '_bottom', 'class' : 'mceBottom'},
+							['div', {'class' : 'mceLeft'}],
+							['div', {'class' : 'mceCenter'}],
+							['div', {'class' : 'mceRight'}],
+							['span', {id : id + '_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 : id + '_resize_n', 'class' : 'mceResize mceResizeN', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_s', 'class' : 'mceResize mceResizeS', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_w', 'class' : 'mceResize mceResizeW', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_e', 'class' : 'mceResize mceResizeE', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_nw', 'class' : 'mceResize mceResizeNW', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_ne', 'class' : 'mceResize mceResizeNE', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_sw', 'class' : 'mceResize mceResizeSW', tabindex : '-1', href : 'javascript:;'}],
+						['a', {id : id + '_resize_se', 'class' : 'mceResize mceResizeSE', tabindex : '-1', href : 'javascript:;'}]
+					]
+				]
+			);
+
+			DOM.setStyles(id, {top : -10000, left : -10000});
+
+			// Fix gecko rendering bug, where the editors iframe messed with window contents
+			if (tinymce.isGecko)
+				DOM.setStyle(id, 'overflow', 'auto');
+
+			// Measure borders
+			if (!f.type) {
+				dw += DOM.get(id + '_left').clientWidth;
+				dw += DOM.get(id + '_right').clientWidth;
+				dh += DOM.get(id + '_top').clientHeight;
+				dh += DOM.get(id + '_bottom').clientHeight;
+			}
+
+			// Resize window
+			DOM.setStyles(id, {top : f.top, left : f.left, width : f.width + dw, height : f.height + dh});
+
+			u = f.url || f.file;
+			if (u) {
+				if (tinymce.relaxedDomain)
+					u += (u.indexOf('?') == -1 ? '?' : '&') + 'mce_rdomain=' + tinymce.relaxedDomain;
+
+				u = tinymce._addVer(u);
+			}
+
+			if (!f.type) {
+				DOM.add(id + '_content', 'iframe', {id : id + '_ifr', src : 'javascript:""', frameBorder : 0, style : 'border:0;width:10px;height:10px'});
+				DOM.setStyles(id + '_ifr', {width : f.width, height : f.height});
+				DOM.setAttrib(id + '_ifr', 'src', u);
+			} else {
+				DOM.add(id + '_wrapper', 'a', {id : id + '_ok', 'class' : 'mceButton mceOk', href : 'javascript:;', onmousedown : 'return false;'}, 'Ok');
+
+				if (f.type == 'confirm')
+					DOM.add(id + '_wrapper', 'a', {'class' : 'mceButton mceCancel', href : 'javascript:;', onmousedown : 'return false;'}, 'Cancel');
+
+				DOM.add(id + '_middle', 'div', {'class' : 'mceIcon'});
+				DOM.setHTML(id + '_content', f.content.replace('\n', '<br />'));
+			}
+
+			// Register events
+			mdf = Event.add(id, 'mousedown', function(e) {
+				var n = e.target, w, vp;
+
+				w = t.windows[id];
+				t.focus(id);
+
+				if (n.nodeName == 'A' || n.nodeName == 'a') {
+					if (n.className == 'mceMax') {
+						w.oldPos = w.element.getXY();
+						w.oldSize = w.element.getSize();
+
+						vp = DOM.getViewPort();
+
+						// Reduce viewport size to avoid scrollbars
+						vp.w -= 2;
+						vp.h -= 2;
+
+						w.element.moveTo(vp.x, vp.y);
+						w.element.resizeTo(vp.w, vp.h);
+						DOM.setStyles(id + '_ifr', {width : vp.w - w.deltaWidth, height : vp.h - w.deltaHeight});
+						DOM.addClass(id + '_wrapper', 'mceMaximized');
+					} else if (n.className == 'mceMed') {
+						// Reset to old size
+						w.element.moveTo(w.oldPos.x, w.oldPos.y);
+						w.element.resizeTo(w.oldSize.w, w.oldSize.h);
+						w.iframeElement.resizeTo(w.oldSize.w - w.deltaWidth, w.oldSize.h - w.deltaHeight);
+
+						DOM.removeClass(id + '_wrapper', 'mceMaximized');
+					} else if (n.className == 'mceMove')
+						return t._startDrag(id, e, n.className);
+					else if (DOM.hasClass(n, 'mceResize'))
+						return t._startDrag(id, e, n.className.substring(13));
+				}
+			});
+
+			clf = Event.add(id, 'click', function(e) {
+				var n = e.target;
+
+				t.focus(id);
+
+				if (n.nodeName == 'A' || n.nodeName == 'a') {
+					switch (n.className) {
+						case 'mceClose':
+							t.close(null, id);
+							return Event.cancel(e);
+
+						case 'mceButton mceOk':
+						case 'mceButton mceCancel':
+							f.button_func(n.className == 'mceButton mceOk');
+							return Event.cancel(e);
+					}
+				}
+			});
+
+			// Add window
+			t.windows = t.windows || {};
+			w = t.windows[id] = {
+				id : id,
+				mousedown_func : mdf,
+				click_func : clf,
+				element : new Element(id, {blocker : 1, container : ed.getContainer()}),
+				iframeElement : new Element(id + '_ifr'),
+				features : f,
+				deltaWidth : dw,
+				deltaHeight : dh
+			};
+
+			w.iframeElement.on('focus', function() {
+				t.focus(id);
+			});
+
+			// Setup blocker
+			if (t.count == 0 && t.editor.getParam('dialog_type', 'modal') == 'modal') {
+				DOM.add(DOM.doc.body, 'div', {
+					id : 'mceModalBlocker',
+					'class' : (t.editor.settings.inlinepopups_skin || 'clearlooks2') + '_modalBlocker',
+					style : {left : vp.x, top : vp.y, zIndex : t.zIndex - 1}
+				});
+
+				DOM.show('mceModalBlocker'); // Reduces flicker in IE
+			} else
+				DOM.setStyle('mceModalBlocker', 'z-index', t.zIndex - 1);
+
+			if (tinymce.isIE6 || (tinymce.isIE && !DOM.boxModel))
+				DOM.setStyles('mceModalBlocker', {position : 'absolute', width : vp.w - 2, height : vp.h - 2});
+
+			t.focus(id);
+			t._fixIELayout(id, 1);
+
+			// Focus ok button
+			if (DOM.get(id + '_ok'))
+				DOM.get(id + '_ok').focus();
+
+			t.count++;
+
+			return w;
+		},
+
+		focus : function(id) {
+			var t = this, w = t.windows[id];
+
+			w.zIndex = this.zIndex++;
+			w.element.setStyle('zIndex', w.zIndex);
+			w.element.update();
+
+			id = id + '_wrapper';
+			DOM.removeClass(t.lastId, 'mceFocus');
+			DOM.addClass(id, 'mceFocus');
+			t.lastId = id;
+		},
+
+		_addAll : function(te, ne) {
+			var i, n, t = this, dom = tinymce.DOM;
+
+			if (is(ne, 'string'))
+				te.appendChild(dom.doc.createTextNode(ne));
+			else if (ne.length) {
+				te = te.appendChild(dom.create(ne[0], ne[1]));
+
+				for (i=2; i<ne.length; i++)
+					t._addAll(te, ne[i]);
+			}
+		},
+
+		_startDrag : function(id, se, ac) {
+			var t = this, mu, mm, d = DOM.doc, eb, w = t.windows[id], we = w.element, sp = we.getXY(), p, sz, ph, cp, vp, sx, sy, sex, sey, dx, dy, dw, dh;
+
+			// Get positons and sizes
+//			cp = DOM.getPos(t.editor.getContainer());
+			cp = {x : 0, y : 0};
+			vp = DOM.getViewPort();
+
+			// Reduce viewport size to avoid scrollbars while dragging
+			vp.w -= 2;
+			vp.h -= 2;
+
+			sex = se.screenX;
+			sey = se.screenY;
+			dx = dy = dw = dh = 0;
+
+			// Handle mouse up
+			mu = Event.add(d, 'mouseup', function(e) {
+				Event.remove(d, 'mouseup', mu);
+				Event.remove(d, 'mousemove', mm);
+
+				if (eb)
+					eb.remove();
+
+				we.moveBy(dx, dy);
+				we.resizeBy(dw, dh);
+				sz = we.getSize();
+				DOM.setStyles(id + '_ifr', {width : sz.w - w.deltaWidth, height : sz.h - w.deltaHeight});
+				t._fixIELayout(id, 1);
+
+				return Event.cancel(e);
+			});
+
+			if (ac != 'Move')
+				startMove();
+
+			function startMove() {
+				if (eb)
+					return;
+
+				t._fixIELayout(id, 0);
+
+				// Setup event blocker
+				DOM.add(d.body, 'div', {
+					id : 'mceEventBlocker',
+					'class' : 'mceEventBlocker ' + (t.editor.settings.inlinepopups_skin || 'clearlooks2'),
+					style : {left : vp.x, top : vp.y, zIndex : t.zIndex + 1}
+				});
+
+				if (tinymce.isIE6 || (tinymce.isIE && !DOM.boxModel))
+					DOM.setStyles('mceEventBlocker', {position : 'absolute', width : vp.w - 2, height : vp.h - 2});
+
+				eb = new Element('mceEventBlocker');
+				eb.update();
+
+				// Setup placeholder
+				p = we.getXY();
+				sz = we.getSize();
+				sx = cp.x + p.x - vp.x;
+				sy = cp.y + p.y - vp.y;
+				DOM.add(eb.get(), 'div', {id : 'mcePlaceHolder', 'class' : 'mcePlaceHolder', style : {left : sx, top : sy, width : sz.w, height : sz.h}});
+				ph = new Element('mcePlaceHolder');
+			};
+
+			// Handle mouse move/drag
+			mm = Event.add(d, 'mousemove', function(e) {
+				var x, y, v;
+
+				startMove();
+
+				x = e.screenX - sex;
+				y = e.screenY - sey;
+
+				switch (ac) {
+					case 'ResizeW':
+						dx = x;
+						dw = 0 - x;
+						break;
+
+					case 'ResizeE':
+						dw = x;
+						break;
+
+					case 'ResizeN':
+					case 'ResizeNW':
+					case 'ResizeNE':
+						if (ac == "ResizeNW") {
+							dx = x;
+							dw = 0 - x;
+						} else if (ac == "ResizeNE")
+							dw = x;
+
+						dy = y;
+						dh = 0 - y;
+						break;
+
+					case 'ResizeS':
+					case 'ResizeSW':
+					case 'ResizeSE':
+						if (ac == "ResizeSW") {
+							dx = x;
+							dw = 0 - x;
+						} else if (ac == "ResizeSE")
+							dw = x;
+
+						dh = y;
+						break;
+
+					case 'mceMove':
+						dx = x;
+						dy = y;
+						break;
+				}
+
+				// Boundary check
+				if (dw < (v = w.features.min_width - sz.w)) {
+					if (dx !== 0)
+						dx += dw - v;
+
+					dw = v;
+				}
+	
+				if (dh < (v = w.features.min_height - sz.h)) {
+					if (dy !== 0)
+						dy += dh - v;
+
+					dh = v;
+				}
+
+				dw = Math.min(dw, w.features.max_width - sz.w);
+				dh = Math.min(dh, w.features.max_height - sz.h);
+				dx = Math.max(dx, vp.x - (sx + vp.x));
+				dy = Math.max(dy, vp.y - (sy + vp.y));
+				dx = Math.min(dx, (vp.w + vp.x) - (sx + sz.w + vp.x));
+				dy = Math.min(dy, (vp.h + vp.y) - (sy + sz.h + vp.y));
+
+				// Move if needed
+				if (dx + dy !== 0) {
+					if (sx + dx < 0)
+						dx = 0;
+	
+					if (sy + dy < 0)
+						dy = 0;
+
+					ph.moveTo(sx + dx, sy + dy);
+				}
+
+				// Resize if needed
+				if (dw + dh !== 0)
+					ph.resizeTo(sz.w + dw, sz.h + dh);
+
+				return Event.cancel(e);
+			});
+
+			return Event.cancel(se);
+		},
+
+		resizeBy : function(dw, dh, id) {
+			var w = this.windows[id];
+
+			if (w) {
+				w.element.resizeBy(dw, dh);
+				w.iframeElement.resizeBy(dw, dh);
+			}
+		},
+
+		close : function(win, id) {
+			var t = this, w, d = DOM.doc, ix = 0, fw, id;
+
+			id = t._findId(id || win);
+
+			t.count--;
+
+			if (t.count == 0)
+				DOM.remove('mceModalBlocker');
+
+			// Probably not inline
+			if (!id && win) {
+				t.parent(win);
+				return;
+			}
+
+			if (w = t.windows[id]) {
+				t.onClose.dispatch(t);
+				Event.remove(d, 'mousedown', w.mousedownFunc);
+				Event.remove(d, 'click', w.clickFunc);
+				Event.clear(id);
+				Event.clear(id + '_ifr');
+
+				DOM.setAttrib(id + '_ifr', 'src', 'javascript:""'); // Prevent leak
+				w.element.remove();
+				delete t.windows[id];
+
+				// Find front most window and focus that
+				each (t.windows, function(w) {
+					if (w.zIndex > ix) {
+						fw = w;
+						ix = w.zIndex;
+					}
+				});
+
+				if (fw)
+					t.focus(fw.id);
+			}
+		},
+
+		setTitle : function(w, ti) {
+			var e;
+
+			w = this._findId(w);
+
+			if (e = DOM.get(w + '_title'))
+				e.innerHTML = DOM.encode(ti);
+		},
+
+		alert : function(txt, cb, s) {
+			var t = this, w;
+
+			w = t.open({
+				title : t,
+				type : 'alert',
+				button_func : function(s) {
+					if (cb)
+						cb.call(s || t, s);
+
+					t.close(null, w.id);
+				},
+				content : DOM.encode(t.editor.getLang(txt, txt)),
+				inline : 1,
+				width : 400,
+				height : 130
+			});
+		},
+
+		confirm : function(txt, cb, s) {
+			var t = this, w;
+
+			w = t.open({
+				title : t,
+				type : 'confirm',
+				button_func : function(s) {
+					if (cb)
+						cb.call(s || t, s);
+
+					t.close(null, w.id);
+				},
+				content : DOM.encode(t.editor.getLang(txt, txt)),
+				inline : 1,
+				width : 400,
+				height : 130
+			});
+		},
+
+		// Internal functions
+
+		_findId : function(w) {
+			var t = this;
+
+			if (typeof(w) == 'string')
+				return w;
+
+			each(t.windows, function(wo) {
+				var ifr = DOM.get(wo.id + '_ifr');
+
+				if (ifr && w == ifr.contentWindow) {
+					w = wo.id;
+					return false;
+				}
+			});
+
+			return w;
+		},
+
+		_fixIELayout : function(id, s) {
+			var w, img;
+
+			if (!tinymce.isIE6)
+				return;
+
+			// Fixes the bug where hover flickers and does odd things in IE6
+			each(['n','s','w','e','nw','ne','sw','se'], function(v) {
+				var e = DOM.get(id + '_resize_' + v);
+
+				DOM.setStyles(e, {
+					width : s ? e.clientWidth : '',
+					height : s ? e.clientHeight : '',
+					cursor : DOM.getStyle(e, 'cursor', 1)
+				});
+
+				DOM.setStyle(id + "_bottom", 'bottom', '-1px');
+
+				e = 0;
+			});
+
+			// Fixes graphics glitch
+			if (w = this.windows[id]) {
+				// Fixes rendering bug after resize
+				w.element.hide();
+				w.element.show();
+
+				// Forced a repaint of the window
+				//DOM.get(id).style.filter = '';
+
+				// IE has a bug where images used in CSS won't get loaded
+				// sometimes when the cache in the browser is disabled
+				// This fix tries to solve it by loading the images using the image object
+				each(DOM.select('div,a', id), function(e, i) {
+					if (e.currentStyle.backgroundImage != 'none') {
+						img = new Image();
+						img.src = e.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/, '$1');
+					}
+				});
+
+				DOM.get(id).style.filter = '';
+			}
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('inlinepopups', tinymce.plugins.InlinePopups);
+})();
+
diff --git a/webapp/web/js/tiny_mce/plugins/inlinepopups/template.htm b/webapp/web/js/tiny_mce/plugins/inlinepopups/template.htm
index f9ec64219..c98fe41a6 100755
--- a/webapp/web/js/tiny_mce/plugins/inlinepopups/template.htm
+++ b/webapp/web/js/tiny_mce/plugins/inlinepopups/template.htm
@@ -1,387 +1,387 @@
-<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -->
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Template for dialogs</title>
-<link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css" />
-</head>
-<body>
-
-<div class="mceEditor">
-	<div class="clearlooks2" style="width:400px; height:100px; left:10px;">
-		<div class="mceWrapper">
-			<div class="mceTop">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-				<span>Blured</span>
-			</div>
-
-			<div class="mceMiddle">
-				<div class="mceLeft"></div>
-				<span>Content</span>
-				<div class="mceRight"></div>
-			</div>
-
-			<div class="mceBottom">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-				<span>Statusbar text.</span>
-			</div>
-
-			<a class="mceMove" href="#"></a>
-			<a class="mceMin" href="#"></a>
-			<a class="mceMax" href="#"></a>
-			<a class="mceMed" href="#"></a>
-			<a class="mceClose" href="#"></a>
-			<a class="mceResize mceResizeN" href="#"></a>
-			<a class="mceResize mceResizeS" href="#"></a>
-			<a class="mceResize mceResizeW" href="#"></a>
-			<a class="mceResize mceResizeE" href="#"></a>
-			<a class="mceResize mceResizeNW" href="#"></a>
-			<a class="mceResize mceResizeNE" href="#"></a>
-			<a class="mceResize mceResizeSW" href="#"></a>
-			<a class="mceResize mceResizeSE" href="#"></a>
-		</div>
-	</div>
-
-	<div class="clearlooks2" style="width:400px; height:100px; left:420px;">
-		<div class="mceWrapper mceMovable mceFocus">
-			<div class="mceTop">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-				<span>Focused</span>
-			</div>
-
-			<div class="mceMiddle">
-				<div class="mceLeft"></div>
-				<span>Content</span>
-				<div class="mceRight"></div>
-			</div>
-
-			<div class="mceBottom">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-				<span>Statusbar text.</span>
-			</div>
-
-			<a class="mceMove" href="#"></a>
-			<a class="mceMin" href="#"></a>
-			<a class="mceMax" href="#"></a>
-			<a class="mceMed" href="#"></a>
-			<a class="mceClose" href="#"></a>
-			<a class="mceResize mceResizeN" href="#"></a>
-			<a class="mceResize mceResizeS" href="#"></a>
-			<a class="mceResize mceResizeW" href="#"></a>
-			<a class="mceResize mceResizeE" href="#"></a>
-			<a class="mceResize mceResizeNW" href="#"></a>
-			<a class="mceResize mceResizeNE" href="#"></a>
-			<a class="mceResize mceResizeSW" href="#"></a>
-			<a class="mceResize mceResizeSE" href="#"></a>
-		</div>
-	</div>
-
-	<div class="clearlooks2" style="width:400px; height:100px; left:10px; top:120px;">
-		<div class="mceWrapper mceMovable mceFocus mceStatusbar">
-			<div class="mceTop">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-				<span>Statusbar</span>
-			</div>
-
-			<div class="mceMiddle">
-				<div class="mceLeft"></div>
-				<span>Content</span>
-				<div class="mceRight"></div>
-			</div>
-
-			<div class="mceBottom">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-				<span>Statusbar text.</span>
-			</div>
-
-			<a class="mceMove" href="#"></a>
-			<a class="mceMin" href="#"></a>
-			<a class="mceMax" href="#"></a>
-			<a class="mceMed" href="#"></a>
-			<a class="mceClose" href="#"></a>
-			<a class="mceResize mceResizeN" href="#"></a>
-			<a class="mceResize mceResizeS" href="#"></a>
-			<a class="mceResize mceResizeW" href="#"></a>
-			<a class="mceResize mceResizeE" href="#"></a>
-			<a class="mceResize mceResizeNW" href="#"></a>
-			<a class="mceResize mceResizeNE" href="#"></a>
-			<a class="mceResize mceResizeSW" href="#"></a>
-			<a class="mceResize mceResizeSE" href="#"></a>
-		</div>
-	</div>
-
-	<div class="clearlooks2" style="width:400px; height:100px; left:420px; top:120px;">
-		<div class="mceWrapper mceMovable mceFocus mceStatusbar mceResizable">
-			<div class="mceTop">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-				<span>Statusbar, Resizable</span>
-			</div>
-
-			<div class="mceMiddle">
-				<div class="mceLeft"></div>
-				<span>Content</span>
-				<div class="mceRight"></div>
-			</div>
-
-			<div class="mceBottom">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-				<span>Statusbar text.</span>
-			</div>
-
-			<a class="mceMove" href="#"></a>
-			<a class="mceMin" href="#"></a>
-			<a class="mceMax" href="#"></a>
-			<a class="mceMed" href="#"></a>
-			<a class="mceClose" href="#"></a>
-			<a class="mceResize mceResizeN" href="#"></a>
-			<a class="mceResize mceResizeS" href="#"></a>
-			<a class="mceResize mceResizeW" href="#"></a>
-			<a class="mceResize mceResizeE" href="#"></a>
-			<a class="mceResize mceResizeNW" href="#"></a>
-			<a class="mceResize mceResizeNE" href="#"></a>
-			<a class="mceResize mceResizeSW" href="#"></a>
-			<a class="mceResize mceResizeSE" href="#"></a>
-		</div>
-	</div>
-
-	<div class="clearlooks2" style="width:400px; height:100px; left:10px; top:230px;">
-		<div class="mceWrapper mceMovable mceFocus mceResizable mceMaximizable">
-			<div class="mceTop">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-				<span>Resizable, Maximizable</span>
-			</div>
-
-			<div class="mceMiddle">
-				<div class="mceLeft"></div>
-				<span>Content</span>
-				<div class="mceRight"></div>
-			</div>
-
-			<div class="mceBottom">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-				<span>Statusbar text.</span>
-			</div>
-
-			<a class="mceMove" href="#"></a>
-			<a class="mceMin" href="#"></a>
-			<a class="mceMax" href="#"></a>
-			<a class="mceMed" href="#"></a>
-			<a class="mceClose" href="#"></a>
-			<a class="mceResize mceResizeN" href="#"></a>
-			<a class="mceResize mceResizeS" href="#"></a>
-			<a class="mceResize mceResizeW" href="#"></a>
-			<a class="mceResize mceResizeE" href="#"></a>
-			<a class="mceResize mceResizeNW" href="#"></a>
-			<a class="mceResize mceResizeNE" href="#"></a>
-			<a class="mceResize mceResizeSW" href="#"></a>
-			<a class="mceResize mceResizeSE" href="#"></a>
-		</div>
-	</div>
-
-	<div class="clearlooks2" style="width:400px; height:100px; left:420px; top:230px;">
-		<div class="mceWrapper mceMovable mceStatusbar mceResizable mceMaximizable">
-			<div class="mceTop">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-				<span>Blurred, Maximizable, Statusbar, Resizable</span>
-			</div>
-
-			<div class="mceMiddle">
-				<div class="mceLeft"></div>
-				<span>Content</span>
-				<div class="mceRight"></div>
-			</div>
-
-			<div class="mceBottom">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-				<span>Statusbar text.</span>
-			</div>
-
-			<a class="mceMove" href="#"></a>
-			<a class="mceMin" href="#"></a>
-			<a class="mceMax" href="#"></a>
-			<a class="mceMed" href="#"></a>
-			<a class="mceClose" href="#"></a>
-			<a class="mceResize mceResizeN" href="#"></a>
-			<a class="mceResize mceResizeS" href="#"></a>
-			<a class="mceResize mceResizeW" href="#"></a>
-			<a class="mceResize mceResizeE" href="#"></a>
-			<a class="mceResize mceResizeNW" href="#"></a>
-			<a class="mceResize mceResizeNE" href="#"></a>
-			<a class="mceResize mceResizeSW" href="#"></a>
-			<a class="mceResize mceResizeSE" href="#"></a>
-		</div>
-	</div>
-
-	<div class="clearlooks2" style="width:400px; height:100px; left:10px; top:340px;">
-		<div class="mceWrapper mceMovable mceFocus mceResizable mceMaximized mceMinimizable mceMaximizable">
-			<div class="mceTop">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-				<span>Maximized, Maximizable, Minimizable</span>
-			</div>
-
-			<div class="mceMiddle">
-				<div class="mceLeft"></div>
-				<span>Content</span>
-				<div class="mceRight"></div>
-			</div>
-
-			<div class="mceBottom">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-				<span>Statusbar text.</span>
-			</div>
-
-			<a class="mceMove" href="#"></a>
-			<a class="mceMin" href="#"></a>
-			<a class="mceMax" href="#"></a>
-			<a class="mceMed" href="#"></a>
-			<a class="mceClose" href="#"></a>
-			<a class="mceResize mceResizeN" href="#"></a>
-			<a class="mceResize mceResizeS" href="#"></a>
-			<a class="mceResize mceResizeW" href="#"></a>
-			<a class="mceResize mceResizeE" href="#"></a>
-			<a class="mceResize mceResizeNW" href="#"></a>
-			<a class="mceResize mceResizeNE" href="#"></a>
-			<a class="mceResize mceResizeSW" href="#"></a>
-			<a class="mceResize mceResizeSE" href="#"></a>
-		</div>
-	</div>
-
-	<div class="clearlooks2" style="width:400px; height:100px; left:420px; top:340px;">
-		<div class="mceWrapper mceMovable mceStatusbar mceResizable mceMaximized mceMinimizable mceMaximizable">
-			<div class="mceTop">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-				<span>Blured</span>
-			</div>
-
-			<div class="mceMiddle">
-				<div class="mceLeft"></div>
-				<span>Content</span>
-				<div class="mceRight"></div>
-			</div>
-
-			<div class="mceBottom">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-				<span>Statusbar text.</span>
-			</div>
-
-			<a class="mceMove" href="#"></a>
-			<a class="mceMin" href="#"></a>
-			<a class="mceMax" href="#"></a>
-			<a class="mceMed" href="#"></a>
-			<a class="mceClose" href="#"></a>
-			<a class="mceResize mceResizeN" href="#"></a>
-			<a class="mceResize mceResizeS" href="#"></a>
-			<a class="mceResize mceResizeW" href="#"></a>
-			<a class="mceResize mceResizeE" href="#"></a>
-			<a class="mceResize mceResizeNW" href="#"></a>
-			<a class="mceResize mceResizeNE" href="#"></a>
-			<a class="mceResize mceResizeSW" href="#"></a>
-			<a class="mceResize mceResizeSE" href="#"></a>
-		</div>
-	</div>
-
-	<div class="clearlooks2" style="width:400px; height:130px; left:10px; top:450px;">
-		<div class="mceWrapper mceMovable mceFocus mceModal mceAlert">
-			<div class="mceTop">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-				<span>Alert</span>
-			</div>
-
-			<div class="mceMiddle">
-				<div class="mceLeft"></div>
-				<span>
-					This is a very long error message. This is a very long error message.
-					This is a very long error message. This is a very long error message.
-					This is a very long error message. This is a very long error message.
-					This is a very long error message. This is a very long error message.
-					This is a very long error message. This is a very long error message.
-					This is a very long error message. This is a very long error message.
-				</span>
-				<div class="mceRight"></div>
-				<div class="mceIcon"></div>
-			</div>
-
-			<div class="mceBottom">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-			</div>
-
-			<a class="mceMove" href="#"></a>
-			<a class="mceButton mceOk" href="#">Ok</a>
-			<a class="mceClose" href="#"></a>
-		</div>
-	</div>
-
-	<div class="clearlooks2" style="width:400px; height:130px; left:420px; top:450px;">
-		<div class="mceWrapper mceMovable mceFocus mceModal mceConfirm">
-			<div class="mceTop">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-				<span>Confirm</span>
-			</div>
-
-			<div class="mceMiddle">
-				<div class="mceLeft"></div>
-				<span>
-					This is a very long error message. This is a very long error message.
-					This is a very long error message. This is a very long error message.
-					This is a very long error message. This is a very long error message.
-					This is a very long error message. This is a very long error message.
-					This is a very long error message. This is a very long error message.
-					This is a very long error message. This is a very long error message.
-					</span>
-				<div class="mceRight"></div>
-				<div class="mceIcon"></div>
-			</div>
-
-			<div class="mceBottom">
-				<div class="mceLeft"></div>
-				<div class="mceCenter"></div>
-				<div class="mceRight"></div>
-			</div>
-
-			<a class="mceMove" href="#"></a>
-			<a class="mceButton mceOk" href="#">Ok</a>
-			<a class="mceButton mceCancel" href="#">Cancel</a>
-			<a class="mceClose" href="#"></a>
-		</div>
-	</div>
-</div>
-
-</body>
-</html>
+<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Template for dialogs</title>
+<link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css" />
+</head>
+<body>
+
+<div class="mceEditor">
+	<div class="clearlooks2" style="width:400px; height:100px; left:10px;">
+		<div class="mceWrapper">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Blured</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>Content</span>
+				<div class="mceRight"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar text.</span>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceMin" href="#"></a>
+			<a class="mceMax" href="#"></a>
+			<a class="mceMed" href="#"></a>
+			<a class="mceClose" href="#"></a>
+			<a class="mceResize mceResizeN" href="#"></a>
+			<a class="mceResize mceResizeS" href="#"></a>
+			<a class="mceResize mceResizeW" href="#"></a>
+			<a class="mceResize mceResizeE" href="#"></a>
+			<a class="mceResize mceResizeNW" href="#"></a>
+			<a class="mceResize mceResizeNE" href="#"></a>
+			<a class="mceResize mceResizeSW" href="#"></a>
+			<a class="mceResize mceResizeSE" href="#"></a>
+		</div>
+	</div>
+
+	<div class="clearlooks2" style="width:400px; height:100px; left:420px;">
+		<div class="mceWrapper mceMovable mceFocus">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Focused</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>Content</span>
+				<div class="mceRight"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar text.</span>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceMin" href="#"></a>
+			<a class="mceMax" href="#"></a>
+			<a class="mceMed" href="#"></a>
+			<a class="mceClose" href="#"></a>
+			<a class="mceResize mceResizeN" href="#"></a>
+			<a class="mceResize mceResizeS" href="#"></a>
+			<a class="mceResize mceResizeW" href="#"></a>
+			<a class="mceResize mceResizeE" href="#"></a>
+			<a class="mceResize mceResizeNW" href="#"></a>
+			<a class="mceResize mceResizeNE" href="#"></a>
+			<a class="mceResize mceResizeSW" href="#"></a>
+			<a class="mceResize mceResizeSE" href="#"></a>
+		</div>
+	</div>
+
+	<div class="clearlooks2" style="width:400px; height:100px; left:10px; top:120px;">
+		<div class="mceWrapper mceMovable mceFocus mceStatusbar">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>Content</span>
+				<div class="mceRight"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar text.</span>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceMin" href="#"></a>
+			<a class="mceMax" href="#"></a>
+			<a class="mceMed" href="#"></a>
+			<a class="mceClose" href="#"></a>
+			<a class="mceResize mceResizeN" href="#"></a>
+			<a class="mceResize mceResizeS" href="#"></a>
+			<a class="mceResize mceResizeW" href="#"></a>
+			<a class="mceResize mceResizeE" href="#"></a>
+			<a class="mceResize mceResizeNW" href="#"></a>
+			<a class="mceResize mceResizeNE" href="#"></a>
+			<a class="mceResize mceResizeSW" href="#"></a>
+			<a class="mceResize mceResizeSE" href="#"></a>
+		</div>
+	</div>
+
+	<div class="clearlooks2" style="width:400px; height:100px; left:420px; top:120px;">
+		<div class="mceWrapper mceMovable mceFocus mceStatusbar mceResizable">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar, Resizable</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>Content</span>
+				<div class="mceRight"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar text.</span>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceMin" href="#"></a>
+			<a class="mceMax" href="#"></a>
+			<a class="mceMed" href="#"></a>
+			<a class="mceClose" href="#"></a>
+			<a class="mceResize mceResizeN" href="#"></a>
+			<a class="mceResize mceResizeS" href="#"></a>
+			<a class="mceResize mceResizeW" href="#"></a>
+			<a class="mceResize mceResizeE" href="#"></a>
+			<a class="mceResize mceResizeNW" href="#"></a>
+			<a class="mceResize mceResizeNE" href="#"></a>
+			<a class="mceResize mceResizeSW" href="#"></a>
+			<a class="mceResize mceResizeSE" href="#"></a>
+		</div>
+	</div>
+
+	<div class="clearlooks2" style="width:400px; height:100px; left:10px; top:230px;">
+		<div class="mceWrapper mceMovable mceFocus mceResizable mceMaximizable">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Resizable, Maximizable</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>Content</span>
+				<div class="mceRight"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar text.</span>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceMin" href="#"></a>
+			<a class="mceMax" href="#"></a>
+			<a class="mceMed" href="#"></a>
+			<a class="mceClose" href="#"></a>
+			<a class="mceResize mceResizeN" href="#"></a>
+			<a class="mceResize mceResizeS" href="#"></a>
+			<a class="mceResize mceResizeW" href="#"></a>
+			<a class="mceResize mceResizeE" href="#"></a>
+			<a class="mceResize mceResizeNW" href="#"></a>
+			<a class="mceResize mceResizeNE" href="#"></a>
+			<a class="mceResize mceResizeSW" href="#"></a>
+			<a class="mceResize mceResizeSE" href="#"></a>
+		</div>
+	</div>
+
+	<div class="clearlooks2" style="width:400px; height:100px; left:420px; top:230px;">
+		<div class="mceWrapper mceMovable mceStatusbar mceResizable mceMaximizable">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Blurred, Maximizable, Statusbar, Resizable</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>Content</span>
+				<div class="mceRight"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar text.</span>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceMin" href="#"></a>
+			<a class="mceMax" href="#"></a>
+			<a class="mceMed" href="#"></a>
+			<a class="mceClose" href="#"></a>
+			<a class="mceResize mceResizeN" href="#"></a>
+			<a class="mceResize mceResizeS" href="#"></a>
+			<a class="mceResize mceResizeW" href="#"></a>
+			<a class="mceResize mceResizeE" href="#"></a>
+			<a class="mceResize mceResizeNW" href="#"></a>
+			<a class="mceResize mceResizeNE" href="#"></a>
+			<a class="mceResize mceResizeSW" href="#"></a>
+			<a class="mceResize mceResizeSE" href="#"></a>
+		</div>
+	</div>
+
+	<div class="clearlooks2" style="width:400px; height:100px; left:10px; top:340px;">
+		<div class="mceWrapper mceMovable mceFocus mceResizable mceMaximized mceMinimizable mceMaximizable">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Maximized, Maximizable, Minimizable</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>Content</span>
+				<div class="mceRight"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar text.</span>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceMin" href="#"></a>
+			<a class="mceMax" href="#"></a>
+			<a class="mceMed" href="#"></a>
+			<a class="mceClose" href="#"></a>
+			<a class="mceResize mceResizeN" href="#"></a>
+			<a class="mceResize mceResizeS" href="#"></a>
+			<a class="mceResize mceResizeW" href="#"></a>
+			<a class="mceResize mceResizeE" href="#"></a>
+			<a class="mceResize mceResizeNW" href="#"></a>
+			<a class="mceResize mceResizeNE" href="#"></a>
+			<a class="mceResize mceResizeSW" href="#"></a>
+			<a class="mceResize mceResizeSE" href="#"></a>
+		</div>
+	</div>
+
+	<div class="clearlooks2" style="width:400px; height:100px; left:420px; top:340px;">
+		<div class="mceWrapper mceMovable mceStatusbar mceResizable mceMaximized mceMinimizable mceMaximizable">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Blured</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>Content</span>
+				<div class="mceRight"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Statusbar text.</span>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceMin" href="#"></a>
+			<a class="mceMax" href="#"></a>
+			<a class="mceMed" href="#"></a>
+			<a class="mceClose" href="#"></a>
+			<a class="mceResize mceResizeN" href="#"></a>
+			<a class="mceResize mceResizeS" href="#"></a>
+			<a class="mceResize mceResizeW" href="#"></a>
+			<a class="mceResize mceResizeE" href="#"></a>
+			<a class="mceResize mceResizeNW" href="#"></a>
+			<a class="mceResize mceResizeNE" href="#"></a>
+			<a class="mceResize mceResizeSW" href="#"></a>
+			<a class="mceResize mceResizeSE" href="#"></a>
+		</div>
+	</div>
+
+	<div class="clearlooks2" style="width:400px; height:130px; left:10px; top:450px;">
+		<div class="mceWrapper mceMovable mceFocus mceModal mceAlert">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Alert</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+				</span>
+				<div class="mceRight"></div>
+				<div class="mceIcon"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceButton mceOk" href="#">Ok</a>
+			<a class="mceClose" href="#"></a>
+		</div>
+	</div>
+
+	<div class="clearlooks2" style="width:400px; height:130px; left:420px; top:450px;">
+		<div class="mceWrapper mceMovable mceFocus mceModal mceConfirm">
+			<div class="mceTop">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+				<span>Confirm</span>
+			</div>
+
+			<div class="mceMiddle">
+				<div class="mceLeft"></div>
+				<span>
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+					This is a very long error message. This is a very long error message.
+					</span>
+				<div class="mceRight"></div>
+				<div class="mceIcon"></div>
+			</div>
+
+			<div class="mceBottom">
+				<div class="mceLeft"></div>
+				<div class="mceCenter"></div>
+				<div class="mceRight"></div>
+			</div>
+
+			<a class="mceMove" href="#"></a>
+			<a class="mceButton mceOk" href="#">Ok</a>
+			<a class="mceButton mceCancel" href="#">Cancel</a>
+			<a class="mceClose" href="#"></a>
+		</div>
+	</div>
+</div>
+
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/insertdatetime/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
index 9ab3135bd..e80895cd3 100755
--- a/webapp/web/js/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/insertdatetime/editor_plugin_src.js
@@ -1,80 +1,80 @@
-/**
- * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.InsertDateTime', {
-		init : function(ed, url) {
-			var t = this;
-
-			t.editor = ed;
-
-			ed.addCommand('mceInsertDate', function() {
-				var str = t._getDateTime(new Date(), ed.getParam("plugin_insertdate_dateFormat", ed.getLang('insertdatetime.date_fmt')));
-
-				ed.execCommand('mceInsertContent', false, str);
-			});
-
-			ed.addCommand('mceInsertTime', function() {
-				var str = t._getDateTime(new Date(), ed.getParam("plugin_insertdate_timeFormat", ed.getLang('insertdatetime.time_fmt')));
-
-				ed.execCommand('mceInsertContent', false, str);
-			});
-
-			ed.addButton('insertdate', {title : 'insertdatetime.insertdate_desc', cmd : 'mceInsertDate'});
-			ed.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
-			};
-		},
-
-		// Private methods
-
-		_getDateTime : function(d, fmt) {
-			var ed = this.editor;
-
-			function addZeros(value, len) {
-				value = "" + value;
-
-				if (value.length < len) {
-					for (var i=0; i<(len-value.length); i++)
-						value = "0" + value;
-				}
-
-				return value;
-			};
-
-			fmt = fmt.replace("%D", "%m/%d/%y");
-			fmt = fmt.replace("%r", "%I:%M:%S %p");
-			fmt = fmt.replace("%Y", "" + d.getFullYear());
-			fmt = fmt.replace("%y", "" + d.getYear());
-			fmt = fmt.replace("%m", addZeros(d.getMonth()+1, 2));
-			fmt = fmt.replace("%d", addZeros(d.getDate(), 2));
-			fmt = fmt.replace("%H", "" + addZeros(d.getHours(), 2));
-			fmt = fmt.replace("%M", "" + addZeros(d.getMinutes(), 2));
-			fmt = fmt.replace("%S", "" + addZeros(d.getSeconds(), 2));
-			fmt = fmt.replace("%I", "" + ((d.getHours() + 11) % 12 + 1));
-			fmt = fmt.replace("%p", "" + (d.getHours() < 12 ? "AM" : "PM"));
-			fmt = fmt.replace("%B", "" + ed.getLang("insertdatetime.months_long").split(',')[d.getMonth()]);
-			fmt = fmt.replace("%b", "" + ed.getLang("insertdatetime.months_short").split(',')[d.getMonth()]);
-			fmt = fmt.replace("%A", "" + ed.getLang("insertdatetime.day_long").split(',')[d.getDay()]);
-			fmt = fmt.replace("%a", "" + ed.getLang("insertdatetime.day_short").split(',')[d.getDay()]);
-			fmt = fmt.replace("%%", "%");
-
-			return fmt;
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('insertdatetime', tinymce.plugins.InsertDateTime);
+/**
+ * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.InsertDateTime', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			ed.addCommand('mceInsertDate', function() {
+				var str = t._getDateTime(new Date(), ed.getParam("plugin_insertdate_dateFormat", ed.getLang('insertdatetime.date_fmt')));
+
+				ed.execCommand('mceInsertContent', false, str);
+			});
+
+			ed.addCommand('mceInsertTime', function() {
+				var str = t._getDateTime(new Date(), ed.getParam("plugin_insertdate_timeFormat", ed.getLang('insertdatetime.time_fmt')));
+
+				ed.execCommand('mceInsertContent', false, str);
+			});
+
+			ed.addButton('insertdate', {title : 'insertdatetime.insertdate_desc', cmd : 'mceInsertDate'});
+			ed.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
+			};
+		},
+
+		// Private methods
+
+		_getDateTime : function(d, fmt) {
+			var ed = this.editor;
+
+			function addZeros(value, len) {
+				value = "" + value;
+
+				if (value.length < len) {
+					for (var i=0; i<(len-value.length); i++)
+						value = "0" + value;
+				}
+
+				return value;
+			};
+
+			fmt = fmt.replace("%D", "%m/%d/%y");
+			fmt = fmt.replace("%r", "%I:%M:%S %p");
+			fmt = fmt.replace("%Y", "" + d.getFullYear());
+			fmt = fmt.replace("%y", "" + d.getYear());
+			fmt = fmt.replace("%m", addZeros(d.getMonth()+1, 2));
+			fmt = fmt.replace("%d", addZeros(d.getDate(), 2));
+			fmt = fmt.replace("%H", "" + addZeros(d.getHours(), 2));
+			fmt = fmt.replace("%M", "" + addZeros(d.getMinutes(), 2));
+			fmt = fmt.replace("%S", "" + addZeros(d.getSeconds(), 2));
+			fmt = fmt.replace("%I", "" + ((d.getHours() + 11) % 12 + 1));
+			fmt = fmt.replace("%p", "" + (d.getHours() < 12 ? "AM" : "PM"));
+			fmt = fmt.replace("%B", "" + ed.getLang("insertdatetime.months_long").split(',')[d.getMonth()]);
+			fmt = fmt.replace("%b", "" + ed.getLang("insertdatetime.months_short").split(',')[d.getMonth()]);
+			fmt = fmt.replace("%A", "" + ed.getLang("insertdatetime.day_long").split(',')[d.getDay()]);
+			fmt = fmt.replace("%a", "" + ed.getLang("insertdatetime.day_short").split(',')[d.getDay()]);
+			fmt = fmt.replace("%%", "%");
+
+			return fmt;
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('insertdatetime', tinymce.plugins.InsertDateTime);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/layer/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/layer/editor_plugin_src.js
index a72f6c36e..c53143d0e 100755
--- a/webapp/web/js/tiny_mce/plugins/layer/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/layer/editor_plugin_src.js
@@ -1,209 +1,209 @@
-/**
- * $Id: editor_plugin_src.js 652 2008-02-29 13:09:46Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.Layer', {
-		init : function(ed, url) {
-			var t = this;
-
-			t.editor = ed;
-
-			// Register commands
-			ed.addCommand('mceInsertLayer', t._insertLayer, t);
-
-			ed.addCommand('mceMoveForward', function() {
-				t._move(1);
-			});
-
-			ed.addCommand('mceMoveBackward', function() {
-				t._move(-1);
-			});
-
-			ed.addCommand('mceMakeAbsolute', function() {
-				t._toggleAbsolute();
-			});
-
-			// Register buttons
-			ed.addButton('moveforward', {title : 'layer.forward_desc', cmd : 'mceMoveForward'});
-			ed.addButton('movebackward', {title : 'layer.backward_desc', cmd : 'mceMoveBackward'});
-			ed.addButton('absolute', {title : 'layer.absolute_desc', cmd : 'mceMakeAbsolute'});
-			ed.addButton('insertlayer', {title : 'layer.insertlayer_desc', cmd : 'mceInsertLayer'});
-
-			ed.onInit.add(function() {
-				if (tinymce.isIE)
-					ed.getDoc().execCommand('2D-Position', false, true);
-			});
-
-			ed.onNodeChange.add(t._nodeChange, t);
-			ed.onVisualAid.add(t._visualAid, t);
-		},
-
-		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
-			};
-		},
-
-		// Private methods
-
-		_nodeChange : function(ed, cm, n) {
-			var le, p;
-
-			le = this._getParentLayer(n);
-			p = ed.dom.getParent(n, 'DIV,P,IMG');
-
-			if (!p) {
-				cm.setDisabled('absolute', 1);
-				cm.setDisabled('moveforward', 1);
-				cm.setDisabled('movebackward', 1);
-			} else {
-				cm.setDisabled('absolute', 0);
-				cm.setDisabled('moveforward', !le);
-				cm.setDisabled('movebackward', !le);
-				cm.setActive('absolute', le && le.style.position.toLowerCase() == "absolute");
-			}
-		},
-
-		// Private methods
-
-		_visualAid : function(ed, e, s) {
-			var dom = ed.dom;
-
-			tinymce.each(dom.select('div,p', e), function(e) {
-				if (/^(absolute|relative|static)$/i.test(e.style.position)) {
-					if (s)
-						dom.addClass(e, 'mceItemVisualAid');
-					else
-						dom.removeClass(e, 'mceItemVisualAid');	
-				}
-			});
-		},
-
-		_move : function(d) {
-			var ed = this.editor, i, z = [], le = this._getParentLayer(ed.selection.getNode()), ci = -1, fi = -1, nl;
-
-			nl = [];
-			tinymce.walk(ed.getBody(), function(n) {
-				if (n.nodeType == 1 && /^(absolute|relative|static)$/i.test(n.style.position))
-					nl.push(n); 
-			}, 'childNodes');
-
-			// Find z-indexes
-			for (i=0; i<nl.length; i++) {
-				z[i] = nl[i].style.zIndex ? parseInt(nl[i].style.zIndex) : 0;
-
-				if (ci < 0 && nl[i] == le)
-					ci = i;
-			}
-
-			if (d < 0) {
-				// Move back
-
-				// Try find a lower one
-				for (i=0; i<z.length; i++) {
-					if (z[i] < z[ci]) {
-						fi = i;
-						break;
-					}
-				}
-
-				if (fi > -1) {
-					nl[ci].style.zIndex = z[fi];
-					nl[fi].style.zIndex = z[ci];
-				} else {
-					if (z[ci] > 0)
-						nl[ci].style.zIndex = z[ci] - 1;
-				}
-			} else {
-				// Move forward
-
-				// Try find a higher one
-				for (i=0; i<z.length; i++) {
-					if (z[i] > z[ci]) {
-						fi = i;
-						break;
-					}
-				}
-
-				if (fi > -1) {
-					nl[ci].style.zIndex = z[fi];
-					nl[fi].style.zIndex = z[ci];
-				} else
-					nl[ci].style.zIndex = z[ci] + 1;
-			}
-
-			ed.execCommand('mceRepaint');
-		},
-
-		_getParentLayer : function(n) {
-			return this.editor.dom.getParent(n, function(n) {
-				return n.nodeType == 1 && /^(absolute|relative|static)$/i.test(n.style.position);
-			});
-		},
-
-		_insertLayer : function() {
-			var ed = this.editor, p = ed.dom.getPos(ed.dom.getParent(ed.selection.getNode(), '*'));
-
-			ed.dom.add(ed.getBody(), 'div', {
-				style : {
-					position : 'absolute',
-					left : p.x,
-					top : (p.y > 20 ? p.y : 20),
-					width : 100,
-					height : 100
-				},
-				'class' : 'mceItemVisualAid'
-			}, ed.selection.getContent() || ed.getLang('layer.content'));
-		},
-
-		_toggleAbsolute : function() {
-			var ed = this.editor, le = this._getParentLayer(ed.selection.getNode());
-
-			if (!le)
-				le = ed.dom.getParent(ed.selection.getNode(), 'DIV,P,IMG');
-
-			if (le) {
-				if (le.style.position.toLowerCase() == "absolute") {
-					ed.dom.setStyles(le, {
-						position : '',
-						left : '',
-						top : '',
-						width : '',
-						height : ''
-					});
-
-					ed.dom.removeClass(le, 'mceItemVisualAid');
-				} else {
-					if (le.style.left == "")
-						le.style.left = 20 + 'px';
-
-					if (le.style.top == "")
-						le.style.top = 20 + 'px';
-
-					if (le.style.width == "")
-						le.style.width = le.width ? (le.width + 'px') : '100px';
-
-					if (le.style.height == "")
-						le.style.height = le.height ? (le.height + 'px') : '100px';
-
-					le.style.position = "absolute";
-					ed.addVisual(ed.getBody());
-				}
-
-				ed.execCommand('mceRepaint');
-				ed.nodeChanged();
-			}
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('layer', tinymce.plugins.Layer);
+/**
+ * $Id: editor_plugin_src.js 652 2008-02-29 13:09:46Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Layer', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceInsertLayer', t._insertLayer, t);
+
+			ed.addCommand('mceMoveForward', function() {
+				t._move(1);
+			});
+
+			ed.addCommand('mceMoveBackward', function() {
+				t._move(-1);
+			});
+
+			ed.addCommand('mceMakeAbsolute', function() {
+				t._toggleAbsolute();
+			});
+
+			// Register buttons
+			ed.addButton('moveforward', {title : 'layer.forward_desc', cmd : 'mceMoveForward'});
+			ed.addButton('movebackward', {title : 'layer.backward_desc', cmd : 'mceMoveBackward'});
+			ed.addButton('absolute', {title : 'layer.absolute_desc', cmd : 'mceMakeAbsolute'});
+			ed.addButton('insertlayer', {title : 'layer.insertlayer_desc', cmd : 'mceInsertLayer'});
+
+			ed.onInit.add(function() {
+				if (tinymce.isIE)
+					ed.getDoc().execCommand('2D-Position', false, true);
+			});
+
+			ed.onNodeChange.add(t._nodeChange, t);
+			ed.onVisualAid.add(t._visualAid, t);
+		},
+
+		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
+			};
+		},
+
+		// Private methods
+
+		_nodeChange : function(ed, cm, n) {
+			var le, p;
+
+			le = this._getParentLayer(n);
+			p = ed.dom.getParent(n, 'DIV,P,IMG');
+
+			if (!p) {
+				cm.setDisabled('absolute', 1);
+				cm.setDisabled('moveforward', 1);
+				cm.setDisabled('movebackward', 1);
+			} else {
+				cm.setDisabled('absolute', 0);
+				cm.setDisabled('moveforward', !le);
+				cm.setDisabled('movebackward', !le);
+				cm.setActive('absolute', le && le.style.position.toLowerCase() == "absolute");
+			}
+		},
+
+		// Private methods
+
+		_visualAid : function(ed, e, s) {
+			var dom = ed.dom;
+
+			tinymce.each(dom.select('div,p', e), function(e) {
+				if (/^(absolute|relative|static)$/i.test(e.style.position)) {
+					if (s)
+						dom.addClass(e, 'mceItemVisualAid');
+					else
+						dom.removeClass(e, 'mceItemVisualAid');	
+				}
+			});
+		},
+
+		_move : function(d) {
+			var ed = this.editor, i, z = [], le = this._getParentLayer(ed.selection.getNode()), ci = -1, fi = -1, nl;
+
+			nl = [];
+			tinymce.walk(ed.getBody(), function(n) {
+				if (n.nodeType == 1 && /^(absolute|relative|static)$/i.test(n.style.position))
+					nl.push(n); 
+			}, 'childNodes');
+
+			// Find z-indexes
+			for (i=0; i<nl.length; i++) {
+				z[i] = nl[i].style.zIndex ? parseInt(nl[i].style.zIndex) : 0;
+
+				if (ci < 0 && nl[i] == le)
+					ci = i;
+			}
+
+			if (d < 0) {
+				// Move back
+
+				// Try find a lower one
+				for (i=0; i<z.length; i++) {
+					if (z[i] < z[ci]) {
+						fi = i;
+						break;
+					}
+				}
+
+				if (fi > -1) {
+					nl[ci].style.zIndex = z[fi];
+					nl[fi].style.zIndex = z[ci];
+				} else {
+					if (z[ci] > 0)
+						nl[ci].style.zIndex = z[ci] - 1;
+				}
+			} else {
+				// Move forward
+
+				// Try find a higher one
+				for (i=0; i<z.length; i++) {
+					if (z[i] > z[ci]) {
+						fi = i;
+						break;
+					}
+				}
+
+				if (fi > -1) {
+					nl[ci].style.zIndex = z[fi];
+					nl[fi].style.zIndex = z[ci];
+				} else
+					nl[ci].style.zIndex = z[ci] + 1;
+			}
+
+			ed.execCommand('mceRepaint');
+		},
+
+		_getParentLayer : function(n) {
+			return this.editor.dom.getParent(n, function(n) {
+				return n.nodeType == 1 && /^(absolute|relative|static)$/i.test(n.style.position);
+			});
+		},
+
+		_insertLayer : function() {
+			var ed = this.editor, p = ed.dom.getPos(ed.dom.getParent(ed.selection.getNode(), '*'));
+
+			ed.dom.add(ed.getBody(), 'div', {
+				style : {
+					position : 'absolute',
+					left : p.x,
+					top : (p.y > 20 ? p.y : 20),
+					width : 100,
+					height : 100
+				},
+				'class' : 'mceItemVisualAid'
+			}, ed.selection.getContent() || ed.getLang('layer.content'));
+		},
+
+		_toggleAbsolute : function() {
+			var ed = this.editor, le = this._getParentLayer(ed.selection.getNode());
+
+			if (!le)
+				le = ed.dom.getParent(ed.selection.getNode(), 'DIV,P,IMG');
+
+			if (le) {
+				if (le.style.position.toLowerCase() == "absolute") {
+					ed.dom.setStyles(le, {
+						position : '',
+						left : '',
+						top : '',
+						width : '',
+						height : ''
+					});
+
+					ed.dom.removeClass(le, 'mceItemVisualAid');
+				} else {
+					if (le.style.left == "")
+						le.style.left = 20 + 'px';
+
+					if (le.style.top == "")
+						le.style.top = 20 + 'px';
+
+					if (le.style.width == "")
+						le.style.width = le.width ? (le.width + 'px') : '100px';
+
+					if (le.style.height == "")
+						le.style.height = le.height ? (le.height + 'px') : '100px';
+
+					le.style.position = "absolute";
+					ed.addVisual(ed.getBody());
+				}
+
+				ed.execCommand('mceRepaint');
+				ed.nodeChanged();
+			}
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('layer', tinymce.plugins.Layer);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/media/css/content.css b/webapp/web/js/tiny_mce/plugins/media/css/content.css
index 1bf6a7586..7739381da 100755
--- a/webapp/web/js/tiny_mce/plugins/media/css/content.css
+++ b/webapp/web/js/tiny_mce/plugins/media/css/content.css
@@ -1,6 +1,6 @@
-.mceItemFlash, .mceItemShockWave, .mceItemQuickTime, .mceItemWindowsMedia, .mceItemRealMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc;}
-.mceItemShockWave {background-image: url(../img/shockwave.gif);}
-.mceItemFlash {background-image:url(../img/flash.gif);}
-.mceItemQuickTime {background-image:url(../img/quicktime.gif);}
-.mceItemWindowsMedia {background-image:url(../img/windowsmedia.gif);}
-.mceItemRealMedia {background-image:url(../img/realmedia.gif);}
+.mceItemFlash, .mceItemShockWave, .mceItemQuickTime, .mceItemWindowsMedia, .mceItemRealMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc;}
+.mceItemShockWave {background-image: url(../img/shockwave.gif);}
+.mceItemFlash {background-image:url(../img/flash.gif);}
+.mceItemQuickTime {background-image:url(../img/quicktime.gif);}
+.mceItemWindowsMedia {background-image:url(../img/windowsmedia.gif);}
+.mceItemRealMedia {background-image:url(../img/realmedia.gif);}
diff --git a/webapp/web/js/tiny_mce/plugins/media/css/media.css b/webapp/web/js/tiny_mce/plugins/media/css/media.css
index 2d087944d..7b2253ba3 100755
--- a/webapp/web/js/tiny_mce/plugins/media/css/media.css
+++ b/webapp/web/js/tiny_mce/plugins/media/css/media.css
@@ -1,16 +1,16 @@
-#id, #name, #hspace, #vspace, #class_name, #align {	width: 100px }
-#hspace, #vspace { width: 50px }
-#flash_quality, #flash_align, #flash_scale, #flash_salign, #flash_wmode { width: 100px }
-#flash_base, #flash_flashvars { width: 240px }
-#width, #height { width: 40px }
-#src, #media_type { width: 250px }
-#class { width: 120px }
-#prev { margin: 0; border: 1px solid black; width: 380px; height: 230px; overflow: auto }
-.panel_wrapper div.current { height: 390px; overflow: auto }
-#flash_options, #shockwave_options, #qt_options, #wmp_options, #rmp_options { display: none }
-.mceAddSelectValue { background-color: #DDDDDD }
-#qt_starttime, #qt_endtime, #qt_fov, #qt_href, #qt_moveid, #qt_moviename, #qt_node, #qt_pan, #qt_qtsrc, #qt_qtsrcchokespeed, #qt_target, #qt_tilt, #qt_urlsubstituten, #qt_volume { width: 70px }
-#wmp_balance, #wmp_baseurl, #wmp_captioningid, #wmp_currentmarker, #wmp_currentposition, #wmp_defaultframe, #wmp_playcount, #wmp_rate, #wmp_uimode, #wmp_volume { width: 70px }
-#rmp_console, #rmp_numloop, #rmp_controls, #rmp_scriptcallbacks { width: 70px }
-#shockwave_swvolume, #shockwave_swframe, #shockwave_swurl, #shockwave_swstretchvalign, #shockwave_swstretchhalign, #shockwave_swstretchstyle { width: 90px }
-#qt_qtsrc { width: 200px }
+#id, #name, #hspace, #vspace, #class_name, #align {	width: 100px }
+#hspace, #vspace { width: 50px }
+#flash_quality, #flash_align, #flash_scale, #flash_salign, #flash_wmode { width: 100px }
+#flash_base, #flash_flashvars { width: 240px }
+#width, #height { width: 40px }
+#src, #media_type { width: 250px }
+#class { width: 120px }
+#prev { margin: 0; border: 1px solid black; width: 380px; height: 230px; overflow: auto }
+.panel_wrapper div.current { height: 390px; overflow: auto }
+#flash_options, #shockwave_options, #qt_options, #wmp_options, #rmp_options { display: none }
+.mceAddSelectValue { background-color: #DDDDDD }
+#qt_starttime, #qt_endtime, #qt_fov, #qt_href, #qt_moveid, #qt_moviename, #qt_node, #qt_pan, #qt_qtsrc, #qt_qtsrcchokespeed, #qt_target, #qt_tilt, #qt_urlsubstituten, #qt_volume { width: 70px }
+#wmp_balance, #wmp_baseurl, #wmp_captioningid, #wmp_currentmarker, #wmp_currentposition, #wmp_defaultframe, #wmp_playcount, #wmp_rate, #wmp_uimode, #wmp_volume { width: 70px }
+#rmp_console, #rmp_numloop, #rmp_controls, #rmp_scriptcallbacks { width: 70px }
+#shockwave_swvolume, #shockwave_swframe, #shockwave_swurl, #shockwave_swstretchvalign, #shockwave_swstretchhalign, #shockwave_swstretchstyle { width: 90px }
+#qt_qtsrc { width: 200px }
diff --git a/webapp/web/js/tiny_mce/plugins/media/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/media/editor_plugin_src.js
index 31ef9ce99..de75ecfcb 100755
--- a/webapp/web/js/tiny_mce/plugins/media/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/media/editor_plugin_src.js
@@ -1,366 +1,366 @@
-/**
- * $Id: editor_plugin_src.js 880 2008-06-19 10:14:14Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	var each = tinymce.each;
-
-	tinymce.create('tinymce.plugins.MediaPlugin', {
-		init : function(ed, url) {
-			var t = this;
-			
-			t.editor = ed;
-			t.url = url;
-
-			function isMediaElm(n) {
-				return /^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(n.className);
-			};
-
-			ed.onPreInit.add(function() {
-				// Force in _value parameter this extra parameter is required for older Opera versions
-				ed.serializer.addRules('param[name|value|_value]');
-			});
-
-			// Register commands
-			ed.addCommand('mceMedia', function() {
-				ed.windowManager.open({
-					file : url + '/media.htm',
-					width : 430 + parseInt(ed.getLang('media.delta_width', 0)),
-					height : 470 + parseInt(ed.getLang('media.delta_height', 0)),
-					inline : 1
-				}, {
-					plugin_url : url
-				});
-			});
-
-			// Register buttons
-			ed.addButton('media', {title : 'media.desc', cmd : 'mceMedia'});
-
-			ed.onNodeChange.add(function(ed, cm, n) {
-				cm.setActive('media', n.nodeName == 'IMG' && isMediaElm(n));
-			});
-
-			ed.onInit.add(function() {
-				var lo = {
-					mceItemFlash : 'flash',
-					mceItemShockWave : 'shockwave',
-					mceItemWindowsMedia : 'windowsmedia',
-					mceItemQuickTime : 'quicktime',
-					mceItemRealMedia : 'realmedia'
-				};
-
-				if (ed.settings.content_css !== false)
-					ed.dom.loadCSS(url + "/css/content.css");
-
-				if (ed.theme.onResolveName) {
-					ed.theme.onResolveName.add(function(th, o) {
-						if (o.name == 'img') {
-							each(lo, function(v, k) {
-								if (ed.dom.hasClass(o.node, k)) {
-									o.name = v;
-									o.title = ed.dom.getAttrib(o.node, 'title');
-									return false;
-								}
-							});
-						}
-					});
-				}
-
-				if (ed && ed.plugins.contextmenu) {
-					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {
-						if (e.nodeName == 'IMG' && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(e.className)) {
-							m.add({title : 'media.edit', icon : 'media', cmd : 'mceMedia'});
-						}
-					});
-				}
-			});
-
-			ed.onBeforeSetContent.add(function(ed, o) {
-				var h = o.content;
-
-				h = h.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi, function(a, b, c) {
-					var o = t._parse(c);
-
-					return '<img class="mceItem' + b + '" title="' + ed.dom.encode(c) + '" src="' + url + '/img/trans.gif" width="' + o.width + '" height="' + o.height + '" />'
-				});
-
-				h = h.replace(/<object([^>]*)>/gi, '<span class="mceItemObject" $1>');
-				h = h.replace(/<embed([^>]*)\/?>/gi, '<span class="mceItemEmbed" $1></span>');
-				h = h.replace(/<embed([^>]*)>/gi, '<span class="mceItemEmbed" $1>');
-				h = h.replace(/<\/(object)([^>]*)>/gi, '</span>');
-				h = h.replace(/<\/embed>/gi, '');
-				h = h.replace(/<param([^>]*)>/gi, function(a, b) {return '<span ' + b.replace(/value=/gi, '_value=') + ' class="mceItemParam"></span>'});
-				h = h.replace(/\/ class=\"mceItemParam\"><\/span>/gi, 'class="mceItemParam"></span>');
-
-				o.content = h;
-			});
-
-			ed.onSetContent.add(function() {
-				t._spansToImgs(ed.getBody());
-			});
-
-			ed.onPreProcess.add(function(ed, o) {
-				var dom = ed.dom;
-
-				if (o.set) {
-					t._spansToImgs(o.node);
-
-					each(dom.select('IMG', o.node), function(n) {
-						var p;
-
-						if (isMediaElm(n)) {
-							p = t._parse(n.title);
-							dom.setAttrib(n, 'width', dom.getAttrib(n, 'width', p.width || 100));
-							dom.setAttrib(n, 'height', dom.getAttrib(n, 'height', p.height || 100));
-						}
-					});
-				}
-
-				if (o.get) {
-					each(dom.select('IMG', o.node), function(n) {
-						var ci, cb, mt;
-
-						if (ed.getParam('media_use_script')) {
-							if (isMediaElm(n))
-								n.className = n.className.replace(/mceItem/g, 'mceTemp');
-
-							return;
-						}
-
-						switch (n.className) {
-							case 'mceItemFlash':
-								ci = 'd27cdb6e-ae6d-11cf-96b8-444553540000';
-								cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
-								mt = 'application/x-shockwave-flash';
-								break;
-
-							case 'mceItemShockWave':
-								ci = '166b1bca-3f9c-11cf-8075-444553540000';
-								cb = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';
-								mt = 'application/x-director';
-								break;
-
-							case 'mceItemWindowsMedia':
-								ci = ed.getParam('media_wmp6_compatible') ? '05589fa1-c356-11ce-bf01-00aa0055595a' : '6bf52a52-394a-11d3-b153-00c04f79faa6';
-								cb = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
-								mt = 'application/x-mplayer2';
-								break;
-
-							case 'mceItemQuickTime':
-								ci = '02bf25d5-8c17-4b23-bc80-d3488abddc6b';
-								cb = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';
-								mt = 'video/quicktime';
-								break;
-
-							case 'mceItemRealMedia':
-								ci = 'cfcdaa03-8be4-11cf-b84b-0020afbbccfa';
-								cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
-								mt = 'audio/x-pn-realaudio-plugin';
-								break;
-						}
-
-						if (ci) {
-							dom.replace(t._buildObj({
-								classid : ci,
-								codebase : cb,
-								type : mt
-							}, n), n);
-						}
-					});
-				}
-			});
-
-			ed.onPostProcess.add(function(ed, o) {
-				o.content = o.content.replace(/_value=/g, 'value=');
-			});
-
-			if (ed.getParam('media_use_script')) {
-				function getAttr(s, n) {
-					n = new RegExp(n + '=\"([^\"]+)\"', 'g').exec(s);
-
-					return n ? ed.dom.decode(n[1]) : '';
-				};
-
-				ed.onPostProcess.add(function(ed, o) {
-					o.content = o.content.replace(/<img[^>]+>/g, function(im) {
-						var cl = getAttr(im, 'class');
-
-						if (/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(cl)) {
-							at = t._parse(getAttr(im, 'title'));
-							at.width = getAttr(im, 'width');
-							at.height = getAttr(im, 'height');
-							im = '<script type="text/javascript">write' + cl.substring(7) + '({' + t._serialize(at) + '});</script>';
-						}
-
-						return im;
-					});
-				});
-			}
-		},
-
-		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
-			};
-		},
-
-		// Private methods
-
-		_buildObj : function(o, n) {
-			var ob, ed = this.editor, dom = ed.dom, p = this._parse(n.title);
-
-			p.width = o.width = dom.getAttrib(n, 'width') || 100;
-			p.height = o.height = dom.getAttrib(n, 'height') || 100;
-
-			ob = dom.create('span', {
-				mce_name : 'object',
-				classid : "clsid:" + o.classid,
-				codebase : o.codebase,
-				width : o.width,
-				height : o.height
-			});
-
-			if (p.src)
-				p.src = ed.convertURL(p.src, 'src', n);
-
-			each (p, function(v, k) {
-				if (!/^(width|height|codebase|classid)$/.test(k)) {
-					// Use url instead of src in IE for Windows media
-					if (o.type == 'application/x-mplayer2' && k == 'src')
-						k = 'url';
-
-					dom.add(ob, 'span', {mce_name : 'param', name : k, '_value' : v});
-				}
-			});
-
-			dom.add(ob, 'span', tinymce.extend({mce_name : 'embed', type : o.type}, p));
-
-			return ob;
-		},
-
-		_spansToImgs : function(p) {
-			var t = this, dom = t.editor.dom, im, ci;
-
-			each(dom.select('span', p), function(n) {
-				// Convert object into image
-				if (dom.getAttrib(n, 'class') == 'mceItemObject') {
-					ci = dom.getAttrib(n, "classid").toLowerCase().replace(/\s+/g, '');
-
-					switch (ci) {
-						case 'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000':
-							dom.replace(t._createImg('mceItemFlash', n), n);
-							break;
-
-						case 'clsid:166b1bca-3f9c-11cf-8075-444553540000':
-							dom.replace(t._createImg('mceItemShockWave', n), n);
-							break;
-
-						case 'clsid:6bf52a52-394a-11d3-b153-00c04f79faa6':
-						case 'clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95':
-						case 'clsid:05589fa1-c356-11ce-bf01-00aa0055595a':
-							dom.replace(t._createImg('mceItemWindowsMedia', n), n);
-							break;
-
-						case 'clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b':
-							dom.replace(t._createImg('mceItemQuickTime', n), n);
-							break;
-
-						case 'clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa':
-							dom.replace(t._createImg('mceItemRealMedia', n), n);
-							break;
-
-						default:
-							dom.replace(t._createImg('mceItemFlash', n), n);
-					}
-					
-					return;
-				}
-
-				// Convert embed into image
-				if (dom.getAttrib(n, 'class') == 'mceItemEmbed') {
-					switch (dom.getAttrib(n, 'type')) {
-						case 'application/x-shockwave-flash':
-							dom.replace(t._createImg('mceItemFlash', n), n);
-							break;
-
-						case 'application/x-director':
-							dom.replace(t._createImg('mceItemShockWave', n), n);
-							break;
-
-						case 'application/x-mplayer2':
-							dom.replace(t._createImg('mceItemWindowsMedia', n), n);
-							break;
-
-						case 'video/quicktime':
-							dom.replace(t._createImg('mceItemQuickTime', n), n);
-							break;
-
-						case 'audio/x-pn-realaudio-plugin':
-							dom.replace(t._createImg('mceItemRealMedia', n), n);
-							break;
-
-						default:
-							dom.replace(t._createImg('mceItemFlash', n), n);
-					}
-				}			
-			});
-		},
-
-		_createImg : function(cl, n) {
-			var im, dom = this.editor.dom, pa = {}, ti = '';
-
-			// Create image
-			im = dom.create('img', {
-				src : this.url + '/img/trans.gif',
-				width : dom.getAttrib(n, 'width') || 100,
-				height : dom.getAttrib(n, 'height') || 100,
-				'class' : cl
-			});
-
-			// Setup base parameters
-			each(['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode'], function(na) {
-				var v = dom.getAttrib(n, na);
-
-				if (v)
-					pa[na] = v;
-			});
-
-			// Add optional parameters
-			each(dom.select('span', n), function(n) {
-				if (dom.hasClass(n, 'mceItemParam'))
-					pa[dom.getAttrib(n, 'name')] = dom.getAttrib(n, '_value');
-			});
-
-			// Use src not movie
-			if (pa.movie) {
-				pa.src = pa.movie;
-				delete pa.movie;
-			}
-
-			delete pa.width;
-			delete pa.height;
-
-			im.title = this._serialize(pa);
-
-			return im;
-		},
-
-		_parse : function(s) {
-			return tinymce.util.JSON.parse('{' + s + '}');
-		},
-
-		_serialize : function(o) {
-			return tinymce.util.JSON.serialize(o).replace(/[{}]/g, '');
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('media', tinymce.plugins.MediaPlugin);
+/**
+ * $Id: editor_plugin_src.js 880 2008-06-19 10:14:14Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('tinymce.plugins.MediaPlugin', {
+		init : function(ed, url) {
+			var t = this;
+			
+			t.editor = ed;
+			t.url = url;
+
+			function isMediaElm(n) {
+				return /^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(n.className);
+			};
+
+			ed.onPreInit.add(function() {
+				// Force in _value parameter this extra parameter is required for older Opera versions
+				ed.serializer.addRules('param[name|value|_value]');
+			});
+
+			// Register commands
+			ed.addCommand('mceMedia', function() {
+				ed.windowManager.open({
+					file : url + '/media.htm',
+					width : 430 + parseInt(ed.getLang('media.delta_width', 0)),
+					height : 470 + parseInt(ed.getLang('media.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			// Register buttons
+			ed.addButton('media', {title : 'media.desc', cmd : 'mceMedia'});
+
+			ed.onNodeChange.add(function(ed, cm, n) {
+				cm.setActive('media', n.nodeName == 'IMG' && isMediaElm(n));
+			});
+
+			ed.onInit.add(function() {
+				var lo = {
+					mceItemFlash : 'flash',
+					mceItemShockWave : 'shockwave',
+					mceItemWindowsMedia : 'windowsmedia',
+					mceItemQuickTime : 'quicktime',
+					mceItemRealMedia : 'realmedia'
+				};
+
+				if (ed.settings.content_css !== false)
+					ed.dom.loadCSS(url + "/css/content.css");
+
+				if (ed.theme.onResolveName) {
+					ed.theme.onResolveName.add(function(th, o) {
+						if (o.name == 'img') {
+							each(lo, function(v, k) {
+								if (ed.dom.hasClass(o.node, k)) {
+									o.name = v;
+									o.title = ed.dom.getAttrib(o.node, 'title');
+									return false;
+								}
+							});
+						}
+					});
+				}
+
+				if (ed && ed.plugins.contextmenu) {
+					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {
+						if (e.nodeName == 'IMG' && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(e.className)) {
+							m.add({title : 'media.edit', icon : 'media', cmd : 'mceMedia'});
+						}
+					});
+				}
+			});
+
+			ed.onBeforeSetContent.add(function(ed, o) {
+				var h = o.content;
+
+				h = h.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi, function(a, b, c) {
+					var o = t._parse(c);
+
+					return '<img class="mceItem' + b + '" title="' + ed.dom.encode(c) + '" src="' + url + '/img/trans.gif" width="' + o.width + '" height="' + o.height + '" />'
+				});
+
+				h = h.replace(/<object([^>]*)>/gi, '<span class="mceItemObject" $1>');
+				h = h.replace(/<embed([^>]*)\/?>/gi, '<span class="mceItemEmbed" $1></span>');
+				h = h.replace(/<embed([^>]*)>/gi, '<span class="mceItemEmbed" $1>');
+				h = h.replace(/<\/(object)([^>]*)>/gi, '</span>');
+				h = h.replace(/<\/embed>/gi, '');
+				h = h.replace(/<param([^>]*)>/gi, function(a, b) {return '<span ' + b.replace(/value=/gi, '_value=') + ' class="mceItemParam"></span>'});
+				h = h.replace(/\/ class=\"mceItemParam\"><\/span>/gi, 'class="mceItemParam"></span>');
+
+				o.content = h;
+			});
+
+			ed.onSetContent.add(function() {
+				t._spansToImgs(ed.getBody());
+			});
+
+			ed.onPreProcess.add(function(ed, o) {
+				var dom = ed.dom;
+
+				if (o.set) {
+					t._spansToImgs(o.node);
+
+					each(dom.select('IMG', o.node), function(n) {
+						var p;
+
+						if (isMediaElm(n)) {
+							p = t._parse(n.title);
+							dom.setAttrib(n, 'width', dom.getAttrib(n, 'width', p.width || 100));
+							dom.setAttrib(n, 'height', dom.getAttrib(n, 'height', p.height || 100));
+						}
+					});
+				}
+
+				if (o.get) {
+					each(dom.select('IMG', o.node), function(n) {
+						var ci, cb, mt;
+
+						if (ed.getParam('media_use_script')) {
+							if (isMediaElm(n))
+								n.className = n.className.replace(/mceItem/g, 'mceTemp');
+
+							return;
+						}
+
+						switch (n.className) {
+							case 'mceItemFlash':
+								ci = 'd27cdb6e-ae6d-11cf-96b8-444553540000';
+								cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
+								mt = 'application/x-shockwave-flash';
+								break;
+
+							case 'mceItemShockWave':
+								ci = '166b1bca-3f9c-11cf-8075-444553540000';
+								cb = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';
+								mt = 'application/x-director';
+								break;
+
+							case 'mceItemWindowsMedia':
+								ci = ed.getParam('media_wmp6_compatible') ? '05589fa1-c356-11ce-bf01-00aa0055595a' : '6bf52a52-394a-11d3-b153-00c04f79faa6';
+								cb = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
+								mt = 'application/x-mplayer2';
+								break;
+
+							case 'mceItemQuickTime':
+								ci = '02bf25d5-8c17-4b23-bc80-d3488abddc6b';
+								cb = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';
+								mt = 'video/quicktime';
+								break;
+
+							case 'mceItemRealMedia':
+								ci = 'cfcdaa03-8be4-11cf-b84b-0020afbbccfa';
+								cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
+								mt = 'audio/x-pn-realaudio-plugin';
+								break;
+						}
+
+						if (ci) {
+							dom.replace(t._buildObj({
+								classid : ci,
+								codebase : cb,
+								type : mt
+							}, n), n);
+						}
+					});
+				}
+			});
+
+			ed.onPostProcess.add(function(ed, o) {
+				o.content = o.content.replace(/_value=/g, 'value=');
+			});
+
+			if (ed.getParam('media_use_script')) {
+				function getAttr(s, n) {
+					n = new RegExp(n + '=\"([^\"]+)\"', 'g').exec(s);
+
+					return n ? ed.dom.decode(n[1]) : '';
+				};
+
+				ed.onPostProcess.add(function(ed, o) {
+					o.content = o.content.replace(/<img[^>]+>/g, function(im) {
+						var cl = getAttr(im, 'class');
+
+						if (/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(cl)) {
+							at = t._parse(getAttr(im, 'title'));
+							at.width = getAttr(im, 'width');
+							at.height = getAttr(im, 'height');
+							im = '<script type="text/javascript">write' + cl.substring(7) + '({' + t._serialize(at) + '});</script>';
+						}
+
+						return im;
+					});
+				});
+			}
+		},
+
+		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
+			};
+		},
+
+		// Private methods
+
+		_buildObj : function(o, n) {
+			var ob, ed = this.editor, dom = ed.dom, p = this._parse(n.title);
+
+			p.width = o.width = dom.getAttrib(n, 'width') || 100;
+			p.height = o.height = dom.getAttrib(n, 'height') || 100;
+
+			ob = dom.create('span', {
+				mce_name : 'object',
+				classid : "clsid:" + o.classid,
+				codebase : o.codebase,
+				width : o.width,
+				height : o.height
+			});
+
+			if (p.src)
+				p.src = ed.convertURL(p.src, 'src', n);
+
+			each (p, function(v, k) {
+				if (!/^(width|height|codebase|classid)$/.test(k)) {
+					// Use url instead of src in IE for Windows media
+					if (o.type == 'application/x-mplayer2' && k == 'src')
+						k = 'url';
+
+					dom.add(ob, 'span', {mce_name : 'param', name : k, '_value' : v});
+				}
+			});
+
+			dom.add(ob, 'span', tinymce.extend({mce_name : 'embed', type : o.type}, p));
+
+			return ob;
+		},
+
+		_spansToImgs : function(p) {
+			var t = this, dom = t.editor.dom, im, ci;
+
+			each(dom.select('span', p), function(n) {
+				// Convert object into image
+				if (dom.getAttrib(n, 'class') == 'mceItemObject') {
+					ci = dom.getAttrib(n, "classid").toLowerCase().replace(/\s+/g, '');
+
+					switch (ci) {
+						case 'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000':
+							dom.replace(t._createImg('mceItemFlash', n), n);
+							break;
+
+						case 'clsid:166b1bca-3f9c-11cf-8075-444553540000':
+							dom.replace(t._createImg('mceItemShockWave', n), n);
+							break;
+
+						case 'clsid:6bf52a52-394a-11d3-b153-00c04f79faa6':
+						case 'clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95':
+						case 'clsid:05589fa1-c356-11ce-bf01-00aa0055595a':
+							dom.replace(t._createImg('mceItemWindowsMedia', n), n);
+							break;
+
+						case 'clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b':
+							dom.replace(t._createImg('mceItemQuickTime', n), n);
+							break;
+
+						case 'clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa':
+							dom.replace(t._createImg('mceItemRealMedia', n), n);
+							break;
+
+						default:
+							dom.replace(t._createImg('mceItemFlash', n), n);
+					}
+					
+					return;
+				}
+
+				// Convert embed into image
+				if (dom.getAttrib(n, 'class') == 'mceItemEmbed') {
+					switch (dom.getAttrib(n, 'type')) {
+						case 'application/x-shockwave-flash':
+							dom.replace(t._createImg('mceItemFlash', n), n);
+							break;
+
+						case 'application/x-director':
+							dom.replace(t._createImg('mceItemShockWave', n), n);
+							break;
+
+						case 'application/x-mplayer2':
+							dom.replace(t._createImg('mceItemWindowsMedia', n), n);
+							break;
+
+						case 'video/quicktime':
+							dom.replace(t._createImg('mceItemQuickTime', n), n);
+							break;
+
+						case 'audio/x-pn-realaudio-plugin':
+							dom.replace(t._createImg('mceItemRealMedia', n), n);
+							break;
+
+						default:
+							dom.replace(t._createImg('mceItemFlash', n), n);
+					}
+				}			
+			});
+		},
+
+		_createImg : function(cl, n) {
+			var im, dom = this.editor.dom, pa = {}, ti = '';
+
+			// Create image
+			im = dom.create('img', {
+				src : this.url + '/img/trans.gif',
+				width : dom.getAttrib(n, 'width') || 100,
+				height : dom.getAttrib(n, 'height') || 100,
+				'class' : cl
+			});
+
+			// Setup base parameters
+			each(['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode'], function(na) {
+				var v = dom.getAttrib(n, na);
+
+				if (v)
+					pa[na] = v;
+			});
+
+			// Add optional parameters
+			each(dom.select('span', n), function(n) {
+				if (dom.hasClass(n, 'mceItemParam'))
+					pa[dom.getAttrib(n, 'name')] = dom.getAttrib(n, '_value');
+			});
+
+			// Use src not movie
+			if (pa.movie) {
+				pa.src = pa.movie;
+				delete pa.movie;
+			}
+
+			delete pa.width;
+			delete pa.height;
+
+			im.title = this._serialize(pa);
+
+			return im;
+		},
+
+		_parse : function(s) {
+			return tinymce.util.JSON.parse('{' + s + '}');
+		},
+
+		_serialize : function(o) {
+			return tinymce.util.JSON.serialize(o).replace(/[{}]/g, '');
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('media', tinymce.plugins.MediaPlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/media/js/embed.js b/webapp/web/js/tiny_mce/plugins/media/js/embed.js
index f8dc81052..6fe25de09 100755
--- a/webapp/web/js/tiny_mce/plugins/media/js/embed.js
+++ b/webapp/web/js/tiny_mce/plugins/media/js/embed.js
@@ -1,73 +1,73 @@
-/**
- * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose.
- */
-
-function writeFlash(p) {
-	writeEmbed(
-		'D27CDB6E-AE6D-11cf-96B8-444553540000',
-		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
-		'application/x-shockwave-flash',
-		p
-	);
-}
-
-function writeShockWave(p) {
-	writeEmbed(
-	'166B1BCA-3F9C-11CF-8075-444553540000',
-	'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0',
-	'application/x-director',
-		p
-	);
-}
-
-function writeQuickTime(p) {
-	writeEmbed(
-		'02BF25D5-8C17-4B23-BC80-D3488ABDDC6B',
-		'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0',
-		'video/quicktime',
-		p
-	);
-}
-
-function writeRealMedia(p) {
-	writeEmbed(
-		'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA',
-		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
-		'audio/x-pn-realaudio-plugin',
-		p
-	);
-}
-
-function writeWindowsMedia(p) {
-	p.url = p.src;
-	writeEmbed(
-		'6BF52A52-394A-11D3-B153-00C04F79FAA6',
-		'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701',
-		'application/x-mplayer2',
-		p
-	);
-}
-
-function writeEmbed(cls, cb, mt, p) {
-	var h = '', n;
-
-	h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';
-	h += typeof(p.id) != "undefined" ? 'id="' + p.id + '"' : '';
-	h += typeof(p.name) != "undefined" ? 'name="' + p.name + '"' : '';
-	h += typeof(p.width) != "undefined" ? 'width="' + p.width + '"' : '';
-	h += typeof(p.height) != "undefined" ? 'height="' + p.height + '"' : '';
-	h += typeof(p.align) != "undefined" ? 'align="' + p.align + '"' : '';
-	h += '>';
-
-	for (n in p)
-		h += '<param name="' + n + '" value="' + p[n] + '">';
-
-	h += '<embed type="' + mt + '"';
-
-	for (n in p)
-		h += n + '="' + p[n] + '" ';
-
-	h += '></embed></object>';
-
-	document.write(h);
-}
+/**
+ * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose.
+ */
+
+function writeFlash(p) {
+	writeEmbed(
+		'D27CDB6E-AE6D-11cf-96B8-444553540000',
+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+		'application/x-shockwave-flash',
+		p
+	);
+}
+
+function writeShockWave(p) {
+	writeEmbed(
+	'166B1BCA-3F9C-11CF-8075-444553540000',
+	'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0',
+	'application/x-director',
+		p
+	);
+}
+
+function writeQuickTime(p) {
+	writeEmbed(
+		'02BF25D5-8C17-4B23-BC80-D3488ABDDC6B',
+		'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0',
+		'video/quicktime',
+		p
+	);
+}
+
+function writeRealMedia(p) {
+	writeEmbed(
+		'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA',
+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+		'audio/x-pn-realaudio-plugin',
+		p
+	);
+}
+
+function writeWindowsMedia(p) {
+	p.url = p.src;
+	writeEmbed(
+		'6BF52A52-394A-11D3-B153-00C04F79FAA6',
+		'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701',
+		'application/x-mplayer2',
+		p
+	);
+}
+
+function writeEmbed(cls, cb, mt, p) {
+	var h = '', n;
+
+	h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';
+	h += typeof(p.id) != "undefined" ? 'id="' + p.id + '"' : '';
+	h += typeof(p.name) != "undefined" ? 'name="' + p.name + '"' : '';
+	h += typeof(p.width) != "undefined" ? 'width="' + p.width + '"' : '';
+	h += typeof(p.height) != "undefined" ? 'height="' + p.height + '"' : '';
+	h += typeof(p.align) != "undefined" ? 'align="' + p.align + '"' : '';
+	h += '>';
+
+	for (n in p)
+		h += '<param name="' + n + '" value="' + p[n] + '">';
+
+	h += '<embed type="' + mt + '"';
+
+	for (n in p)
+		h += n + '="' + p[n] + '" ';
+
+	h += '></embed></object>';
+
+	document.write(h);
+}
diff --git a/webapp/web/js/tiny_mce/plugins/media/js/media.js b/webapp/web/js/tiny_mce/plugins/media/js/media.js
index 28816d1e1..f67a74bdf 100755
--- a/webapp/web/js/tiny_mce/plugins/media/js/media.js
+++ b/webapp/web/js/tiny_mce/plugins/media/js/media.js
@@ -1,628 +1,628 @@
-tinyMCEPopup.requireLangPack();
-
-var oldWidth, oldHeight, ed, url;
-
-if (url = tinyMCEPopup.getParam("media_external_list_url"))
-	document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
-
-function init() {
-	var pl = "", f, val;
-	var type = "flash", fe, i;
-
-	ed = tinyMCEPopup.editor;
-
-	tinyMCEPopup.resizeToInnerSize();
-	f = document.forms[0]
-
-	fe = ed.selection.getNode();
-	if (/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) {
-		pl = fe.title;
-
-		switch (ed.dom.getAttrib(fe, 'class')) {
-			case 'mceItemFlash':
-				type = 'flash';
-				break;
-
-			case 'mceItemFlashVideo':
-				type = 'flv';
-				break;
-
-			case 'mceItemShockWave':
-				type = 'shockwave';
-				break;
-
-			case 'mceItemWindowsMedia':
-				type = 'wmp';
-				break;
-
-			case 'mceItemQuickTime':
-				type = 'qt';
-				break;
-
-			case 'mceItemRealMedia':
-				type = 'rmp';
-				break;
-		}
-
-		document.forms[0].insert.value = ed.getLang('update', 'Insert', true); 
-	}
-
-	document.getElementById('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');
-	document.getElementById('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','qt_qtsrc','media','media');
-	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
-
-	var html = getMediaListHTML('medialist','src','media','media');
-	if (html == "")
-		document.getElementById("linklistrow").style.display = 'none';
-	else
-		document.getElementById("linklistcontainer").innerHTML = html;
-
-	// Resize some elements
-	if (isVisible('filebrowser'))
-		document.getElementById('src').style.width = '230px';
-
-	// Setup form
-	if (pl != "") {
-		pl = tinyMCEPopup.editor.plugins.media._parse(pl);
-
-		switch (type) {
-			case "flash":
-				setBool(pl, 'flash', 'play');
-				setBool(pl, 'flash', 'loop');
-				setBool(pl, 'flash', 'menu');
-				setBool(pl, 'flash', 'swliveconnect');
-				setStr(pl, 'flash', 'quality');
-				setStr(pl, 'flash', 'scale');
-				setStr(pl, 'flash', 'salign');
-				setStr(pl, 'flash', 'wmode');
-				setStr(pl, 'flash', 'base');
-				setStr(pl, 'flash', 'flashvars');
-			break;
-
-			case "qt":
-				setBool(pl, 'qt', 'loop');
-				setBool(pl, 'qt', 'autoplay');
-				setBool(pl, 'qt', 'cache');
-				setBool(pl, 'qt', 'controller');
-				setBool(pl, 'qt', 'correction');
-				setBool(pl, 'qt', 'enablejavascript');
-				setBool(pl, 'qt', 'kioskmode');
-				setBool(pl, 'qt', 'autohref');
-				setBool(pl, 'qt', 'playeveryframe');
-				setBool(pl, 'qt', 'tarsetcache');
-				setStr(pl, 'qt', 'scale');
-				setStr(pl, 'qt', 'starttime');
-				setStr(pl, 'qt', 'endtime');
-				setStr(pl, 'qt', 'tarset');
-				setStr(pl, 'qt', 'qtsrcchokespeed');
-				setStr(pl, 'qt', 'volume');
-				setStr(pl, 'qt', 'qtsrc');
-			break;
-
-			case "shockwave":
-				setBool(pl, 'shockwave', 'sound');
-				setBool(pl, 'shockwave', 'progress');
-				setBool(pl, 'shockwave', 'autostart');
-				setBool(pl, 'shockwave', 'swliveconnect');
-				setStr(pl, 'shockwave', 'swvolume');
-				setStr(pl, 'shockwave', 'swstretchstyle');
-				setStr(pl, 'shockwave', 'swstretchhalign');
-				setStr(pl, 'shockwave', 'swstretchvalign');
-			break;
-
-			case "wmp":
-				setBool(pl, 'wmp', 'autostart');
-				setBool(pl, 'wmp', 'enabled');
-				setBool(pl, 'wmp', 'enablecontextmenu');
-				setBool(pl, 'wmp', 'fullscreen');
-				setBool(pl, 'wmp', 'invokeurls');
-				setBool(pl, 'wmp', 'mute');
-				setBool(pl, 'wmp', 'stretchtofit');
-				setBool(pl, 'wmp', 'windowlessvideo');
-				setStr(pl, 'wmp', 'balance');
-				setStr(pl, 'wmp', 'baseurl');
-				setStr(pl, 'wmp', 'captioningid');
-				setStr(pl, 'wmp', 'currentmarker');
-				setStr(pl, 'wmp', 'currentposition');
-				setStr(pl, 'wmp', 'defaultframe');
-				setStr(pl, 'wmp', 'playcount');
-				setStr(pl, 'wmp', 'rate');
-				setStr(pl, 'wmp', 'uimode');
-				setStr(pl, 'wmp', 'volume');
-			break;
-
-			case "rmp":
-				setBool(pl, 'rmp', 'autostart');
-				setBool(pl, 'rmp', 'loop');
-				setBool(pl, 'rmp', 'autogotourl');
-				setBool(pl, 'rmp', 'center');
-				setBool(pl, 'rmp', 'imagestatus');
-				setBool(pl, 'rmp', 'maintainaspect');
-				setBool(pl, 'rmp', 'nojava');
-				setBool(pl, 'rmp', 'prefetch');
-				setBool(pl, 'rmp', 'shuffle');
-				setStr(pl, 'rmp', 'console');
-				setStr(pl, 'rmp', 'controls');
-				setStr(pl, 'rmp', 'numloop');
-				setStr(pl, 'rmp', 'scriptcallbacks');
-			break;
-		}
-
-		setStr(pl, null, 'src');
-		setStr(pl, null, 'id');
-		setStr(pl, null, 'name');
-		setStr(pl, null, 'vspace');
-		setStr(pl, null, 'hspace');
-		setStr(pl, null, 'bgcolor');
-		setStr(pl, null, 'align');
-		setStr(pl, null, 'width');
-		setStr(pl, null, 'height');
-
-		if ((val = ed.dom.getAttrib(fe, "width")) != "")
-			pl.width = f.width.value = val;
-
-		if ((val = ed.dom.getAttrib(fe, "height")) != "")
-			pl.height = f.height.value = val;
-
-		oldWidth = pl.width ? parseInt(pl.width) : 0;
-		oldHeight = pl.height ? parseInt(pl.height) : 0;
-	} else
-		oldWidth = oldHeight = 0;
-
-	selectByValue(f, 'media_type', type);
-	changedType(type);
-	updateColor('bgcolor_pick', 'bgcolor');
-
-	TinyMCE_EditableSelects.init();
-	generatePreview();
-}
-
-function insertMedia() {
-	var fe, f = document.forms[0], h;
-
-	tinyMCEPopup.restoreSelection();
-
-	if (!AutoValidator.validate(f)) {
-		tinyMCEPopup.alert(ed.getLang('invalid_data'));
-		return false;
-	}
-
-	f.width.value = f.width.value == "" ? 100 : f.width.value;
-	f.height.value = f.height.value == "" ? 100 : f.height.value;
-
-	fe = ed.selection.getNode();
-	if (fe != null && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) {
-		switch (f.media_type.options[f.media_type.selectedIndex].value) {
-			case "flash":
-				fe.className = "mceItemFlash";
-				break;
-
-			case "flv":
-				fe.className = "mceItemFlashVideo";
-				break;
-
-			case "shockwave":
-				fe.className = "mceItemShockWave";
-				break;
-
-			case "qt":
-				fe.className = "mceItemQuickTime";
-				break;
-
-			case "wmp":
-				fe.className = "mceItemWindowsMedia";
-				break;
-
-			case "rmp":
-				fe.className = "mceItemRealMedia";
-				break;
-		}
-
-		if (fe.width != f.width.value || fe.height != f.height.height)
-			ed.execCommand('mceRepaint');
-
-		fe.title = serializeParameters();
-		fe.width = f.width.value;
-		fe.height = f.height.value;
-		fe.style.width = f.width.value + (f.width.value.indexOf('%') == -1 ? 'px' : '');
-		fe.style.height = f.height.value + (f.height.value.indexOf('%') == -1 ? 'px' : '');
-		fe.align = f.align.options[f.align.selectedIndex].value;
-	} else {
-		h = '<img src="' + tinyMCEPopup.getWindowArg("plugin_url") + '/img/trans.gif"' ;
-
-		switch (f.media_type.options[f.media_type.selectedIndex].value) {
-			case "flash":
-				h += ' class="mceItemFlash"';
-				break;
-
-			case "flv":
-				h += ' class="mceItemFlashVideo"';
-				break;
-
-			case "shockwave":
-				h += ' class="mceItemShockWave"';
-				break;
-
-			case "qt":
-				h += ' class="mceItemQuickTime"';
-				break;
-
-			case "wmp":
-				h += ' class="mceItemWindowsMedia"';
-				break;
-
-			case "rmp":
-				h += ' class="mceItemRealMedia"';
-				break;
-		}
-
-		h += ' title="' + serializeParameters() + '"';
-		h += ' width="' + f.width.value + '"';
-		h += ' height="' + f.height.value + '"';
-		h += ' align="' + f.align.options[f.align.selectedIndex].value + '"';
-
-		h += ' />';
-
-		ed.execCommand('mceInsertContent', false, h);
-	}
-
-	tinyMCEPopup.close();
-}
-
-function updatePreview() {
-	var f = document.forms[0], type;
-
-	f.width.value = f.width.value || '320';
-	f.height.value = f.height.value || '240';
-
-	type = getType(f.src.value);
-	selectByValue(f, 'media_type', type);
-	changedType(type);
-	generatePreview();
-}
-
-function getMediaListHTML() {
-	if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {
-		var html = "";
-
-		html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;updatePreview();">';
-		html += '<option value="">---</option>';
-
-		for (var i=0; i<tinyMCEMediaList.length; i++)
-			html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';
-
-		html += '</select>';
-
-		return html;
-	}
-
-	return "";
-}
-
-function getType(v) {
-	var fo, i, c, el, x, f = document.forms[0];
-
-	fo = ed.getParam("media_types", "flash=swf;flv=flv;shockwave=dcr;qt=mov,qt,mpg,mp3,mp4,mpeg;shockwave=dcr;wmp=avi,wmv,wm,asf,asx,wmx,wvx;rmp=rm,ra,ram").split(';');
-
-	// YouTube
-	if (v.match(/watch\?v=(.+)(.*)/)) {
-		f.width.value = '425';
-		f.height.value = '350';
-		f.src.value = 'http://www.youtube.com/v/' + v.match(/v=(.*)(.*)/)[0].split('=')[1];
-		return 'flash';
-	}
-
-	// Google video
-	if (v.indexOf('http://video.google.com/videoplay?docid=') == 0) {
-		f.width.value = '425';
-		f.height.value = '326';
-		f.src.value = 'http://video.google.com/googleplayer.swf?docId=' + v.substring('http://video.google.com/videoplay?docid='.length) + '&hl=en';
-		return 'flash';
-	}
-
-	for (i=0; i<fo.length; i++) {
-		c = fo[i].split('=');
-
-		el = c[1].split(',');
-		for (x=0; x<el.length; x++)
-		if (v.indexOf('.' + el[x]) != -1)
-			return c[0];
-	}
-
-	return null;
-}
-
-function switchType(v) {
-	var t = getType(v), d = document, f = d.forms[0];
-
-	if (!t)
-		return;
-
-	selectByValue(d.forms[0], 'media_type', t);
-	changedType(t);
-
-	// Update qtsrc also
-	if (t == 'qt' && f.src.value.toLowerCase().indexOf('rtsp://') != -1) {
-		alert(ed.getLang("media_qt_stream_warn"));
-
-		if (f.qt_qtsrc.value == '')
-			f.qt_qtsrc.value = f.src.value;
-	}
-}
-
-function changedType(t) {
-	var d = document;
-
-	d.getElementById('flash_options').style.display = 'none';
-	d.getElementById('flv_options').style.display = 'none';
-	d.getElementById('qt_options').style.display = 'none';
-	d.getElementById('shockwave_options').style.display = 'none';
-	d.getElementById('wmp_options').style.display = 'none';
-	d.getElementById('rmp_options').style.display = 'none';
-	d.getElementById(t + '_options').style.display = 'block';
-}
-
-function serializeParameters() {
-	var d = document, f = d.forms[0], s = '';
-
-	switch (f.media_type.options[f.media_type.selectedIndex].value) {
-		case "flash":
-			s += getBool('flash', 'play', true);
-			s += getBool('flash', 'loop', true);
-			s += getBool('flash', 'menu', true);
-			s += getBool('flash', 'swliveconnect', false);
-			s += getStr('flash', 'quality');
-			s += getStr('flash', 'scale');
-			s += getStr('flash', 'salign');
-			s += getStr('flash', 'wmode');
-			s += getStr('flash', 'base');
-			s += getStr('flash', 'flashvars');
-		break;
-
-		case "qt":
-			s += getBool('qt', 'loop', false);
-			s += getBool('qt', 'autoplay', true);
-			s += getBool('qt', 'cache', false);
-			s += getBool('qt', 'controller', true);
-			s += getBool('qt', 'correction', false, 'none', 'full');
-			s += getBool('qt', 'enablejavascript', false);
-			s += getBool('qt', 'kioskmode', false);
-			s += getBool('qt', 'autohref', false);
-			s += getBool('qt', 'playeveryframe', false);
-			s += getBool('qt', 'targetcache', false);
-			s += getStr('qt', 'scale');
-			s += getStr('qt', 'starttime');
-			s += getStr('qt', 'endtime');
-			s += getStr('qt', 'target');
-			s += getStr('qt', 'qtsrcchokespeed');
-			s += getStr('qt', 'volume');
-			s += getStr('qt', 'qtsrc');
-		break;
-
-		case "shockwave":
-			s += getBool('shockwave', 'sound');
-			s += getBool('shockwave', 'progress');
-			s += getBool('shockwave', 'autostart');
-			s += getBool('shockwave', 'swliveconnect');
-			s += getStr('shockwave', 'swvolume');
-			s += getStr('shockwave', 'swstretchstyle');
-			s += getStr('shockwave', 'swstretchhalign');
-			s += getStr('shockwave', 'swstretchvalign');
-		break;
-
-		case "wmp":
-			s += getBool('wmp', 'autostart', true);
-			s += getBool('wmp', 'enabled', false);
-			s += getBool('wmp', 'enablecontextmenu', true);
-			s += getBool('wmp', 'fullscreen', false);
-			s += getBool('wmp', 'invokeurls', true);
-			s += getBool('wmp', 'mute', false);
-			s += getBool('wmp', 'stretchtofit', false);
-			s += getBool('wmp', 'windowlessvideo', false);
-			s += getStr('wmp', 'balance');
-			s += getStr('wmp', 'baseurl');
-			s += getStr('wmp', 'captioningid');
-			s += getStr('wmp', 'currentmarker');
-			s += getStr('wmp', 'currentposition');
-			s += getStr('wmp', 'defaultframe');
-			s += getStr('wmp', 'playcount');
-			s += getStr('wmp', 'rate');
-			s += getStr('wmp', 'uimode');
-			s += getStr('wmp', 'volume');
-		break;
-
-		case "rmp":
-			s += getBool('rmp', 'autostart', false);
-			s += getBool('rmp', 'loop', false);
-			s += getBool('rmp', 'autogotourl', true);
-			s += getBool('rmp', 'center', false);
-			s += getBool('rmp', 'imagestatus', true);
-			s += getBool('rmp', 'maintainaspect', false);
-			s += getBool('rmp', 'nojava', false);
-			s += getBool('rmp', 'prefetch', false);
-			s += getBool('rmp', 'shuffle', false);
-			s += getStr('rmp', 'console');
-			s += getStr('rmp', 'controls');
-			s += getStr('rmp', 'numloop');
-			s += getStr('rmp', 'scriptcallbacks');
-		break;
-	}
-
-	s += getStr(null, 'id');
-	s += getStr(null, 'name');
-	s += getStr(null, 'src');
-	s += getStr(null, 'align');
-	s += getStr(null, 'bgcolor');
-	s += getInt(null, 'vspace');
-	s += getInt(null, 'hspace');
-	s += getStr(null, 'width');
-	s += getStr(null, 'height');
-
-	s = s.length > 0 ? s.substring(0, s.length - 1) : s;
-
-	return s;
-}
-
-function setBool(pl, p, n) {
-	if (typeof(pl[n]) == "undefined")
-		return;
-
-	document.forms[0].elements[p + "_" + n].checked = pl[n];
-}
-
-function setStr(pl, p, n) {
-	var f = document.forms[0], e = f.elements[(p != null ? p + "_" : '') + n];
-
-	if (typeof(pl[n]) == "undefined")
-		return;
-
-	if (e.type == "text")
-		e.value = pl[n];
-	else
-		selectByValue(f, (p != null ? p + "_" : '') + n, pl[n]);
-}
-
-function getBool(p, n, d, tv, fv) {
-	var v = document.forms[0].elements[p + "_" + n].checked;
-
-	tv = typeof(tv) == 'undefined' ? 'true' : "'" + jsEncode(tv) + "'";
-	fv = typeof(fv) == 'undefined' ? 'false' : "'" + jsEncode(fv) + "'";
-
-	return (v == d) ? '' : n + (v ? ':' + tv + ',' : ':' + fv + ',');
-}
-
-function getStr(p, n, d) {
-	var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];
-	var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value;
-
-	if (n == 'src')
-		v = tinyMCEPopup.editor.convertURL(v, 'src', null);
-
-	return ((n == d || v == '') ? '' : n + ":'" + jsEncode(v) + "',");
-}
-
-function getInt(p, n, d) {
-	var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];
-	var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value;
-
-	return ((n == d || v == '') ? '' : n + ":" + v.replace(/[^0-9]+/g, '') + ",");
-}
-
-function jsEncode(s) {
-	s = s.replace(new RegExp('\\\\', 'g'), '\\\\');
-	s = s.replace(new RegExp('"', 'g'), '\\"');
-	s = s.replace(new RegExp("'", 'g'), "\\'");
-
-	return s;
-}
-
-function generatePreview(c) {
-	var f = document.forms[0], p = document.getElementById('prev'), h = '', cls, pl, n, type, codebase, wp, hp, nw, nh;
-
-	p.innerHTML = '<!-- x --->';
-
-	nw = parseInt(f.width.value);
-	nh = parseInt(f.height.value);
-
-	if (f.width.value != "" && f.height.value != "") {
-		if (f.constrain.checked) {
-			if (c == 'width' && oldWidth != 0) {
-				wp = nw / oldWidth;
-				nh = Math.round(wp * nh);
-				f.height.value = nh;
-			} else if (c == 'height' && oldHeight != 0) {
-				hp = nh / oldHeight;
-				nw = Math.round(hp * nw);
-				f.width.value = nw;
-			}
-		}
-	}
-
-	if (f.width.value != "")
-		oldWidth = nw;
-
-	if (f.height.value != "")
-		oldHeight = nh;
-
-	// After constrain
-	pl = serializeParameters();
-
-	switch (f.media_type.options[f.media_type.selectedIndex].value) {
-		case "flash":
-			cls = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
-			codebase = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
-			type = 'application/x-shockwave-flash';
-			break;
-
-		case "shockwave":
-			cls = 'clsid:166B1BCA-3F9C-11CF-8075-444553540000';
-			codebase = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';
-			type = 'application/x-director';
-			break;
-
-		case "qt":
-			cls = 'clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B';
-			codebase = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';
-			type = 'video/quicktime';
-			break;
-
-		case "wmp":
-			cls = ed.getParam('media_wmp6_compatible') ? 'clsid:05589FA1-C356-11CE-BF01-00AA0055595A' : 'clsid:6BF52A52-394A-11D3-B153-00C04F79FAA6';
-			codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
-			type = 'application/x-mplayer2';
-			break;
-
-		case "rmp":
-			cls = 'clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA';
-			codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
-			type = 'audio/x-pn-realaudio-plugin';
-			break;
-	}
-
-	if (pl == '') {
-		p.innerHTML = '';
-		return;
-	}
-
-	pl = tinyMCEPopup.editor.plugins.media._parse(pl);
-
-	if (!pl.src) {
-		p.innerHTML = '';
-		return;
-	}
-
-	pl.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(pl.src);
-	pl.width = !pl.width ? 100 : pl.width;
-	pl.height = !pl.height ? 100 : pl.height;
-	pl.id = !pl.id ? 'obj' : pl.id;
-	pl.name = !pl.name ? 'eobj' : pl.name;
-	pl.align = !pl.align ? '' : pl.align;
-
-	// Avoid annoying warning about insecure items
-	if (!tinymce.isIE || document.location.protocol != 'https:') {
-		h += '<object classid="clsid:' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';
-
-		for (n in pl) {
-			h += '<param name="' + n + '" value="' + pl[n] + '">';
-
-			// Add extra url parameter if it's an absolute URL
-			if (n == 'src' && pl[n].indexOf('://') != -1)
-				h += '<param name="url" value="' + pl[n] + '" />';
-		}
-	}
-
-	h += '<embed type="' + type + '" ';
-
-	for (n in pl)
-		h += n + '="' + pl[n] + '" ';
-
-	h += '></embed>';
-
-	// Avoid annoying warning about insecure items
-	if (!tinymce.isIE || document.location.protocol != 'https:')
-		h += '</object>';
-
-	p.innerHTML = "<!-- x --->" + h;
-}
-
-tinyMCEPopup.onInit.add(init);
+tinyMCEPopup.requireLangPack();
+
+var oldWidth, oldHeight, ed, url;
+
+if (url = tinyMCEPopup.getParam("media_external_list_url"))
+	document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+
+function init() {
+	var pl = "", f, val;
+	var type = "flash", fe, i;
+
+	ed = tinyMCEPopup.editor;
+
+	tinyMCEPopup.resizeToInnerSize();
+	f = document.forms[0]
+
+	fe = ed.selection.getNode();
+	if (/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) {
+		pl = fe.title;
+
+		switch (ed.dom.getAttrib(fe, 'class')) {
+			case 'mceItemFlash':
+				type = 'flash';
+				break;
+
+			case 'mceItemFlashVideo':
+				type = 'flv';
+				break;
+
+			case 'mceItemShockWave':
+				type = 'shockwave';
+				break;
+
+			case 'mceItemWindowsMedia':
+				type = 'wmp';
+				break;
+
+			case 'mceItemQuickTime':
+				type = 'qt';
+				break;
+
+			case 'mceItemRealMedia':
+				type = 'rmp';
+				break;
+		}
+
+		document.forms[0].insert.value = ed.getLang('update', 'Insert', true); 
+	}
+
+	document.getElementById('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');
+	document.getElementById('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','qt_qtsrc','media','media');
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+
+	var html = getMediaListHTML('medialist','src','media','media');
+	if (html == "")
+		document.getElementById("linklistrow").style.display = 'none';
+	else
+		document.getElementById("linklistcontainer").innerHTML = html;
+
+	// Resize some elements
+	if (isVisible('filebrowser'))
+		document.getElementById('src').style.width = '230px';
+
+	// Setup form
+	if (pl != "") {
+		pl = tinyMCEPopup.editor.plugins.media._parse(pl);
+
+		switch (type) {
+			case "flash":
+				setBool(pl, 'flash', 'play');
+				setBool(pl, 'flash', 'loop');
+				setBool(pl, 'flash', 'menu');
+				setBool(pl, 'flash', 'swliveconnect');
+				setStr(pl, 'flash', 'quality');
+				setStr(pl, 'flash', 'scale');
+				setStr(pl, 'flash', 'salign');
+				setStr(pl, 'flash', 'wmode');
+				setStr(pl, 'flash', 'base');
+				setStr(pl, 'flash', 'flashvars');
+			break;
+
+			case "qt":
+				setBool(pl, 'qt', 'loop');
+				setBool(pl, 'qt', 'autoplay');
+				setBool(pl, 'qt', 'cache');
+				setBool(pl, 'qt', 'controller');
+				setBool(pl, 'qt', 'correction');
+				setBool(pl, 'qt', 'enablejavascript');
+				setBool(pl, 'qt', 'kioskmode');
+				setBool(pl, 'qt', 'autohref');
+				setBool(pl, 'qt', 'playeveryframe');
+				setBool(pl, 'qt', 'tarsetcache');
+				setStr(pl, 'qt', 'scale');
+				setStr(pl, 'qt', 'starttime');
+				setStr(pl, 'qt', 'endtime');
+				setStr(pl, 'qt', 'tarset');
+				setStr(pl, 'qt', 'qtsrcchokespeed');
+				setStr(pl, 'qt', 'volume');
+				setStr(pl, 'qt', 'qtsrc');
+			break;
+
+			case "shockwave":
+				setBool(pl, 'shockwave', 'sound');
+				setBool(pl, 'shockwave', 'progress');
+				setBool(pl, 'shockwave', 'autostart');
+				setBool(pl, 'shockwave', 'swliveconnect');
+				setStr(pl, 'shockwave', 'swvolume');
+				setStr(pl, 'shockwave', 'swstretchstyle');
+				setStr(pl, 'shockwave', 'swstretchhalign');
+				setStr(pl, 'shockwave', 'swstretchvalign');
+			break;
+
+			case "wmp":
+				setBool(pl, 'wmp', 'autostart');
+				setBool(pl, 'wmp', 'enabled');
+				setBool(pl, 'wmp', 'enablecontextmenu');
+				setBool(pl, 'wmp', 'fullscreen');
+				setBool(pl, 'wmp', 'invokeurls');
+				setBool(pl, 'wmp', 'mute');
+				setBool(pl, 'wmp', 'stretchtofit');
+				setBool(pl, 'wmp', 'windowlessvideo');
+				setStr(pl, 'wmp', 'balance');
+				setStr(pl, 'wmp', 'baseurl');
+				setStr(pl, 'wmp', 'captioningid');
+				setStr(pl, 'wmp', 'currentmarker');
+				setStr(pl, 'wmp', 'currentposition');
+				setStr(pl, 'wmp', 'defaultframe');
+				setStr(pl, 'wmp', 'playcount');
+				setStr(pl, 'wmp', 'rate');
+				setStr(pl, 'wmp', 'uimode');
+				setStr(pl, 'wmp', 'volume');
+			break;
+
+			case "rmp":
+				setBool(pl, 'rmp', 'autostart');
+				setBool(pl, 'rmp', 'loop');
+				setBool(pl, 'rmp', 'autogotourl');
+				setBool(pl, 'rmp', 'center');
+				setBool(pl, 'rmp', 'imagestatus');
+				setBool(pl, 'rmp', 'maintainaspect');
+				setBool(pl, 'rmp', 'nojava');
+				setBool(pl, 'rmp', 'prefetch');
+				setBool(pl, 'rmp', 'shuffle');
+				setStr(pl, 'rmp', 'console');
+				setStr(pl, 'rmp', 'controls');
+				setStr(pl, 'rmp', 'numloop');
+				setStr(pl, 'rmp', 'scriptcallbacks');
+			break;
+		}
+
+		setStr(pl, null, 'src');
+		setStr(pl, null, 'id');
+		setStr(pl, null, 'name');
+		setStr(pl, null, 'vspace');
+		setStr(pl, null, 'hspace');
+		setStr(pl, null, 'bgcolor');
+		setStr(pl, null, 'align');
+		setStr(pl, null, 'width');
+		setStr(pl, null, 'height');
+
+		if ((val = ed.dom.getAttrib(fe, "width")) != "")
+			pl.width = f.width.value = val;
+
+		if ((val = ed.dom.getAttrib(fe, "height")) != "")
+			pl.height = f.height.value = val;
+
+		oldWidth = pl.width ? parseInt(pl.width) : 0;
+		oldHeight = pl.height ? parseInt(pl.height) : 0;
+	} else
+		oldWidth = oldHeight = 0;
+
+	selectByValue(f, 'media_type', type);
+	changedType(type);
+	updateColor('bgcolor_pick', 'bgcolor');
+
+	TinyMCE_EditableSelects.init();
+	generatePreview();
+}
+
+function insertMedia() {
+	var fe, f = document.forms[0], h;
+
+	tinyMCEPopup.restoreSelection();
+
+	if (!AutoValidator.validate(f)) {
+		tinyMCEPopup.alert(ed.getLang('invalid_data'));
+		return false;
+	}
+
+	f.width.value = f.width.value == "" ? 100 : f.width.value;
+	f.height.value = f.height.value == "" ? 100 : f.height.value;
+
+	fe = ed.selection.getNode();
+	if (fe != null && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) {
+		switch (f.media_type.options[f.media_type.selectedIndex].value) {
+			case "flash":
+				fe.className = "mceItemFlash";
+				break;
+
+			case "flv":
+				fe.className = "mceItemFlashVideo";
+				break;
+
+			case "shockwave":
+				fe.className = "mceItemShockWave";
+				break;
+
+			case "qt":
+				fe.className = "mceItemQuickTime";
+				break;
+
+			case "wmp":
+				fe.className = "mceItemWindowsMedia";
+				break;
+
+			case "rmp":
+				fe.className = "mceItemRealMedia";
+				break;
+		}
+
+		if (fe.width != f.width.value || fe.height != f.height.height)
+			ed.execCommand('mceRepaint');
+
+		fe.title = serializeParameters();
+		fe.width = f.width.value;
+		fe.height = f.height.value;
+		fe.style.width = f.width.value + (f.width.value.indexOf('%') == -1 ? 'px' : '');
+		fe.style.height = f.height.value + (f.height.value.indexOf('%') == -1 ? 'px' : '');
+		fe.align = f.align.options[f.align.selectedIndex].value;
+	} else {
+		h = '<img src="' + tinyMCEPopup.getWindowArg("plugin_url") + '/img/trans.gif"' ;
+
+		switch (f.media_type.options[f.media_type.selectedIndex].value) {
+			case "flash":
+				h += ' class="mceItemFlash"';
+				break;
+
+			case "flv":
+				h += ' class="mceItemFlashVideo"';
+				break;
+
+			case "shockwave":
+				h += ' class="mceItemShockWave"';
+				break;
+
+			case "qt":
+				h += ' class="mceItemQuickTime"';
+				break;
+
+			case "wmp":
+				h += ' class="mceItemWindowsMedia"';
+				break;
+
+			case "rmp":
+				h += ' class="mceItemRealMedia"';
+				break;
+		}
+
+		h += ' title="' + serializeParameters() + '"';
+		h += ' width="' + f.width.value + '"';
+		h += ' height="' + f.height.value + '"';
+		h += ' align="' + f.align.options[f.align.selectedIndex].value + '"';
+
+		h += ' />';
+
+		ed.execCommand('mceInsertContent', false, h);
+	}
+
+	tinyMCEPopup.close();
+}
+
+function updatePreview() {
+	var f = document.forms[0], type;
+
+	f.width.value = f.width.value || '320';
+	f.height.value = f.height.value || '240';
+
+	type = getType(f.src.value);
+	selectByValue(f, 'media_type', type);
+	changedType(type);
+	generatePreview();
+}
+
+function getMediaListHTML() {
+	if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {
+		var html = "";
+
+		html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;updatePreview();">';
+		html += '<option value="">---</option>';
+
+		for (var i=0; i<tinyMCEMediaList.length; i++)
+			html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';
+
+		html += '</select>';
+
+		return html;
+	}
+
+	return "";
+}
+
+function getType(v) {
+	var fo, i, c, el, x, f = document.forms[0];
+
+	fo = ed.getParam("media_types", "flash=swf;flv=flv;shockwave=dcr;qt=mov,qt,mpg,mp3,mp4,mpeg;shockwave=dcr;wmp=avi,wmv,wm,asf,asx,wmx,wvx;rmp=rm,ra,ram").split(';');
+
+	// YouTube
+	if (v.match(/watch\?v=(.+)(.*)/)) {
+		f.width.value = '425';
+		f.height.value = '350';
+		f.src.value = 'http://www.youtube.com/v/' + v.match(/v=(.*)(.*)/)[0].split('=')[1];
+		return 'flash';
+	}
+
+	// Google video
+	if (v.indexOf('http://video.google.com/videoplay?docid=') == 0) {
+		f.width.value = '425';
+		f.height.value = '326';
+		f.src.value = 'http://video.google.com/googleplayer.swf?docId=' + v.substring('http://video.google.com/videoplay?docid='.length) + '&hl=en';
+		return 'flash';
+	}
+
+	for (i=0; i<fo.length; i++) {
+		c = fo[i].split('=');
+
+		el = c[1].split(',');
+		for (x=0; x<el.length; x++)
+		if (v.indexOf('.' + el[x]) != -1)
+			return c[0];
+	}
+
+	return null;
+}
+
+function switchType(v) {
+	var t = getType(v), d = document, f = d.forms[0];
+
+	if (!t)
+		return;
+
+	selectByValue(d.forms[0], 'media_type', t);
+	changedType(t);
+
+	// Update qtsrc also
+	if (t == 'qt' && f.src.value.toLowerCase().indexOf('rtsp://') != -1) {
+		alert(ed.getLang("media_qt_stream_warn"));
+
+		if (f.qt_qtsrc.value == '')
+			f.qt_qtsrc.value = f.src.value;
+	}
+}
+
+function changedType(t) {
+	var d = document;
+
+	d.getElementById('flash_options').style.display = 'none';
+	d.getElementById('flv_options').style.display = 'none';
+	d.getElementById('qt_options').style.display = 'none';
+	d.getElementById('shockwave_options').style.display = 'none';
+	d.getElementById('wmp_options').style.display = 'none';
+	d.getElementById('rmp_options').style.display = 'none';
+	d.getElementById(t + '_options').style.display = 'block';
+}
+
+function serializeParameters() {
+	var d = document, f = d.forms[0], s = '';
+
+	switch (f.media_type.options[f.media_type.selectedIndex].value) {
+		case "flash":
+			s += getBool('flash', 'play', true);
+			s += getBool('flash', 'loop', true);
+			s += getBool('flash', 'menu', true);
+			s += getBool('flash', 'swliveconnect', false);
+			s += getStr('flash', 'quality');
+			s += getStr('flash', 'scale');
+			s += getStr('flash', 'salign');
+			s += getStr('flash', 'wmode');
+			s += getStr('flash', 'base');
+			s += getStr('flash', 'flashvars');
+		break;
+
+		case "qt":
+			s += getBool('qt', 'loop', false);
+			s += getBool('qt', 'autoplay', true);
+			s += getBool('qt', 'cache', false);
+			s += getBool('qt', 'controller', true);
+			s += getBool('qt', 'correction', false, 'none', 'full');
+			s += getBool('qt', 'enablejavascript', false);
+			s += getBool('qt', 'kioskmode', false);
+			s += getBool('qt', 'autohref', false);
+			s += getBool('qt', 'playeveryframe', false);
+			s += getBool('qt', 'targetcache', false);
+			s += getStr('qt', 'scale');
+			s += getStr('qt', 'starttime');
+			s += getStr('qt', 'endtime');
+			s += getStr('qt', 'target');
+			s += getStr('qt', 'qtsrcchokespeed');
+			s += getStr('qt', 'volume');
+			s += getStr('qt', 'qtsrc');
+		break;
+
+		case "shockwave":
+			s += getBool('shockwave', 'sound');
+			s += getBool('shockwave', 'progress');
+			s += getBool('shockwave', 'autostart');
+			s += getBool('shockwave', 'swliveconnect');
+			s += getStr('shockwave', 'swvolume');
+			s += getStr('shockwave', 'swstretchstyle');
+			s += getStr('shockwave', 'swstretchhalign');
+			s += getStr('shockwave', 'swstretchvalign');
+		break;
+
+		case "wmp":
+			s += getBool('wmp', 'autostart', true);
+			s += getBool('wmp', 'enabled', false);
+			s += getBool('wmp', 'enablecontextmenu', true);
+			s += getBool('wmp', 'fullscreen', false);
+			s += getBool('wmp', 'invokeurls', true);
+			s += getBool('wmp', 'mute', false);
+			s += getBool('wmp', 'stretchtofit', false);
+			s += getBool('wmp', 'windowlessvideo', false);
+			s += getStr('wmp', 'balance');
+			s += getStr('wmp', 'baseurl');
+			s += getStr('wmp', 'captioningid');
+			s += getStr('wmp', 'currentmarker');
+			s += getStr('wmp', 'currentposition');
+			s += getStr('wmp', 'defaultframe');
+			s += getStr('wmp', 'playcount');
+			s += getStr('wmp', 'rate');
+			s += getStr('wmp', 'uimode');
+			s += getStr('wmp', 'volume');
+		break;
+
+		case "rmp":
+			s += getBool('rmp', 'autostart', false);
+			s += getBool('rmp', 'loop', false);
+			s += getBool('rmp', 'autogotourl', true);
+			s += getBool('rmp', 'center', false);
+			s += getBool('rmp', 'imagestatus', true);
+			s += getBool('rmp', 'maintainaspect', false);
+			s += getBool('rmp', 'nojava', false);
+			s += getBool('rmp', 'prefetch', false);
+			s += getBool('rmp', 'shuffle', false);
+			s += getStr('rmp', 'console');
+			s += getStr('rmp', 'controls');
+			s += getStr('rmp', 'numloop');
+			s += getStr('rmp', 'scriptcallbacks');
+		break;
+	}
+
+	s += getStr(null, 'id');
+	s += getStr(null, 'name');
+	s += getStr(null, 'src');
+	s += getStr(null, 'align');
+	s += getStr(null, 'bgcolor');
+	s += getInt(null, 'vspace');
+	s += getInt(null, 'hspace');
+	s += getStr(null, 'width');
+	s += getStr(null, 'height');
+
+	s = s.length > 0 ? s.substring(0, s.length - 1) : s;
+
+	return s;
+}
+
+function setBool(pl, p, n) {
+	if (typeof(pl[n]) == "undefined")
+		return;
+
+	document.forms[0].elements[p + "_" + n].checked = pl[n];
+}
+
+function setStr(pl, p, n) {
+	var f = document.forms[0], e = f.elements[(p != null ? p + "_" : '') + n];
+
+	if (typeof(pl[n]) == "undefined")
+		return;
+
+	if (e.type == "text")
+		e.value = pl[n];
+	else
+		selectByValue(f, (p != null ? p + "_" : '') + n, pl[n]);
+}
+
+function getBool(p, n, d, tv, fv) {
+	var v = document.forms[0].elements[p + "_" + n].checked;
+
+	tv = typeof(tv) == 'undefined' ? 'true' : "'" + jsEncode(tv) + "'";
+	fv = typeof(fv) == 'undefined' ? 'false' : "'" + jsEncode(fv) + "'";
+
+	return (v == d) ? '' : n + (v ? ':' + tv + ',' : ':' + fv + ',');
+}
+
+function getStr(p, n, d) {
+	var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];
+	var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value;
+
+	if (n == 'src')
+		v = tinyMCEPopup.editor.convertURL(v, 'src', null);
+
+	return ((n == d || v == '') ? '' : n + ":'" + jsEncode(v) + "',");
+}
+
+function getInt(p, n, d) {
+	var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];
+	var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value;
+
+	return ((n == d || v == '') ? '' : n + ":" + v.replace(/[^0-9]+/g, '') + ",");
+}
+
+function jsEncode(s) {
+	s = s.replace(new RegExp('\\\\', 'g'), '\\\\');
+	s = s.replace(new RegExp('"', 'g'), '\\"');
+	s = s.replace(new RegExp("'", 'g'), "\\'");
+
+	return s;
+}
+
+function generatePreview(c) {
+	var f = document.forms[0], p = document.getElementById('prev'), h = '', cls, pl, n, type, codebase, wp, hp, nw, nh;
+
+	p.innerHTML = '<!-- x --->';
+
+	nw = parseInt(f.width.value);
+	nh = parseInt(f.height.value);
+
+	if (f.width.value != "" && f.height.value != "") {
+		if (f.constrain.checked) {
+			if (c == 'width' && oldWidth != 0) {
+				wp = nw / oldWidth;
+				nh = Math.round(wp * nh);
+				f.height.value = nh;
+			} else if (c == 'height' && oldHeight != 0) {
+				hp = nh / oldHeight;
+				nw = Math.round(hp * nw);
+				f.width.value = nw;
+			}
+		}
+	}
+
+	if (f.width.value != "")
+		oldWidth = nw;
+
+	if (f.height.value != "")
+		oldHeight = nh;
+
+	// After constrain
+	pl = serializeParameters();
+
+	switch (f.media_type.options[f.media_type.selectedIndex].value) {
+		case "flash":
+			cls = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
+			codebase = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';
+			type = 'application/x-shockwave-flash';
+			break;
+
+		case "shockwave":
+			cls = 'clsid:166B1BCA-3F9C-11CF-8075-444553540000';
+			codebase = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';
+			type = 'application/x-director';
+			break;
+
+		case "qt":
+			cls = 'clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B';
+			codebase = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';
+			type = 'video/quicktime';
+			break;
+
+		case "wmp":
+			cls = ed.getParam('media_wmp6_compatible') ? 'clsid:05589FA1-C356-11CE-BF01-00AA0055595A' : 'clsid:6BF52A52-394A-11D3-B153-00C04F79FAA6';
+			codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
+			type = 'application/x-mplayer2';
+			break;
+
+		case "rmp":
+			cls = 'clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA';
+			codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';
+			type = 'audio/x-pn-realaudio-plugin';
+			break;
+	}
+
+	if (pl == '') {
+		p.innerHTML = '';
+		return;
+	}
+
+	pl = tinyMCEPopup.editor.plugins.media._parse(pl);
+
+	if (!pl.src) {
+		p.innerHTML = '';
+		return;
+	}
+
+	pl.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(pl.src);
+	pl.width = !pl.width ? 100 : pl.width;
+	pl.height = !pl.height ? 100 : pl.height;
+	pl.id = !pl.id ? 'obj' : pl.id;
+	pl.name = !pl.name ? 'eobj' : pl.name;
+	pl.align = !pl.align ? '' : pl.align;
+
+	// Avoid annoying warning about insecure items
+	if (!tinymce.isIE || document.location.protocol != 'https:') {
+		h += '<object classid="clsid:' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';
+
+		for (n in pl) {
+			h += '<param name="' + n + '" value="' + pl[n] + '">';
+
+			// Add extra url parameter if it's an absolute URL
+			if (n == 'src' && pl[n].indexOf('://') != -1)
+				h += '<param name="url" value="' + pl[n] + '" />';
+		}
+	}
+
+	h += '<embed type="' + type + '" ';
+
+	for (n in pl)
+		h += n + '="' + pl[n] + '" ';
+
+	h += '></embed>';
+
+	// Avoid annoying warning about insecure items
+	if (!tinymce.isIE || document.location.protocol != 'https:')
+		h += '</object>';
+
+	p.innerHTML = "<!-- x --->" + h;
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/webapp/web/js/tiny_mce/plugins/media/langs/en_dlg.js b/webapp/web/js/tiny_mce/plugins/media/langs/en_dlg.js
index 6d0a996f7..cb72e82a5 100755
--- a/webapp/web/js/tiny_mce/plugins/media/langs/en_dlg.js
+++ b/webapp/web/js/tiny_mce/plugins/media/langs/en_dlg.js
@@ -1,103 +1,103 @@
-tinyMCE.addI18n('en.media_dlg',{
-title:"Insert / edit embedded media",
-general:"General",
-advanced:"Advanced",
-file:"File/URL",
-list:"List",
-size:"Dimensions",
-preview:"Preview",
-constrain_proportions:"Constrain proportions",
-type:"Type",
-id:"Id",
-name:"Name",
-class_name:"Class",
-vspace:"V-Space",
-hspace:"H-Space",
-play:"Auto play",
-loop:"Loop",
-menu:"Show menu",
-quality:"Quality",
-scale:"Scale",
-align:"Align",
-salign:"SAlign",
-wmode:"WMode",
-bgcolor:"Background",
-base:"Base",
-flashvars:"Flashvars",
-liveconnect:"SWLiveConnect",
-autohref:"AutoHREF",
-cache:"Cache",
-hidden:"Hidden",
-controller:"Controller",
-kioskmode:"Kiosk mode",
-playeveryframe:"Play every frame",
-targetcache:"Target cache",
-correction:"No correction",
-enablejavascript:"Enable JavaScript",
-starttime:"Start time",
-endtime:"End time",
-href:"Href",
-qtsrcchokespeed:"Choke speed",
-target:"Target",
-volume:"Volume",
-autostart:"Auto start",
-enabled:"Enabled",
-fullscreen:"Fullscreen",
-invokeurls:"Invoke URLs",
-mute:"Mute",
-stretchtofit:"Stretch to fit",
-windowlessvideo:"Windowless video",
-balance:"Balance",
-baseurl:"Base URL",
-captioningid:"Captioning id",
-currentmarker:"Current marker",
-currentposition:"Current position",
-defaultframe:"Default frame",
-playcount:"Play count",
-rate:"Rate",
-uimode:"UI Mode",
-flash_options:"Flash options",
-qt_options:"Quicktime options",
-wmp_options:"Windows media player options",
-rmp_options:"Real media player options",
-shockwave_options:"Shockwave options",
-autogotourl:"Auto goto URL",
-center:"Center",
-imagestatus:"Image status",
-maintainaspect:"Maintain aspect",
-nojava:"No java",
-prefetch:"Prefetch",
-shuffle:"Shuffle",
-console:"Console",
-numloop:"Num loops",
-controls:"Controls",
-scriptcallbacks:"Script callbacks",
-swstretchstyle:"Stretch style",
-swstretchhalign:"Stretch H-Align",
-swstretchvalign:"Stretch V-Align",
-sound:"Sound",
-progress:"Progress",
-qtsrc:"QT Src",
-qt_stream_warn:"Streamed rtsp resources should be added to the QT Src field under the advanced tab.\nYou should also add a non streamed version to the Src field..",
-align_top:"Top",
-align_right:"Right",
-align_bottom:"Bottom",
-align_left:"Left",
-align_center:"Center",
-align_top_left:"Top left",
-align_top_right:"Top right",
-align_bottom_left:"Bottom left",
-align_bottom_right:"Bottom right",
-flv_options:"Flash video options",
-flv_scalemode:"Scale mode",
-flv_buffer:"Buffer",
-flv_startimage:"Start image",
-flv_starttime:"Start time",
-flv_defaultvolume:"Default volumne",
-flv_hiddengui:"Hidden GUI",
-flv_autostart:"Auto start",
-flv_loop:"Loop",
-flv_showscalemodes:"Show scale modes",
-flv_smoothvideo:"Smooth video",
-flv_jscallback:"JS Callback"
+tinyMCE.addI18n('en.media_dlg',{
+title:"Insert / edit embedded media",
+general:"General",
+advanced:"Advanced",
+file:"File/URL",
+list:"List",
+size:"Dimensions",
+preview:"Preview",
+constrain_proportions:"Constrain proportions",
+type:"Type",
+id:"Id",
+name:"Name",
+class_name:"Class",
+vspace:"V-Space",
+hspace:"H-Space",
+play:"Auto play",
+loop:"Loop",
+menu:"Show menu",
+quality:"Quality",
+scale:"Scale",
+align:"Align",
+salign:"SAlign",
+wmode:"WMode",
+bgcolor:"Background",
+base:"Base",
+flashvars:"Flashvars",
+liveconnect:"SWLiveConnect",
+autohref:"AutoHREF",
+cache:"Cache",
+hidden:"Hidden",
+controller:"Controller",
+kioskmode:"Kiosk mode",
+playeveryframe:"Play every frame",
+targetcache:"Target cache",
+correction:"No correction",
+enablejavascript:"Enable JavaScript",
+starttime:"Start time",
+endtime:"End time",
+href:"Href",
+qtsrcchokespeed:"Choke speed",
+target:"Target",
+volume:"Volume",
+autostart:"Auto start",
+enabled:"Enabled",
+fullscreen:"Fullscreen",
+invokeurls:"Invoke URLs",
+mute:"Mute",
+stretchtofit:"Stretch to fit",
+windowlessvideo:"Windowless video",
+balance:"Balance",
+baseurl:"Base URL",
+captioningid:"Captioning id",
+currentmarker:"Current marker",
+currentposition:"Current position",
+defaultframe:"Default frame",
+playcount:"Play count",
+rate:"Rate",
+uimode:"UI Mode",
+flash_options:"Flash options",
+qt_options:"Quicktime options",
+wmp_options:"Windows media player options",
+rmp_options:"Real media player options",
+shockwave_options:"Shockwave options",
+autogotourl:"Auto goto URL",
+center:"Center",
+imagestatus:"Image status",
+maintainaspect:"Maintain aspect",
+nojava:"No java",
+prefetch:"Prefetch",
+shuffle:"Shuffle",
+console:"Console",
+numloop:"Num loops",
+controls:"Controls",
+scriptcallbacks:"Script callbacks",
+swstretchstyle:"Stretch style",
+swstretchhalign:"Stretch H-Align",
+swstretchvalign:"Stretch V-Align",
+sound:"Sound",
+progress:"Progress",
+qtsrc:"QT Src",
+qt_stream_warn:"Streamed rtsp resources should be added to the QT Src field under the advanced tab.\nYou should also add a non streamed version to the Src field..",
+align_top:"Top",
+align_right:"Right",
+align_bottom:"Bottom",
+align_left:"Left",
+align_center:"Center",
+align_top_left:"Top left",
+align_top_right:"Top right",
+align_bottom_left:"Bottom left",
+align_bottom_right:"Bottom right",
+flv_options:"Flash video options",
+flv_scalemode:"Scale mode",
+flv_buffer:"Buffer",
+flv_startimage:"Start image",
+flv_starttime:"Start time",
+flv_defaultvolume:"Default volumne",
+flv_hiddengui:"Hidden GUI",
+flv_autostart:"Auto start",
+flv_loop:"Loop",
+flv_showscalemodes:"Show scale modes",
+flv_smoothvideo:"Smooth video",
+flv_jscallback:"JS Callback"
 });
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/media/media.htm b/webapp/web/js/tiny_mce/plugins/media/media.htm
index 8b3bc1d6b..ac5193169 100755
--- a/webapp/web/js/tiny_mce/plugins/media/media.htm
+++ b/webapp/web/js/tiny_mce/plugins/media/media.htm
@@ -1,824 +1,824 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#media_dlg.title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="js/media.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="../../utils/validate.js"></script>
-	<script type="text/javascript" src="../../utils/form_utils.js"></script>
-	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
-	<link href="css/media.css" rel="stylesheet" type="text/css" />
-	<base target="_self" />
-</head>
-<body style="display: none">
-    <form onsubmit="insertMedia();return false;" action="#">
-		<div class="tabs">
-			<ul>
-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');generatePreview();" onmousedown="return false;">{#media_dlg.general}</a></span></li>
-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#media_dlg.advanced}</a></span></li>
-			</ul>
-		</div>
-
-		<div class="panel_wrapper">
-			<div id="general_panel" class="panel current">
-				<fieldset>
-					<legend>{#media_dlg.general}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-							<tr>
-								<td><label for="media_type">{#media_dlg.type}</label></td>
-								<td>
-									<select id="media_type" name="media_type" onchange="changedType(this.value);generatePreview();">
-										<option value="flash">Flash</option>
-										<!-- <option value="flv">Flash video (FLV)</option> -->
-										<option value="qt">Quicktime</option>
-										<option value="shockwave">Shockwave</option>
-										<option value="wmp">Windows Media</option>
-										<option value="rmp">Real Media</option>
-									</select>
-								</td>
-							</tr>
-							<tr>
-							<td><label for="src">{#media_dlg.file}</label></td>
-							  <td>
-									<table border="0" cellspacing="0" cellpadding="0">
-									  <tr>
-										<td><input id="src" name="src" type="text" value="" class="mceFocus" onchange="switchType(this.value);generatePreview();" /></td>
-										<td id="filebrowsercontainer">&nbsp;</td>
-									  </tr>
-									</table>
-								</td>
-							</tr>
-							<tr id="linklistrow">
-								<td><label for="linklist">{#media_dlg.list}</label></td>
-								<td id="linklistcontainer">&nbsp;</td>
-							</tr>
-							<tr>
-								<td><label for="width">{#media_dlg.size}</label></td>
-								<td>
-									<table border="0" cellpadding="0" cellspacing="0">
-										<tr>
-											<td><input type="text" id="width" name="width" value="" class="size" onchange="generatePreview('width');" /> x <input type="text" id="height" name="height" value="" class="size"  onchange="generatePreview('height');" /></td>
-											<td>&nbsp;&nbsp;<input id="constrain" type="checkbox" name="constrain" class="checkbox" /></td>
-											<td><label id="constrainlabel" for="constrain">{#media_dlg.constrain_proportions}</label></td>
-										</tr>
-									</table>
-								</td>
-							</tr>
-					</table>
-				</fieldset>
-
-				<fieldset>
-					<legend>{#media_dlg.preview}</legend>
-					<div id="prev"></div>
-				</fieldset>
-			</div>
-
-			<div id="advanced_panel" class="panel">
-				<fieldset>
-					<legend>{#media_dlg.advanced}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0" width="100%">
-						<tr>
-							<td><label for="id">{#media_dlg.id}</label></td>
-							<td><input type="text" id="id" name="id" onchange="generatePreview();" /></td>
-							<td><label for="name">{#media_dlg.name}</label></td>
-							<td><input type="text" id="name" name="name" onchange="generatePreview();" /></td>
-						</tr>
-
-						<tr>
-							<td><label for="align">{#media_dlg.align}</label></td>
-							<td>
-								<select id="align" name="align" onchange="generatePreview();">
-									<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>
-									<option value="left">{#media_dlg.align_left}</option>
-								</select>
-							</td>
-
-							<td><label for="bgcolor">{#media_dlg.bgcolor}</label></td>
-							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');generatePreview();" /></td>
-										<td id="bgcolor_pickcontainer">&nbsp;</td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td><label for="vspace">{#media_dlg.vspace}</label></td>
-							<td><input type="text" id="vspace" name="vspace" class="number" onchange="generatePreview();" /></td>
-							<td><label for="hspace">{#media_dlg.hspace}</label></td>
-							<td><input type="text" id="hspace" name="hspace" class="number" onchange="generatePreview();" /></td>
-						</tr>
-					</table>
-				</fieldset>
-
-				<fieldset id="flash_options">
-					<legend>{#media_dlg.flash_options}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td><label for="flash_quality">{#media_dlg.quality}</label></td>
-							<td>
-								<select id="flash_quality" name="flash_quality" onchange="generatePreview();">
-									<option value="">{#not_set}</option> 
-									<option value="high">high</option>
-									<option value="low">low</option>
-									<option value="autolow">autolow</option>
-									<option value="autohigh">autohigh</option>
-									<option value="best">best</option>
-								</select>
-							</td>
-
-							<td><label for="flash_scale">{#media_dlg.scale}</label></td>
-							<td>
-								<select id="flash_scale" name="flash_scale" onchange="generatePreview();">
-									<option value="">{#not_set}</option> 
-									<option value="showall">showall</option>
-									<option value="noborder">noborder</option>
-									<option value="exactfit">exactfit</option>
-									<option value="noscale">noscale</option>
-								</select>
-							</td>
-						</tr>
-
-						<tr>
-							<td><label for="flash_wmode">{#media_dlg.wmode}</label></td>
-							<td>
-								<select id="flash_wmode" name="flash_wmode" onchange="generatePreview();">
-									<option value="">{#not_set}</option> 
-									<option value="window">window</option>
-									<option value="opaque">opaque</option>
-									<option value="transparent">transparent</option>
-								</select>
-							</td>
-
-							<td><label for="flash_salign">{#media_dlg.salign}</label></td>
-							<td>
-								<select id="flash_salign" name="flash_salign" onchange="generatePreview();">
-									<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>
-									<option value="b">{#media_dlg.align_bottom}</option>
-									<option value="tl">{#media_dlg.align_top_left}</option>
-									<option value="tr">{#media_dlg.align_top_right}</option>
-									<option value="bl">{#media_dlg.align_bottom_left}</option>
-									<option value="br">{#media_dlg.align_bottom_right}</option>
-								</select>
-							</td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="flash_play" name="flash_play" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="flash_play">{#media_dlg.play}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="flash_loop" name="flash_loop" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="flash_loop">{#media_dlg.loop}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="flash_menu" name="flash_menu" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="flash_menu">{#media_dlg.menu}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="flash_swliveconnect" name="flash_swliveconnect" onchange="generatePreview();" /></td>
-										<td><label for="flash_swliveconnect">{#media_dlg.liveconnect}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-
-					<table>
-						<tr>
-							<td><label for="flash_base">{#media_dlg.base}</label></td>
-							<td><input type="text" id="flash_base" name="flash_base" onchange="generatePreview();" /></td>
-						</tr>
-
-						<tr>
-							<td><label for="flash_flashvars">{#media_dlg.flashvars}</label></td>
-							<td><input type="text" id="flash_flashvars" name="flash_flashvars" onchange="generatePreview();" /></td>
-						</tr>
-					</table>
-				</fieldset>
-
-				<fieldset id="flv_options">
-					<legend>{#media_dlg.flv_options}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td><label for="flv_scalemode">{#media_dlg.flv_scalemode}</label></td>
-							<td>
-								<select id="flv_scalemode" name="flv_scalemode" onchange="generatePreview();">
-									<option value="">{#not_set}</option> 
-									<option value="none">none</option>
-									<option value="double">double</option>
-									<option value="full">full</option>
-								</select>
-							</td>
-
-							<td><label for="flv_buffer">{#media_dlg.flv_buffer}</label></td>
-							<td><input type="text" id="flv_buffer" name="flv_buffer" onchange="generatePreview();" /></td>
-						</tr>
-
-						<tr>
-							<td><label for="flv_startimage">{#media_dlg.flv_startimage}</label></td>
-							<td><input type="text" id="flv_startimage" name="flv_startimage" onchange="generatePreview();" /></td>
-
-							<td><label for="flv_starttime">{#media_dlg.flv_starttime}</label></td>
-							<td><input type="text" id="flv_starttime" name="flv_starttime" onchange="generatePreview();" /></td>
-						</tr>
-
-						<tr>
-							<td><label for="flv_defaultvolume">{#media_dlg.flv_defaultvolume}</label></td>
-							<td><input type="text" id="flv_defaultvolume" name="flv_defaultvolume" onchange="generatePreview();" /></td>
-
-							<td><label for="flv_starttime">{#media_dlg.flv_starttime}</label></td>
-							<td><input type="text" id="flv_starttime" name="flv_starttime" onchange="generatePreview();" /></td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="flv_hiddengui" name="flv_hiddengui" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="flv_hiddengui">{#media_dlg.flv_hiddengui}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="flv_autostart" name="flv_autostart" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="flv_autostart">{#media_dlg.flv_autostart}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="flv_loop" name="flv_loop" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="flv_loop">{#media_dlg.flv_loop}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="flv_showscalemodes" name="flv_showscalemodes" onchange="generatePreview();" /></td>
-										<td><label for="flv_showscalemodes">{#media_dlg.flv_showscalemodes}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="flv_smoothvideo" name="flash_flv_flv_smoothvideosmoothvideo" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="flv_smoothvideo">{#media_dlg.flv_smoothvideo}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="flv_jscallback" name="flv_jscallback" onchange="generatePreview();" /></td>
-										<td><label for="flv_jscallback">{#media_dlg.flv_jscallback}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</fieldset>
-
-				<fieldset id="qt_options">
-					<legend>{#media_dlg.qt_options}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_loop" name="qt_loop" onchange="generatePreview();" /></td>
-										<td><label for="qt_loop">{#media_dlg.loop}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_autoplay" name="qt_autoplay" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="qt_autoplay">{#media_dlg.play}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_cache" name="qt_cache" onchange="generatePreview();" /></td>
-										<td><label for="qt_cache">{#media_dlg.cache}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_controller" name="qt_controller" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="qt_controller">{#media_dlg.controller}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_correction" name="qt_correction" onchange="generatePreview();" /></td>
-										<td><label for="qt_correction">{#media_dlg.correction}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_enablejavascript" name="qt_enablejavascript" onchange="generatePreview();" /></td>
-										<td><label for="qt_enablejavascript">{#media_dlg.enablejavascript}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_kioskmode" name="qt_kioskmode" onchange="generatePreview();" /></td>
-										<td><label for="qt_kioskmode">{#media_dlg.kioskmode}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_autohref" name="qt_autohref" onchange="generatePreview();" /></td>
-										<td><label for="qt_autohref">{#media_dlg.autohref}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_playeveryframe" name="qt_playeveryframe" onchange="generatePreview();" /></td>
-										<td><label for="qt_playeveryframe">{#media_dlg.playeveryframe}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="qt_targetcache" name="qt_targetcache" onchange="generatePreview();" /></td>
-										<td><label for="qt_targetcache">{#media_dlg.targetcache}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td><label for="qt_scale">{#media_dlg.scale}</label></td>
-							<td><select id="qt_scale" name="qt_scale" class="mceEditableSelect" onchange="generatePreview();">
-									<option value="">{#not_set}</option> 
-									<option value="tofit">tofit</option>
-									<option value="aspect">aspect</option>
-								</select>
-							</td>
-
-							<td colspan="2">&nbsp;</td>
-						</tr>
-
-						<tr>
-							<td><label for="qt_starttime">{#media_dlg.starttime}</label></td>
-							<td><input type="text" id="qt_starttime" name="qt_starttime" onchange="generatePreview();" /></td>
-
-							<td><label for="qt_endtime">{#media_dlg.endtime}</label></td>
-							<td><input type="text" id="qt_endtime" name="qt_endtime" onchange="generatePreview();" /></td>
-						</tr>
-
-						<tr>
-							<td><label for="qt_target">{#media_dlg.target}</label></td>
-							<td><input type="text" id="qt_target" name="qt_target" onchange="generatePreview();" /></td>
-
-							<td><label for="qt_href">{#media_dlg.href}</label></td>
-							<td><input type="text" id="qt_href" name="qt_href" onchange="generatePreview();" /></td>
-						</tr>
-
-						<tr>
-							<td><label for="qt_qtsrcchokespeed">{#media_dlg.qtsrcchokespeed}</label></td>
-							<td><input type="text" id="qt_qtsrcchokespeed" name="qt_qtsrcchokespeed" onchange="generatePreview();" /></td>
-
-							<td><label for="qt_volume">{#media_dlg.volume}</label></td>
-							<td><input type="text" id="qt_volume" name="qt_volume" onchange="generatePreview();" /></td>
-						</tr>
-
-						<tr>
-							<td><label for="qt_qtsrc">{#media_dlg.qtsrc}</label></td>
-							<td colspan="4">
-							<table border="0" cellspacing="0" cellpadding="0">
-								  <tr>
-									<td><input type="text" id="qt_qtsrc" name="qt_qtsrc" onchange="generatePreview();" /></td>
-									<td id="qtsrcfilebrowsercontainer">&nbsp;</td>
-								  </tr>
-							</table>
-							</td>
-						</tr>
-					</table>
-				</fieldset>
-
-				<fieldset id="wmp_options">
-					<legend>{#media_dlg.wmp_options}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="wmp_autostart" name="wmp_autostart" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="wmp_autostart">{#media_dlg.autostart}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="wmp_enabled" name="wmp_enabled" onchange="generatePreview();" /></td>
-										<td><label for="wmp_enabled">{#media_dlg.enabled}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="wmp_enablecontextmenu" name="wmp_enablecontextmenu" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="wmp_enablecontextmenu">{#media_dlg.menu}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="wmp_fullscreen" name="wmp_fullscreen" onchange="generatePreview();" /></td>
-										<td><label for="wmp_fullscreen">{#media_dlg.fullscreen}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="wmp_invokeurls" name="wmp_invokeurls" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="wmp_invokeurls">{#media_dlg.invokeurls}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="wmp_mute" name="wmp_mute" onchange="generatePreview();" /></td>
-										<td><label for="wmp_mute">{#media_dlg.mute}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="wmp_stretchtofit" name="wmp_stretchtofit" onchange="generatePreview();" /></td>
-										<td><label for="wmp_stretchtofit">{#media_dlg.stretchtofit}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="wmp_windowlessvideo" name="wmp_windowlessvideo" onchange="generatePreview();" /></td>
-										<td><label for="wmp_windowlessvideo">{#media_dlg.windowlessvideo}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td><label for="wmp_balance">{#media_dlg.balance}</label></td>
-							<td><input type="text" id="wmp_balance" name="wmp_balance" onchange="generatePreview();" /></td>
-
-							<td><label for="wmp_baseurl">{#media_dlg.baseurl}</label></td>
-							<td><input type="text" id="wmp_baseurl" name="wmp_baseurl" onchange="generatePreview();" /></td>
-						</tr>
-
-						<tr>
-							<td><label for="wmp_captioningid">{#media_dlg.captioningid}</label></td>
-							<td><input type="text" id="wmp_captioningid" name="wmp_captioningid" onchange="generatePreview();" /></td>
-
-							<td><label for="wmp_currentmarker">{#media_dlg.currentmarker}</label></td>
-							<td><input type="text" id="wmp_currentmarker" name="wmp_currentmarker" onchange="generatePreview();" /></td>
-						</tr>
-
-						<tr>
-							<td><label for="wmp_currentposition">{#media_dlg.currentposition}</label></td>
-							<td><input type="text" id="wmp_currentposition" name="wmp_currentposition" onchange="generatePreview();" /></td>
-
-							<td><label for="wmp_defaultframe">{#media_dlg.defaultframe}</label></td>
-							<td><input type="text" id="wmp_defaultframe" name="wmp_defaultframe" onchange="generatePreview();" /></td>
-						</tr>
-
-						<tr>
-							<td><label for="wmp_playcount">{#media_dlg.playcount}</label></td>
-							<td><input type="text" id="wmp_playcount" name="wmp_playcount" onchange="generatePreview();" /></td>
-
-							<td><label for="wmp_rate">{#media_dlg.rate}</label></td>
-							<td><input type="text" id="wmp_rate" name="wmp_rate" onchange="generatePreview();" /></td>
-						</tr>
-
-						<tr>
-							<td><label for="wmp_uimode">{#media_dlg.uimode}</label></td>
-							<td><input type="text" id="wmp_uimode" name="wmp_uimode" onchange="generatePreview();" /></td>
-
-							<td><label for="wmp_volume">{#media_dlg.volume}</label></td>
-							<td><input type="text" id="wmp_volume" name="wmp_volume" onchange="generatePreview();" /></td>
-						</tr>
-
-					</table>
-				</fieldset>
-
-				<fieldset id="rmp_options">
-					<legend>{#media_dlg.rmp_options}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="rmp_autostart" name="rmp_autostart" onchange="generatePreview();" /></td>
-										<td><label for="rmp_autostart">{#media_dlg.autostart}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="rmp_loop" name="rmp_loop" onchange="generatePreview();" /></td>
-										<td><label for="rmp_loop">{#media_dlg.loop}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="rmp_autogotourl" name="rmp_autogotourl" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="rmp_autogotourl">{#media_dlg.autogotourl}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="rmp_center" name="rmp_center" onchange="generatePreview();" /></td>
-										<td><label for="rmp_center">{#media_dlg.center}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="rmp_imagestatus" name="rmp_imagestatus" checked="checked" onchange="generatePreview();" /></td>
-										<td><label for="rmp_imagestatus">{#media_dlg.imagestatus}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="rmp_maintainaspect" name="rmp_maintainaspect" onchange="generatePreview();" /></td>
-										<td><label for="rmp_maintainaspect">{#media_dlg.maintainaspect}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="rmp_nojava" name="rmp_nojava" onchange="generatePreview();" /></td>
-										<td><label for="rmp_nojava">{#media_dlg.nojava}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="rmp_prefetch" name="rmp_prefetch" onchange="generatePreview();" /></td>
-										<td><label for="rmp_prefetch">{#media_dlg.prefetch}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="rmp_shuffle" name="rmp_shuffle" onchange="generatePreview();" /></td>
-										<td><label for="rmp_shuffle">{#media_dlg.shuffle}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								&nbsp;
-							</td>
-						</tr>
-
-						<tr>
-							<td><label for="rmp_console">{#media_dlg.console}</label></td>
-							<td><input type="text" id="rmp_console" name="rmp_console" onchange="generatePreview();" /></td>
-
-							<td><label for="rmp_controls">{#media_dlg.controls}</label></td>
-							<td><input type="text" id="rmp_controls" name="rmp_controls" onchange="generatePreview();" /></td>
-						</tr>
-
-						<tr>
-							<td><label for="rmp_numloop">{#media_dlg.numloop}</label></td>
-							<td><input type="text" id="rmp_numloop" name="rmp_numloop" onchange="generatePreview();" /></td>
-
-							<td><label for="rmp_scriptcallbacks">{#media_dlg.scriptcallbacks}</label></td>
-							<td><input type="text" id="rmp_scriptcallbacks" name="rmp_scriptcallbacks" onchange="generatePreview();" /></td>
-						</tr>
-					</table>
-				</fieldset>
-
-				<fieldset id="shockwave_options">
-					<legend>{#media_dlg.shockwave_options}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td><label for="shockwave_swstretchstyle">{#media_dlg.swstretchstyle}</label></td>
-							<td>
-								<select id="shockwave_swstretchstyle" name="shockwave_swstretchstyle" onchange="generatePreview();">
-									<option value="none">{#not_set}</option>
-									<option value="meet">Meet</option>
-									<option value="fill">Fill</option>
-									<option value="stage">Stage</option>
-								</select>
-							</td>
-
-							<td><label for="shockwave_swvolume">{#media_dlg.volume}</label></td>
-							<td><input type="text" id="shockwave_swvolume" name="shockwave_swvolume" onchange="generatePreview();" /></td>
-						</tr>
-
-						<tr>
-							<td><label for="shockwave_swstretchhalign">{#media_dlg.swstretchhalign}</label></td>
-							<td>
-								<select id="shockwave_swstretchhalign" name="shockwave_swstretchhalign" onchange="generatePreview();">
-									<option value="none">{#not_set}</option>
-									<option value="left">{#media_dlg.align_left}</option>
-									<option value="center">{#media_dlg.align_center}</option>
-									<option value="right">{#media_dlg.align_right}</option>
-								</select>
-							</td>
-
-							<td><label for="shockwave_swstretchvalign">{#media_dlg.swstretchvalign}</label></td>
-							<td>
-								<select id="shockwave_swstretchvalign" name="shockwave_swstretchvalign" onchange="generatePreview();">
-									<option value="none">{#not_set}</option>
-									<option value="meet">Meet</option>
-									<option value="fill">Fill</option>
-									<option value="stage">Stage</option>
-								</select>
-							</td>
-						</tr>
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="shockwave_autostart" name="shockwave_autostart" onchange="generatePreview();" checked="checked" /></td>
-										<td><label for="shockwave_autostart">{#media_dlg.autostart}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="shockwave_sound" name="shockwave_sound" onchange="generatePreview();" checked="checked" /></td>
-										<td><label for="shockwave_sound">{#media_dlg.sound}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-
-
-						<tr>
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="shockwave_swliveconnect" name="shockwave_swliveconnect" onchange="generatePreview();" /></td>
-										<td><label for="shockwave_swliveconnect">{#media_dlg.liveconnect}</label></td>
-									</tr>
-								</table>
-							</td>
-
-							<td colspan="2">
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input type="checkbox" class="checkbox" id="shockwave_progress" name="shockwave_progress" onchange="generatePreview();" checked="checked" /></td>
-										<td><label for="shockwave_progress">{#media_dlg.progress}</label></td>
-									</tr>
-								</table>
-							</td>
-						</tr>
-					</table>
-				</fieldset>
-			</div>
-		</div>
-
-		<div class="mceActionPanel">
-			<div style="float: left">
-				<input type="submit" id="insert" name="insert" value="{#insert}" />
-			</div>
-
-			<div style="float: right">
-				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-			</div>
-		</div>
-	</form>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#media_dlg.title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/media.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/validate.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<link href="css/media.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body style="display: none">
+    <form onsubmit="insertMedia();return false;" action="#">
+		<div class="tabs">
+			<ul>
+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');generatePreview();" onmousedown="return false;">{#media_dlg.general}</a></span></li>
+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#media_dlg.advanced}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<fieldset>
+					<legend>{#media_dlg.general}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+							<tr>
+								<td><label for="media_type">{#media_dlg.type}</label></td>
+								<td>
+									<select id="media_type" name="media_type" onchange="changedType(this.value);generatePreview();">
+										<option value="flash">Flash</option>
+										<!-- <option value="flv">Flash video (FLV)</option> -->
+										<option value="qt">Quicktime</option>
+										<option value="shockwave">Shockwave</option>
+										<option value="wmp">Windows Media</option>
+										<option value="rmp">Real Media</option>
+									</select>
+								</td>
+							</tr>
+							<tr>
+							<td><label for="src">{#media_dlg.file}</label></td>
+							  <td>
+									<table border="0" cellspacing="0" cellpadding="0">
+									  <tr>
+										<td><input id="src" name="src" type="text" value="" class="mceFocus" onchange="switchType(this.value);generatePreview();" /></td>
+										<td id="filebrowsercontainer">&nbsp;</td>
+									  </tr>
+									</table>
+								</td>
+							</tr>
+							<tr id="linklistrow">
+								<td><label for="linklist">{#media_dlg.list}</label></td>
+								<td id="linklistcontainer">&nbsp;</td>
+							</tr>
+							<tr>
+								<td><label for="width">{#media_dlg.size}</label></td>
+								<td>
+									<table border="0" cellpadding="0" cellspacing="0">
+										<tr>
+											<td><input type="text" id="width" name="width" value="" class="size" onchange="generatePreview('width');" /> x <input type="text" id="height" name="height" value="" class="size"  onchange="generatePreview('height');" /></td>
+											<td>&nbsp;&nbsp;<input id="constrain" type="checkbox" name="constrain" class="checkbox" /></td>
+											<td><label id="constrainlabel" for="constrain">{#media_dlg.constrain_proportions}</label></td>
+										</tr>
+									</table>
+								</td>
+							</tr>
+					</table>
+				</fieldset>
+
+				<fieldset>
+					<legend>{#media_dlg.preview}</legend>
+					<div id="prev"></div>
+				</fieldset>
+			</div>
+
+			<div id="advanced_panel" class="panel">
+				<fieldset>
+					<legend>{#media_dlg.advanced}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0" width="100%">
+						<tr>
+							<td><label for="id">{#media_dlg.id}</label></td>
+							<td><input type="text" id="id" name="id" onchange="generatePreview();" /></td>
+							<td><label for="name">{#media_dlg.name}</label></td>
+							<td><input type="text" id="name" name="name" onchange="generatePreview();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="align">{#media_dlg.align}</label></td>
+							<td>
+								<select id="align" name="align" onchange="generatePreview();">
+									<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>
+									<option value="left">{#media_dlg.align_left}</option>
+								</select>
+							</td>
+
+							<td><label for="bgcolor">{#media_dlg.bgcolor}</label></td>
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');generatePreview();" /></td>
+										<td id="bgcolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="vspace">{#media_dlg.vspace}</label></td>
+							<td><input type="text" id="vspace" name="vspace" class="number" onchange="generatePreview();" /></td>
+							<td><label for="hspace">{#media_dlg.hspace}</label></td>
+							<td><input type="text" id="hspace" name="hspace" class="number" onchange="generatePreview();" /></td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset id="flash_options">
+					<legend>{#media_dlg.flash_options}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td><label for="flash_quality">{#media_dlg.quality}</label></td>
+							<td>
+								<select id="flash_quality" name="flash_quality" onchange="generatePreview();">
+									<option value="">{#not_set}</option> 
+									<option value="high">high</option>
+									<option value="low">low</option>
+									<option value="autolow">autolow</option>
+									<option value="autohigh">autohigh</option>
+									<option value="best">best</option>
+								</select>
+							</td>
+
+							<td><label for="flash_scale">{#media_dlg.scale}</label></td>
+							<td>
+								<select id="flash_scale" name="flash_scale" onchange="generatePreview();">
+									<option value="">{#not_set}</option> 
+									<option value="showall">showall</option>
+									<option value="noborder">noborder</option>
+									<option value="exactfit">exactfit</option>
+									<option value="noscale">noscale</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="flash_wmode">{#media_dlg.wmode}</label></td>
+							<td>
+								<select id="flash_wmode" name="flash_wmode" onchange="generatePreview();">
+									<option value="">{#not_set}</option> 
+									<option value="window">window</option>
+									<option value="opaque">opaque</option>
+									<option value="transparent">transparent</option>
+								</select>
+							</td>
+
+							<td><label for="flash_salign">{#media_dlg.salign}</label></td>
+							<td>
+								<select id="flash_salign" name="flash_salign" onchange="generatePreview();">
+									<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>
+									<option value="b">{#media_dlg.align_bottom}</option>
+									<option value="tl">{#media_dlg.align_top_left}</option>
+									<option value="tr">{#media_dlg.align_top_right}</option>
+									<option value="bl">{#media_dlg.align_bottom_left}</option>
+									<option value="br">{#media_dlg.align_bottom_right}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="flash_play" name="flash_play" checked="checked" onchange="generatePreview();" /></td>
+										<td><label for="flash_play">{#media_dlg.play}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="flash_loop" name="flash_loop" checked="checked" onchange="generatePreview();" /></td>
+										<td><label for="flash_loop">{#media_dlg.loop}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="flash_menu" name="flash_menu" checked="checked" onchange="generatePreview();" /></td>
+										<td><label for="flash_menu">{#media_dlg.menu}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="flash_swliveconnect" name="flash_swliveconnect" onchange="generatePreview();" /></td>
+										<td><label for="flash_swliveconnect">{#media_dlg.liveconnect}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+
+					<table>
+						<tr>
+							<td><label for="flash_base">{#media_dlg.base}</label></td>
+							<td><input type="text" id="flash_base" name="flash_base" onchange="generatePreview();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="flash_flashvars">{#media_dlg.flashvars}</label></td>
+							<td><input type="text" id="flash_flashvars" name="flash_flashvars" onchange="generatePreview();" /></td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset id="flv_options">
+					<legend>{#media_dlg.flv_options}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td><label for="flv_scalemode">{#media_dlg.flv_scalemode}</label></td>
+							<td>
+								<select id="flv_scalemode" name="flv_scalemode" onchange="generatePreview();">
+									<option value="">{#not_set}</option> 
+									<option value="none">none</option>
+									<option value="double">double</option>
+									<option value="full">full</option>
+								</select>
+							</td>
+
+							<td><label for="flv_buffer">{#media_dlg.flv_buffer}</label></td>
+							<td><input type="text" id="flv_buffer" name="flv_buffer" onchange="generatePreview();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="flv_startimage">{#media_dlg.flv_startimage}</label></td>
+							<td><input type="text" id="flv_startimage" name="flv_startimage" onchange="generatePreview();" /></td>
+
+							<td><label for="flv_starttime">{#media_dlg.flv_starttime}</label></td>
+							<td><input type="text" id="flv_starttime" name="flv_starttime" onchange="generatePreview();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="flv_defaultvolume">{#media_dlg.flv_defaultvolume}</label></td>
+							<td><input type="text" id="flv_defaultvolume" name="flv_defaultvolume" onchange="generatePreview();" /></td>
+
+							<td><label for="flv_starttime">{#media_dlg.flv_starttime}</label></td>
+							<td><input type="text" id="flv_starttime" name="flv_starttime" onchange="generatePreview();" /></td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="flv_hiddengui" name="flv_hiddengui" checked="checked" onchange="generatePreview();" /></td>
+										<td><label for="flv_hiddengui">{#media_dlg.flv_hiddengui}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="flv_autostart" name="flv_autostart" checked="checked" onchange="generatePreview();" /></td>
+										<td><label for="flv_autostart">{#media_dlg.flv_autostart}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="flv_loop" name="flv_loop" checked="checked" onchange="generatePreview();" /></td>
+										<td><label for="flv_loop">{#media_dlg.flv_loop}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="flv_showscalemodes" name="flv_showscalemodes" onchange="generatePreview();" /></td>
+										<td><label for="flv_showscalemodes">{#media_dlg.flv_showscalemodes}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="flv_smoothvideo" name="flash_flv_flv_smoothvideosmoothvideo" checked="checked" onchange="generatePreview();" /></td>
+										<td><label for="flv_smoothvideo">{#media_dlg.flv_smoothvideo}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="flv_jscallback" name="flv_jscallback" onchange="generatePreview();" /></td>
+										<td><label for="flv_jscallback">{#media_dlg.flv_jscallback}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset id="qt_options">
+					<legend>{#media_dlg.qt_options}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="qt_loop" name="qt_loop" onchange="generatePreview();" /></td>
+										<td><label for="qt_loop">{#media_dlg.loop}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="qt_autoplay" name="qt_autoplay" checked="checked" onchange="generatePreview();" /></td>
+										<td><label for="qt_autoplay">{#media_dlg.play}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="qt_cache" name="qt_cache" onchange="generatePreview();" /></td>
+										<td><label for="qt_cache">{#media_dlg.cache}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="qt_controller" name="qt_controller" checked="checked" onchange="generatePreview();" /></td>
+										<td><label for="qt_controller">{#media_dlg.controller}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="qt_correction" name="qt_correction" onchange="generatePreview();" /></td>
+										<td><label for="qt_correction">{#media_dlg.correction}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="qt_enablejavascript" name="qt_enablejavascript" onchange="generatePreview();" /></td>
+										<td><label for="qt_enablejavascript">{#media_dlg.enablejavascript}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="qt_kioskmode" name="qt_kioskmode" onchange="generatePreview();" /></td>
+										<td><label for="qt_kioskmode">{#media_dlg.kioskmode}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="qt_autohref" name="qt_autohref" onchange="generatePreview();" /></td>
+										<td><label for="qt_autohref">{#media_dlg.autohref}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="qt_playeveryframe" name="qt_playeveryframe" onchange="generatePreview();" /></td>
+										<td><label for="qt_playeveryframe">{#media_dlg.playeveryframe}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="qt_targetcache" name="qt_targetcache" onchange="generatePreview();" /></td>
+										<td><label for="qt_targetcache">{#media_dlg.targetcache}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="qt_scale">{#media_dlg.scale}</label></td>
+							<td><select id="qt_scale" name="qt_scale" class="mceEditableSelect" onchange="generatePreview();">
+									<option value="">{#not_set}</option> 
+									<option value="tofit">tofit</option>
+									<option value="aspect">aspect</option>
+								</select>
+							</td>
+
+							<td colspan="2">&nbsp;</td>
+						</tr>
+
+						<tr>
+							<td><label for="qt_starttime">{#media_dlg.starttime}</label></td>
+							<td><input type="text" id="qt_starttime" name="qt_starttime" onchange="generatePreview();" /></td>
+
+							<td><label for="qt_endtime">{#media_dlg.endtime}</label></td>
+							<td><input type="text" id="qt_endtime" name="qt_endtime" onchange="generatePreview();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="qt_target">{#media_dlg.target}</label></td>
+							<td><input type="text" id="qt_target" name="qt_target" onchange="generatePreview();" /></td>
+
+							<td><label for="qt_href">{#media_dlg.href}</label></td>
+							<td><input type="text" id="qt_href" name="qt_href" onchange="generatePreview();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="qt_qtsrcchokespeed">{#media_dlg.qtsrcchokespeed}</label></td>
+							<td><input type="text" id="qt_qtsrcchokespeed" name="qt_qtsrcchokespeed" onchange="generatePreview();" /></td>
+
+							<td><label for="qt_volume">{#media_dlg.volume}</label></td>
+							<td><input type="text" id="qt_volume" name="qt_volume" onchange="generatePreview();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="qt_qtsrc">{#media_dlg.qtsrc}</label></td>
+							<td colspan="4">
+							<table border="0" cellspacing="0" cellpadding="0">
+								  <tr>
+									<td><input type="text" id="qt_qtsrc" name="qt_qtsrc" onchange="generatePreview();" /></td>
+									<td id="qtsrcfilebrowsercontainer">&nbsp;</td>
+								  </tr>
+							</table>
+							</td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset id="wmp_options">
+					<legend>{#media_dlg.wmp_options}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="wmp_autostart" name="wmp_autostart" checked="checked" onchange="generatePreview();" /></td>
+										<td><label for="wmp_autostart">{#media_dlg.autostart}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="wmp_enabled" name="wmp_enabled" onchange="generatePreview();" /></td>
+										<td><label for="wmp_enabled">{#media_dlg.enabled}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="wmp_enablecontextmenu" name="wmp_enablecontextmenu" checked="checked" onchange="generatePreview();" /></td>
+										<td><label for="wmp_enablecontextmenu">{#media_dlg.menu}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="wmp_fullscreen" name="wmp_fullscreen" onchange="generatePreview();" /></td>
+										<td><label for="wmp_fullscreen">{#media_dlg.fullscreen}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="wmp_invokeurls" name="wmp_invokeurls" checked="checked" onchange="generatePreview();" /></td>
+										<td><label for="wmp_invokeurls">{#media_dlg.invokeurls}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="wmp_mute" name="wmp_mute" onchange="generatePreview();" /></td>
+										<td><label for="wmp_mute">{#media_dlg.mute}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="wmp_stretchtofit" name="wmp_stretchtofit" onchange="generatePreview();" /></td>
+										<td><label for="wmp_stretchtofit">{#media_dlg.stretchtofit}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="wmp_windowlessvideo" name="wmp_windowlessvideo" onchange="generatePreview();" /></td>
+										<td><label for="wmp_windowlessvideo">{#media_dlg.windowlessvideo}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="wmp_balance">{#media_dlg.balance}</label></td>
+							<td><input type="text" id="wmp_balance" name="wmp_balance" onchange="generatePreview();" /></td>
+
+							<td><label for="wmp_baseurl">{#media_dlg.baseurl}</label></td>
+							<td><input type="text" id="wmp_baseurl" name="wmp_baseurl" onchange="generatePreview();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="wmp_captioningid">{#media_dlg.captioningid}</label></td>
+							<td><input type="text" id="wmp_captioningid" name="wmp_captioningid" onchange="generatePreview();" /></td>
+
+							<td><label for="wmp_currentmarker">{#media_dlg.currentmarker}</label></td>
+							<td><input type="text" id="wmp_currentmarker" name="wmp_currentmarker" onchange="generatePreview();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="wmp_currentposition">{#media_dlg.currentposition}</label></td>
+							<td><input type="text" id="wmp_currentposition" name="wmp_currentposition" onchange="generatePreview();" /></td>
+
+							<td><label for="wmp_defaultframe">{#media_dlg.defaultframe}</label></td>
+							<td><input type="text" id="wmp_defaultframe" name="wmp_defaultframe" onchange="generatePreview();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="wmp_playcount">{#media_dlg.playcount}</label></td>
+							<td><input type="text" id="wmp_playcount" name="wmp_playcount" onchange="generatePreview();" /></td>
+
+							<td><label for="wmp_rate">{#media_dlg.rate}</label></td>
+							<td><input type="text" id="wmp_rate" name="wmp_rate" onchange="generatePreview();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="wmp_uimode">{#media_dlg.uimode}</label></td>
+							<td><input type="text" id="wmp_uimode" name="wmp_uimode" onchange="generatePreview();" /></td>
+
+							<td><label for="wmp_volume">{#media_dlg.volume}</label></td>
+							<td><input type="text" id="wmp_volume" name="wmp_volume" onchange="generatePreview();" /></td>
+						</tr>
+
+					</table>
+				</fieldset>
+
+				<fieldset id="rmp_options">
+					<legend>{#media_dlg.rmp_options}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="rmp_autostart" name="rmp_autostart" onchange="generatePreview();" /></td>
+										<td><label for="rmp_autostart">{#media_dlg.autostart}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="rmp_loop" name="rmp_loop" onchange="generatePreview();" /></td>
+										<td><label for="rmp_loop">{#media_dlg.loop}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="rmp_autogotourl" name="rmp_autogotourl" checked="checked" onchange="generatePreview();" /></td>
+										<td><label for="rmp_autogotourl">{#media_dlg.autogotourl}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="rmp_center" name="rmp_center" onchange="generatePreview();" /></td>
+										<td><label for="rmp_center">{#media_dlg.center}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="rmp_imagestatus" name="rmp_imagestatus" checked="checked" onchange="generatePreview();" /></td>
+										<td><label for="rmp_imagestatus">{#media_dlg.imagestatus}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="rmp_maintainaspect" name="rmp_maintainaspect" onchange="generatePreview();" /></td>
+										<td><label for="rmp_maintainaspect">{#media_dlg.maintainaspect}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="rmp_nojava" name="rmp_nojava" onchange="generatePreview();" /></td>
+										<td><label for="rmp_nojava">{#media_dlg.nojava}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="rmp_prefetch" name="rmp_prefetch" onchange="generatePreview();" /></td>
+										<td><label for="rmp_prefetch">{#media_dlg.prefetch}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="rmp_shuffle" name="rmp_shuffle" onchange="generatePreview();" /></td>
+										<td><label for="rmp_shuffle">{#media_dlg.shuffle}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								&nbsp;
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="rmp_console">{#media_dlg.console}</label></td>
+							<td><input type="text" id="rmp_console" name="rmp_console" onchange="generatePreview();" /></td>
+
+							<td><label for="rmp_controls">{#media_dlg.controls}</label></td>
+							<td><input type="text" id="rmp_controls" name="rmp_controls" onchange="generatePreview();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="rmp_numloop">{#media_dlg.numloop}</label></td>
+							<td><input type="text" id="rmp_numloop" name="rmp_numloop" onchange="generatePreview();" /></td>
+
+							<td><label for="rmp_scriptcallbacks">{#media_dlg.scriptcallbacks}</label></td>
+							<td><input type="text" id="rmp_scriptcallbacks" name="rmp_scriptcallbacks" onchange="generatePreview();" /></td>
+						</tr>
+					</table>
+				</fieldset>
+
+				<fieldset id="shockwave_options">
+					<legend>{#media_dlg.shockwave_options}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td><label for="shockwave_swstretchstyle">{#media_dlg.swstretchstyle}</label></td>
+							<td>
+								<select id="shockwave_swstretchstyle" name="shockwave_swstretchstyle" onchange="generatePreview();">
+									<option value="none">{#not_set}</option>
+									<option value="meet">Meet</option>
+									<option value="fill">Fill</option>
+									<option value="stage">Stage</option>
+								</select>
+							</td>
+
+							<td><label for="shockwave_swvolume">{#media_dlg.volume}</label></td>
+							<td><input type="text" id="shockwave_swvolume" name="shockwave_swvolume" onchange="generatePreview();" /></td>
+						</tr>
+
+						<tr>
+							<td><label for="shockwave_swstretchhalign">{#media_dlg.swstretchhalign}</label></td>
+							<td>
+								<select id="shockwave_swstretchhalign" name="shockwave_swstretchhalign" onchange="generatePreview();">
+									<option value="none">{#not_set}</option>
+									<option value="left">{#media_dlg.align_left}</option>
+									<option value="center">{#media_dlg.align_center}</option>
+									<option value="right">{#media_dlg.align_right}</option>
+								</select>
+							</td>
+
+							<td><label for="shockwave_swstretchvalign">{#media_dlg.swstretchvalign}</label></td>
+							<td>
+								<select id="shockwave_swstretchvalign" name="shockwave_swstretchvalign" onchange="generatePreview();">
+									<option value="none">{#not_set}</option>
+									<option value="meet">Meet</option>
+									<option value="fill">Fill</option>
+									<option value="stage">Stage</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="shockwave_autostart" name="shockwave_autostart" onchange="generatePreview();" checked="checked" /></td>
+										<td><label for="shockwave_autostart">{#media_dlg.autostart}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="shockwave_sound" name="shockwave_sound" onchange="generatePreview();" checked="checked" /></td>
+										<td><label for="shockwave_sound">{#media_dlg.sound}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+
+
+						<tr>
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="shockwave_swliveconnect" name="shockwave_swliveconnect" onchange="generatePreview();" /></td>
+										<td><label for="shockwave_swliveconnect">{#media_dlg.liveconnect}</label></td>
+									</tr>
+								</table>
+							</td>
+
+							<td colspan="2">
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input type="checkbox" class="checkbox" id="shockwave_progress" name="shockwave_progress" onchange="generatePreview();" checked="checked" /></td>
+										<td><label for="shockwave_progress">{#media_dlg.progress}</label></td>
+									</tr>
+								</table>
+							</td>
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div style="float: left">
+				<input type="submit" id="insert" name="insert" value="{#insert}" />
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+	</form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/nonbreaking/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
index b72375660..b19255090 100755
--- a/webapp/web/js/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/nonbreaking/editor_plugin_src.js
@@ -1,50 +1,50 @@
-/**
- * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.Nonbreaking', {
-		init : function(ed, url) {
-			var t = this;
-
-			t.editor = ed;
-
-			// Register commands
-			ed.addCommand('mceNonBreaking', function() {
-				ed.execCommand('mceInsertContent', false, (ed.plugins.visualchars && ed.plugins.visualchars.state) ? '<span class="mceItemHidden mceVisualNbsp">&middot;</span>' : '&nbsp;');
-			});
-
-			// Register buttons
-			ed.addButton('nonbreaking', {title : 'nonbreaking.nonbreaking_desc', cmd : 'mceNonBreaking'});
-
-			if (ed.getParam('nonbreaking_force_tab')) {
-				ed.onKeyDown.add(function(ed, e) {
-					if (tinymce.isIE && e.keyCode == 9) {
-						ed.execCommand('mceNonBreaking');
-						ed.execCommand('mceNonBreaking');
-						ed.execCommand('mceNonBreaking');
-						tinymce.dom.Event.cancel(e);
-					}
-				});
-			}
-		},
-
-		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
-			};
-		}
-
-		// Private methods
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('nonbreaking', tinymce.plugins.Nonbreaking);
+/**
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Nonbreaking', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceNonBreaking', function() {
+				ed.execCommand('mceInsertContent', false, (ed.plugins.visualchars && ed.plugins.visualchars.state) ? '<span class="mceItemHidden mceVisualNbsp">&middot;</span>' : '&nbsp;');
+			});
+
+			// Register buttons
+			ed.addButton('nonbreaking', {title : 'nonbreaking.nonbreaking_desc', cmd : 'mceNonBreaking'});
+
+			if (ed.getParam('nonbreaking_force_tab')) {
+				ed.onKeyDown.add(function(ed, e) {
+					if (tinymce.isIE && e.keyCode == 9) {
+						ed.execCommand('mceNonBreaking');
+						ed.execCommand('mceNonBreaking');
+						ed.execCommand('mceNonBreaking');
+						tinymce.dom.Event.cancel(e);
+					}
+				});
+			}
+		},
+
+		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
+			};
+		}
+
+		// Private methods
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('nonbreaking', tinymce.plugins.Nonbreaking);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/noneditable/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/noneditable/editor_plugin_src.js
index 77db577cf..ff93b34ca 100755
--- a/webapp/web/js/tiny_mce/plugins/noneditable/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/noneditable/editor_plugin_src.js
@@ -1,87 +1,87 @@
-/**
- * $Id: editor_plugin_src.js 743 2008-03-23 17:47:33Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	var Event = tinymce.dom.Event;
-
-	tinymce.create('tinymce.plugins.NonEditablePlugin', {
-		init : function(ed, url) {
-			var t = this, editClass, nonEditClass;
-
-			t.editor = ed;
-			editClass = ed.getParam("noneditable_editable_class", "mceEditable");
-			nonEditClass = ed.getParam("noneditable_noneditable_class", "mceNonEditable");
-
-			ed.onNodeChange.addToTop(function(ed, cm, n) {
-				var sc, ec;
-
-				// Block if start or end is inside a non editable element
-				sc = ed.dom.getParent(ed.selection.getStart(), function(n) {
-					return ed.dom.hasClass(n, nonEditClass);
-				});
-
-				ec = ed.dom.getParent(ed.selection.getEnd(), function(n) {
-					return ed.dom.hasClass(n, nonEditClass);
-				});
-
-				// Block or unblock
-				if (sc || ec) {
-					t._setDisabled(1);
-					return false;
-				} else
-					t._setDisabled(0);
-			});
-		},
-
-		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
-			};
-		},
-
-		_block : function(ed, e) {
-			var k = e.keyCode;
-
-			// Don't block arrow keys, pg up/down, and F1-F12
-			if ((k > 32 && k < 41) || (k > 111 && k < 124))
-				return;
-
-			return Event.cancel(e);
-		},
-
-		_setDisabled : function(s) {
-			var t = this, ed = t.editor;
-
-			tinymce.each(ed.controlManager.controls, function(c) {
-				c.setDisabled(s);
-			});
-
-			if (s !== t.disabled) {
-				if (s) {
-					ed.onKeyDown.addToTop(t._block);
-					ed.onKeyPress.addToTop(t._block);
-					ed.onKeyUp.addToTop(t._block);
-					ed.onPaste.addToTop(t._block);
-				} else {
-					ed.onKeyDown.remove(t._block);
-					ed.onKeyPress.remove(t._block);
-					ed.onKeyUp.remove(t._block);
-					ed.onPaste.remove(t._block);
-				}
-
-				t.disabled = s;
-			}
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('noneditable', tinymce.plugins.NonEditablePlugin);
+/**
+ * $Id: editor_plugin_src.js 743 2008-03-23 17:47:33Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var Event = tinymce.dom.Event;
+
+	tinymce.create('tinymce.plugins.NonEditablePlugin', {
+		init : function(ed, url) {
+			var t = this, editClass, nonEditClass;
+
+			t.editor = ed;
+			editClass = ed.getParam("noneditable_editable_class", "mceEditable");
+			nonEditClass = ed.getParam("noneditable_noneditable_class", "mceNonEditable");
+
+			ed.onNodeChange.addToTop(function(ed, cm, n) {
+				var sc, ec;
+
+				// Block if start or end is inside a non editable element
+				sc = ed.dom.getParent(ed.selection.getStart(), function(n) {
+					return ed.dom.hasClass(n, nonEditClass);
+				});
+
+				ec = ed.dom.getParent(ed.selection.getEnd(), function(n) {
+					return ed.dom.hasClass(n, nonEditClass);
+				});
+
+				// Block or unblock
+				if (sc || ec) {
+					t._setDisabled(1);
+					return false;
+				} else
+					t._setDisabled(0);
+			});
+		},
+
+		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
+			};
+		},
+
+		_block : function(ed, e) {
+			var k = e.keyCode;
+
+			// Don't block arrow keys, pg up/down, and F1-F12
+			if ((k > 32 && k < 41) || (k > 111 && k < 124))
+				return;
+
+			return Event.cancel(e);
+		},
+
+		_setDisabled : function(s) {
+			var t = this, ed = t.editor;
+
+			tinymce.each(ed.controlManager.controls, function(c) {
+				c.setDisabled(s);
+			});
+
+			if (s !== t.disabled) {
+				if (s) {
+					ed.onKeyDown.addToTop(t._block);
+					ed.onKeyPress.addToTop(t._block);
+					ed.onKeyUp.addToTop(t._block);
+					ed.onPaste.addToTop(t._block);
+				} else {
+					ed.onKeyDown.remove(t._block);
+					ed.onKeyPress.remove(t._block);
+					ed.onKeyUp.remove(t._block);
+					ed.onPaste.remove(t._block);
+				}
+
+				t.disabled = s;
+			}
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('noneditable', tinymce.plugins.NonEditablePlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/pagebreak/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/pagebreak/editor_plugin_src.js
index 16f574827..8f0a240db 100755
--- a/webapp/web/js/tiny_mce/plugins/pagebreak/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/pagebreak/editor_plugin_src.js
@@ -1,74 +1,74 @@
-/**
- * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.PageBreakPlugin', {
-		init : function(ed, url) {
-			var pb = '<img src="' + url + '/img/trans.gif" class="mcePageBreak mceItemNoResize" />', cls = 'mcePageBreak', sep = ed.getParam('pagebreak_separator', '<!-- pagebreak -->'), pbRE;
-
-			pbRE = new RegExp(sep.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g, function(a) {return '\\' + a;}), 'g');
-
-			// Register commands
-			ed.addCommand('mcePageBreak', function() {
-				ed.execCommand('mceInsertContent', 0, pb);
-			});
-
-			// Register buttons
-			ed.addButton('pagebreak', {title : 'pagebreak.desc', cmd : cls});
-
-			ed.onInit.add(function() {
-				if (ed.settings.content_css !== false)
-					ed.dom.loadCSS(url + "/css/content.css");
-
-				if (ed.theme.onResolveName) {
-					ed.theme.onResolveName.add(function(th, o) {
-						if (o.node.nodeName == 'IMG' && ed.dom.hasClass(o.node, cls))
-							o.name = 'pagebreak';
-					});
-				}
-			});
-
-			ed.onClick.add(function(ed, e) {
-				e = e.target;
-
-				if (e.nodeName === 'IMG' && ed.dom.hasClass(e, cls))
-					ed.selection.select(e);
-			});
-
-			ed.onNodeChange.add(function(ed, cm, n) {
-				cm.setActive('pagebreak', n.nodeName === 'IMG' && ed.dom.hasClass(n, cls));
-			});
-
-			ed.onBeforeSetContent.add(function(ed, o) {
-				o.content = o.content.replace(pbRE, pb);
-			});
-
-			ed.onPostProcess.add(function(ed, o) {
-				if (o.get)
-					o.content = o.content.replace(/<img[^>]+>/g, function(im) {
-						if (im.indexOf('class="mcePageBreak') !== -1)
-							im = sep;
-
-						return im;
-					});
-			});
-		},
-
-		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
-			};
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('pagebreak', tinymce.plugins.PageBreakPlugin);
+/**
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.PageBreakPlugin', {
+		init : function(ed, url) {
+			var pb = '<img src="' + url + '/img/trans.gif" class="mcePageBreak mceItemNoResize" />', cls = 'mcePageBreak', sep = ed.getParam('pagebreak_separator', '<!-- pagebreak -->'), pbRE;
+
+			pbRE = new RegExp(sep.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g, function(a) {return '\\' + a;}), 'g');
+
+			// Register commands
+			ed.addCommand('mcePageBreak', function() {
+				ed.execCommand('mceInsertContent', 0, pb);
+			});
+
+			// Register buttons
+			ed.addButton('pagebreak', {title : 'pagebreak.desc', cmd : cls});
+
+			ed.onInit.add(function() {
+				if (ed.settings.content_css !== false)
+					ed.dom.loadCSS(url + "/css/content.css");
+
+				if (ed.theme.onResolveName) {
+					ed.theme.onResolveName.add(function(th, o) {
+						if (o.node.nodeName == 'IMG' && ed.dom.hasClass(o.node, cls))
+							o.name = 'pagebreak';
+					});
+				}
+			});
+
+			ed.onClick.add(function(ed, e) {
+				e = e.target;
+
+				if (e.nodeName === 'IMG' && ed.dom.hasClass(e, cls))
+					ed.selection.select(e);
+			});
+
+			ed.onNodeChange.add(function(ed, cm, n) {
+				cm.setActive('pagebreak', n.nodeName === 'IMG' && ed.dom.hasClass(n, cls));
+			});
+
+			ed.onBeforeSetContent.add(function(ed, o) {
+				o.content = o.content.replace(pbRE, pb);
+			});
+
+			ed.onPostProcess.add(function(ed, o) {
+				if (o.get)
+					o.content = o.content.replace(/<img[^>]+>/g, function(im) {
+						if (im.indexOf('class="mcePageBreak') !== -1)
+							im = sep;
+
+						return im;
+					});
+			});
+		},
+
+		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
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('pagebreak', tinymce.plugins.PageBreakPlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/paste/blank.htm b/webapp/web/js/tiny_mce/plugins/paste/blank.htm
index 7ba26bd65..f841206c0 100755
--- a/webapp/web/js/tiny_mce/plugins/paste/blank.htm
+++ b/webapp/web/js/tiny_mce/plugins/paste/blank.htm
@@ -1,22 +1,22 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>blank_page</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link href="css/blank.css" rel="stylesheet" type="text/css" />
-<base target="_self" />
-<script type="text/javascript">
-function init() {
-	if (parent.tinymce.isIE)
-		document.body.contentEditable = true;
-	else
-		document.designMode = 'on';
-
-	parent.initIframe(document);
-	window.focus();
-}
-</script>
-</head>
-<body onload="init();">
-
-</body>
-</html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>blank_page</title>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link href="css/blank.css" rel="stylesheet" type="text/css" />
+<base target="_self" />
+<script type="text/javascript">
+function init() {
+	if (parent.tinymce.isIE)
+		document.body.contentEditable = true;
+	else
+		document.designMode = 'on';
+
+	parent.initIframe(document);
+	window.focus();
+}
+</script>
+</head>
+<body onload="init();">
+
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/paste/css/blank.css b/webapp/web/js/tiny_mce/plugins/paste/css/blank.css
index 6b16bac25..f1ab11338 100755
--- a/webapp/web/js/tiny_mce/plugins/paste/css/blank.css
+++ b/webapp/web/js/tiny_mce/plugins/paste/css/blank.css
@@ -1,14 +1,14 @@
-html, body {height:98%}
-body {
-background-color: #FFFFFF;
-font-family: Verdana, Arial, Helvetica, sans-serif;
-font-size: 10px;
-scrollbar-3dlight-color: #F0F0EE;
-scrollbar-arrow-color: #676662;
-scrollbar-base-color: #F0F0EE;
-scrollbar-darkshadow-color: #DDDDDD;
-scrollbar-face-color: #E0E0DD;
-scrollbar-highlight-color: #F0F0EE;
-scrollbar-shadow-color: #F0F0EE;
-scrollbar-track-color: #F5F5F5;
-}
+html, body {height:98%}
+body {
+background-color: #FFFFFF;
+font-family: Verdana, Arial, Helvetica, sans-serif;
+font-size: 10px;
+scrollbar-3dlight-color: #F0F0EE;
+scrollbar-arrow-color: #676662;
+scrollbar-base-color: #F0F0EE;
+scrollbar-darkshadow-color: #DDDDDD;
+scrollbar-face-color: #E0E0DD;
+scrollbar-highlight-color: #F0F0EE;
+scrollbar-shadow-color: #F0F0EE;
+scrollbar-track-color: #F5F5F5;
+}
diff --git a/webapp/web/js/tiny_mce/plugins/paste/css/pasteword.css b/webapp/web/js/tiny_mce/plugins/paste/css/pasteword.css
index b3be6270b..77685fd2e 100755
--- a/webapp/web/js/tiny_mce/plugins/paste/css/pasteword.css
+++ b/webapp/web/js/tiny_mce/plugins/paste/css/pasteword.css
@@ -1,3 +1,3 @@
-.sourceIframe {
-	border: 1px solid #808080;
-}
+.sourceIframe {
+	border: 1px solid #808080;
+}
diff --git a/webapp/web/js/tiny_mce/plugins/paste/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/paste/editor_plugin_src.js
index f271758f9..54cdf57ef 100755
--- a/webapp/web/js/tiny_mce/plugins/paste/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/paste/editor_plugin_src.js
@@ -1,389 +1,389 @@
-/**
- * $Id: editor_plugin_src.js 862 2008-06-02 20:09:06Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	var Event = tinymce.dom.Event;
-
-	tinymce.create('tinymce.plugins.PastePlugin', {
-		init : function(ed, url) {
-			var t = this;
-
-			t.editor = ed; 
-
-			// Register commands
-			ed.addCommand('mcePasteText', function(ui, v) {
-				if (ui) {
-					if ((ed.getParam('paste_use_dialog', true)) || (!tinymce.isIE)) {
-						ed.windowManager.open({
-							file : url + '/pastetext.htm',
-							width : 450,
-							height : 400,
-							inline : 1
-						}, {
-							plugin_url : url
-						});
-					} else
-						t._insertText(clipboardData.getData("Text"), true);
-				} else
-					t._insertText(v.html, v.linebreaks);
-			});
-
-			ed.addCommand('mcePasteWord', function(ui, v) {
-				if (ui) {
-					if ((ed.getParam('paste_use_dialog', true)) || (!tinymce.isIE)) {
-						ed.windowManager.open({
-							file : url + '/pasteword.htm',
-							width : 450,
-							height : 400,
-							inline : 1
-						}, {
-							plugin_url : url
-						});
-					} else
-						t._insertText(t._clipboardHTML());
-				} else
-					t._insertWordContent(v);
-			});
-
-			ed.addCommand('mceSelectAll', function() {
-				ed.execCommand('selectall'); 
-			});
-
-			// Register buttons
-			ed.addButton('pastetext', {title : 'paste.paste_text_desc', cmd : 'mcePasteText', ui : true});
-			ed.addButton('pasteword', {title : 'paste.paste_word_desc', cmd : 'mcePasteWord', ui : true});
-			ed.addButton('selectall', {title : 'paste.selectall_desc', cmd : 'mceSelectAll'});
-
-			if (ed.getParam("paste_auto_cleanup_on_paste", false)) {
-				ed.onPaste.add(function(ed, e) {
-					return t._handlePasteEvent(e)
-				});
-			}
-
-			if (!tinymce.isIE && ed.getParam("paste_auto_cleanup_on_paste", false)) {
-				// Force paste dialog if non IE browser
-				ed.onKeyDown.add(function(ed, e) {
-					if (e.ctrlKey && e.keyCode == 86) {
-						window.setTimeout(function() {
-							ed.execCommand("mcePasteText", true);
-						}, 1);
-
-						Event.cancel(e);
-					}
-				});
-			}
-		},
-
-		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
-			};
-		},
-
-		// Private methods
-
-		_handlePasteEvent : function(e) {
-			var html = this._clipboardHTML(), ed = this.editor, sel = ed.selection, r;
-
-			// Removes italic, strong etc, the if was needed due to bug #1437114
-			if (ed && (r = sel.getRng()) && r.text.length > 0)
-				ed.execCommand('delete');
-
-			if (html && html.length > 0)
-				ed.execCommand('mcePasteWord', false, html);
-
-			return Event.cancel(e);
-		},
-
-		_insertText : function(content, bLinebreaks) {
-			content = this.editor.dom.encode(content);
-
-			if (content && content.length > 0) {
-				if (bLinebreaks) { 
-					// Special paragraph treatment 
-					if (this.editor.getParam("paste_create_paragraphs", true)) {
-						var rl = this.editor.getParam("paste_replace_list", '\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');
-						for (var i=0; i<rl.length; i+=2)
-							content = content.replace(new RegExp(rl[i], 'gi'), rl[i+1]);
-
-						content = content.replace(/\r\n\r\n/g, '</p><p>');
-						content = content.replace(/\r\r/g, '</p><p>');
-						content = content.replace(/\n\n/g, '</p><p>');
-
-						// Has paragraphs 
-						if ((pos = content.indexOf('</p><p>')) != -1) { 
-							this.editor.execCommand("Delete"); 
-
-							var node = this.editor.selection.getNode(); 
-
-							// Get list of elements to break 
-							var breakElms = [];
-
-							do { 
-								if (node.nodeType == 1) { 
-									// Don't break tables and break at body 
-									if (node.nodeName == "TD" || node.nodeName == "BODY") 
-										break; 
-			
-									breakElms[breakElms.length] = node; 
-								} 
-							} while(node = node.parentNode); 
-
-							var before = "", after = "</p>"; 
-							before += content.substring(0, pos); 
-
-							for (var i=0; i<breakElms.length; i++) { 
-								before += "</" + breakElms[i].nodeName + ">"; 
-								after += "<" + breakElms[(breakElms.length-1)-i].nodeName + ">"; 
-							} 
-
-							before += "<p>"; 
-							content = before + content.substring(pos+7) + after; 
-						} 
-					} 
-
-					if (this.editor.getParam("paste_create_linebreaks", true)) {
-						content = content.replace(/\r\n/g, '<br />');
-						content = content.replace(/\r/g, '<br />');
-						content = content.replace(/\n/g, '<br />');
-					}
-				} 
-
-				this.editor.execCommand("mceInsertRawHTML", false, content); 
-			}
-		},
-
-		_insertWordContent : function(content) { 
-			var t = this, ed = t.editor;
-
-			if (content && content.length > 0) {
-				// Cleanup Word content
-				var bull = String.fromCharCode(8226);
-				var middot = String.fromCharCode(183);
-
-				if (ed.getParam('paste_insert_word_content_callback'))
-					content = ed.execCallback('paste_insert_word_content_callback', 'before', content);
-
-				var rl = ed.getParam("paste_replace_list", '\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');
-				for (var i=0; i<rl.length; i+=2)
-					content = content.replace(new RegExp(rl[i], 'gi'), rl[i+1]);
-
-				if (this.editor.getParam("paste_convert_headers_to_strong", false)) {
-					content = content.replace(new RegExp('<p class=MsoHeading.*?>(.*?)<\/p>', 'gi'), '<p><b>$1</b></p>');
-				}
-
-				content = content.replace(new RegExp('tab-stops: list [0-9]+.0pt">', 'gi'), '">' + "--list--");
-				content = content.replace(new RegExp(bull + "(.*?)<BR>", "gi"), "<p>" + middot + "$1</p>");
-				content = content.replace(new RegExp('<SPAN style="mso-list: Ignore">', 'gi'), "<span>" + bull); // Covert to bull list
-				content = content.replace(/<o:p><\/o:p>/gi, "");
-				content = content.replace(new RegExp('<br style="page-break-before: always;.*>', 'gi'), '-- page break --'); // Replace pagebreaks
-				content = content.replace(new RegExp('<(!--)([^>]*)(--)>', 'g'), "");  // Word comments
-
-				if (this.editor.getParam("paste_remove_spans", true))
-					content = content.replace(/<\/?span[^>]*>/gi, "");
-
-				if (this.editor.getParam("paste_remove_styles", true))
-					content = content.replace(new RegExp('<(\\w[^>]*) style="([^"]*)"([^>]*)', 'gi'), "<$1$3");
-
-				content = content.replace(/<\/?font[^>]*>/gi, "");
-
-				// Strips class attributes.
-				switch (this.editor.getParam("paste_strip_class_attributes", "all")) {
-					case "all":
-						content = content.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi, "<$1$3");
-						break;
-
-					case "mso":
-						content = content.replace(new RegExp('<(\\w[^>]*) class="?mso([^ |>]*)([^>]*)', 'gi'), "<$1$3");
-						break;
-				}
-
-				content = content.replace(new RegExp('href="?' + this._reEscape("" + document.location) + '', 'gi'), 'href="' + this.editor.documentBaseURI.getURI());
-				content = content.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi, "<$1$3");
-				content = content.replace(/<\\?\?xml[^>]*>/gi, "");
-				content = content.replace(/<\/?\w+:[^>]*>/gi, "");
-				content = content.replace(/-- page break --\s*<p>&nbsp;<\/p>/gi, ""); // Remove pagebreaks
-				content = content.replace(/-- page break --/gi, ""); // Remove pagebreaks
-
-		//		content = content.replace(/\/?&nbsp;*/gi, ""); &nbsp;
-		//		content = content.replace(/<p>&nbsp;<\/p>/gi, '');
-
-				if (!this.editor.getParam('force_p_newlines')) {
-					content = content.replace('', '' ,'gi');
-					content = content.replace('</p>', '<br /><br />' ,'gi');
-				}
-
-				if (!tinymce.isIE && !this.editor.getParam('force_p_newlines')) {
-					content = content.replace(/<\/?p[^>]*>/gi, "");
-				}
-
-				content = content.replace(/<\/?div[^>]*>/gi, "");
-
-				// Convert all middlot lists to UL lists
-				if (this.editor.getParam("paste_convert_middot_lists", true)) {
-					var div = ed.dom.create("div", null, content);
-
-					// Convert all middot paragraphs to li elements
-					var className = this.editor.getParam("paste_unindented_list_class", "unIndentedList");
-
-					while (this._convertMiddots(div, "--list--")) ; // bull
-					while (this._convertMiddots(div, middot, className)) ; // Middot
-					while (this._convertMiddots(div, bull)) ; // bull
-
-					content = div.innerHTML;
-				}
-
-				// Replace all headers with strong and fix some other issues
-				if (this.editor.getParam("paste_convert_headers_to_strong", false)) {
-					content = content.replace(/<h[1-6]>&nbsp;<\/h[1-6]>/gi, '<p>&nbsp;&nbsp;</p>');
-					content = content.replace(/<h[1-6]>/gi, '<p><b>');
-					content = content.replace(/<\/h[1-6]>/gi, '</b></p>');
-					content = content.replace(/<b>&nbsp;<\/b>/gi, '<b>&nbsp;&nbsp;</b>');
-					content = content.replace(/^(&nbsp;)*/gi, '');
-				}
-
-				content = content.replace(/--list--/gi, ""); // Remove --list--
-
-				if (ed.getParam('paste_insert_word_content_callback'))
-					content = ed.execCallback('paste_insert_word_content_callback', 'after', content);
-
-				// Insert cleaned content
-				this.editor.execCommand("mceInsertContent", false, content);
-
-				if (this.editor.getParam('paste_force_cleanup_wordpaste', true)) {
-					var ed = this.editor;
-
-					window.setTimeout(function() {
-						ed.execCommand("mceCleanup");
-					}, 1); // Do normal cleanup detached from this thread
-				}
-			}
-		},
-
-		_reEscape : function(s) {
-			var l = "?.\\*[](){}+^$:";
-			var o = "";
-
-			for (var i=0; i<s.length; i++) {
-				var c = s.charAt(i);
-
-				if (l.indexOf(c) != -1)
-					o += '\\' + c;
-				else
-					o += c;
-			}
-
-			return o;
-		},
-
-		_convertMiddots : function(div, search, class_name) {
-			var ed = this.editor, mdot = String.fromCharCode(183), bull = String.fromCharCode(8226);
-			var nodes, prevul, i, p, ul, li, np, cp, li;
-
-			nodes = div.getElementsByTagName("p");
-			for (i=0; i<nodes.length; i++) {
-				p = nodes[i];
-
-				// Is middot
-				if (p.innerHTML.indexOf(search) == 0) {
-					ul = ed.dom.create("ul");
-
-					if (class_name)
-						ul.className = class_name;
-
-					// Add the first one
-					li = ed.dom.create("li");
-					li.innerHTML = p.innerHTML.replace(new RegExp('' + mdot + '|' + bull + '|--list--|&nbsp;', "gi"), '');
-					ul.appendChild(li);
-
-					// Add the rest
-					np = p.nextSibling;
-					while (np) {
-						// If the node is whitespace, then
-						// ignore it and continue on.
-						if (np.nodeType == 3 && new RegExp('^\\s$', 'm').test(np.nodeValue)) {
-								np = np.nextSibling;
-								continue;
-						}
-
-						if (search == mdot) {
-								if (np.nodeType == 1 && new RegExp('^o(\\s+|&nbsp;)').test(np.innerHTML)) {
-										// Second level of nesting
-										if (!prevul) {
-												prevul = ul;
-												ul = ed.dom.create("ul");
-												prevul.appendChild(ul);
-										}
-										np.innerHTML = np.innerHTML.replace(/^o/, '');
-								} else {
-										// Pop the stack if we're going back up to the first level
-										if (prevul) {
-												ul = prevul;
-												prevul = null;
-										}
-										// Not element or middot paragraph
-										if (np.nodeType != 1 || np.innerHTML.indexOf(search) != 0)
-												break;
-								}
-						} else {
-								// Not element or middot paragraph
-								if (np.nodeType != 1 || np.innerHTML.indexOf(search) != 0)
-										break;
-							}
-
-						cp = np.nextSibling;
-						li = ed.dom.create("li");
-						li.innerHTML = np.innerHTML.replace(new RegExp('' + mdot + '|' + bull + '|--list--|&nbsp;', "gi"), '');
-						np.parentNode.removeChild(np);
-						ul.appendChild(li);
-						np = cp;
-					}
-
-					p.parentNode.replaceChild(ul, p);
-
-					return true;
-				}
-			}
-
-			return false;
-		},
-
-		_clipboardHTML : function() {
-			var div = document.getElementById('_TinyMCE_clipboardHTML');
-
-			if (!div) {
-				var div = document.createElement('DIV');
-				div.id = '_TinyMCE_clipboardHTML';
-
-				with (div.style) {
-					visibility = 'hidden';
-					overflow = 'hidden';
-					position = 'absolute';
-					width = 1;
-					height = 1;
-				}
-
-				document.body.appendChild(div);
-			}
-
-			div.innerHTML = '';
-			var rng = document.body.createTextRange();
-			rng.moveToElementText(div);
-			rng.execCommand('Paste');
-			var html = div.innerHTML;
-			div.innerHTML = '';
-			return html;
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('paste', tinymce.plugins.PastePlugin);
+/**
+ * $Id: editor_plugin_src.js 862 2008-06-02 20:09:06Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var Event = tinymce.dom.Event;
+
+	tinymce.create('tinymce.plugins.PastePlugin', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed; 
+
+			// Register commands
+			ed.addCommand('mcePasteText', function(ui, v) {
+				if (ui) {
+					if ((ed.getParam('paste_use_dialog', true)) || (!tinymce.isIE)) {
+						ed.windowManager.open({
+							file : url + '/pastetext.htm',
+							width : 450,
+							height : 400,
+							inline : 1
+						}, {
+							plugin_url : url
+						});
+					} else
+						t._insertText(clipboardData.getData("Text"), true);
+				} else
+					t._insertText(v.html, v.linebreaks);
+			});
+
+			ed.addCommand('mcePasteWord', function(ui, v) {
+				if (ui) {
+					if ((ed.getParam('paste_use_dialog', true)) || (!tinymce.isIE)) {
+						ed.windowManager.open({
+							file : url + '/pasteword.htm',
+							width : 450,
+							height : 400,
+							inline : 1
+						}, {
+							plugin_url : url
+						});
+					} else
+						t._insertText(t._clipboardHTML());
+				} else
+					t._insertWordContent(v);
+			});
+
+			ed.addCommand('mceSelectAll', function() {
+				ed.execCommand('selectall'); 
+			});
+
+			// Register buttons
+			ed.addButton('pastetext', {title : 'paste.paste_text_desc', cmd : 'mcePasteText', ui : true});
+			ed.addButton('pasteword', {title : 'paste.paste_word_desc', cmd : 'mcePasteWord', ui : true});
+			ed.addButton('selectall', {title : 'paste.selectall_desc', cmd : 'mceSelectAll'});
+
+			if (ed.getParam("paste_auto_cleanup_on_paste", false)) {
+				ed.onPaste.add(function(ed, e) {
+					return t._handlePasteEvent(e)
+				});
+			}
+
+			if (!tinymce.isIE && ed.getParam("paste_auto_cleanup_on_paste", false)) {
+				// Force paste dialog if non IE browser
+				ed.onKeyDown.add(function(ed, e) {
+					if (e.ctrlKey && e.keyCode == 86) {
+						window.setTimeout(function() {
+							ed.execCommand("mcePasteText", true);
+						}, 1);
+
+						Event.cancel(e);
+					}
+				});
+			}
+		},
+
+		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
+			};
+		},
+
+		// Private methods
+
+		_handlePasteEvent : function(e) {
+			var html = this._clipboardHTML(), ed = this.editor, sel = ed.selection, r;
+
+			// Removes italic, strong etc, the if was needed due to bug #1437114
+			if (ed && (r = sel.getRng()) && r.text.length > 0)
+				ed.execCommand('delete');
+
+			if (html && html.length > 0)
+				ed.execCommand('mcePasteWord', false, html);
+
+			return Event.cancel(e);
+		},
+
+		_insertText : function(content, bLinebreaks) {
+			content = this.editor.dom.encode(content);
+
+			if (content && content.length > 0) {
+				if (bLinebreaks) { 
+					// Special paragraph treatment 
+					if (this.editor.getParam("paste_create_paragraphs", true)) {
+						var rl = this.editor.getParam("paste_replace_list", '\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');
+						for (var i=0; i<rl.length; i+=2)
+							content = content.replace(new RegExp(rl[i], 'gi'), rl[i+1]);
+
+						content = content.replace(/\r\n\r\n/g, '</p><p>');
+						content = content.replace(/\r\r/g, '</p><p>');
+						content = content.replace(/\n\n/g, '</p><p>');
+
+						// Has paragraphs 
+						if ((pos = content.indexOf('</p><p>')) != -1) { 
+							this.editor.execCommand("Delete"); 
+
+							var node = this.editor.selection.getNode(); 
+
+							// Get list of elements to break 
+							var breakElms = [];
+
+							do { 
+								if (node.nodeType == 1) { 
+									// Don't break tables and break at body 
+									if (node.nodeName == "TD" || node.nodeName == "BODY") 
+										break; 
+			
+									breakElms[breakElms.length] = node; 
+								} 
+							} while(node = node.parentNode); 
+
+							var before = "", after = "</p>"; 
+							before += content.substring(0, pos); 
+
+							for (var i=0; i<breakElms.length; i++) { 
+								before += "</" + breakElms[i].nodeName + ">"; 
+								after += "<" + breakElms[(breakElms.length-1)-i].nodeName + ">"; 
+							} 
+
+							before += "<p>"; 
+							content = before + content.substring(pos+7) + after; 
+						} 
+					} 
+
+					if (this.editor.getParam("paste_create_linebreaks", true)) {
+						content = content.replace(/\r\n/g, '<br />');
+						content = content.replace(/\r/g, '<br />');
+						content = content.replace(/\n/g, '<br />');
+					}
+				} 
+
+				this.editor.execCommand("mceInsertRawHTML", false, content); 
+			}
+		},
+
+		_insertWordContent : function(content) { 
+			var t = this, ed = t.editor;
+
+			if (content && content.length > 0) {
+				// Cleanup Word content
+				var bull = String.fromCharCode(8226);
+				var middot = String.fromCharCode(183);
+
+				if (ed.getParam('paste_insert_word_content_callback'))
+					content = ed.execCallback('paste_insert_word_content_callback', 'before', content);
+
+				var rl = ed.getParam("paste_replace_list", '\u2122,<sup>TM</sup>,\u2026,...,\u201c|\u201d,",\u2019,\',\u2013|\u2014|\u2015|\u2212,-').split(',');
+				for (var i=0; i<rl.length; i+=2)
+					content = content.replace(new RegExp(rl[i], 'gi'), rl[i+1]);
+
+				if (this.editor.getParam("paste_convert_headers_to_strong", false)) {
+					content = content.replace(new RegExp('<p class=MsoHeading.*?>(.*?)<\/p>', 'gi'), '<p><b>$1</b></p>');
+				}
+
+				content = content.replace(new RegExp('tab-stops: list [0-9]+.0pt">', 'gi'), '">' + "--list--");
+				content = content.replace(new RegExp(bull + "(.*?)<BR>", "gi"), "<p>" + middot + "$1</p>");
+				content = content.replace(new RegExp('<SPAN style="mso-list: Ignore">', 'gi'), "<span>" + bull); // Covert to bull list
+				content = content.replace(/<o:p><\/o:p>/gi, "");
+				content = content.replace(new RegExp('<br style="page-break-before: always;.*>', 'gi'), '-- page break --'); // Replace pagebreaks
+				content = content.replace(new RegExp('<(!--)([^>]*)(--)>', 'g'), "");  // Word comments
+
+				if (this.editor.getParam("paste_remove_spans", true))
+					content = content.replace(/<\/?span[^>]*>/gi, "");
+
+				if (this.editor.getParam("paste_remove_styles", true))
+					content = content.replace(new RegExp('<(\\w[^>]*) style="([^"]*)"([^>]*)', 'gi'), "<$1$3");
+
+				content = content.replace(/<\/?font[^>]*>/gi, "");
+
+				// Strips class attributes.
+				switch (this.editor.getParam("paste_strip_class_attributes", "all")) {
+					case "all":
+						content = content.replace(/<(\w[^>]*) class=([^ |>]*)([^>]*)/gi, "<$1$3");
+						break;
+
+					case "mso":
+						content = content.replace(new RegExp('<(\\w[^>]*) class="?mso([^ |>]*)([^>]*)', 'gi'), "<$1$3");
+						break;
+				}
+
+				content = content.replace(new RegExp('href="?' + this._reEscape("" + document.location) + '', 'gi'), 'href="' + this.editor.documentBaseURI.getURI());
+				content = content.replace(/<(\w[^>]*) lang=([^ |>]*)([^>]*)/gi, "<$1$3");
+				content = content.replace(/<\\?\?xml[^>]*>/gi, "");
+				content = content.replace(/<\/?\w+:[^>]*>/gi, "");
+				content = content.replace(/-- page break --\s*<p>&nbsp;<\/p>/gi, ""); // Remove pagebreaks
+				content = content.replace(/-- page break --/gi, ""); // Remove pagebreaks
+
+		//		content = content.replace(/\/?&nbsp;*/gi, ""); &nbsp;
+		//		content = content.replace(/<p>&nbsp;<\/p>/gi, '');
+
+				if (!this.editor.getParam('force_p_newlines')) {
+					content = content.replace('', '' ,'gi');
+					content = content.replace('</p>', '<br /><br />' ,'gi');
+				}
+
+				if (!tinymce.isIE && !this.editor.getParam('force_p_newlines')) {
+					content = content.replace(/<\/?p[^>]*>/gi, "");
+				}
+
+				content = content.replace(/<\/?div[^>]*>/gi, "");
+
+				// Convert all middlot lists to UL lists
+				if (this.editor.getParam("paste_convert_middot_lists", true)) {
+					var div = ed.dom.create("div", null, content);
+
+					// Convert all middot paragraphs to li elements
+					var className = this.editor.getParam("paste_unindented_list_class", "unIndentedList");
+
+					while (this._convertMiddots(div, "--list--")) ; // bull
+					while (this._convertMiddots(div, middot, className)) ; // Middot
+					while (this._convertMiddots(div, bull)) ; // bull
+
+					content = div.innerHTML;
+				}
+
+				// Replace all headers with strong and fix some other issues
+				if (this.editor.getParam("paste_convert_headers_to_strong", false)) {
+					content = content.replace(/<h[1-6]>&nbsp;<\/h[1-6]>/gi, '<p>&nbsp;&nbsp;</p>');
+					content = content.replace(/<h[1-6]>/gi, '<p><b>');
+					content = content.replace(/<\/h[1-6]>/gi, '</b></p>');
+					content = content.replace(/<b>&nbsp;<\/b>/gi, '<b>&nbsp;&nbsp;</b>');
+					content = content.replace(/^(&nbsp;)*/gi, '');
+				}
+
+				content = content.replace(/--list--/gi, ""); // Remove --list--
+
+				if (ed.getParam('paste_insert_word_content_callback'))
+					content = ed.execCallback('paste_insert_word_content_callback', 'after', content);
+
+				// Insert cleaned content
+				this.editor.execCommand("mceInsertContent", false, content);
+
+				if (this.editor.getParam('paste_force_cleanup_wordpaste', true)) {
+					var ed = this.editor;
+
+					window.setTimeout(function() {
+						ed.execCommand("mceCleanup");
+					}, 1); // Do normal cleanup detached from this thread
+				}
+			}
+		},
+
+		_reEscape : function(s) {
+			var l = "?.\\*[](){}+^$:";
+			var o = "";
+
+			for (var i=0; i<s.length; i++) {
+				var c = s.charAt(i);
+
+				if (l.indexOf(c) != -1)
+					o += '\\' + c;
+				else
+					o += c;
+			}
+
+			return o;
+		},
+
+		_convertMiddots : function(div, search, class_name) {
+			var ed = this.editor, mdot = String.fromCharCode(183), bull = String.fromCharCode(8226);
+			var nodes, prevul, i, p, ul, li, np, cp, li;
+
+			nodes = div.getElementsByTagName("p");
+			for (i=0; i<nodes.length; i++) {
+				p = nodes[i];
+
+				// Is middot
+				if (p.innerHTML.indexOf(search) == 0) {
+					ul = ed.dom.create("ul");
+
+					if (class_name)
+						ul.className = class_name;
+
+					// Add the first one
+					li = ed.dom.create("li");
+					li.innerHTML = p.innerHTML.replace(new RegExp('' + mdot + '|' + bull + '|--list--|&nbsp;', "gi"), '');
+					ul.appendChild(li);
+
+					// Add the rest
+					np = p.nextSibling;
+					while (np) {
+						// If the node is whitespace, then
+						// ignore it and continue on.
+						if (np.nodeType == 3 && new RegExp('^\\s$', 'm').test(np.nodeValue)) {
+								np = np.nextSibling;
+								continue;
+						}
+
+						if (search == mdot) {
+								if (np.nodeType == 1 && new RegExp('^o(\\s+|&nbsp;)').test(np.innerHTML)) {
+										// Second level of nesting
+										if (!prevul) {
+												prevul = ul;
+												ul = ed.dom.create("ul");
+												prevul.appendChild(ul);
+										}
+										np.innerHTML = np.innerHTML.replace(/^o/, '');
+								} else {
+										// Pop the stack if we're going back up to the first level
+										if (prevul) {
+												ul = prevul;
+												prevul = null;
+										}
+										// Not element or middot paragraph
+										if (np.nodeType != 1 || np.innerHTML.indexOf(search) != 0)
+												break;
+								}
+						} else {
+								// Not element or middot paragraph
+								if (np.nodeType != 1 || np.innerHTML.indexOf(search) != 0)
+										break;
+							}
+
+						cp = np.nextSibling;
+						li = ed.dom.create("li");
+						li.innerHTML = np.innerHTML.replace(new RegExp('' + mdot + '|' + bull + '|--list--|&nbsp;', "gi"), '');
+						np.parentNode.removeChild(np);
+						ul.appendChild(li);
+						np = cp;
+					}
+
+					p.parentNode.replaceChild(ul, p);
+
+					return true;
+				}
+			}
+
+			return false;
+		},
+
+		_clipboardHTML : function() {
+			var div = document.getElementById('_TinyMCE_clipboardHTML');
+
+			if (!div) {
+				var div = document.createElement('DIV');
+				div.id = '_TinyMCE_clipboardHTML';
+
+				with (div.style) {
+					visibility = 'hidden';
+					overflow = 'hidden';
+					position = 'absolute';
+					width = 1;
+					height = 1;
+				}
+
+				document.body.appendChild(div);
+			}
+
+			div.innerHTML = '';
+			var rng = document.body.createTextRange();
+			rng.moveToElementText(div);
+			rng.execCommand('Paste');
+			var html = div.innerHTML;
+			div.innerHTML = '';
+			return html;
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('paste', tinymce.plugins.PastePlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/paste/js/pastetext.js b/webapp/web/js/tiny_mce/plugins/paste/js/pastetext.js
index 326bb16a2..28073877e 100755
--- a/webapp/web/js/tiny_mce/plugins/paste/js/pastetext.js
+++ b/webapp/web/js/tiny_mce/plugins/paste/js/pastetext.js
@@ -1,42 +1,42 @@
-tinyMCEPopup.requireLangPack();
-
-function saveContent() {
-	if (document.forms[0].htmlSource.value == '') {
-		tinyMCEPopup.close();
-		return false;
-	}
-
-	tinyMCEPopup.execCommand('mcePasteText', false, {
-		html : document.forms[0].htmlSource.value,
-		linebreaks : document.forms[0].linebreaks.checked
-	});
-
-	tinyMCEPopup.close();
-}
-
-function onLoadInit() {
-	tinyMCEPopup.resizeToInnerSize();
-
-	// Remove Gecko spellchecking
-	if (tinymce.isGecko)
-		document.body.spellcheck = tinyMCEPopup.getParam("gecko_spellcheck");
-
-	resizeInputs();
-}
-
-var wHeight=0, wWidth=0, owHeight=0, owWidth=0;
-
-function resizeInputs() {
-	if (!tinymce.isIE) {
-		wHeight = self.innerHeight-80;
-		wWidth = self.innerWidth-17;
-	} else {
-		wHeight = document.body.clientHeight-80;
-		wWidth = document.body.clientWidth-17;
-	}
-
-	document.forms[0].htmlSource.style.height = Math.abs(wHeight) + 'px';
-	document.forms[0].htmlSource.style.width  = Math.abs(wWidth) + 'px';
-}
-
+tinyMCEPopup.requireLangPack();
+
+function saveContent() {
+	if (document.forms[0].htmlSource.value == '') {
+		tinyMCEPopup.close();
+		return false;
+	}
+
+	tinyMCEPopup.execCommand('mcePasteText', false, {
+		html : document.forms[0].htmlSource.value,
+		linebreaks : document.forms[0].linebreaks.checked
+	});
+
+	tinyMCEPopup.close();
+}
+
+function onLoadInit() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	// Remove Gecko spellchecking
+	if (tinymce.isGecko)
+		document.body.spellcheck = tinyMCEPopup.getParam("gecko_spellcheck");
+
+	resizeInputs();
+}
+
+var wHeight=0, wWidth=0, owHeight=0, owWidth=0;
+
+function resizeInputs() {
+	if (!tinymce.isIE) {
+		wHeight = self.innerHeight-80;
+		wWidth = self.innerWidth-17;
+	} else {
+		wHeight = document.body.clientHeight-80;
+		wWidth = document.body.clientWidth-17;
+	}
+
+	document.forms[0].htmlSource.style.height = Math.abs(wHeight) + 'px';
+	document.forms[0].htmlSource.style.width  = Math.abs(wWidth) + 'px';
+}
+
 tinyMCEPopup.onInit.add(onLoadInit);
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/paste/js/pasteword.js b/webapp/web/js/tiny_mce/plugins/paste/js/pasteword.js
index 6701b99fc..ea9c29c2b 100755
--- a/webapp/web/js/tiny_mce/plugins/paste/js/pasteword.js
+++ b/webapp/web/js/tiny_mce/plugins/paste/js/pasteword.js
@@ -1,56 +1,56 @@
-tinyMCEPopup.requireLangPack();
-
-function saveContent() {
-	var html = document.getElementById("frmData").contentWindow.document.body.innerHTML;
-
-	if (html == ''){
-		tinyMCEPopup.close();
-		return false;
-	}
-
-	tinyMCEPopup.execCommand('mcePasteWord', false, html);
-	tinyMCEPopup.close();
-}
-
-function onLoadInit() {
-	tinyMCEPopup.resizeToInnerSize();
-
-	// Fix for endless reloading in FF
-	window.setTimeout(createIFrame, 10);
-}
-
-function createIFrame() {
-	document.getElementById('iframecontainer').innerHTML = '<iframe id="frmData" name="frmData" class="sourceIframe" src="blank.htm" height="280" width="400" frameborder="0" style="background-color:#FFFFFF; width:100%;" dir="ltr" wrap="soft"></iframe>';
-}
-
-var wHeight=0, wWidth=0, owHeight=0, owWidth=0;
-
-function initIframe(doc) {
-	var dir = tinyMCEPopup.editor.settings.directionality;
-
-	doc.body.dir = dir;
-
-	// Remove Gecko spellchecking
-	if (tinymce.isGecko)
-		doc.body.spellcheck = tinyMCEPopup.getParam("gecko_spellcheck");
-
-	resizeInputs();
-}
-
-function resizeInputs() {
-	if (!tinymce.isIE) {
-		wHeight = self.innerHeight - 80;
-		wWidth = self.innerWidth - 18;
-	} else {
-		wHeight = document.body.clientHeight - 80;
-		wWidth = document.body.clientWidth - 18;
-	}
-
-	var elm = document.getElementById('frmData');
-	if (elm) {
-		elm.style.height = Math.abs(wHeight) + 'px';
-		elm.style.width  = Math.abs(wWidth) + 'px';
-	}
-}
-
-tinyMCEPopup.onInit.add(onLoadInit);
+tinyMCEPopup.requireLangPack();
+
+function saveContent() {
+	var html = document.getElementById("frmData").contentWindow.document.body.innerHTML;
+
+	if (html == ''){
+		tinyMCEPopup.close();
+		return false;
+	}
+
+	tinyMCEPopup.execCommand('mcePasteWord', false, html);
+	tinyMCEPopup.close();
+}
+
+function onLoadInit() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	// Fix for endless reloading in FF
+	window.setTimeout(createIFrame, 10);
+}
+
+function createIFrame() {
+	document.getElementById('iframecontainer').innerHTML = '<iframe id="frmData" name="frmData" class="sourceIframe" src="blank.htm" height="280" width="400" frameborder="0" style="background-color:#FFFFFF; width:100%;" dir="ltr" wrap="soft"></iframe>';
+}
+
+var wHeight=0, wWidth=0, owHeight=0, owWidth=0;
+
+function initIframe(doc) {
+	var dir = tinyMCEPopup.editor.settings.directionality;
+
+	doc.body.dir = dir;
+
+	// Remove Gecko spellchecking
+	if (tinymce.isGecko)
+		doc.body.spellcheck = tinyMCEPopup.getParam("gecko_spellcheck");
+
+	resizeInputs();
+}
+
+function resizeInputs() {
+	if (!tinymce.isIE) {
+		wHeight = self.innerHeight - 80;
+		wWidth = self.innerWidth - 18;
+	} else {
+		wHeight = document.body.clientHeight - 80;
+		wWidth = document.body.clientWidth - 18;
+	}
+
+	var elm = document.getElementById('frmData');
+	if (elm) {
+		elm.style.height = Math.abs(wHeight) + 'px';
+		elm.style.width  = Math.abs(wWidth) + 'px';
+	}
+}
+
+tinyMCEPopup.onInit.add(onLoadInit);
diff --git a/webapp/web/js/tiny_mce/plugins/paste/langs/en_dlg.js b/webapp/web/js/tiny_mce/plugins/paste/langs/en_dlg.js
index eeac77896..823eb16a7 100755
--- a/webapp/web/js/tiny_mce/plugins/paste/langs/en_dlg.js
+++ b/webapp/web/js/tiny_mce/plugins/paste/langs/en_dlg.js
@@ -1,5 +1,5 @@
-tinyMCE.addI18n('en.paste_dlg',{
-text_title:"Use CTRL+V on your keyboard to paste the text into the window.",
-text_linebreaks:"Keep linebreaks",
-word_title:"Use CTRL+V on your keyboard to paste the text into the window."
+tinyMCE.addI18n('en.paste_dlg',{
+text_title:"Use CTRL+V on your keyboard to paste the text into the window.",
+text_linebreaks:"Keep linebreaks",
+word_title:"Use CTRL+V on your keyboard to paste the text into the window."
 });
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/paste/pastetext.htm b/webapp/web/js/tiny_mce/plugins/paste/pastetext.htm
index 2f2b341a1..0e0d99f1f 100755
--- a/webapp/web/js/tiny_mce/plugins/paste/pastetext.htm
+++ b/webapp/web/js/tiny_mce/plugins/paste/pastetext.htm
@@ -1,34 +1,34 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#paste.paste_text_desc}</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="js/pastetext.js"></script>
-	<base target="_self" />
-</head>
-<body onresize="resizeInputs();" style="display:none; overflow:hidden;">
-<form name="source" onsubmit="saveContent();return false;" action="#">
-	<div style="float: left" class="title">{#paste.paste_text_desc}</div>
-
-	<div style="float: right">
-		<input type="checkbox" name="linebreaks" id="linebreaks" class="wordWrapCode" checked="checked" /><label for="linebreaks">{#paste_dlg.text_linebreaks}</label>
-	</div>
-
-	<br style="clear: both" />
-
-	<div>{#paste_dlg.text_title}</div>
-
-	<textarea name="htmlSource" id="htmlSource" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,mono; font-size: 12px;" dir="ltr" wrap="soft" class="mceFocus"></textarea>
-
-	<div class="mceActionPanel">
-		<div style="float: left">
-			<input type="submit" name="insert" value="{#insert}" id="insert" />
-		</div>
-
-		<div style="float: right">
-			<input type="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
-		</div>
-	</div>
-</form>
-</body> 
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#paste.paste_text_desc}</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/pastetext.js"></script>
+	<base target="_self" />
+</head>
+<body onresize="resizeInputs();" style="display:none; overflow:hidden;">
+<form name="source" onsubmit="saveContent();return false;" action="#">
+	<div style="float: left" class="title">{#paste.paste_text_desc}</div>
+
+	<div style="float: right">
+		<input type="checkbox" name="linebreaks" id="linebreaks" class="wordWrapCode" checked="checked" /><label for="linebreaks">{#paste_dlg.text_linebreaks}</label>
+	</div>
+
+	<br style="clear: both" />
+
+	<div>{#paste_dlg.text_title}</div>
+
+	<textarea name="htmlSource" id="htmlSource" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,mono; font-size: 12px;" dir="ltr" wrap="soft" class="mceFocus"></textarea>
+
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="submit" name="insert" value="{#insert}" id="insert" />
+		</div>
+
+		<div style="float: right">
+			<input type="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
+		</div>
+	</div>
+</form>
+</body> 
 </html>
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/paste/pasteword.htm b/webapp/web/js/tiny_mce/plugins/paste/pasteword.htm
index 9e5ab1b5b..f96d47846 100755
--- a/webapp/web/js/tiny_mce/plugins/paste/pasteword.htm
+++ b/webapp/web/js/tiny_mce/plugins/paste/pasteword.htm
@@ -1,29 +1,29 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-	<title>{#paste.paste_word_desc}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="js/pasteword.js"></script>
-	<link href="css/pasteword.css" rel="stylesheet" type="text/css" />
-	<base target="_self" />
-</head>
-<body onresize="resizeInputs();" style="display:none; overflow:hidden;">
-	<form name="source" onsubmit="saveContent();" action="#">
-		<div class="title">{#paste.paste_word_desc}</div>
-
-		<div>{#paste_dlg.word_title}</div>
-
-		<div id="iframecontainer"></div>
-
-		<div class="mceActionPanel">
-			<div style="float: left">
-				<input type="button" id="insert" name="insert" value="{#insert}" onclick="saveContent();" />
-			</div>
-
-			<div style="float: right">
-				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-			</div>
-		</div>
-	</form>
-</body>
-</html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title>{#paste.paste_word_desc}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/pasteword.js"></script>
+	<link href="css/pasteword.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body onresize="resizeInputs();" style="display:none; overflow:hidden;">
+	<form name="source" onsubmit="saveContent();" action="#">
+		<div class="title">{#paste.paste_word_desc}</div>
+
+		<div>{#paste_dlg.word_title}</div>
+
+		<div id="iframecontainer"></div>
+
+		<div class="mceActionPanel">
+			<div style="float: left">
+				<input type="button" id="insert" name="insert" value="{#insert}" onclick="saveContent();" />
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+	</form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/preview/example.html b/webapp/web/js/tiny_mce/plugins/preview/example.html
index b2c3d90ce..48202224d 100755
--- a/webapp/web/js/tiny_mce/plugins/preview/example.html
+++ b/webapp/web/js/tiny_mce/plugins/preview/example.html
@@ -1,28 +1,28 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<script language="javascript" src="../../tiny_mce_popup.js"></script>
-<script type="text/javascript" src="jscripts/embed.js"></script>
-<script type="text/javascript">
-tinyMCEPopup.onInit.add(function(ed) {
-	var dom = tinyMCEPopup.dom;
-
-	// Load editor content_css
-	tinymce.each(ed.settings.content_css.split(','), function(u) {
-		dom.loadCSS(ed.documentBaseURI.toAbsolute(u));
-	});
-
-	// Place contents inside div container
-	dom.setHTML('content', ed.getContent());
-});
-</script>
-<title>Example of a custom preview page</title>
-</head>
-<body>
-
-Editor contents: <br />
-<div id="content">
-<!-- Gets filled with editor contents -->
-</div>
-
-</body>
-</html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<script language="javascript" src="../../tiny_mce_popup.js"></script>
+<script type="text/javascript" src="jscripts/embed.js"></script>
+<script type="text/javascript">
+tinyMCEPopup.onInit.add(function(ed) {
+	var dom = tinyMCEPopup.dom;
+
+	// Load editor content_css
+	tinymce.each(ed.settings.content_css.split(','), function(u) {
+		dom.loadCSS(ed.documentBaseURI.toAbsolute(u));
+	});
+
+	// Place contents inside div container
+	dom.setHTML('content', ed.getContent());
+});
+</script>
+<title>Example of a custom preview page</title>
+</head>
+<body>
+
+Editor contents: <br />
+<div id="content">
+<!-- Gets filled with editor contents -->
+</div>
+
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/preview/jscripts/embed.js b/webapp/web/js/tiny_mce/plugins/preview/jscripts/embed.js
index f8dc81052..6fe25de09 100755
--- a/webapp/web/js/tiny_mce/plugins/preview/jscripts/embed.js
+++ b/webapp/web/js/tiny_mce/plugins/preview/jscripts/embed.js
@@ -1,73 +1,73 @@
-/**
- * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose.
- */
-
-function writeFlash(p) {
-	writeEmbed(
-		'D27CDB6E-AE6D-11cf-96B8-444553540000',
-		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
-		'application/x-shockwave-flash',
-		p
-	);
-}
-
-function writeShockWave(p) {
-	writeEmbed(
-	'166B1BCA-3F9C-11CF-8075-444553540000',
-	'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0',
-	'application/x-director',
-		p
-	);
-}
-
-function writeQuickTime(p) {
-	writeEmbed(
-		'02BF25D5-8C17-4B23-BC80-D3488ABDDC6B',
-		'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0',
-		'video/quicktime',
-		p
-	);
-}
-
-function writeRealMedia(p) {
-	writeEmbed(
-		'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA',
-		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
-		'audio/x-pn-realaudio-plugin',
-		p
-	);
-}
-
-function writeWindowsMedia(p) {
-	p.url = p.src;
-	writeEmbed(
-		'6BF52A52-394A-11D3-B153-00C04F79FAA6',
-		'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701',
-		'application/x-mplayer2',
-		p
-	);
-}
-
-function writeEmbed(cls, cb, mt, p) {
-	var h = '', n;
-
-	h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';
-	h += typeof(p.id) != "undefined" ? 'id="' + p.id + '"' : '';
-	h += typeof(p.name) != "undefined" ? 'name="' + p.name + '"' : '';
-	h += typeof(p.width) != "undefined" ? 'width="' + p.width + '"' : '';
-	h += typeof(p.height) != "undefined" ? 'height="' + p.height + '"' : '';
-	h += typeof(p.align) != "undefined" ? 'align="' + p.align + '"' : '';
-	h += '>';
-
-	for (n in p)
-		h += '<param name="' + n + '" value="' + p[n] + '">';
-
-	h += '<embed type="' + mt + '"';
-
-	for (n in p)
-		h += n + '="' + p[n] + '" ';
-
-	h += '></embed></object>';
-
-	document.write(h);
-}
+/**
+ * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose.
+ */
+
+function writeFlash(p) {
+	writeEmbed(
+		'D27CDB6E-AE6D-11cf-96B8-444553540000',
+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+		'application/x-shockwave-flash',
+		p
+	);
+}
+
+function writeShockWave(p) {
+	writeEmbed(
+	'166B1BCA-3F9C-11CF-8075-444553540000',
+	'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0',
+	'application/x-director',
+		p
+	);
+}
+
+function writeQuickTime(p) {
+	writeEmbed(
+		'02BF25D5-8C17-4B23-BC80-D3488ABDDC6B',
+		'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0',
+		'video/quicktime',
+		p
+	);
+}
+
+function writeRealMedia(p) {
+	writeEmbed(
+		'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA',
+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',
+		'audio/x-pn-realaudio-plugin',
+		p
+	);
+}
+
+function writeWindowsMedia(p) {
+	p.url = p.src;
+	writeEmbed(
+		'6BF52A52-394A-11D3-B153-00C04F79FAA6',
+		'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701',
+		'application/x-mplayer2',
+		p
+	);
+}
+
+function writeEmbed(cls, cb, mt, p) {
+	var h = '', n;
+
+	h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';
+	h += typeof(p.id) != "undefined" ? 'id="' + p.id + '"' : '';
+	h += typeof(p.name) != "undefined" ? 'name="' + p.name + '"' : '';
+	h += typeof(p.width) != "undefined" ? 'width="' + p.width + '"' : '';
+	h += typeof(p.height) != "undefined" ? 'height="' + p.height + '"' : '';
+	h += typeof(p.align) != "undefined" ? 'align="' + p.align + '"' : '';
+	h += '>';
+
+	for (n in p)
+		h += '<param name="' + n + '" value="' + p[n] + '">';
+
+	h += '<embed type="' + mt + '"';
+
+	for (n in p)
+		h += n + '="' + p[n] + '" ';
+
+	h += '></embed></object>';
+
+	document.write(h);
+}
diff --git a/webapp/web/js/tiny_mce/plugins/preview/preview.html b/webapp/web/js/tiny_mce/plugins/preview/preview.html
index 7960f7858..7c761d371 100755
--- a/webapp/web/js/tiny_mce/plugins/preview/preview.html
+++ b/webapp/web/js/tiny_mce/plugins/preview/preview.html
@@ -1,19 +1,19 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<script language="javascript" src="../../tiny_mce_popup.js"></script>
-<script type="text/javascript" src="jscripts/embed.js"></script>
-<script type="text/javascript">
-tinyMCEPopup.onInit.add(function(ed) {
-	var dom = tinyMCEPopup.dom;
-
-	dom.setHTML('content', ed.getContent());
-});
-
-document.write('<base href="' + tinyMCEPopup.getWindowArg("base") + '">');
-</script>
-<title>{#preview.preview_desc}</title>
-</head>
-<body id="content">
-<!-- Gets filled with editor contents -->
-</body>
-</html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<script language="javascript" src="../../tiny_mce_popup.js"></script>
+<script type="text/javascript" src="jscripts/embed.js"></script>
+<script type="text/javascript">
+tinyMCEPopup.onInit.add(function(ed) {
+	var dom = tinyMCEPopup.dom;
+
+	dom.setHTML('content', ed.getContent());
+});
+
+document.write('<base href="' + tinyMCEPopup.getWindowArg("base") + '">');
+</script>
+<title>{#preview.preview_desc}</title>
+</head>
+<body id="content">
+<!-- Gets filled with editor contents -->
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/print/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/print/editor_plugin_src.js
index 51fe15677..cb37c1189 100755
--- a/webapp/web/js/tiny_mce/plugins/print/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/print/editor_plugin_src.js
@@ -1,31 +1,31 @@
-/**
- * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.Print', {
-		init : function(ed, url) {
-			ed.addCommand('mcePrint', function() {
-				ed.getWin().print();
-			});
-
-			ed.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
-			};
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('print', tinymce.plugins.Print);
-})();
+/**
+ * $Id: editor_plugin_src.js 520 2008-01-07 16:30:32Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Print', {
+		init : function(ed, url) {
+			ed.addCommand('mcePrint', function() {
+				ed.getWin().print();
+			});
+
+			ed.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
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('print', tinymce.plugins.Print);
+})();
diff --git a/webapp/web/js/tiny_mce/plugins/safari/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/safari/editor_plugin_src.js
index 0a93b912f..01875efa3 100755
--- a/webapp/web/js/tiny_mce/plugins/safari/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/safari/editor_plugin_src.js
@@ -1,467 +1,467 @@
-/**
- * $Id: editor_plugin_src.js 264 2007-04-26 20:53:09Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	var Event = tinymce.dom.Event, grep = tinymce.grep, each = tinymce.each, inArray = tinymce.inArray, isOldWebKit = tinymce.isOldWebKit;
-
-	tinymce.create('tinymce.plugins.Safari', {
-		init : function(ed) {
-			var t = this, dom;
-
-			// Ignore on non webkit
-			if (!tinymce.isWebKit)
-				return;
-
-			t.editor = ed;
-			t.webKitFontSizes = ['x-small', 'small', 'medium', 'large', 'x-large', 'xx-large', '-webkit-xxx-large'];
-			t.namedFontSizes = ['xx-small', 'x-small','small','medium','large','x-large', 'xx-large'];
-
-			// Safari CreateLink command will not work correctly on images that is aligned
-			ed.addCommand('CreateLink', function(u, v) {
-				var n = ed.selection.getNode(), dom = ed.dom, a;
-
-				if (n && (/^(left|right)$/i.test(dom.getStyle(n, 'float', 1)) || /^(left|right)$/i.test(dom.getAttrib(n, 'align')))) {
-					a = dom.create('a', {href : v}, n.cloneNode());
-					n.parentNode.replaceChild(a, n);
-					ed.selection.select(a);
-				} else
-					ed.getDoc().execCommand("CreateLink", false, v);
-			});
-
-			ed.onPaste.add(function(ed, e) {
-				function removeStyles(e) {
-					e = e.target;
-
-					if (e.nodeType == 1) {
-						e.style.cssText = '';
-
-						each(ed.dom.select('*', e), function(e) {
-							e.style.cssText = '';
-						});
-					}
-				};
-
-				Event.add(ed.getDoc(), 'DOMNodeInserted', removeStyles);
-
-				window.setTimeout(function() {
-					Event.remove(ed.getDoc(), 'DOMNodeInserted', removeStyles);
-				}, 0);
-			});
-
-			ed.onKeyUp.add(function(ed, e) {
-				var h, b;
-
-				// If backspace or delete key
-				if (e.keyCode == 46 || e.keyCode == 8) {
-					b = ed.getBody();
-					h = b.innerHTML;
-
-					// If there is no text content or images or hr elements then remove everything
-					if (b.childNodes.length == 1 && !/<(img|hr)/.test(h) && tinymce.trim(h.replace(/<[^>]+>/g, '')).length == 0)
-						ed.setContent('', {format : 'raw'});
-				}
-			});
-
-			// Workaround for FormatBlock bug, http://bugs.webkit.org/show_bug.cgi?id=16004
-			ed.addCommand('FormatBlock', function(u, v) {
-				var dom = ed.dom, e = dom.getParent(ed.selection.getNode(), dom.isBlock);
-
-				if (e)
-					dom.replace(dom.create(v), e, 1);
-				else
-					ed.getDoc().execCommand("FormatBlock", false, v);
-			});
-
-			// Workaround for InsertHTML bug, http://bugs.webkit.org/show_bug.cgi?id=16382
-			ed.addCommand('mceInsertContent', function(u, v) {
-				ed.getDoc().execCommand("InsertText", false, 'mce_marker');
-				ed.getBody().innerHTML = ed.getBody().innerHTML.replace(/mce_marker/g, v + '<span id="_mce_tmp">XX</span>');
-				ed.selection.select(ed.dom.get('_mce_tmp'));
-				ed.getDoc().execCommand("Delete", false, ' ');
-			});
-
-			// Workaround for missing shift+enter support, http://bugs.webkit.org/show_bug.cgi?id=16973
-			ed.onKeyPress.add(function(ed, e) {
-				if (e.keyCode == 13 && (e.shiftKey || ed.settings.force_br_newlines && ed.selection.getNode().nodeName != 'LI')) {
-					t._insertBR(ed);
-					Event.cancel(e);
-				}
-			});
-
-			// Safari returns incorrect values
-			ed.addQueryValueHandler('FontSize', function(u, v) {
-				var e, v;
-
-				// Check for the real font size at the start of selection
-				if ((e = ed.dom.getParent(ed.selection.getStart(), 'span')) && (v = e.style.fontSize))
-					return tinymce.inArray(t.namedFontSizes, v) + 1;
-
-				// Check for the real font size at the end of selection
-				if ((e = ed.dom.getParent(ed.selection.getEnd(), 'span')) && (v = e.style.fontSize))
-					return tinymce.inArray(t.namedFontSizes, v) + 1;
-
-				// Return default value it's better than nothing right!
-				return ed.getDoc().queryCommandValue('FontSize');
-			});
-
-			// Safari returns incorrect values
-			ed.addQueryValueHandler('FontName', function(u, v) {
-				var e, v;
-
-				// Check for the real font name at the start of selection
-				if ((e = ed.dom.getParent(ed.selection.getStart(), 'span')) && (v = e.style.fontFamily))
-					return v.replace(/, /g, ',');
-
-				// Check for the real font name at the end of selection
-				if ((e = ed.dom.getParent(ed.selection.getEnd(), 'span')) && (v = e.style.fontFamily))
-					return v.replace(/, /g, ',');
-
-				// Return default value it's better than nothing right!
-				return ed.getDoc().queryCommandValue('FontName');
-			});
-
-			// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
-			ed.onClick.add(function(ed, e) {
-				e = e.target;
-
-				if (e.nodeName == 'IMG') {
-					t.selElm = e;
-					ed.selection.select(e);
-				} else
-					t.selElm = null;
-			});
-
-/*			ed.onBeforeExecCommand.add(function(ed, c, b) {
-				var r = t.bookmarkRng;
-
-				// Restore selection
-				if (r) {
-					ed.selection.setRng(r);
-					t.bookmarkRng = null;
-					//console.debug('restore', r.startContainer, r.startOffset, r.endContainer, r.endOffset);
-				}
-			});*/
-
-			ed.onInit.add(function() {
-				t._fixWebKitSpans();
-
-/*				ed.windowManager.onOpen.add(function() {
-					var r = ed.selection.getRng();
-
-					// Store selection if valid
-					if (r.startContainer != ed.getDoc()) {
-						t.bookmarkRng = r.cloneRange();
-						//console.debug('store', r.startContainer, r.startOffset, r.endContainer, r.endOffset);
-					}
-				});
-
-				ed.windowManager.onClose.add(function() {
-					t.bookmarkRng = null;
-				});*/
-
-				if (isOldWebKit)
-					t._patchSafari2x(ed);
-			});
-
-			ed.onSetContent.add(function() {
-				dom = ed.dom;
-
-				// Convert strong,b,em,u,strike to spans
-				each(['strong','b','em','u','strike','sub','sup','a'], function(v) {
-					each(grep(dom.select(v)).reverse(), function(n) {
-						var nn = n.nodeName.toLowerCase(), st;
-
-						// Convert anchors into images
-						if (nn == 'a') {
-							if (n.name)
-								dom.replace(dom.create('img', {mce_name : 'a', name : n.name, 'class' : 'mceItemAnchor'}), n);
-
-							return;
-						}
-
-						switch (nn) {
-							case 'b':
-							case 'strong':
-								if (nn == 'b')
-									nn = 'strong';
-
-								st = 'font-weight: bold;';
-								break;
-
-							case 'em':
-								st = 'font-style: italic;';
-								break;
-
-							case 'u':
-								st = 'text-decoration: underline;';
-								break;
-
-							case 'sub':
-								st = 'vertical-align: sub;';
-								break;
-
-							case 'sup':
-								st = 'vertical-align: super;';
-								break;
-
-							case 'strike':
-								st = 'text-decoration: line-through;';
-								break;
-						}
-
-						dom.replace(dom.create('span', {mce_name : nn, style : st, 'class' : 'Apple-style-span'}), n, 1);
-					});
-				});
-			});
-
-			ed.onPreProcess.add(function(ed, o) {
-				dom = ed.dom;
-
-				each(grep(o.node.getElementsByTagName('span')).reverse(), function(n) {
-					var v, bg;
-
-					if (o.get) {
-						if (dom.hasClass(n, 'Apple-style-span')) {
-							bg = n.style.backgroundColor;
-
-							switch (dom.getAttrib(n, 'mce_name')) {
-								case 'font':
-									if (!ed.settings.convert_fonts_to_spans)
-										dom.setAttrib(n, 'style', '');
-									break;
-
-								case 'strong':
-								case 'em':
-								case 'sub':
-								case 'sup':
-									dom.setAttrib(n, 'style', '');
-									break;
-
-								case 'strike':
-								case 'u':
-									if (!ed.settings.inline_styles)
-										dom.setAttrib(n, 'style', '');
-									else
-										dom.setAttrib(n, 'mce_name', '');
-
-									break;
-
-								default:
-									if (!ed.settings.inline_styles)
-										dom.setAttrib(n, 'style', '');
-							}
-
-
-							if (bg)
-								n.style.backgroundColor = bg;
-						}
-					}
-
-					if (dom.hasClass(n, 'mceItemRemoved'))
-						dom.remove(n, 1);
-				});
-			});
-
-			ed.onPostProcess.add(function(ed, o) {
-				// Safari adds BR at end of all block elements
-				o.content = o.content.replace(/<br \/><\/(h[1-6]|div|p|address|pre)>/g, '</$1>');
-
-				// Safari adds id="undefined" to HR elements
-				o.content = o.content.replace(/ id=\"undefined\"/g, '');
-			});
-		},
-
-		getInfo : function() {
-			return {
-				longname : 'Safari compatibility',
-				author : 'Moxiecode Systems AB',
-				authorurl : 'http://tinymce.moxiecode.com',
-				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/safari',
-				version : tinymce.majorVersion + "." + tinymce.minorVersion
-			};
-		},
-
-		// Internal methods
-
-		_fixWebKitSpans : function() {
-			var t = this, ed = t.editor;
-
-			if (!isOldWebKit) {
-				// Use mutator events on new WebKit
-				Event.add(ed.getDoc(), 'DOMNodeInserted', function(e) {
-					e = e.target;
-
-					if (e && e.nodeType == 1)
-						t._fixAppleSpan(e);
-				});
-			} else {
-				// Do post command processing in old WebKit since the browser crashes on Mutator events :(
-				ed.onExecCommand.add(function() {
-					each(ed.dom.select('span'), function(n) {
-						t._fixAppleSpan(n);
-					});
-
-					ed.nodeChanged();
-				});
-			}
-		},
-
-		_fixAppleSpan : function(e) {
-			var ed = this.editor, dom = ed.dom, fz = this.webKitFontSizes, fzn = this.namedFontSizes, s = ed.settings, st, p;
-
-			if (dom.getAttrib(e, 'mce_fixed'))
-				return;
-
-			// Handle Apple style spans
-			if (e.nodeName == 'SPAN' && e.className == 'Apple-style-span') {
-				st = e.style;
-
-				if (!s.convert_fonts_to_spans) {
-					if (st.fontSize) {
-						dom.setAttrib(e, 'mce_name', 'font');
-						dom.setAttrib(e, 'size', inArray(fz, st.fontSize) + 1);
-					}
-
-					if (st.fontFamily) {
-						dom.setAttrib(e, 'mce_name', 'font');
-						dom.setAttrib(e, 'face', st.fontFamily);
-					}
-
-					if (st.color) {
-						dom.setAttrib(e, 'mce_name', 'font');
-						dom.setAttrib(e, 'color', dom.toHex(st.color));
-					}
-
-					if (st.backgroundColor) {
-						dom.setAttrib(e, 'mce_name', 'font');
-						dom.setStyle(e, 'background-color', st.backgroundColor);
-					}
-				} else {
-					if (st.fontSize)
-						dom.setStyle(e, 'fontSize', fzn[inArray(fz, st.fontSize)]);
-				}
-
-				if (st.fontWeight == 'bold')
-					dom.setAttrib(e, 'mce_name', 'strong');
-
-				if (st.fontStyle == 'italic')
-					dom.setAttrib(e, 'mce_name', 'em');
-
-				if (st.textDecoration == 'underline')
-					dom.setAttrib(e, 'mce_name', 'u');
-
-				if (st.textDecoration == 'line-through')
-					dom.setAttrib(e, 'mce_name', 'strike');
-
-				if (st.verticalAlign == 'super')
-					dom.setAttrib(e, 'mce_name', 'sup');
-
-				if (st.verticalAlign == 'sub')
-					dom.setAttrib(e, 'mce_name', 'sub');
-
-				dom.setAttrib(e, 'mce_fixed', '1');
-			}
-		},
-
-		_patchSafari2x : function(ed) {
-			var t = this, setContent, getNode, dom = ed.dom, lr;
-
-			// Inline dialogs
-			if (ed.windowManager.onBeforeOpen) {
-				ed.windowManager.onBeforeOpen.add(function() {
-					r = ed.selection.getRng();
-				});
-			}
-
-			// Fake select on 2.x
-			ed.selection.select = function(n) {
-				this.getSel().setBaseAndExtent(n, 0, n, 1);
-			};
-
-			getNode = ed.selection.getNode;
-			ed.selection.getNode = function() {
-				return t.selElm || getNode.call(this);
-			};
-
-			// Fake range on Safari 2.x
-			ed.selection.getRng = function() {
-				var t = this, s = t.getSel(), d = ed.getDoc(), r, rb, ra, di;
-
-				// Fake range on Safari 2.x
-				if (s.anchorNode) {
-					r = d.createRange();
-
-					try {
-						// Setup before range
-						rb = d.createRange();
-						rb.setStart(s.anchorNode, s.anchorOffset);
-						rb.collapse(1);
-
-						// Setup after range
-						ra = d.createRange();
-						ra.setStart(s.focusNode, s.focusOffset);
-						ra.collapse(1);
-
-						// Setup start/end points by comparing locations
-						di = rb.compareBoundaryPoints(rb.START_TO_END, ra) < 0;
-						r.setStart(di ? s.anchorNode : s.focusNode, di ? s.anchorOffset : s.focusOffset);
-						r.setEnd(di ? s.focusNode : s.anchorNode, di ? s.focusOffset : s.anchorOffset);
-
-						lr = r;
-					} catch (ex) {
-						// Sometimes fails, at least we tried to do it by the book. I hope Safari 2.x will go disappear soooon!!!
-					}
-				}
-
-				return r || lr;
-			};
-
-			// Fix setContent so it works
-			setContent = ed.selection.setContent;
-			ed.selection.setContent = function(h, s) {
-				var r = this.getRng(), b;
-
-				try {
-					setContent.call(this, h, s);
-				} catch (ex) {
-					// Workaround for Safari 2.x
-					b = dom.create('body');
-					b.innerHTML = h;
-
-					each(b.childNodes, function(n) {
-						r.insertNode(n.cloneNode(true));
-					});
-				}
-			};
-		},
-
-		_insertBR : function(ed) {
-			var dom = ed.dom, s = ed.selection, r = s.getRng(), br;
-
-			// Insert BR element
-			r.insertNode(br = dom.create('br'));
-
-			// Place caret after BR
-			r.setStartAfter(br);
-			r.setEndAfter(br);
-			s.setRng(r);
-
-			// Could not place caret after BR then insert an nbsp entity and move the caret
-			if (s.getSel().focusNode == br.previousSibling) {
-				s.select(dom.insertAfter(dom.doc.createTextNode('\u00a0'), br));
-				s.collapse(1);
-			}
-
-			// Scroll to new position, scrollIntoView can't be used due to bug: http://bugs.webkit.org/show_bug.cgi?id=16117
-			ed.getWin().scrollTo(0, dom.getPos(s.getRng().startContainer).y);
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('safari', tinymce.plugins.Safari);
-})();
-
+/**
+ * $Id: editor_plugin_src.js 264 2007-04-26 20:53:09Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var Event = tinymce.dom.Event, grep = tinymce.grep, each = tinymce.each, inArray = tinymce.inArray, isOldWebKit = tinymce.isOldWebKit;
+
+	tinymce.create('tinymce.plugins.Safari', {
+		init : function(ed) {
+			var t = this, dom;
+
+			// Ignore on non webkit
+			if (!tinymce.isWebKit)
+				return;
+
+			t.editor = ed;
+			t.webKitFontSizes = ['x-small', 'small', 'medium', 'large', 'x-large', 'xx-large', '-webkit-xxx-large'];
+			t.namedFontSizes = ['xx-small', 'x-small','small','medium','large','x-large', 'xx-large'];
+
+			// Safari CreateLink command will not work correctly on images that is aligned
+			ed.addCommand('CreateLink', function(u, v) {
+				var n = ed.selection.getNode(), dom = ed.dom, a;
+
+				if (n && (/^(left|right)$/i.test(dom.getStyle(n, 'float', 1)) || /^(left|right)$/i.test(dom.getAttrib(n, 'align')))) {
+					a = dom.create('a', {href : v}, n.cloneNode());
+					n.parentNode.replaceChild(a, n);
+					ed.selection.select(a);
+				} else
+					ed.getDoc().execCommand("CreateLink", false, v);
+			});
+
+			ed.onPaste.add(function(ed, e) {
+				function removeStyles(e) {
+					e = e.target;
+
+					if (e.nodeType == 1) {
+						e.style.cssText = '';
+
+						each(ed.dom.select('*', e), function(e) {
+							e.style.cssText = '';
+						});
+					}
+				};
+
+				Event.add(ed.getDoc(), 'DOMNodeInserted', removeStyles);
+
+				window.setTimeout(function() {
+					Event.remove(ed.getDoc(), 'DOMNodeInserted', removeStyles);
+				}, 0);
+			});
+
+			ed.onKeyUp.add(function(ed, e) {
+				var h, b;
+
+				// If backspace or delete key
+				if (e.keyCode == 46 || e.keyCode == 8) {
+					b = ed.getBody();
+					h = b.innerHTML;
+
+					// If there is no text content or images or hr elements then remove everything
+					if (b.childNodes.length == 1 && !/<(img|hr)/.test(h) && tinymce.trim(h.replace(/<[^>]+>/g, '')).length == 0)
+						ed.setContent('', {format : 'raw'});
+				}
+			});
+
+			// Workaround for FormatBlock bug, http://bugs.webkit.org/show_bug.cgi?id=16004
+			ed.addCommand('FormatBlock', function(u, v) {
+				var dom = ed.dom, e = dom.getParent(ed.selection.getNode(), dom.isBlock);
+
+				if (e)
+					dom.replace(dom.create(v), e, 1);
+				else
+					ed.getDoc().execCommand("FormatBlock", false, v);
+			});
+
+			// Workaround for InsertHTML bug, http://bugs.webkit.org/show_bug.cgi?id=16382
+			ed.addCommand('mceInsertContent', function(u, v) {
+				ed.getDoc().execCommand("InsertText", false, 'mce_marker');
+				ed.getBody().innerHTML = ed.getBody().innerHTML.replace(/mce_marker/g, v + '<span id="_mce_tmp">XX</span>');
+				ed.selection.select(ed.dom.get('_mce_tmp'));
+				ed.getDoc().execCommand("Delete", false, ' ');
+			});
+
+			// Workaround for missing shift+enter support, http://bugs.webkit.org/show_bug.cgi?id=16973
+			ed.onKeyPress.add(function(ed, e) {
+				if (e.keyCode == 13 && (e.shiftKey || ed.settings.force_br_newlines && ed.selection.getNode().nodeName != 'LI')) {
+					t._insertBR(ed);
+					Event.cancel(e);
+				}
+			});
+
+			// Safari returns incorrect values
+			ed.addQueryValueHandler('FontSize', function(u, v) {
+				var e, v;
+
+				// Check for the real font size at the start of selection
+				if ((e = ed.dom.getParent(ed.selection.getStart(), 'span')) && (v = e.style.fontSize))
+					return tinymce.inArray(t.namedFontSizes, v) + 1;
+
+				// Check for the real font size at the end of selection
+				if ((e = ed.dom.getParent(ed.selection.getEnd(), 'span')) && (v = e.style.fontSize))
+					return tinymce.inArray(t.namedFontSizes, v) + 1;
+
+				// Return default value it's better than nothing right!
+				return ed.getDoc().queryCommandValue('FontSize');
+			});
+
+			// Safari returns incorrect values
+			ed.addQueryValueHandler('FontName', function(u, v) {
+				var e, v;
+
+				// Check for the real font name at the start of selection
+				if ((e = ed.dom.getParent(ed.selection.getStart(), 'span')) && (v = e.style.fontFamily))
+					return v.replace(/, /g, ',');
+
+				// Check for the real font name at the end of selection
+				if ((e = ed.dom.getParent(ed.selection.getEnd(), 'span')) && (v = e.style.fontFamily))
+					return v.replace(/, /g, ',');
+
+				// Return default value it's better than nothing right!
+				return ed.getDoc().queryCommandValue('FontName');
+			});
+
+			// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
+			ed.onClick.add(function(ed, e) {
+				e = e.target;
+
+				if (e.nodeName == 'IMG') {
+					t.selElm = e;
+					ed.selection.select(e);
+				} else
+					t.selElm = null;
+			});
+
+/*			ed.onBeforeExecCommand.add(function(ed, c, b) {
+				var r = t.bookmarkRng;
+
+				// Restore selection
+				if (r) {
+					ed.selection.setRng(r);
+					t.bookmarkRng = null;
+					//console.debug('restore', r.startContainer, r.startOffset, r.endContainer, r.endOffset);
+				}
+			});*/
+
+			ed.onInit.add(function() {
+				t._fixWebKitSpans();
+
+/*				ed.windowManager.onOpen.add(function() {
+					var r = ed.selection.getRng();
+
+					// Store selection if valid
+					if (r.startContainer != ed.getDoc()) {
+						t.bookmarkRng = r.cloneRange();
+						//console.debug('store', r.startContainer, r.startOffset, r.endContainer, r.endOffset);
+					}
+				});
+
+				ed.windowManager.onClose.add(function() {
+					t.bookmarkRng = null;
+				});*/
+
+				if (isOldWebKit)
+					t._patchSafari2x(ed);
+			});
+
+			ed.onSetContent.add(function() {
+				dom = ed.dom;
+
+				// Convert strong,b,em,u,strike to spans
+				each(['strong','b','em','u','strike','sub','sup','a'], function(v) {
+					each(grep(dom.select(v)).reverse(), function(n) {
+						var nn = n.nodeName.toLowerCase(), st;
+
+						// Convert anchors into images
+						if (nn == 'a') {
+							if (n.name)
+								dom.replace(dom.create('img', {mce_name : 'a', name : n.name, 'class' : 'mceItemAnchor'}), n);
+
+							return;
+						}
+
+						switch (nn) {
+							case 'b':
+							case 'strong':
+								if (nn == 'b')
+									nn = 'strong';
+
+								st = 'font-weight: bold;';
+								break;
+
+							case 'em':
+								st = 'font-style: italic;';
+								break;
+
+							case 'u':
+								st = 'text-decoration: underline;';
+								break;
+
+							case 'sub':
+								st = 'vertical-align: sub;';
+								break;
+
+							case 'sup':
+								st = 'vertical-align: super;';
+								break;
+
+							case 'strike':
+								st = 'text-decoration: line-through;';
+								break;
+						}
+
+						dom.replace(dom.create('span', {mce_name : nn, style : st, 'class' : 'Apple-style-span'}), n, 1);
+					});
+				});
+			});
+
+			ed.onPreProcess.add(function(ed, o) {
+				dom = ed.dom;
+
+				each(grep(o.node.getElementsByTagName('span')).reverse(), function(n) {
+					var v, bg;
+
+					if (o.get) {
+						if (dom.hasClass(n, 'Apple-style-span')) {
+							bg = n.style.backgroundColor;
+
+							switch (dom.getAttrib(n, 'mce_name')) {
+								case 'font':
+									if (!ed.settings.convert_fonts_to_spans)
+										dom.setAttrib(n, 'style', '');
+									break;
+
+								case 'strong':
+								case 'em':
+								case 'sub':
+								case 'sup':
+									dom.setAttrib(n, 'style', '');
+									break;
+
+								case 'strike':
+								case 'u':
+									if (!ed.settings.inline_styles)
+										dom.setAttrib(n, 'style', '');
+									else
+										dom.setAttrib(n, 'mce_name', '');
+
+									break;
+
+								default:
+									if (!ed.settings.inline_styles)
+										dom.setAttrib(n, 'style', '');
+							}
+
+
+							if (bg)
+								n.style.backgroundColor = bg;
+						}
+					}
+
+					if (dom.hasClass(n, 'mceItemRemoved'))
+						dom.remove(n, 1);
+				});
+			});
+
+			ed.onPostProcess.add(function(ed, o) {
+				// Safari adds BR at end of all block elements
+				o.content = o.content.replace(/<br \/><\/(h[1-6]|div|p|address|pre)>/g, '</$1>');
+
+				// Safari adds id="undefined" to HR elements
+				o.content = o.content.replace(/ id=\"undefined\"/g, '');
+			});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Safari compatibility',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/safari',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Internal methods
+
+		_fixWebKitSpans : function() {
+			var t = this, ed = t.editor;
+
+			if (!isOldWebKit) {
+				// Use mutator events on new WebKit
+				Event.add(ed.getDoc(), 'DOMNodeInserted', function(e) {
+					e = e.target;
+
+					if (e && e.nodeType == 1)
+						t._fixAppleSpan(e);
+				});
+			} else {
+				// Do post command processing in old WebKit since the browser crashes on Mutator events :(
+				ed.onExecCommand.add(function() {
+					each(ed.dom.select('span'), function(n) {
+						t._fixAppleSpan(n);
+					});
+
+					ed.nodeChanged();
+				});
+			}
+		},
+
+		_fixAppleSpan : function(e) {
+			var ed = this.editor, dom = ed.dom, fz = this.webKitFontSizes, fzn = this.namedFontSizes, s = ed.settings, st, p;
+
+			if (dom.getAttrib(e, 'mce_fixed'))
+				return;
+
+			// Handle Apple style spans
+			if (e.nodeName == 'SPAN' && e.className == 'Apple-style-span') {
+				st = e.style;
+
+				if (!s.convert_fonts_to_spans) {
+					if (st.fontSize) {
+						dom.setAttrib(e, 'mce_name', 'font');
+						dom.setAttrib(e, 'size', inArray(fz, st.fontSize) + 1);
+					}
+
+					if (st.fontFamily) {
+						dom.setAttrib(e, 'mce_name', 'font');
+						dom.setAttrib(e, 'face', st.fontFamily);
+					}
+
+					if (st.color) {
+						dom.setAttrib(e, 'mce_name', 'font');
+						dom.setAttrib(e, 'color', dom.toHex(st.color));
+					}
+
+					if (st.backgroundColor) {
+						dom.setAttrib(e, 'mce_name', 'font');
+						dom.setStyle(e, 'background-color', st.backgroundColor);
+					}
+				} else {
+					if (st.fontSize)
+						dom.setStyle(e, 'fontSize', fzn[inArray(fz, st.fontSize)]);
+				}
+
+				if (st.fontWeight == 'bold')
+					dom.setAttrib(e, 'mce_name', 'strong');
+
+				if (st.fontStyle == 'italic')
+					dom.setAttrib(e, 'mce_name', 'em');
+
+				if (st.textDecoration == 'underline')
+					dom.setAttrib(e, 'mce_name', 'u');
+
+				if (st.textDecoration == 'line-through')
+					dom.setAttrib(e, 'mce_name', 'strike');
+
+				if (st.verticalAlign == 'super')
+					dom.setAttrib(e, 'mce_name', 'sup');
+
+				if (st.verticalAlign == 'sub')
+					dom.setAttrib(e, 'mce_name', 'sub');
+
+				dom.setAttrib(e, 'mce_fixed', '1');
+			}
+		},
+
+		_patchSafari2x : function(ed) {
+			var t = this, setContent, getNode, dom = ed.dom, lr;
+
+			// Inline dialogs
+			if (ed.windowManager.onBeforeOpen) {
+				ed.windowManager.onBeforeOpen.add(function() {
+					r = ed.selection.getRng();
+				});
+			}
+
+			// Fake select on 2.x
+			ed.selection.select = function(n) {
+				this.getSel().setBaseAndExtent(n, 0, n, 1);
+			};
+
+			getNode = ed.selection.getNode;
+			ed.selection.getNode = function() {
+				return t.selElm || getNode.call(this);
+			};
+
+			// Fake range on Safari 2.x
+			ed.selection.getRng = function() {
+				var t = this, s = t.getSel(), d = ed.getDoc(), r, rb, ra, di;
+
+				// Fake range on Safari 2.x
+				if (s.anchorNode) {
+					r = d.createRange();
+
+					try {
+						// Setup before range
+						rb = d.createRange();
+						rb.setStart(s.anchorNode, s.anchorOffset);
+						rb.collapse(1);
+
+						// Setup after range
+						ra = d.createRange();
+						ra.setStart(s.focusNode, s.focusOffset);
+						ra.collapse(1);
+
+						// Setup start/end points by comparing locations
+						di = rb.compareBoundaryPoints(rb.START_TO_END, ra) < 0;
+						r.setStart(di ? s.anchorNode : s.focusNode, di ? s.anchorOffset : s.focusOffset);
+						r.setEnd(di ? s.focusNode : s.anchorNode, di ? s.focusOffset : s.anchorOffset);
+
+						lr = r;
+					} catch (ex) {
+						// Sometimes fails, at least we tried to do it by the book. I hope Safari 2.x will go disappear soooon!!!
+					}
+				}
+
+				return r || lr;
+			};
+
+			// Fix setContent so it works
+			setContent = ed.selection.setContent;
+			ed.selection.setContent = function(h, s) {
+				var r = this.getRng(), b;
+
+				try {
+					setContent.call(this, h, s);
+				} catch (ex) {
+					// Workaround for Safari 2.x
+					b = dom.create('body');
+					b.innerHTML = h;
+
+					each(b.childNodes, function(n) {
+						r.insertNode(n.cloneNode(true));
+					});
+				}
+			};
+		},
+
+		_insertBR : function(ed) {
+			var dom = ed.dom, s = ed.selection, r = s.getRng(), br;
+
+			// Insert BR element
+			r.insertNode(br = dom.create('br'));
+
+			// Place caret after BR
+			r.setStartAfter(br);
+			r.setEndAfter(br);
+			s.setRng(r);
+
+			// Could not place caret after BR then insert an nbsp entity and move the caret
+			if (s.getSel().focusNode == br.previousSibling) {
+				s.select(dom.insertAfter(dom.doc.createTextNode('\u00a0'), br));
+				s.collapse(1);
+			}
+
+			// Scroll to new position, scrollIntoView can't be used due to bug: http://bugs.webkit.org/show_bug.cgi?id=16117
+			ed.getWin().scrollTo(0, dom.getPos(s.getRng().startContainer).y);
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('safari', tinymce.plugins.Safari);
+})();
+
diff --git a/webapp/web/js/tiny_mce/plugins/save/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/save/editor_plugin_src.js
index b38be4d63..9ec04400c 100755
--- a/webapp/web/js/tiny_mce/plugins/save/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/save/editor_plugin_src.js
@@ -1,98 +1,98 @@
-/**
- * $Id: editor_plugin_src.js 851 2008-05-26 15:38:49Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.Save', {
-		init : function(ed, url) {
-			var t = this;
-
-			t.editor = ed;
-
-			// Register commands
-			ed.addCommand('mceSave', t._save, t);
-			ed.addCommand('mceCancel', t._cancel, t);
-
-			// Register buttons
-			ed.addButton('save', {title : 'save.save_desc', cmd : 'mceSave'});
-			ed.addButton('cancel', {title : 'save.cancel_desc', cmd : 'mceCancel'});
-
-			ed.onNodeChange.add(t._nodeChange, t);
-			ed.addShortcut('ctrl+s', ed.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
-			};
-		},
-
-		// Private methods
-
-		_nodeChange : function(ed, cm, n) {
-			var ed = this.editor;
-
-			if (ed.getParam('save_enablewhendirty')) {
-				cm.setDisabled('save', !ed.isDirty());
-				cm.setDisabled('cancel', !ed.isDirty());
-			}
-		},
-
-		// Private methods
-
-		_save : function() {
-			var ed = this.editor, formObj, os, i, elementId;
-
-			formObj = tinymce.DOM.get(ed.id).form || tinymce.DOM.getParent(ed.id, 'form');
-
-			if (ed.getParam("save_enablewhendirty") && !ed.isDirty())
-				return;
-
-			tinyMCE.triggerSave();
-
-			// Use callback instead
-			if (os = ed.getParam("save_onsavecallback")) {
-				if (ed.execCallback('save_onsavecallback', ed)) {
-					ed.startContent = tinymce.trim(ed.getContent({format : 'raw'}));
-					ed.nodeChanged();
-				}
-
-				return;
-			}
-
-			if (formObj) {
-				ed.isNotDirty = true;
-
-				if (formObj.onsubmit == null || formObj.onsubmit() != false)
-					formObj.submit();
-
-				ed.nodeChanged();
-			} else
-				ed.windowManager.alert("Error: No form element found.");
-		},
-
-		_cancel : function() {
-			var ed = this.editor, os, h = tinymce.trim(ed.startContent);
-
-			// Use callback instead
-			if (os = ed.getParam("save_oncancelcallback")) {
-				ed.execCallback('save_oncancelcallback', ed);
-				return;
-			}
-
-			ed.setContent(h);
-			ed.undoManager.clear();
-			ed.nodeChanged();
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('save', tinymce.plugins.Save);
+/**
+ * $Id: editor_plugin_src.js 851 2008-05-26 15:38:49Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Save', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceSave', t._save, t);
+			ed.addCommand('mceCancel', t._cancel, t);
+
+			// Register buttons
+			ed.addButton('save', {title : 'save.save_desc', cmd : 'mceSave'});
+			ed.addButton('cancel', {title : 'save.cancel_desc', cmd : 'mceCancel'});
+
+			ed.onNodeChange.add(t._nodeChange, t);
+			ed.addShortcut('ctrl+s', ed.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
+			};
+		},
+
+		// Private methods
+
+		_nodeChange : function(ed, cm, n) {
+			var ed = this.editor;
+
+			if (ed.getParam('save_enablewhendirty')) {
+				cm.setDisabled('save', !ed.isDirty());
+				cm.setDisabled('cancel', !ed.isDirty());
+			}
+		},
+
+		// Private methods
+
+		_save : function() {
+			var ed = this.editor, formObj, os, i, elementId;
+
+			formObj = tinymce.DOM.get(ed.id).form || tinymce.DOM.getParent(ed.id, 'form');
+
+			if (ed.getParam("save_enablewhendirty") && !ed.isDirty())
+				return;
+
+			tinyMCE.triggerSave();
+
+			// Use callback instead
+			if (os = ed.getParam("save_onsavecallback")) {
+				if (ed.execCallback('save_onsavecallback', ed)) {
+					ed.startContent = tinymce.trim(ed.getContent({format : 'raw'}));
+					ed.nodeChanged();
+				}
+
+				return;
+			}
+
+			if (formObj) {
+				ed.isNotDirty = true;
+
+				if (formObj.onsubmit == null || formObj.onsubmit() != false)
+					formObj.submit();
+
+				ed.nodeChanged();
+			} else
+				ed.windowManager.alert("Error: No form element found.");
+		},
+
+		_cancel : function() {
+			var ed = this.editor, os, h = tinymce.trim(ed.startContent);
+
+			// Use callback instead
+			if (os = ed.getParam("save_oncancelcallback")) {
+				ed.execCallback('save_oncancelcallback', ed);
+				return;
+			}
+
+			ed.setContent(h);
+			ed.undoManager.clear();
+			ed.nodeChanged();
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('save', tinymce.plugins.Save);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/searchreplace/css/searchreplace.css b/webapp/web/js/tiny_mce/plugins/searchreplace/css/searchreplace.css
index ecdf58c7b..3e2eaf34b 100755
--- a/webapp/web/js/tiny_mce/plugins/searchreplace/css/searchreplace.css
+++ b/webapp/web/js/tiny_mce/plugins/searchreplace/css/searchreplace.css
@@ -1,6 +1,6 @@
-.panel_wrapper {height:85px;}
-.panel_wrapper div.current {height:85px;}
-
-/* IE */
-* html .panel_wrapper {height:100px;}
-* html .panel_wrapper div.current {height:100px;}
+.panel_wrapper {height:85px;}
+.panel_wrapper div.current {height:85px;}
+
+/* IE */
+* html .panel_wrapper {height:100px;}
+* html .panel_wrapper div.current {height:100px;}
diff --git a/webapp/web/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js
index 59edc3b25..078128673 100755
--- a/webapp/web/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/searchreplace/editor_plugin_src.js
@@ -1,54 +1,54 @@
-/**
- * $Id: editor_plugin_src.js 686 2008-03-09 18:13:49Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.SearchReplacePlugin', {
-		init : function(ed, url) {
-			function open(m) {
-				ed.windowManager.open({
-					file : url + '/searchreplace.htm',
-					width : 420 + parseInt(ed.getLang('searchreplace.delta_width', 0)),
-					height : 160 + parseInt(ed.getLang('searchreplace.delta_height', 0)),
-					inline : 1,
-					auto_focus : 0
-				}, {
-					mode : m,
-					search_string : ed.selection.getContent({format : 'text'}),
-					plugin_url : url
-				});
-			};
-
-			// Register commands
-			ed.addCommand('mceSearch', function() {
-				open('search');
-			});
-
-			ed.addCommand('mceReplace', function() {
-				open('replace');
-			});
-
-			// Register buttons
-			ed.addButton('search', {title : 'searchreplace.search_desc', cmd : 'mceSearch'});
-			ed.addButton('replace', {title : 'searchreplace.replace_desc', cmd : 'mceReplace'});
-
-			ed.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
-			};
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('searchreplace', tinymce.plugins.SearchReplacePlugin);
+/**
+ * $Id: editor_plugin_src.js 686 2008-03-09 18:13:49Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.SearchReplacePlugin', {
+		init : function(ed, url) {
+			function open(m) {
+				ed.windowManager.open({
+					file : url + '/searchreplace.htm',
+					width : 420 + parseInt(ed.getLang('searchreplace.delta_width', 0)),
+					height : 160 + parseInt(ed.getLang('searchreplace.delta_height', 0)),
+					inline : 1,
+					auto_focus : 0
+				}, {
+					mode : m,
+					search_string : ed.selection.getContent({format : 'text'}),
+					plugin_url : url
+				});
+			};
+
+			// Register commands
+			ed.addCommand('mceSearch', function() {
+				open('search');
+			});
+
+			ed.addCommand('mceReplace', function() {
+				open('replace');
+			});
+
+			// Register buttons
+			ed.addButton('search', {title : 'searchreplace.search_desc', cmd : 'mceSearch'});
+			ed.addButton('replace', {title : 'searchreplace.replace_desc', cmd : 'mceReplace'});
+
+			ed.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
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('searchreplace', tinymce.plugins.SearchReplacePlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/searchreplace/js/searchreplace.js b/webapp/web/js/tiny_mce/plugins/searchreplace/js/searchreplace.js
index 8533e4442..9eb7c4f18 100755
--- a/webapp/web/js/tiny_mce/plugins/searchreplace/js/searchreplace.js
+++ b/webapp/web/js/tiny_mce/plugins/searchreplace/js/searchreplace.js
@@ -1,123 +1,123 @@
-tinyMCEPopup.requireLangPack();
-
-var SearchReplaceDialog = {
-	init : function(ed) {
-		var f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode");
-
-		this.switchMode(m);
-
-		f[m + '_panel_searchstring'].value = tinyMCEPopup.getWindowArg("search_string");
-
-		// Focus input field
-		f[m + '_panel_searchstring'].focus();
-	},
-
-	switchMode : function(m) {
-		var f, lm = this.lastMode;
-
-		if (lm != m) {
-			f = document.forms[0];
-
-			if (lm) {
-				f[m + '_panel_searchstring'].value = f[lm + '_panel_searchstring'].value;
-				f[m + '_panel_backwardsu'].checked = f[lm + '_panel_backwardsu'].checked;
-				f[m + '_panel_backwardsd'].checked = f[lm + '_panel_backwardsd'].checked;
-				f[m + '_panel_casesensitivebox'].checked = f[lm + '_panel_casesensitivebox'].checked;
-			}
-
-			mcTabs.displayTab(m + '_tab',  m + '_panel');
-			document.getElementById("replaceBtn").style.display = (m == "replace") ? "inline" : "none";
-			document.getElementById("replaceAllBtn").style.display = (m == "replace") ? "inline" : "none";
-			this.lastMode = m;
-		}
-	},
-
-	searchNext : function(a) {
-		var ed = tinyMCEPopup.editor, se = ed.selection, r = se.getRng(), f, m = this.lastMode, s, b, fl = 0, w = ed.getWin(), wm = ed.windowManager, fo = 0;
-
-		// Get input
-		f = document.forms[0];
-		s = f[m + '_panel_searchstring'].value;
-		b = f[m + '_panel_backwardsu'].checked;
-		ca = f[m + '_panel_casesensitivebox'].checked;
-		rs = f['replace_panel_replacestring'].value;
-
-		function fix() {
-			// Correct Firefox graphics glitches
-			r = se.getRng().cloneRange();
-			ed.getDoc().execCommand('SelectAll', false, null);
-			se.setRng(r);
-		};
-
-		function replace() {
-			if (tinymce.isIE)
-				ed.selection.getRng().duplicate().pasteHTML(rs); // Needs to be duplicated due to selection bug in IE
-			else
-				ed.getDoc().execCommand('InsertHTML', false, rs);
-		};
-
-		// IE flags
-		if (ca)
-			fl = fl | 4;
-
-		switch (a) {
-			case 'all':
-				// Move caret to beginning of text
-				ed.execCommand('SelectAll');
-				ed.selection.collapse(true);
-
-				if (tinymce.isIE) {
-					while (r.findText(s, b ? -1 : 1, fl)) {
-						r.scrollIntoView();
-						r.select();
-						replace();
-						fo = 1;
-					}
-
-					tinyMCEPopup.storeSelection();
-				} else {
-					while (w.find(s, ca, b, false, false, false, false)) {
-						replace();
-						fo = 1;
-					}
-				}
-
-				if (fo)
-					tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.allreplaced'));
-				else
-					tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.notfound'));
-
-				return;
-
-			case 'current':
-				if (!ed.selection.isCollapsed())
-					replace();
-
-				break;
-		}
-
-		se.collapse(b);
-		r = se.getRng();
-
-		// Whats the point
-		if (!s)
-			return;
-
-		if (tinymce.isIE) {
-			if (r.findText(s, b ? -1 : 1, fl)) {
-				r.scrollIntoView();
-				r.select();
-			} else
-				tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.notfound'));
-
-			tinyMCEPopup.storeSelection();
-		} else {
-			if (!w.find(s, ca, b, false, false, false, false))
-				tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.notfound'));
-			else
-				fix();
-		}
-	}
-};
-
-tinyMCEPopup.onInit.add(SearchReplaceDialog.init, SearchReplaceDialog);
+tinyMCEPopup.requireLangPack();
+
+var SearchReplaceDialog = {
+	init : function(ed) {
+		var f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode");
+
+		this.switchMode(m);
+
+		f[m + '_panel_searchstring'].value = tinyMCEPopup.getWindowArg("search_string");
+
+		// Focus input field
+		f[m + '_panel_searchstring'].focus();
+	},
+
+	switchMode : function(m) {
+		var f, lm = this.lastMode;
+
+		if (lm != m) {
+			f = document.forms[0];
+
+			if (lm) {
+				f[m + '_panel_searchstring'].value = f[lm + '_panel_searchstring'].value;
+				f[m + '_panel_backwardsu'].checked = f[lm + '_panel_backwardsu'].checked;
+				f[m + '_panel_backwardsd'].checked = f[lm + '_panel_backwardsd'].checked;
+				f[m + '_panel_casesensitivebox'].checked = f[lm + '_panel_casesensitivebox'].checked;
+			}
+
+			mcTabs.displayTab(m + '_tab',  m + '_panel');
+			document.getElementById("replaceBtn").style.display = (m == "replace") ? "inline" : "none";
+			document.getElementById("replaceAllBtn").style.display = (m == "replace") ? "inline" : "none";
+			this.lastMode = m;
+		}
+	},
+
+	searchNext : function(a) {
+		var ed = tinyMCEPopup.editor, se = ed.selection, r = se.getRng(), f, m = this.lastMode, s, b, fl = 0, w = ed.getWin(), wm = ed.windowManager, fo = 0;
+
+		// Get input
+		f = document.forms[0];
+		s = f[m + '_panel_searchstring'].value;
+		b = f[m + '_panel_backwardsu'].checked;
+		ca = f[m + '_panel_casesensitivebox'].checked;
+		rs = f['replace_panel_replacestring'].value;
+
+		function fix() {
+			// Correct Firefox graphics glitches
+			r = se.getRng().cloneRange();
+			ed.getDoc().execCommand('SelectAll', false, null);
+			se.setRng(r);
+		};
+
+		function replace() {
+			if (tinymce.isIE)
+				ed.selection.getRng().duplicate().pasteHTML(rs); // Needs to be duplicated due to selection bug in IE
+			else
+				ed.getDoc().execCommand('InsertHTML', false, rs);
+		};
+
+		// IE flags
+		if (ca)
+			fl = fl | 4;
+
+		switch (a) {
+			case 'all':
+				// Move caret to beginning of text
+				ed.execCommand('SelectAll');
+				ed.selection.collapse(true);
+
+				if (tinymce.isIE) {
+					while (r.findText(s, b ? -1 : 1, fl)) {
+						r.scrollIntoView();
+						r.select();
+						replace();
+						fo = 1;
+					}
+
+					tinyMCEPopup.storeSelection();
+				} else {
+					while (w.find(s, ca, b, false, false, false, false)) {
+						replace();
+						fo = 1;
+					}
+				}
+
+				if (fo)
+					tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.allreplaced'));
+				else
+					tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.notfound'));
+
+				return;
+
+			case 'current':
+				if (!ed.selection.isCollapsed())
+					replace();
+
+				break;
+		}
+
+		se.collapse(b);
+		r = se.getRng();
+
+		// Whats the point
+		if (!s)
+			return;
+
+		if (tinymce.isIE) {
+			if (r.findText(s, b ? -1 : 1, fl)) {
+				r.scrollIntoView();
+				r.select();
+			} else
+				tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.notfound'));
+
+			tinyMCEPopup.storeSelection();
+		} else {
+			if (!w.find(s, ca, b, false, false, false, false))
+				tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.notfound'));
+			else
+				fix();
+		}
+	}
+};
+
+tinyMCEPopup.onInit.add(SearchReplaceDialog.init, SearchReplaceDialog);
diff --git a/webapp/web/js/tiny_mce/plugins/searchreplace/langs/en_dlg.js b/webapp/web/js/tiny_mce/plugins/searchreplace/langs/en_dlg.js
index 370959afa..3dd3453dc 100755
--- a/webapp/web/js/tiny_mce/plugins/searchreplace/langs/en_dlg.js
+++ b/webapp/web/js/tiny_mce/plugins/searchreplace/langs/en_dlg.js
@@ -1,16 +1,16 @@
-tinyMCE.addI18n('en.searchreplace_dlg',{
-searchnext_desc:"Find again",
-notfound:"The search has been completed. The search string could not be found.",
-search_title:"Find",
-replace_title:"Find/Replace",
-allreplaced:"All occurrences of the search string were replaced.",
-findwhat:"Find what",
-replacewith:"Replace with",
-direction:"Direction",
-up:"Up",
-down:"Down",
-mcase:"Match case",
-findnext:"Find next",
-replace:"Replace",
-replaceall:"Replace all"
+tinyMCE.addI18n('en.searchreplace_dlg',{
+searchnext_desc:"Find again",
+notfound:"The search has been completed. The search string could not be found.",
+search_title:"Find",
+replace_title:"Find/Replace",
+allreplaced:"All occurrences of the search string were replaced.",
+findwhat:"Find what",
+replacewith:"Replace with",
+direction:"Direction",
+up:"Up",
+down:"Down",
+mcase:"Match case",
+findnext:"Find next",
+replace:"Replace",
+replaceall:"Replace all"
 });
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/searchreplace/searchreplace.htm b/webapp/web/js/tiny_mce/plugins/searchreplace/searchreplace.htm
index 9c95a6a30..90e80d07d 100755
--- a/webapp/web/js/tiny_mce/plugins/searchreplace/searchreplace.htm
+++ b/webapp/web/js/tiny_mce/plugins/searchreplace/searchreplace.htm
@@ -1,105 +1,105 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#searchreplace_dlg.replace_title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="../../utils/form_utils.js"></script>
-	<script type="text/javascript" src="js/searchreplace.js"></script>
-	<link rel="stylesheet" type="text/css" href="css/searchreplace.css" />
-	<base target="_self" />
-</head>
-<body style="display:none;">
-<form onsubmit="SearchReplaceDialog.searchNext('none');return false;" action="#">
-	<div class="tabs">
-		<ul>
-			<li id="search_tab"><span><a href="javascript:SearchReplaceDialog.switchMode('search');" onmousedown="return false;">{#searchreplace.search_desc}</a></span></li>
-			<li id="replace_tab"><span><a href="javascript:SearchReplaceDialog.switchMode('replace');" onmousedown="return false;">{#searchreplace_dlg.replace}</a></span></li>
-		</ul>
-	</div>
-
-	<div class="panel_wrapper">
-		<div id="search_panel" class="panel">
-			<table border="0" cellspacing="0" cellpadding="2">
-				<tr>
-					<td><label for="search_panel_searchstring">{#searchreplace_dlg.findwhat}</label></td>
-					<td><input type="text" id="search_panel_searchstring" name="search_panel_searchstring" style="width: 200px" /></td>
-				</tr>
-				<tr>
-					<td colspan="2">
-						<table border="0" cellspacing="0" cellpadding="0" class="direction">
-							<tr>
-								<td><label>{#searchreplace_dlg.direction}</label></td>
-								<td><input id="search_panel_backwardsu" name="search_panel_backwards" class="radio" type="radio" /></td>
-								<td><label for="search_panel_backwardsu">{#searchreplace_dlg.up}</label></td>
-								<td><input id="search_panel_backwardsd" name="search_panel_backwards" class="radio" type="radio" checked="checked" /></td>
-								<td><label for="search_panel_backwardsd">{#searchreplace_dlg.down}</label></td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="2">
-						<table border="0" cellspacing="0" cellpadding="0">
-							<tr>
-								<td><input id="search_panel_casesensitivebox" name="search_panel_casesensitivebox" class="checkbox" type="checkbox" /></td>
-								<td><label for="search_panel_casesensitivebox">{#searchreplace_dlg.mcase}</label></td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-			</table>
-		</div>
-
-		<div id="replace_panel" class="panel">
-			<table border="0" cellspacing="0" cellpadding="2">
-				<tr>
-					<td><label for="replace_panel_searchstring">{#searchreplace_dlg.findwhat}</label></td>
-					<td><input type="text" id="replace_panel_searchstring" name="replace_panel_searchstring" style="width: 200px" /></td>
-				</tr>
-				<tr>
-					<td><label for="replace_panel_replacestring">{#searchreplace_dlg.replacewith}</label></td>
-					<td><input type="text" id="replace_panel_replacestring" name="replace_panel_replacestring" style="width: 200px" /></td>
-				</tr>
-				<tr>
-					<td colspan="2">
-						<table border="0" cellspacing="0" cellpadding="0" class="direction">
-							<tr>
-								<td><label>{#searchreplace_dlg.direction}</label></td>
-								<td><input id="replace_panel_backwardsu" name="replace_panel_backwards" class="radio" type="radio" /></td>
-								<td><label for="replace_panel_backwardsu">{#searchreplace_dlg.up}</label></td>
-								<td><input id="replace_panel_backwardsd" name="replace_panel_backwards" class="radio" type="radio" checked="checked" /></td>
-								<td><label for="replace_panel_backwardsd">{#searchreplace_dlg.down}</label></td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-				<tr>
-					<td colspan="2">
-						<table border="0" cellspacing="0" cellpadding="0">
-							<tr>
-								<td><input id="replace_panel_casesensitivebox" name="replace_panel_casesensitivebox" class="checkbox" type="checkbox" /></td>
-								<td><label for="replace_panel_casesensitivebox">{#searchreplace_dlg.mcase}</label></td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-			</table>
-		</div>
-
-	</div>
-
-	<div class="mceActionPanel">
-		<div style="float: left">
-			<input type="submit" id="insert" name="insert" value="{#searchreplace_dlg.findnext}" />
-			<input type="button" class="button" id="replaceBtn" name="replaceBtn" value="{#searchreplace_dlg.replace}" onclick="SearchReplaceDialog.searchNext('current');" />
-			<input type="button" class="button" id="replaceAllBtn" name="replaceAllBtn" value="{#searchreplace_dlg.replaceall}" onclick="SearchReplaceDialog.searchNext('all');" />
-		</div>
-
-		<div style="float: right">	
-			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-		</div>
-	</div>
-</form>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#searchreplace_dlg.replace_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="js/searchreplace.js"></script>
+	<link rel="stylesheet" type="text/css" href="css/searchreplace.css" />
+	<base target="_self" />
+</head>
+<body style="display:none;">
+<form onsubmit="SearchReplaceDialog.searchNext('none');return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="search_tab"><span><a href="javascript:SearchReplaceDialog.switchMode('search');" onmousedown="return false;">{#searchreplace.search_desc}</a></span></li>
+			<li id="replace_tab"><span><a href="javascript:SearchReplaceDialog.switchMode('replace');" onmousedown="return false;">{#searchreplace_dlg.replace}</a></span></li>
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="search_panel" class="panel">
+			<table border="0" cellspacing="0" cellpadding="2">
+				<tr>
+					<td><label for="search_panel_searchstring">{#searchreplace_dlg.findwhat}</label></td>
+					<td><input type="text" id="search_panel_searchstring" name="search_panel_searchstring" style="width: 200px" /></td>
+				</tr>
+				<tr>
+					<td colspan="2">
+						<table border="0" cellspacing="0" cellpadding="0" class="direction">
+							<tr>
+								<td><label>{#searchreplace_dlg.direction}</label></td>
+								<td><input id="search_panel_backwardsu" name="search_panel_backwards" class="radio" type="radio" /></td>
+								<td><label for="search_panel_backwardsu">{#searchreplace_dlg.up}</label></td>
+								<td><input id="search_panel_backwardsd" name="search_panel_backwards" class="radio" type="radio" checked="checked" /></td>
+								<td><label for="search_panel_backwardsd">{#searchreplace_dlg.down}</label></td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="2">
+						<table border="0" cellspacing="0" cellpadding="0">
+							<tr>
+								<td><input id="search_panel_casesensitivebox" name="search_panel_casesensitivebox" class="checkbox" type="checkbox" /></td>
+								<td><label for="search_panel_casesensitivebox">{#searchreplace_dlg.mcase}</label></td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+			</table>
+		</div>
+
+		<div id="replace_panel" class="panel">
+			<table border="0" cellspacing="0" cellpadding="2">
+				<tr>
+					<td><label for="replace_panel_searchstring">{#searchreplace_dlg.findwhat}</label></td>
+					<td><input type="text" id="replace_panel_searchstring" name="replace_panel_searchstring" style="width: 200px" /></td>
+				</tr>
+				<tr>
+					<td><label for="replace_panel_replacestring">{#searchreplace_dlg.replacewith}</label></td>
+					<td><input type="text" id="replace_panel_replacestring" name="replace_panel_replacestring" style="width: 200px" /></td>
+				</tr>
+				<tr>
+					<td colspan="2">
+						<table border="0" cellspacing="0" cellpadding="0" class="direction">
+							<tr>
+								<td><label>{#searchreplace_dlg.direction}</label></td>
+								<td><input id="replace_panel_backwardsu" name="replace_panel_backwards" class="radio" type="radio" /></td>
+								<td><label for="replace_panel_backwardsu">{#searchreplace_dlg.up}</label></td>
+								<td><input id="replace_panel_backwardsd" name="replace_panel_backwards" class="radio" type="radio" checked="checked" /></td>
+								<td><label for="replace_panel_backwardsd">{#searchreplace_dlg.down}</label></td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="2">
+						<table border="0" cellspacing="0" cellpadding="0">
+							<tr>
+								<td><input id="replace_panel_casesensitivebox" name="replace_panel_casesensitivebox" class="checkbox" type="checkbox" /></td>
+								<td><label for="replace_panel_casesensitivebox">{#searchreplace_dlg.mcase}</label></td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+			</table>
+		</div>
+
+	</div>
+
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="submit" id="insert" name="insert" value="{#searchreplace_dlg.findnext}" />
+			<input type="button" class="button" id="replaceBtn" name="replaceBtn" value="{#searchreplace_dlg.replace}" onclick="SearchReplaceDialog.searchNext('current');" />
+			<input type="button" class="button" id="replaceAllBtn" name="replaceAllBtn" value="{#searchreplace_dlg.replaceall}" onclick="SearchReplaceDialog.searchNext('all');" />
+		</div>
+
+		<div style="float: right">	
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+</form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/spellchecker/css/content.css b/webapp/web/js/tiny_mce/plugins/spellchecker/css/content.css
index 24efa0217..656ce1eee 100755
--- a/webapp/web/js/tiny_mce/plugins/spellchecker/css/content.css
+++ b/webapp/web/js/tiny_mce/plugins/spellchecker/css/content.css
@@ -1 +1 @@
-.mceItemHiddenSpellWord {background:url(../img/wline.gif) repeat-x bottom left; cursor:default;}
+.mceItemHiddenSpellWord {background:url(../img/wline.gif) repeat-x bottom left; cursor:default;}
diff --git a/webapp/web/js/tiny_mce/plugins/spellchecker/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/spellchecker/editor_plugin_src.js
index c913c4603..ebcf475be 100755
--- a/webapp/web/js/tiny_mce/plugins/spellchecker/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/spellchecker/editor_plugin_src.js
@@ -1,338 +1,338 @@
-/**
- * $Id: editor_plugin_src.js 425 2007-11-21 15:17:39Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	var JSONRequest = tinymce.util.JSONRequest, each = tinymce.each, DOM = 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(ed, url) {
-			var t = this, cm;
-
-			t.url = url;
-			t.editor = ed;
-
-			// Register commands
-			ed.addCommand('mceSpellCheck', function() {
-				if (!t.active) {
-					ed.setProgressState(1);
-					t._sendRPC('checkWords', [t.selectedLang, t._getWords()], function(r) {
-						if (r.length > 0) {
-							t.active = 1;
-							t._markWords(r);
-							ed.setProgressState(0);
-							ed.nodeChanged();
-						} else {
-							ed.setProgressState(0);
-							ed.windowManager.alert('spellchecker.no_mpell');
-						}
-					});
-				} else
-					t._done();
-			});
-
-			ed.onInit.add(function() {
-				if (ed.settings.content_css !== false)
-					ed.dom.loadCSS(url + '/css/content.css');
-			});
-
-			ed.onClick.add(t._showMenu, t);
-			ed.onContextMenu.add(t._showMenu, t);
-			ed.onBeforeGetContent.add(function() {
-				if (t.active)
-					t._removeWords();
-			});
-
-			ed.onNodeChange.add(function(ed, cm) {
-				cm.setActive('spellchecker', t.active);
-			});
-
-			ed.onSetContent.add(function() {
-				t._done();
-			});
-
-			ed.onBeforeGetContent.add(function() {
-				t._done();
-			});
-
-			ed.onBeforeExecCommand.add(function(ed, cmd) {
-				if (cmd == 'mceFullScreen')
-					t._done();
-			});
-
-			// Find selected language
-			t.languages = {};
-			each(ed.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(v, k) {
-				if (k.indexOf('+') === 0) {
-					k = k.substring(1);
-					t.selectedLang = v;
-				}
-
-				t.languages[k] = v;
-			});
-		},
-
-		createControl : function(n, cm) {
-			var t = this, c, ed = t.editor;
-
-			if (n == 'spellchecker') {
-				c = cm.createSplitButton(n, {title : 'spellchecker.desc', cmd : 'mceSpellCheck', scope : t});
-
-				c.onRenderMenu.add(function(c, m) {
-					m.add({title : 'spellchecker.langs', 'class' : 'mceMenuItemTitle'}).setDisabled(1);
-					each(t.languages, function(v, k) {
-						var o = {icon : 1}, mi;
-
-						o.onclick = function() {
-							mi.setSelected(1);
-							t.selectedItem.setSelected(0);
-							t.selectedItem = mi;
-							t.selectedLang = v;
-						};
-
-						o.title = k;
-						mi = m.add(o);
-						mi.setSelected(v == t.selectedLang);
-
-						if (v == t.selectedLang)
-							t.selectedItem = mi;
-					})
-				});
-
-				return c;
-			}
-		},
-
-		// Internal functions
-
-		_walk : function(n, f) {
-			var d = this.editor.getDoc(), w;
-
-			if (d.createTreeWalker) {
-				w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);
-
-				while ((n = w.nextNode()) != null)
-					f.call(this, n);
-			} else
-				tinymce.walk(n, f, 'childNodes');
-		},
-
-		_getSeparators : function() {
-			var re = '', i, str = this.editor.getParam('spellchecker_word_separator_chars', '\\s!"#$%&()*+,-./:;<=>?@[\]^_{|}§©«®±¶·¸»¼½¾¿×÷¤\u201d\u201c');
-
-			// Build word separator regexp
-			for (i=0; i<str.length; i++)
-				re += '\\' + str.charAt(i);
-
-			return re;
-		},
-
-		_getWords : function() {
-			var ed = this.editor, wl = [], tx = '', lo = {};
-
-			// Get area text
-			this._walk(ed.getBody(), function(n) {
-				if (n.nodeType == 3)
-					tx += n.nodeValue + ' ';
-			});
-
-			// Split words by separator
-			tx = tx.replace(new RegExp('([0-9]|[' + this._getSeparators() + '])', 'g'), ' ');
-			tx = tinymce.trim(tx.replace(/(\s+)/g, ' '));
-
-			// Build word array and remove duplicates
-			each(tx.split(' '), function(v) {
-				if (!lo[v]) {
-					wl.push(v);
-					lo[v] = 1;
-				}
-			});
-
-			return wl;
-		},
-
-		_removeWords : function(w) {
-			var ed = this.editor, dom = ed.dom, se = ed.selection, b = se.getBookmark();
-
-			each(dom.select('span').reverse(), function(n) {
-				if (n && (dom.hasClass(n, 'mceItemHiddenSpellWord') || dom.hasClass(n, 'mceItemHidden'))) {
-					if (!w || dom.decode(n.innerHTML) == w)
-						dom.remove(n, 1);
-				}
-			});
-
-			se.moveToBookmark(b);
-		},
-
-		_markWords : function(wl) {
-			var r1, r2, r3, r4, r5, w = '', ed = this.editor, re = this._getSeparators(), dom = ed.dom, nl = [];
-			var se = ed.selection, b = se.getBookmark();
-
-			each(wl, function(v) {
-				w += (w ? '|' : '') + v;
-			});
-
-			r1 = new RegExp('([' + re + '])(' + w + ')([' + re + '])', 'g');
-			r2 = new RegExp('^(' + w + ')', 'g');
-			r3 = new RegExp('(' + w + ')([' + re + ']?)$', 'g');
-			r4 = new RegExp('^(' + w + ')([' + re + ']?)$', 'g');
-			r5 = new RegExp('(' + w + ')([' + re + '])', 'g');
-
-			// Collect all text nodes
-			this._walk(this.editor.getBody(), function(n) {
-				if (n.nodeType == 3) {
-					nl.push(n);
-				}
-			});
-
-			// Wrap incorrect words in spans
-			each(nl, function(n) {
-				var v;
-
-				if (n.nodeType == 3) {
-					v = n.nodeValue;
-
-					if (r1.test(v) || r2.test(v) || r3.test(v) || r4.test(v)) {
-						v = dom.encode(v);
-						v = v.replace(r5, '<span class="mceItemHiddenSpellWord">$1</span>$2');
-						v = v.replace(r3, '<span class="mceItemHiddenSpellWord">$1</span>$2');
-
-						dom.replace(dom.create('span', {'class' : 'mceItemHidden'}, v), n);
-					}
-				}
-			});
-
-			se.moveToBookmark(b);
-		},
-
-		_showMenu : function(ed, e) {
-			var t = this, ed = t.editor, m = t._menu, p1, dom = ed.dom, vp = dom.getViewPort(ed.getWin());
-
-			if (!m) {
-				p1 = DOM.getPos(ed.getContentAreaContainer());
-				//p2 = DOM.getPos(ed.getContainer());
-
-				m = ed.controlManager.createDropMenu('spellcheckermenu', {
-					offset_x : p1.x,
-					offset_y : p1.y,
-					'class' : 'mceNoIcons'
-				});
-
-				t._menu = m;
-			}
-
-			if (dom.hasClass(e.target, 'mceItemHiddenSpellWord')) {
-				m.removeAll();
-				m.add({title : 'spellchecker.wait', 'class' : 'mceMenuItemTitle'}).setDisabled(1);
-
-				t._sendRPC('getSuggestions', [t.selectedLang, dom.decode(e.target.innerHTML)], function(r) {
-					m.removeAll();
-
-					if (r.length > 0) {
-						m.add({title : 'spellchecker.sug', 'class' : 'mceMenuItemTitle'}).setDisabled(1);
-						each(r, function(v) {
-							m.add({title : v, onclick : function() {
-								dom.replace(ed.getDoc().createTextNode(v), e.target);
-								t._checkDone();
-							}});
-						});
-
-						m.addSeparator();
-					} else
-						m.add({title : 'spellchecker.no_sug', 'class' : 'mceMenuItemTitle'}).setDisabled(1);
-
-					m.add({
-						title : 'spellchecker.ignore_word',
-						onclick : function() {
-							dom.remove(e.target, 1);
-							t._checkDone();
-						}
-					});
-
-					m.add({
-						title : 'spellchecker.ignore_words',
-						onclick : function() {
-							t._removeWords(dom.decode(e.target.innerHTML));
-							t._checkDone();
-						}
-					});
-
-					m.update();
-				});
-
-				ed.selection.select(e.target);
-				p1 = dom.getPos(e.target);
-				m.showMenu(p1.x, p1.y + e.target.offsetHeight - vp.y);
-
-				return tinymce.dom.Event.cancel(e);
-			} else
-				m.hideMenu();
-		},
-
-		_checkDone : function() {
-			var t = this, ed = t.editor, dom = ed.dom, o;
-
-			each(dom.select('span'), function(n) {
-				if (n && dom.hasClass(n, 'mceItemHiddenSpellWord')) {
-					o = true;
-					return false;
-				}
-			});
-
-			if (!o)
-				t._done();
-		},
-
-		_done : function() {
-			var t = this, la = t.active;
-
-			if (t.active) {
-				t.active = 0;
-				t._removeWords();
-
-				if (t._menu)
-					t._menu.hideMenu();
-
-				if (la)
-					t.editor.nodeChanged();
-			}
-		},
-
-		_sendRPC : function(m, p, cb) {
-			var t = this, url = t.editor.getParam("spellchecker_rpc_url", "{backend}");
-
-			if (url == '{backend}') {
-				t.editor.setProgressState(0);
-				alert('Please specify: spellchecker_rpc_url');
-				return;
-			}
-
-			JSONRequest.sendRPC({
-				url : url,
-				method : m,
-				params : p,
-				success : cb,
-				error : function(e, x) {
-					t.editor.setProgressState(0);
-					t.editor.windowManager.alert(e.errstr || ('Error response: ' + x.responseText));
-				}
-			});
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('spellchecker', tinymce.plugins.SpellcheckerPlugin);
+/**
+ * $Id: editor_plugin_src.js 425 2007-11-21 15:17:39Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var JSONRequest = tinymce.util.JSONRequest, each = tinymce.each, DOM = 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(ed, url) {
+			var t = this, cm;
+
+			t.url = url;
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceSpellCheck', function() {
+				if (!t.active) {
+					ed.setProgressState(1);
+					t._sendRPC('checkWords', [t.selectedLang, t._getWords()], function(r) {
+						if (r.length > 0) {
+							t.active = 1;
+							t._markWords(r);
+							ed.setProgressState(0);
+							ed.nodeChanged();
+						} else {
+							ed.setProgressState(0);
+							ed.windowManager.alert('spellchecker.no_mpell');
+						}
+					});
+				} else
+					t._done();
+			});
+
+			ed.onInit.add(function() {
+				if (ed.settings.content_css !== false)
+					ed.dom.loadCSS(url + '/css/content.css');
+			});
+
+			ed.onClick.add(t._showMenu, t);
+			ed.onContextMenu.add(t._showMenu, t);
+			ed.onBeforeGetContent.add(function() {
+				if (t.active)
+					t._removeWords();
+			});
+
+			ed.onNodeChange.add(function(ed, cm) {
+				cm.setActive('spellchecker', t.active);
+			});
+
+			ed.onSetContent.add(function() {
+				t._done();
+			});
+
+			ed.onBeforeGetContent.add(function() {
+				t._done();
+			});
+
+			ed.onBeforeExecCommand.add(function(ed, cmd) {
+				if (cmd == 'mceFullScreen')
+					t._done();
+			});
+
+			// Find selected language
+			t.languages = {};
+			each(ed.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(v, k) {
+				if (k.indexOf('+') === 0) {
+					k = k.substring(1);
+					t.selectedLang = v;
+				}
+
+				t.languages[k] = v;
+			});
+		},
+
+		createControl : function(n, cm) {
+			var t = this, c, ed = t.editor;
+
+			if (n == 'spellchecker') {
+				c = cm.createSplitButton(n, {title : 'spellchecker.desc', cmd : 'mceSpellCheck', scope : t});
+
+				c.onRenderMenu.add(function(c, m) {
+					m.add({title : 'spellchecker.langs', 'class' : 'mceMenuItemTitle'}).setDisabled(1);
+					each(t.languages, function(v, k) {
+						var o = {icon : 1}, mi;
+
+						o.onclick = function() {
+							mi.setSelected(1);
+							t.selectedItem.setSelected(0);
+							t.selectedItem = mi;
+							t.selectedLang = v;
+						};
+
+						o.title = k;
+						mi = m.add(o);
+						mi.setSelected(v == t.selectedLang);
+
+						if (v == t.selectedLang)
+							t.selectedItem = mi;
+					})
+				});
+
+				return c;
+			}
+		},
+
+		// Internal functions
+
+		_walk : function(n, f) {
+			var d = this.editor.getDoc(), w;
+
+			if (d.createTreeWalker) {
+				w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);
+
+				while ((n = w.nextNode()) != null)
+					f.call(this, n);
+			} else
+				tinymce.walk(n, f, 'childNodes');
+		},
+
+		_getSeparators : function() {
+			var re = '', i, str = this.editor.getParam('spellchecker_word_separator_chars', '\\s!"#$%&()*+,-./:;<=>?@[\]^_{|}§©«®±¶·¸»¼½¾¿×÷¤\u201d\u201c');
+
+			// Build word separator regexp
+			for (i=0; i<str.length; i++)
+				re += '\\' + str.charAt(i);
+
+			return re;
+		},
+
+		_getWords : function() {
+			var ed = this.editor, wl = [], tx = '', lo = {};
+
+			// Get area text
+			this._walk(ed.getBody(), function(n) {
+				if (n.nodeType == 3)
+					tx += n.nodeValue + ' ';
+			});
+
+			// Split words by separator
+			tx = tx.replace(new RegExp('([0-9]|[' + this._getSeparators() + '])', 'g'), ' ');
+			tx = tinymce.trim(tx.replace(/(\s+)/g, ' '));
+
+			// Build word array and remove duplicates
+			each(tx.split(' '), function(v) {
+				if (!lo[v]) {
+					wl.push(v);
+					lo[v] = 1;
+				}
+			});
+
+			return wl;
+		},
+
+		_removeWords : function(w) {
+			var ed = this.editor, dom = ed.dom, se = ed.selection, b = se.getBookmark();
+
+			each(dom.select('span').reverse(), function(n) {
+				if (n && (dom.hasClass(n, 'mceItemHiddenSpellWord') || dom.hasClass(n, 'mceItemHidden'))) {
+					if (!w || dom.decode(n.innerHTML) == w)
+						dom.remove(n, 1);
+				}
+			});
+
+			se.moveToBookmark(b);
+		},
+
+		_markWords : function(wl) {
+			var r1, r2, r3, r4, r5, w = '', ed = this.editor, re = this._getSeparators(), dom = ed.dom, nl = [];
+			var se = ed.selection, b = se.getBookmark();
+
+			each(wl, function(v) {
+				w += (w ? '|' : '') + v;
+			});
+
+			r1 = new RegExp('([' + re + '])(' + w + ')([' + re + '])', 'g');
+			r2 = new RegExp('^(' + w + ')', 'g');
+			r3 = new RegExp('(' + w + ')([' + re + ']?)$', 'g');
+			r4 = new RegExp('^(' + w + ')([' + re + ']?)$', 'g');
+			r5 = new RegExp('(' + w + ')([' + re + '])', 'g');
+
+			// Collect all text nodes
+			this._walk(this.editor.getBody(), function(n) {
+				if (n.nodeType == 3) {
+					nl.push(n);
+				}
+			});
+
+			// Wrap incorrect words in spans
+			each(nl, function(n) {
+				var v;
+
+				if (n.nodeType == 3) {
+					v = n.nodeValue;
+
+					if (r1.test(v) || r2.test(v) || r3.test(v) || r4.test(v)) {
+						v = dom.encode(v);
+						v = v.replace(r5, '<span class="mceItemHiddenSpellWord">$1</span>$2');
+						v = v.replace(r3, '<span class="mceItemHiddenSpellWord">$1</span>$2');
+
+						dom.replace(dom.create('span', {'class' : 'mceItemHidden'}, v), n);
+					}
+				}
+			});
+
+			se.moveToBookmark(b);
+		},
+
+		_showMenu : function(ed, e) {
+			var t = this, ed = t.editor, m = t._menu, p1, dom = ed.dom, vp = dom.getViewPort(ed.getWin());
+
+			if (!m) {
+				p1 = DOM.getPos(ed.getContentAreaContainer());
+				//p2 = DOM.getPos(ed.getContainer());
+
+				m = ed.controlManager.createDropMenu('spellcheckermenu', {
+					offset_x : p1.x,
+					offset_y : p1.y,
+					'class' : 'mceNoIcons'
+				});
+
+				t._menu = m;
+			}
+
+			if (dom.hasClass(e.target, 'mceItemHiddenSpellWord')) {
+				m.removeAll();
+				m.add({title : 'spellchecker.wait', 'class' : 'mceMenuItemTitle'}).setDisabled(1);
+
+				t._sendRPC('getSuggestions', [t.selectedLang, dom.decode(e.target.innerHTML)], function(r) {
+					m.removeAll();
+
+					if (r.length > 0) {
+						m.add({title : 'spellchecker.sug', 'class' : 'mceMenuItemTitle'}).setDisabled(1);
+						each(r, function(v) {
+							m.add({title : v, onclick : function() {
+								dom.replace(ed.getDoc().createTextNode(v), e.target);
+								t._checkDone();
+							}});
+						});
+
+						m.addSeparator();
+					} else
+						m.add({title : 'spellchecker.no_sug', 'class' : 'mceMenuItemTitle'}).setDisabled(1);
+
+					m.add({
+						title : 'spellchecker.ignore_word',
+						onclick : function() {
+							dom.remove(e.target, 1);
+							t._checkDone();
+						}
+					});
+
+					m.add({
+						title : 'spellchecker.ignore_words',
+						onclick : function() {
+							t._removeWords(dom.decode(e.target.innerHTML));
+							t._checkDone();
+						}
+					});
+
+					m.update();
+				});
+
+				ed.selection.select(e.target);
+				p1 = dom.getPos(e.target);
+				m.showMenu(p1.x, p1.y + e.target.offsetHeight - vp.y);
+
+				return tinymce.dom.Event.cancel(e);
+			} else
+				m.hideMenu();
+		},
+
+		_checkDone : function() {
+			var t = this, ed = t.editor, dom = ed.dom, o;
+
+			each(dom.select('span'), function(n) {
+				if (n && dom.hasClass(n, 'mceItemHiddenSpellWord')) {
+					o = true;
+					return false;
+				}
+			});
+
+			if (!o)
+				t._done();
+		},
+
+		_done : function() {
+			var t = this, la = t.active;
+
+			if (t.active) {
+				t.active = 0;
+				t._removeWords();
+
+				if (t._menu)
+					t._menu.hideMenu();
+
+				if (la)
+					t.editor.nodeChanged();
+			}
+		},
+
+		_sendRPC : function(m, p, cb) {
+			var t = this, url = t.editor.getParam("spellchecker_rpc_url", "{backend}");
+
+			if (url == '{backend}') {
+				t.editor.setProgressState(0);
+				alert('Please specify: spellchecker_rpc_url');
+				return;
+			}
+
+			JSONRequest.sendRPC({
+				url : url,
+				method : m,
+				params : p,
+				success : cb,
+				error : function(e, x) {
+					t.editor.setProgressState(0);
+					t.editor.windowManager.alert(e.errstr || ('Error response: ' + x.responseText));
+				}
+			});
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('spellchecker', tinymce.plugins.SpellcheckerPlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/style/css/props.css b/webapp/web/js/tiny_mce/plugins/style/css/props.css
index eb1f26496..5550b093c 100755
--- a/webapp/web/js/tiny_mce/plugins/style/css/props.css
+++ b/webapp/web/js/tiny_mce/plugins/style/css/props.css
@@ -1,13 +1,13 @@
-#text_font {width:250px;}
-#text_size {width:70px;}
-.mceAddSelectValue {background:#DDD;}
-select, #block_text_indent, #box_width, #box_height, #box_padding_top, #box_padding_right, #box_padding_bottom, #box_padding_left {width:70px;}
-#box_margin_top, #box_margin_right, #box_margin_bottom, #box_margin_left, #positioning_width, #positioning_height, #positioning_zindex {width:70px;}
-#positioning_placement_top, #positioning_placement_right, #positioning_placement_bottom, #positioning_placement_left {width:70px;}
-#positioning_clip_top, #positioning_clip_right, #positioning_clip_bottom, #positioning_clip_left {width:70px;}
-.panel_wrapper div.current {padding-top:10px;height:230px;}
-.delim {border-left:1px solid gray;}
-.tdelim {border-bottom:1px solid gray;}
-#block_display {width:145px;}
-#list_type {width:115px;}
-.disabled {background:#EEE;}
+#text_font {width:250px;}
+#text_size {width:70px;}
+.mceAddSelectValue {background:#DDD;}
+select, #block_text_indent, #box_width, #box_height, #box_padding_top, #box_padding_right, #box_padding_bottom, #box_padding_left {width:70px;}
+#box_margin_top, #box_margin_right, #box_margin_bottom, #box_margin_left, #positioning_width, #positioning_height, #positioning_zindex {width:70px;}
+#positioning_placement_top, #positioning_placement_right, #positioning_placement_bottom, #positioning_placement_left {width:70px;}
+#positioning_clip_top, #positioning_clip_right, #positioning_clip_bottom, #positioning_clip_left {width:70px;}
+.panel_wrapper div.current {padding-top:10px;height:230px;}
+.delim {border-left:1px solid gray;}
+.tdelim {border-bottom:1px solid gray;}
+#block_display {width:145px;}
+#list_type {width:115px;}
+.disabled {background:#EEE;}
diff --git a/webapp/web/js/tiny_mce/plugins/style/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/style/editor_plugin_src.js
index 6c817ce48..de2bd682b 100755
--- a/webapp/web/js/tiny_mce/plugins/style/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/style/editor_plugin_src.js
@@ -1,52 +1,52 @@
-/**
- * $Id: editor_plugin_src.js 787 2008-04-10 11:40:57Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.StylePlugin', {
-		init : function(ed, url) {
-			// Register commands
-			ed.addCommand('mceStyleProps', function() {
-				ed.windowManager.open({
-					file : url + '/props.htm',
-					width : 480 + parseInt(ed.getLang('style.delta_width', 0)),
-					height : 320 + parseInt(ed.getLang('style.delta_height', 0)),
-					inline : 1
-				}, {
-					plugin_url : url,
-					style_text : ed.selection.getNode().style.cssText
-				});
-			});
-
-			ed.addCommand('mceSetElementStyle', function(ui, v) {
-				if (e = ed.selection.getNode()) {
-					ed.dom.setAttrib(e, 'style', v);
-					ed.execCommand('mceRepaint');
-				}
-			});
-
-			ed.onNodeChange.add(function(ed, cm, n) {
-				cm.setDisabled('styleprops', n.nodeName === 'BODY');
-			});
-
-			// Register buttons
-			ed.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
-			};
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('style', tinymce.plugins.StylePlugin);
+/**
+ * $Id: editor_plugin_src.js 787 2008-04-10 11:40:57Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.StylePlugin', {
+		init : function(ed, url) {
+			// Register commands
+			ed.addCommand('mceStyleProps', function() {
+				ed.windowManager.open({
+					file : url + '/props.htm',
+					width : 480 + parseInt(ed.getLang('style.delta_width', 0)),
+					height : 320 + parseInt(ed.getLang('style.delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url,
+					style_text : ed.selection.getNode().style.cssText
+				});
+			});
+
+			ed.addCommand('mceSetElementStyle', function(ui, v) {
+				if (e = ed.selection.getNode()) {
+					ed.dom.setAttrib(e, 'style', v);
+					ed.execCommand('mceRepaint');
+				}
+			});
+
+			ed.onNodeChange.add(function(ed, cm, n) {
+				cm.setDisabled('styleprops', n.nodeName === 'BODY');
+			});
+
+			// Register buttons
+			ed.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
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('style', tinymce.plugins.StylePlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/style/js/props.js b/webapp/web/js/tiny_mce/plugins/style/js/props.js
index cafd6b1cf..4fdfceb85 100755
--- a/webapp/web/js/tiny_mce/plugins/style/js/props.js
+++ b/webapp/web/js/tiny_mce/plugins/style/js/props.js
@@ -1,641 +1,641 @@
-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;" + 
-	"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";
-var defaultMeasurement = "+pixels=px;points=pt;em;in;cm;mm;picas;ems;exs;%";
-var defaultSpacingMeasurement = "pixels=px;points=pt;in;cm;mm;picas;+ems;exs;%";
-var defaultIndentMeasurement = "pixels=px;+points=pt;in;cm;mm;picas;ems;exs;%";
-var defaultWeight = "normal;bold;bolder;lighter;100;200;300;400;500;600;700;800;900";
-var defaultTextStyle = "normal;italic;oblique";
-var defaultVariant = "normal;small-caps";
-var defaultLineHeight = "normal";
-var defaultAttachment = "fixed;scroll";
-var defaultRepeat = "no-repeat;repeat;repeat-x;repeat-y";
-var defaultPosH = "left;center;right";
-var defaultPosV = "top;center;bottom";
-var defaultVAlign = "baseline;sub;super;top;text-top;middle;bottom;text-bottom";
-var defaultDisplay = "inline;block;list-item;run-in;compact;marker;table;inline-table;table-row-group;table-header-group;table-footer-group;table-row;table-column-group;table-column;table-cell;table-caption;none";
-var defaultBorderStyle = "none;solid;dashed;dotted;double;groove;ridge;inset;outset";
-var defaultBorderWidth = "thin;medium;thick";
-var defaultListType = "disc;circle;square;decimal;lower-roman;upper-roman;lower-alpha;upper-alpha;none";
-
-function init() {
-	var ce = document.getElementById('container'), h;
-
-	ce.style.cssText = tinyMCEPopup.getWindowArg('style_text');
-
-	h = getBrowserHTML('background_image_browser','background_image','image','advimage');
-	document.getElementById("background_image_browser").innerHTML = h;
-
-	document.getElementById('text_color_pickcontainer').innerHTML = getColorPickerHTML('text_color_pick','text_color');
-	document.getElementById('background_color_pickcontainer').innerHTML = getColorPickerHTML('background_color_pick','background_color');
-	document.getElementById('border_color_top_pickcontainer').innerHTML = getColorPickerHTML('border_color_top_pick','border_color_top');
-	document.getElementById('border_color_right_pickcontainer').innerHTML = getColorPickerHTML('border_color_right_pick','border_color_right');
-	document.getElementById('border_color_bottom_pickcontainer').innerHTML = getColorPickerHTML('border_color_bottom_pick','border_color_bottom');
-	document.getElementById('border_color_left_pickcontainer').innerHTML = getColorPickerHTML('border_color_left_pick','border_color_left');
-
-	fillSelect(0, 'text_font', 'style_font', defaultFonts, ';', true);
-	fillSelect(0, 'text_size', 'style_font_size', defaultSizes, ';', true);
-	fillSelect(0, 'text_size_measurement', 'style_font_size_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'text_case', 'style_text_case', "capitalize;uppercase;lowercase", ';', true);
-	fillSelect(0, 'text_weight', 'style_font_weight', defaultWeight, ';', true);
-	fillSelect(0, 'text_style', 'style_font_style', defaultTextStyle, ';', true);
-	fillSelect(0, 'text_variant', 'style_font_variant', defaultVariant, ';', true);
-	fillSelect(0, 'text_lineheight', 'style_font_line_height', defaultLineHeight, ';', true);
-	fillSelect(0, 'text_lineheight_measurement', 'style_font_line_height_measurement', defaultMeasurement, ';', true);
-
-	fillSelect(0, 'background_attachment', 'style_background_attachment', defaultAttachment, ';', true);
-	fillSelect(0, 'background_repeat', 'style_background_repeat', defaultRepeat, ';', true);
-
-	fillSelect(0, 'background_hpos_measurement', 'style_background_hpos_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'background_vpos_measurement', 'style_background_vpos_measurement', defaultMeasurement, ';', true);
-
-	fillSelect(0, 'background_hpos', 'style_background_hpos', defaultPosH, ';', true);
-	fillSelect(0, 'background_vpos', 'style_background_vpos', defaultPosV, ';', true);
-
-	fillSelect(0, 'block_wordspacing', 'style_wordspacing', 'normal', ';', true);
-	fillSelect(0, 'block_wordspacing_measurement', 'style_wordspacing_measurement', defaultSpacingMeasurement, ';', true);
-	fillSelect(0, 'block_letterspacing', 'style_letterspacing', 'normal', ';', true);
-	fillSelect(0, 'block_letterspacing_measurement', 'style_letterspacing_measurement', defaultSpacingMeasurement, ';', true);
-	fillSelect(0, 'block_vertical_alignment', 'style_vertical_alignment', defaultVAlign, ';', true);
-	fillSelect(0, 'block_text_align', 'style_text_align', "left;right;center;justify", ';', true);
-	fillSelect(0, 'block_whitespace', 'style_whitespace', "normal;pre;nowrap", ';', true);
-	fillSelect(0, 'block_display', 'style_display', defaultDisplay, ';', true);
-	fillSelect(0, 'block_text_indent_measurement', 'style_text_indent_measurement', defaultIndentMeasurement, ';', true);
-
-	fillSelect(0, 'box_width_measurement', 'style_box_width_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'box_height_measurement', 'style_box_height_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'box_float', 'style_float', 'left;right;none', ';', true);
-	fillSelect(0, 'box_clear', 'style_clear', 'left;right;both;none', ';', true);
-	fillSelect(0, 'box_padding_left_measurement', 'style_padding_left_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'box_padding_top_measurement', 'style_padding_top_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'box_padding_bottom_measurement', 'style_padding_bottom_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'box_padding_right_measurement', 'style_padding_right_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'box_margin_left_measurement', 'style_margin_left_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'box_margin_top_measurement', 'style_margin_top_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'box_margin_bottom_measurement', 'style_margin_bottom_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'box_margin_right_measurement', 'style_margin_right_measurement', defaultMeasurement, ';', true);
-
-	fillSelect(0, 'border_style_top', 'style_border_style_top', defaultBorderStyle, ';', true);
-	fillSelect(0, 'border_style_right', 'style_border_style_right', defaultBorderStyle, ';', true);
-	fillSelect(0, 'border_style_bottom', 'style_border_style_bottom', defaultBorderStyle, ';', true);
-	fillSelect(0, 'border_style_left', 'style_border_style_left', defaultBorderStyle, ';', true);
-
-	fillSelect(0, 'border_width_top', 'style_border_width_top', defaultBorderWidth, ';', true);
-	fillSelect(0, 'border_width_right', 'style_border_width_right', defaultBorderWidth, ';', true);
-	fillSelect(0, 'border_width_bottom', 'style_border_width_bottom', defaultBorderWidth, ';', true);
-	fillSelect(0, 'border_width_left', 'style_border_width_left', defaultBorderWidth, ';', true);
-
-	fillSelect(0, 'border_width_top_measurement', 'style_border_width_top_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'border_width_right_measurement', 'style_border_width_right_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'border_width_bottom_measurement', 'style_border_width_bottom_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'border_width_left_measurement', 'style_border_width_left_measurement', defaultMeasurement, ';', true);
-
-	fillSelect(0, 'list_type', 'style_list_type', defaultListType, ';', true);
-	fillSelect(0, 'list_position', 'style_list_position', "inside;outside", ';', true);
-
-	fillSelect(0, 'positioning_type', 'style_positioning_type', "absolute;relative;static", ';', true);
-	fillSelect(0, 'positioning_visibility', 'style_positioning_visibility', "inherit;visible;hidden", ';', true);
-
-	fillSelect(0, 'positioning_width_measurement', 'style_positioning_width_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'positioning_height_measurement', 'style_positioning_height_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'positioning_overflow', 'style_positioning_overflow', "visible;hidden;scroll;auto", ';', true);
-
-	fillSelect(0, 'positioning_placement_top_measurement', 'style_positioning_placement_top_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'positioning_placement_right_measurement', 'style_positioning_placement_right_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'positioning_placement_bottom_measurement', 'style_positioning_placement_bottom_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'positioning_placement_left_measurement', 'style_positioning_placement_left_measurement', defaultMeasurement, ';', true);
-
-	fillSelect(0, 'positioning_clip_top_measurement', 'style_positioning_clip_top_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'positioning_clip_right_measurement', 'style_positioning_clip_right_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'positioning_clip_bottom_measurement', 'style_positioning_clip_bottom_measurement', defaultMeasurement, ';', true);
-	fillSelect(0, 'positioning_clip_left_measurement', 'style_positioning_clip_left_measurement', defaultMeasurement, ';', true);
-
-	TinyMCE_EditableSelects.init();
-	setupFormData();
-	showDisabledControls();
-}
-
-function setupFormData() {
-	var ce = document.getElementById('container'), f = document.forms[0], s, b, i;
-
-	// Setup text fields
-
-	selectByValue(f, 'text_font', ce.style.fontFamily, true, true);
-	selectByValue(f, 'text_size', getNum(ce.style.fontSize), true, true);
-	selectByValue(f, 'text_size_measurement', getMeasurement(ce.style.fontSize));
-	selectByValue(f, 'text_weight', ce.style.fontWeight, true, true);
-	selectByValue(f, 'text_style', ce.style.fontStyle, true, true);
-	selectByValue(f, 'text_lineheight', getNum(ce.style.lineHeight), true, true);
-	selectByValue(f, 'text_lineheight_measurement', getMeasurement(ce.style.lineHeight));
-	selectByValue(f, 'text_case', ce.style.textTransform, true, true);
-	selectByValue(f, 'text_variant', ce.style.fontVariant, true, true);
-	f.text_color.value = tinyMCEPopup.editor.dom.toHex(ce.style.color);
-	updateColor('text_color_pick', 'text_color');
-	f.text_underline.checked = inStr(ce.style.textDecoration, 'underline');
-	f.text_overline.checked = inStr(ce.style.textDecoration, 'overline');
-	f.text_linethrough.checked = inStr(ce.style.textDecoration, 'line-through');
-	f.text_blink.checked = inStr(ce.style.textDecoration, 'blink');
-
-	// Setup background fields
-
-	f.background_color.value = tinyMCEPopup.editor.dom.toHex(ce.style.backgroundColor);
-	updateColor('background_color_pick', 'background_color');
-	f.background_image.value = ce.style.backgroundImage.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
-	selectByValue(f, 'background_repeat', ce.style.backgroundRepeat, true, true);
-	selectByValue(f, 'background_attachment', ce.style.backgroundAttachment, true, true);
-	selectByValue(f, 'background_hpos', getNum(getVal(ce.style.backgroundPosition, 0)), true, true);
-	selectByValue(f, 'background_hpos_measurement', getMeasurement(getVal(ce.style.backgroundPosition, 0)));
-	selectByValue(f, 'background_vpos', getNum(getVal(ce.style.backgroundPosition, 1)), true, true);
-	selectByValue(f, 'background_vpos_measurement', getMeasurement(getVal(ce.style.backgroundPosition, 1)));
-
-	// Setup block fields
-
-	selectByValue(f, 'block_wordspacing', getNum(ce.style.wordSpacing), true, true);
-	selectByValue(f, 'block_wordspacing_measurement', getMeasurement(ce.style.wordSpacing));
-	selectByValue(f, 'block_letterspacing', getNum(ce.style.letterSpacing), true, true);
-	selectByValue(f, 'block_letterspacing_measurement', getMeasurement(ce.style.letterSpacing));
-	selectByValue(f, 'block_vertical_alignment', ce.style.verticalAlign, true, true);
-	selectByValue(f, 'block_text_align', ce.style.textAlign, true, true);
-	f.block_text_indent.value = getNum(ce.style.textIndent);
-	selectByValue(f, 'block_text_indent_measurement', getMeasurement(ce.style.textIndent));
-	selectByValue(f, 'block_whitespace', ce.style.whiteSpace, true, true);
-	selectByValue(f, 'block_display', ce.style.display, true, true);
-
-	// Setup box fields
-
-	f.box_width.value = getNum(ce.style.width);
-	selectByValue(f, 'box_width_measurement', getMeasurement(ce.style.width));
-
-	f.box_height.value = getNum(ce.style.height);
-	selectByValue(f, 'box_height_measurement', getMeasurement(ce.style.height));
-
-	if (tinymce.isGecko)
-		selectByValue(f, 'box_float', ce.style.cssFloat, true, true);
-	else
-		selectByValue(f, 'box_float', ce.style.styleFloat, true, true);
-
-	selectByValue(f, 'box_clear', ce.style.clear, true, true);
-
-	setupBox(f, ce, 'box_padding', 'padding', '');
-	setupBox(f, ce, 'box_margin', 'margin', '');
-
-	// Setup border fields
-
-	setupBox(f, ce, 'border_style', 'border', 'Style');
-	setupBox(f, ce, 'border_width', 'border', 'Width');
-	setupBox(f, ce, 'border_color', 'border', 'Color');
-
-	updateColor('border_color_top_pick', 'border_color_top');
-	updateColor('border_color_right_pick', 'border_color_right');
-	updateColor('border_color_bottom_pick', 'border_color_bottom');
-	updateColor('border_color_left_pick', 'border_color_left');
-
-	f.elements.border_color_top.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_top.value);
-	f.elements.border_color_right.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_right.value);
-	f.elements.border_color_bottom.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_bottom.value);
-	f.elements.border_color_left.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_left.value);
-
-	// Setup list fields
-
-	selectByValue(f, 'list_type', ce.style.listStyleType, true, true);
-	selectByValue(f, 'list_position', ce.style.listStylePosition, true, true);
-	f.list_bullet_image.value = ce.style.listStyleImage.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
-
-	// Setup box fields
-
-	selectByValue(f, 'positioning_type', ce.style.position, true, true);
-	selectByValue(f, 'positioning_visibility', ce.style.visibility, true, true);
-	selectByValue(f, 'positioning_overflow', ce.style.overflow, true, true);
-	f.positioning_zindex.value = ce.style.zIndex ? ce.style.zIndex : "";
-
-	f.positioning_width.value = getNum(ce.style.width);
-	selectByValue(f, 'positioning_width_measurement', getMeasurement(ce.style.width));
-
-	f.positioning_height.value = getNum(ce.style.height);
-	selectByValue(f, 'positioning_height_measurement', getMeasurement(ce.style.height));
-
-	setupBox(f, ce, 'positioning_placement', '', '', ['top', 'right', 'bottom', 'left']);
-
-	s = ce.style.clip.replace(new RegExp("rect\\('?([^']*)'?\\)", 'gi'), "$1");
-	s = s.replace(/,/g, ' ');
-
-	if (!hasEqualValues([getVal(s, 0), getVal(s, 1), getVal(s, 2), getVal(s, 3)])) {
-		f.positioning_clip_top.value = getNum(getVal(s, 0));
-		selectByValue(f, 'positioning_clip_top_measurement', getMeasurement(getVal(s, 0)));
-		f.positioning_clip_right.value = getNum(getVal(s, 1));
-		selectByValue(f, 'positioning_clip_right_measurement', getMeasurement(getVal(s, 1)));
-		f.positioning_clip_bottom.value = getNum(getVal(s, 2));
-		selectByValue(f, 'positioning_clip_bottom_measurement', getMeasurement(getVal(s, 2)));
-		f.positioning_clip_left.value = getNum(getVal(s, 3));
-		selectByValue(f, 'positioning_clip_left_measurement', getMeasurement(getVal(s, 3)));
-	} else {
-		f.positioning_clip_top.value = getNum(getVal(s, 0));
-		selectByValue(f, 'positioning_clip_top_measurement', getMeasurement(getVal(s, 0)));
-		f.positioning_clip_right.value = f.positioning_clip_bottom.value = f.positioning_clip_left.value;
-	}
-
-//	setupBox(f, ce, '', 'border', 'Color');
-}
-
-function getMeasurement(s) {
-	return s.replace(/^([0-9]+)(.*)$/, "$2");
-}
-
-function getNum(s) {
-	if (new RegExp('^[0-9]+[a-z%]+$', 'gi').test(s))
-		return s.replace(/[^0-9]/g, '');
-
-	return s;
-}
-
-function inStr(s, n) {
-	return new RegExp(n, 'gi').test(s);
-}
-
-function getVal(s, i) {
-	var a = s.split(' ');
-
-	if (a.length > 1)
-		return a[i];
-
-	return "";
-}
-
-function setValue(f, n, v) {
-	if (f.elements[n].type == "text")
-		f.elements[n].value = v;
-	else
-		selectByValue(f, n, v, true, true);
-}
-
-function setupBox(f, ce, fp, pr, sf, b) {
-	if (typeof(b) == "undefined")
-		b = ['Top', 'Right', 'Bottom', 'Left'];
-
-	if (isSame(ce, pr, sf, b)) {
-		f.elements[fp + "_same"].checked = true;
-
-		setValue(f, fp + "_top", getNum(ce.style[pr + b[0] + sf]));
-		f.elements[fp + "_top"].disabled = false;
-
-		f.elements[fp + "_right"].value = "";
-		f.elements[fp + "_right"].disabled = true;
-		f.elements[fp + "_bottom"].value = "";
-		f.elements[fp + "_bottom"].disabled = true;
-		f.elements[fp + "_left"].value = "";
-		f.elements[fp + "_left"].disabled = true;
-
-		if (f.elements[fp + "_top_measurement"]) {
-			selectByValue(f, fp + '_top_measurement', getMeasurement(ce.style[pr + b[0] + sf]));
-			f.elements[fp + "_left_measurement"].disabled = true;
-			f.elements[fp + "_bottom_measurement"].disabled = true;
-			f.elements[fp + "_right_measurement"].disabled = true;
-		}
-	} else {
-		f.elements[fp + "_same"].checked = false;
-
-		setValue(f, fp + "_top", getNum(ce.style[pr + b[0] + sf]));
-		f.elements[fp + "_top"].disabled = false;
-
-		setValue(f, fp + "_right", getNum(ce.style[pr + b[1] + sf]));
-		f.elements[fp + "_right"].disabled = false;
-
-		setValue(f, fp + "_bottom", getNum(ce.style[pr + b[2] + sf]));
-		f.elements[fp + "_bottom"].disabled = false;
-
-		setValue(f, fp + "_left", getNum(ce.style[pr + b[3] + sf]));
-		f.elements[fp + "_left"].disabled = false;
-
-		if (f.elements[fp + "_top_measurement"]) {
-			selectByValue(f, fp + '_top_measurement', getMeasurement(ce.style[pr + b[0] + sf]));
-			selectByValue(f, fp + '_right_measurement', getMeasurement(ce.style[pr + b[1] + sf]));
-			selectByValue(f, fp + '_bottom_measurement', getMeasurement(ce.style[pr + b[2] + sf]));
-			selectByValue(f, fp + '_left_measurement', getMeasurement(ce.style[pr + b[3] + sf]));
-			f.elements[fp + "_left_measurement"].disabled = false;
-			f.elements[fp + "_bottom_measurement"].disabled = false;
-			f.elements[fp + "_right_measurement"].disabled = false;
-		}
-	}
-}
-
-function isSame(e, pr, sf, b) {
-	var a = [], i, x;
-
-	if (typeof(b) == "undefined")
-		b = ['Top', 'Right', 'Bottom', 'Left'];
-
-	if (typeof(sf) == "undefined" || sf == null)
-		sf = "";
-
-	a[0] = e.style[pr + b[0] + sf];
-	a[1] = e.style[pr + b[1] + sf];
-	a[2] = e.style[pr + b[2] + sf];
-	a[3] = e.style[pr + b[3] + sf];
-
-	for (i=0; i<a.length; i++) {
-		if (a[i] == null)
-			return false;
-
-		for (x=0; x<a.length; x++) {
-			if (a[x] != a[i])
-				return false;
-		}
-	}
-
-	return true;
-};
-
-function hasEqualValues(a) {
-	var i, x;
-
-	for (i=0; i<a.length; i++) {
-		if (a[i] == null)
-			return false;
-
-		for (x=0; x<a.length; x++) {
-			if (a[x] != a[i])
-				return false;
-		}
-	}
-
-	return true;
-}
-
-function applyAction() {
-	var ce = document.getElementById('container'), ed = tinyMCEPopup.editor;
-
-	generateCSS();
-
-	tinyMCEPopup.restoreSelection();
-	ed.dom.setAttrib(ed.selection.getNode(), 'style', tinyMCEPopup.editor.dom.serializeStyle(tinyMCEPopup.editor.dom.parseStyle(ce.style.cssText)));
-}
-
-function updateAction() {
-	applyAction();
-	tinyMCEPopup.close();
-}
-
-function generateCSS() {
-	var ce = document.getElementById('container'), f = document.forms[0], num = new RegExp('[0-9]+', 'g'), s, t;
-
-	ce.style.cssText = "";
-
-	// Build text styles
-	ce.style.fontFamily = f.text_font.value;
-	ce.style.fontSize = f.text_size.value + (isNum(f.text_size.value) ? (f.text_size_measurement.value || 'px') : "");
-	ce.style.fontStyle = f.text_style.value;
-	ce.style.lineHeight = f.text_lineheight.value + (isNum(f.text_lineheight.value) ? f.text_lineheight_measurement.value : "");
-	ce.style.textTransform = f.text_case.value;
-	ce.style.fontWeight = f.text_weight.value;
-	ce.style.fontVariant = f.text_variant.value;
-	ce.style.color = f.text_color.value;
-
-	s = "";
-	s += f.text_underline.checked ? " underline" : "";
-	s += f.text_overline.checked ? " overline" : "";
-	s += f.text_linethrough.checked ? " line-through" : "";
-	s += f.text_blink.checked ? " blink" : "";
-	s = s.length > 0 ? s.substring(1) : s;
-
-	if (f.text_none.checked)
-		s = "none";
-
-	ce.style.textDecoration = s;
-
-	// Build background styles
-
-	ce.style.backgroundColor = f.background_color.value;
-	ce.style.backgroundImage = f.background_image.value != "" ? "url(" + f.background_image.value + ")" : "";
-	ce.style.backgroundRepeat = f.background_repeat.value;
-	ce.style.backgroundAttachment = f.background_attachment.value;
-
-	if (f.background_hpos.value != "") {
-		s = "";
-		s += f.background_hpos.value + (isNum(f.background_hpos.value) ? f.background_hpos_measurement.value : "") + " ";
-		s += f.background_vpos.value + (isNum(f.background_vpos.value) ? f.background_vpos_measurement.value : "");
-		ce.style.backgroundPosition = s;
-	}
-
-	// Build block styles
-
-	ce.style.wordSpacing = f.block_wordspacing.value + (isNum(f.block_wordspacing.value) ? f.block_wordspacing_measurement.value : "");
-	ce.style.letterSpacing = f.block_letterspacing.value + (isNum(f.block_letterspacing.value) ? f.block_letterspacing_measurement.value : "");
-	ce.style.verticalAlign = f.block_vertical_alignment.value;
-	ce.style.textAlign = f.block_text_align.value;
-	ce.style.textIndent = f.block_text_indent.value + (isNum(f.block_text_indent.value) ? f.block_text_indent_measurement.value : "");
-	ce.style.whiteSpace = f.block_whitespace.value;
-	ce.style.display = f.block_display.value;
-
-	// Build box styles
-
-	ce.style.width = f.box_width.value + (isNum(f.box_width.value) ? f.box_width_measurement.value : "");
-	ce.style.height = f.box_height.value + (isNum(f.box_height.value) ? f.box_height_measurement.value : "");
-	ce.style.styleFloat = f.box_float.value;
-
-	if (tinymce.isGecko)
-		ce.style.cssFloat = f.box_float.value;
-
-	ce.style.clear = f.box_clear.value;
-
-	if (!f.box_padding_same.checked) {
-		ce.style.paddingTop = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");
-		ce.style.paddingRight = f.box_padding_right.value + (isNum(f.box_padding_right.value) ? f.box_padding_right_measurement.value : "");
-		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 : "");		
-
-	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 : "");
-		ce.style.marginRight = f.box_margin_right.value + (isNum(f.box_margin_right.value) ? f.box_margin_right_measurement.value : "");
-		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 : "");		
-
-	// Build border styles
-
-	if (!f.border_style_same.checked) {
-		ce.style.borderTopStyle = f.border_style_top.value;
-		ce.style.borderRightStyle = f.border_style_right.value;
-		ce.style.borderBottomStyle = f.border_style_bottom.value;
-		ce.style.borderLeftStyle = f.border_style_left.value;
-	} else
-		ce.style.borderStyle = f.border_style_top.value;
-
-	if (!f.border_width_same.checked) {
-		ce.style.borderTopWidth = f.border_width_top.value + (isNum(f.border_width_top.value) ? f.border_width_top_measurement.value : "");
-		ce.style.borderRightWidth = f.border_width_right.value + (isNum(f.border_width_right.value) ? f.border_width_right_measurement.value : "");
-		ce.style.borderBottomWidth = f.border_width_bottom.value + (isNum(f.border_width_bottom.value) ? f.border_width_bottom_measurement.value : "");
-		ce.style.borderLeftWidth = f.border_width_left.value + (isNum(f.border_width_left.value) ? f.border_width_left_measurement.value : "");
-	} else
-		ce.style.borderWidth = f.border_width_top.value;
-
-	if (!f.border_color_same.checked) {
-		ce.style.borderTopColor = f.border_color_top.value;
-		ce.style.borderRightColor = f.border_color_right.value;
-		ce.style.borderBottomColor = f.border_color_bottom.value;
-		ce.style.borderLeftColor = f.border_color_left.value;
-	} else
-		ce.style.borderColor = f.border_color_top.value;
-
-	// Build list styles
-
-	ce.style.listStyleType = f.list_type.value;
-	ce.style.listStylePosition = f.list_position.value;
-	ce.style.listStyleImage = f.list_bullet_image.value != "" ? "url(" + f.list_bullet_image.value + ")" : "";
-
-	// Build positioning styles
-
-	ce.style.position = f.positioning_type.value;
-	ce.style.visibility = f.positioning_visibility.value;
-
-	if (ce.style.width == "")
-		ce.style.width = f.positioning_width.value + (isNum(f.positioning_width.value) ? f.positioning_width_measurement.value : "");
-
-	if (ce.style.height == "")
-		ce.style.height = f.positioning_height.value + (isNum(f.positioning_height.value) ? f.positioning_height_measurement.value : "");
-
-	ce.style.zIndex = f.positioning_zindex.value;
-	ce.style.overflow = f.positioning_overflow.value;
-
-	if (!f.positioning_placement_same.checked) {
-		ce.style.top = f.positioning_placement_top.value + (isNum(f.positioning_placement_top.value) ? f.positioning_placement_top_measurement.value : "");
-		ce.style.right = f.positioning_placement_right.value + (isNum(f.positioning_placement_right.value) ? f.positioning_placement_right_measurement.value : "");
-		ce.style.bottom = f.positioning_placement_bottom.value + (isNum(f.positioning_placement_bottom.value) ? f.positioning_placement_bottom_measurement.value : "");
-		ce.style.left = f.positioning_placement_left.value + (isNum(f.positioning_placement_left.value) ? f.positioning_placement_left_measurement.value : "");
-	} else {
-		s = f.positioning_placement_top.value + (isNum(f.positioning_placement_top.value) ? f.positioning_placement_top_measurement.value : "");
-		ce.style.top = s;
-		ce.style.right = s;
-		ce.style.bottom = s;
-		ce.style.left = s;
-	}
-
-	if (!f.positioning_clip_same.checked) {
-		s = "rect(";
-		s += (isNum(f.positioning_clip_top.value) ? f.positioning_clip_top.value + f.positioning_clip_top_measurement.value : "auto") + " ";
-		s += (isNum(f.positioning_clip_right.value) ? f.positioning_clip_right.value + f.positioning_clip_right_measurement.value : "auto") + " ";
-		s += (isNum(f.positioning_clip_bottom.value) ? f.positioning_clip_bottom.value + f.positioning_clip_bottom_measurement.value : "auto") + " ";
-		s += (isNum(f.positioning_clip_left.value) ? f.positioning_clip_left.value + f.positioning_clip_left_measurement.value : "auto");
-		s += ")";
-
-		if (s != "rect(auto auto auto auto)")
-			ce.style.clip = s;
-	} else {
-		s = "rect(";
-		t = isNum(f.positioning_clip_top.value) ? f.positioning_clip_top.value + f.positioning_clip_top_measurement.value : "auto";
-		s += t + " ";
-		s += t + " ";
-		s += t + " ";
-		s += t + ")";
-
-		if (s != "rect(auto auto auto auto)")
-			ce.style.clip = s;
-	}
-
-	ce.style.cssText = ce.style.cssText;
-}
-
-function isNum(s) {
-	return new RegExp('[0-9]+', 'g').test(s);
-}
-
-function showDisabledControls() {
-	var f = document.forms, i, a;
-
-	for (i=0; i<f.length; i++) {
-		for (a=0; a<f[i].elements.length; a++) {
-			if (f[i].elements[a].disabled)
-				tinyMCEPopup.editor.dom.addClass(f[i].elements[a], "disabled");
-			else
-				tinyMCEPopup.editor.dom.removeClass(f[i].elements[a], "disabled");
-		}
-	}
-}
-
-function fillSelect(f, s, param, dval, sep, em) {
-	var i, ar, p, se;
-
-	f = document.forms[f];
-	sep = typeof(sep) == "undefined" ? ";" : sep;
-
-	if (em)
-		addSelectValue(f, s, "", "");
-
-	ar = tinyMCEPopup.getParam(param, dval).split(sep);
-	for (i=0; i<ar.length; i++) {
-		se = false;
-
-		if (ar[i].charAt(0) == '+') {
-			ar[i] = ar[i].substring(1);
-			se = true;
-		}
-
-		p = ar[i].split('=');
-
-		if (p.length > 1) {
-			addSelectValue(f, s, p[0], p[1]);
-
-			if (se)
-				selectByValue(f, s, p[1]);
-		} else {
-			addSelectValue(f, s, p[0], p[0]);
-
-			if (se)
-				selectByValue(f, s, p[0]);
-		}
-	}
-}
-
-function toggleSame(ce, pre) {
-	var el = document.forms[0].elements, i;
-
-	if (ce.checked) {
-		el[pre + "_top"].disabled = false;
-		el[pre + "_right"].disabled = true;
-		el[pre + "_bottom"].disabled = true;
-		el[pre + "_left"].disabled = true;
-
-		if (el[pre + "_top_measurement"]) {
-			el[pre + "_top_measurement"].disabled = false;
-			el[pre + "_right_measurement"].disabled = true;
-			el[pre + "_bottom_measurement"].disabled = true;
-			el[pre + "_left_measurement"].disabled = true;
-		}
-	} else {
-		el[pre + "_top"].disabled = false;
-		el[pre + "_right"].disabled = false;
-		el[pre + "_bottom"].disabled = false;
-		el[pre + "_left"].disabled = false;
-
-		if (el[pre + "_top_measurement"]) {
-			el[pre + "_top_measurement"].disabled = false;
-			el[pre + "_right_measurement"].disabled = false;
-			el[pre + "_bottom_measurement"].disabled = false;
-			el[pre + "_left_measurement"].disabled = false;
-		}
-	}
-
-	showDisabledControls();
-}
-
-function synch(fr, to) {
-	var f = document.forms[0];
-
-	f.elements[to].value = f.elements[fr].value;
-
-	if (f.elements[fr + "_measurement"])
-		selectByValue(f, to + "_measurement", f.elements[fr + "_measurement"].value);
-}
-
-tinyMCEPopup.onInit.add(init);
+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;" + 
+	"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";
+var defaultMeasurement = "+pixels=px;points=pt;em;in;cm;mm;picas;ems;exs;%";
+var defaultSpacingMeasurement = "pixels=px;points=pt;in;cm;mm;picas;+ems;exs;%";
+var defaultIndentMeasurement = "pixels=px;+points=pt;in;cm;mm;picas;ems;exs;%";
+var defaultWeight = "normal;bold;bolder;lighter;100;200;300;400;500;600;700;800;900";
+var defaultTextStyle = "normal;italic;oblique";
+var defaultVariant = "normal;small-caps";
+var defaultLineHeight = "normal";
+var defaultAttachment = "fixed;scroll";
+var defaultRepeat = "no-repeat;repeat;repeat-x;repeat-y";
+var defaultPosH = "left;center;right";
+var defaultPosV = "top;center;bottom";
+var defaultVAlign = "baseline;sub;super;top;text-top;middle;bottom;text-bottom";
+var defaultDisplay = "inline;block;list-item;run-in;compact;marker;table;inline-table;table-row-group;table-header-group;table-footer-group;table-row;table-column-group;table-column;table-cell;table-caption;none";
+var defaultBorderStyle = "none;solid;dashed;dotted;double;groove;ridge;inset;outset";
+var defaultBorderWidth = "thin;medium;thick";
+var defaultListType = "disc;circle;square;decimal;lower-roman;upper-roman;lower-alpha;upper-alpha;none";
+
+function init() {
+	var ce = document.getElementById('container'), h;
+
+	ce.style.cssText = tinyMCEPopup.getWindowArg('style_text');
+
+	h = getBrowserHTML('background_image_browser','background_image','image','advimage');
+	document.getElementById("background_image_browser").innerHTML = h;
+
+	document.getElementById('text_color_pickcontainer').innerHTML = getColorPickerHTML('text_color_pick','text_color');
+	document.getElementById('background_color_pickcontainer').innerHTML = getColorPickerHTML('background_color_pick','background_color');
+	document.getElementById('border_color_top_pickcontainer').innerHTML = getColorPickerHTML('border_color_top_pick','border_color_top');
+	document.getElementById('border_color_right_pickcontainer').innerHTML = getColorPickerHTML('border_color_right_pick','border_color_right');
+	document.getElementById('border_color_bottom_pickcontainer').innerHTML = getColorPickerHTML('border_color_bottom_pick','border_color_bottom');
+	document.getElementById('border_color_left_pickcontainer').innerHTML = getColorPickerHTML('border_color_left_pick','border_color_left');
+
+	fillSelect(0, 'text_font', 'style_font', defaultFonts, ';', true);
+	fillSelect(0, 'text_size', 'style_font_size', defaultSizes, ';', true);
+	fillSelect(0, 'text_size_measurement', 'style_font_size_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'text_case', 'style_text_case', "capitalize;uppercase;lowercase", ';', true);
+	fillSelect(0, 'text_weight', 'style_font_weight', defaultWeight, ';', true);
+	fillSelect(0, 'text_style', 'style_font_style', defaultTextStyle, ';', true);
+	fillSelect(0, 'text_variant', 'style_font_variant', defaultVariant, ';', true);
+	fillSelect(0, 'text_lineheight', 'style_font_line_height', defaultLineHeight, ';', true);
+	fillSelect(0, 'text_lineheight_measurement', 'style_font_line_height_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'background_attachment', 'style_background_attachment', defaultAttachment, ';', true);
+	fillSelect(0, 'background_repeat', 'style_background_repeat', defaultRepeat, ';', true);
+
+	fillSelect(0, 'background_hpos_measurement', 'style_background_hpos_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'background_vpos_measurement', 'style_background_vpos_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'background_hpos', 'style_background_hpos', defaultPosH, ';', true);
+	fillSelect(0, 'background_vpos', 'style_background_vpos', defaultPosV, ';', true);
+
+	fillSelect(0, 'block_wordspacing', 'style_wordspacing', 'normal', ';', true);
+	fillSelect(0, 'block_wordspacing_measurement', 'style_wordspacing_measurement', defaultSpacingMeasurement, ';', true);
+	fillSelect(0, 'block_letterspacing', 'style_letterspacing', 'normal', ';', true);
+	fillSelect(0, 'block_letterspacing_measurement', 'style_letterspacing_measurement', defaultSpacingMeasurement, ';', true);
+	fillSelect(0, 'block_vertical_alignment', 'style_vertical_alignment', defaultVAlign, ';', true);
+	fillSelect(0, 'block_text_align', 'style_text_align', "left;right;center;justify", ';', true);
+	fillSelect(0, 'block_whitespace', 'style_whitespace', "normal;pre;nowrap", ';', true);
+	fillSelect(0, 'block_display', 'style_display', defaultDisplay, ';', true);
+	fillSelect(0, 'block_text_indent_measurement', 'style_text_indent_measurement', defaultIndentMeasurement, ';', true);
+
+	fillSelect(0, 'box_width_measurement', 'style_box_width_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_height_measurement', 'style_box_height_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_float', 'style_float', 'left;right;none', ';', true);
+	fillSelect(0, 'box_clear', 'style_clear', 'left;right;both;none', ';', true);
+	fillSelect(0, 'box_padding_left_measurement', 'style_padding_left_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_padding_top_measurement', 'style_padding_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_padding_bottom_measurement', 'style_padding_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_padding_right_measurement', 'style_padding_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_left_measurement', 'style_margin_left_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_top_measurement', 'style_margin_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_bottom_measurement', 'style_margin_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'box_margin_right_measurement', 'style_margin_right_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'border_style_top', 'style_border_style_top', defaultBorderStyle, ';', true);
+	fillSelect(0, 'border_style_right', 'style_border_style_right', defaultBorderStyle, ';', true);
+	fillSelect(0, 'border_style_bottom', 'style_border_style_bottom', defaultBorderStyle, ';', true);
+	fillSelect(0, 'border_style_left', 'style_border_style_left', defaultBorderStyle, ';', true);
+
+	fillSelect(0, 'border_width_top', 'style_border_width_top', defaultBorderWidth, ';', true);
+	fillSelect(0, 'border_width_right', 'style_border_width_right', defaultBorderWidth, ';', true);
+	fillSelect(0, 'border_width_bottom', 'style_border_width_bottom', defaultBorderWidth, ';', true);
+	fillSelect(0, 'border_width_left', 'style_border_width_left', defaultBorderWidth, ';', true);
+
+	fillSelect(0, 'border_width_top_measurement', 'style_border_width_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'border_width_right_measurement', 'style_border_width_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'border_width_bottom_measurement', 'style_border_width_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'border_width_left_measurement', 'style_border_width_left_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'list_type', 'style_list_type', defaultListType, ';', true);
+	fillSelect(0, 'list_position', 'style_list_position', "inside;outside", ';', true);
+
+	fillSelect(0, 'positioning_type', 'style_positioning_type', "absolute;relative;static", ';', true);
+	fillSelect(0, 'positioning_visibility', 'style_positioning_visibility', "inherit;visible;hidden", ';', true);
+
+	fillSelect(0, 'positioning_width_measurement', 'style_positioning_width_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_height_measurement', 'style_positioning_height_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_overflow', 'style_positioning_overflow', "visible;hidden;scroll;auto", ';', true);
+
+	fillSelect(0, 'positioning_placement_top_measurement', 'style_positioning_placement_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_placement_right_measurement', 'style_positioning_placement_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_placement_bottom_measurement', 'style_positioning_placement_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_placement_left_measurement', 'style_positioning_placement_left_measurement', defaultMeasurement, ';', true);
+
+	fillSelect(0, 'positioning_clip_top_measurement', 'style_positioning_clip_top_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_clip_right_measurement', 'style_positioning_clip_right_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_clip_bottom_measurement', 'style_positioning_clip_bottom_measurement', defaultMeasurement, ';', true);
+	fillSelect(0, 'positioning_clip_left_measurement', 'style_positioning_clip_left_measurement', defaultMeasurement, ';', true);
+
+	TinyMCE_EditableSelects.init();
+	setupFormData();
+	showDisabledControls();
+}
+
+function setupFormData() {
+	var ce = document.getElementById('container'), f = document.forms[0], s, b, i;
+
+	// Setup text fields
+
+	selectByValue(f, 'text_font', ce.style.fontFamily, true, true);
+	selectByValue(f, 'text_size', getNum(ce.style.fontSize), true, true);
+	selectByValue(f, 'text_size_measurement', getMeasurement(ce.style.fontSize));
+	selectByValue(f, 'text_weight', ce.style.fontWeight, true, true);
+	selectByValue(f, 'text_style', ce.style.fontStyle, true, true);
+	selectByValue(f, 'text_lineheight', getNum(ce.style.lineHeight), true, true);
+	selectByValue(f, 'text_lineheight_measurement', getMeasurement(ce.style.lineHeight));
+	selectByValue(f, 'text_case', ce.style.textTransform, true, true);
+	selectByValue(f, 'text_variant', ce.style.fontVariant, true, true);
+	f.text_color.value = tinyMCEPopup.editor.dom.toHex(ce.style.color);
+	updateColor('text_color_pick', 'text_color');
+	f.text_underline.checked = inStr(ce.style.textDecoration, 'underline');
+	f.text_overline.checked = inStr(ce.style.textDecoration, 'overline');
+	f.text_linethrough.checked = inStr(ce.style.textDecoration, 'line-through');
+	f.text_blink.checked = inStr(ce.style.textDecoration, 'blink');
+
+	// Setup background fields
+
+	f.background_color.value = tinyMCEPopup.editor.dom.toHex(ce.style.backgroundColor);
+	updateColor('background_color_pick', 'background_color');
+	f.background_image.value = ce.style.backgroundImage.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+	selectByValue(f, 'background_repeat', ce.style.backgroundRepeat, true, true);
+	selectByValue(f, 'background_attachment', ce.style.backgroundAttachment, true, true);
+	selectByValue(f, 'background_hpos', getNum(getVal(ce.style.backgroundPosition, 0)), true, true);
+	selectByValue(f, 'background_hpos_measurement', getMeasurement(getVal(ce.style.backgroundPosition, 0)));
+	selectByValue(f, 'background_vpos', getNum(getVal(ce.style.backgroundPosition, 1)), true, true);
+	selectByValue(f, 'background_vpos_measurement', getMeasurement(getVal(ce.style.backgroundPosition, 1)));
+
+	// Setup block fields
+
+	selectByValue(f, 'block_wordspacing', getNum(ce.style.wordSpacing), true, true);
+	selectByValue(f, 'block_wordspacing_measurement', getMeasurement(ce.style.wordSpacing));
+	selectByValue(f, 'block_letterspacing', getNum(ce.style.letterSpacing), true, true);
+	selectByValue(f, 'block_letterspacing_measurement', getMeasurement(ce.style.letterSpacing));
+	selectByValue(f, 'block_vertical_alignment', ce.style.verticalAlign, true, true);
+	selectByValue(f, 'block_text_align', ce.style.textAlign, true, true);
+	f.block_text_indent.value = getNum(ce.style.textIndent);
+	selectByValue(f, 'block_text_indent_measurement', getMeasurement(ce.style.textIndent));
+	selectByValue(f, 'block_whitespace', ce.style.whiteSpace, true, true);
+	selectByValue(f, 'block_display', ce.style.display, true, true);
+
+	// Setup box fields
+
+	f.box_width.value = getNum(ce.style.width);
+	selectByValue(f, 'box_width_measurement', getMeasurement(ce.style.width));
+
+	f.box_height.value = getNum(ce.style.height);
+	selectByValue(f, 'box_height_measurement', getMeasurement(ce.style.height));
+
+	if (tinymce.isGecko)
+		selectByValue(f, 'box_float', ce.style.cssFloat, true, true);
+	else
+		selectByValue(f, 'box_float', ce.style.styleFloat, true, true);
+
+	selectByValue(f, 'box_clear', ce.style.clear, true, true);
+
+	setupBox(f, ce, 'box_padding', 'padding', '');
+	setupBox(f, ce, 'box_margin', 'margin', '');
+
+	// Setup border fields
+
+	setupBox(f, ce, 'border_style', 'border', 'Style');
+	setupBox(f, ce, 'border_width', 'border', 'Width');
+	setupBox(f, ce, 'border_color', 'border', 'Color');
+
+	updateColor('border_color_top_pick', 'border_color_top');
+	updateColor('border_color_right_pick', 'border_color_right');
+	updateColor('border_color_bottom_pick', 'border_color_bottom');
+	updateColor('border_color_left_pick', 'border_color_left');
+
+	f.elements.border_color_top.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_top.value);
+	f.elements.border_color_right.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_right.value);
+	f.elements.border_color_bottom.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_bottom.value);
+	f.elements.border_color_left.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_left.value);
+
+	// Setup list fields
+
+	selectByValue(f, 'list_type', ce.style.listStyleType, true, true);
+	selectByValue(f, 'list_position', ce.style.listStylePosition, true, true);
+	f.list_bullet_image.value = ce.style.listStyleImage.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+
+	// Setup box fields
+
+	selectByValue(f, 'positioning_type', ce.style.position, true, true);
+	selectByValue(f, 'positioning_visibility', ce.style.visibility, true, true);
+	selectByValue(f, 'positioning_overflow', ce.style.overflow, true, true);
+	f.positioning_zindex.value = ce.style.zIndex ? ce.style.zIndex : "";
+
+	f.positioning_width.value = getNum(ce.style.width);
+	selectByValue(f, 'positioning_width_measurement', getMeasurement(ce.style.width));
+
+	f.positioning_height.value = getNum(ce.style.height);
+	selectByValue(f, 'positioning_height_measurement', getMeasurement(ce.style.height));
+
+	setupBox(f, ce, 'positioning_placement', '', '', ['top', 'right', 'bottom', 'left']);
+
+	s = ce.style.clip.replace(new RegExp("rect\\('?([^']*)'?\\)", 'gi'), "$1");
+	s = s.replace(/,/g, ' ');
+
+	if (!hasEqualValues([getVal(s, 0), getVal(s, 1), getVal(s, 2), getVal(s, 3)])) {
+		f.positioning_clip_top.value = getNum(getVal(s, 0));
+		selectByValue(f, 'positioning_clip_top_measurement', getMeasurement(getVal(s, 0)));
+		f.positioning_clip_right.value = getNum(getVal(s, 1));
+		selectByValue(f, 'positioning_clip_right_measurement', getMeasurement(getVal(s, 1)));
+		f.positioning_clip_bottom.value = getNum(getVal(s, 2));
+		selectByValue(f, 'positioning_clip_bottom_measurement', getMeasurement(getVal(s, 2)));
+		f.positioning_clip_left.value = getNum(getVal(s, 3));
+		selectByValue(f, 'positioning_clip_left_measurement', getMeasurement(getVal(s, 3)));
+	} else {
+		f.positioning_clip_top.value = getNum(getVal(s, 0));
+		selectByValue(f, 'positioning_clip_top_measurement', getMeasurement(getVal(s, 0)));
+		f.positioning_clip_right.value = f.positioning_clip_bottom.value = f.positioning_clip_left.value;
+	}
+
+//	setupBox(f, ce, '', 'border', 'Color');
+}
+
+function getMeasurement(s) {
+	return s.replace(/^([0-9]+)(.*)$/, "$2");
+}
+
+function getNum(s) {
+	if (new RegExp('^[0-9]+[a-z%]+$', 'gi').test(s))
+		return s.replace(/[^0-9]/g, '');
+
+	return s;
+}
+
+function inStr(s, n) {
+	return new RegExp(n, 'gi').test(s);
+}
+
+function getVal(s, i) {
+	var a = s.split(' ');
+
+	if (a.length > 1)
+		return a[i];
+
+	return "";
+}
+
+function setValue(f, n, v) {
+	if (f.elements[n].type == "text")
+		f.elements[n].value = v;
+	else
+		selectByValue(f, n, v, true, true);
+}
+
+function setupBox(f, ce, fp, pr, sf, b) {
+	if (typeof(b) == "undefined")
+		b = ['Top', 'Right', 'Bottom', 'Left'];
+
+	if (isSame(ce, pr, sf, b)) {
+		f.elements[fp + "_same"].checked = true;
+
+		setValue(f, fp + "_top", getNum(ce.style[pr + b[0] + sf]));
+		f.elements[fp + "_top"].disabled = false;
+
+		f.elements[fp + "_right"].value = "";
+		f.elements[fp + "_right"].disabled = true;
+		f.elements[fp + "_bottom"].value = "";
+		f.elements[fp + "_bottom"].disabled = true;
+		f.elements[fp + "_left"].value = "";
+		f.elements[fp + "_left"].disabled = true;
+
+		if (f.elements[fp + "_top_measurement"]) {
+			selectByValue(f, fp + '_top_measurement', getMeasurement(ce.style[pr + b[0] + sf]));
+			f.elements[fp + "_left_measurement"].disabled = true;
+			f.elements[fp + "_bottom_measurement"].disabled = true;
+			f.elements[fp + "_right_measurement"].disabled = true;
+		}
+	} else {
+		f.elements[fp + "_same"].checked = false;
+
+		setValue(f, fp + "_top", getNum(ce.style[pr + b[0] + sf]));
+		f.elements[fp + "_top"].disabled = false;
+
+		setValue(f, fp + "_right", getNum(ce.style[pr + b[1] + sf]));
+		f.elements[fp + "_right"].disabled = false;
+
+		setValue(f, fp + "_bottom", getNum(ce.style[pr + b[2] + sf]));
+		f.elements[fp + "_bottom"].disabled = false;
+
+		setValue(f, fp + "_left", getNum(ce.style[pr + b[3] + sf]));
+		f.elements[fp + "_left"].disabled = false;
+
+		if (f.elements[fp + "_top_measurement"]) {
+			selectByValue(f, fp + '_top_measurement', getMeasurement(ce.style[pr + b[0] + sf]));
+			selectByValue(f, fp + '_right_measurement', getMeasurement(ce.style[pr + b[1] + sf]));
+			selectByValue(f, fp + '_bottom_measurement', getMeasurement(ce.style[pr + b[2] + sf]));
+			selectByValue(f, fp + '_left_measurement', getMeasurement(ce.style[pr + b[3] + sf]));
+			f.elements[fp + "_left_measurement"].disabled = false;
+			f.elements[fp + "_bottom_measurement"].disabled = false;
+			f.elements[fp + "_right_measurement"].disabled = false;
+		}
+	}
+}
+
+function isSame(e, pr, sf, b) {
+	var a = [], i, x;
+
+	if (typeof(b) == "undefined")
+		b = ['Top', 'Right', 'Bottom', 'Left'];
+
+	if (typeof(sf) == "undefined" || sf == null)
+		sf = "";
+
+	a[0] = e.style[pr + b[0] + sf];
+	a[1] = e.style[pr + b[1] + sf];
+	a[2] = e.style[pr + b[2] + sf];
+	a[3] = e.style[pr + b[3] + sf];
+
+	for (i=0; i<a.length; i++) {
+		if (a[i] == null)
+			return false;
+
+		for (x=0; x<a.length; x++) {
+			if (a[x] != a[i])
+				return false;
+		}
+	}
+
+	return true;
+};
+
+function hasEqualValues(a) {
+	var i, x;
+
+	for (i=0; i<a.length; i++) {
+		if (a[i] == null)
+			return false;
+
+		for (x=0; x<a.length; x++) {
+			if (a[x] != a[i])
+				return false;
+		}
+	}
+
+	return true;
+}
+
+function applyAction() {
+	var ce = document.getElementById('container'), ed = tinyMCEPopup.editor;
+
+	generateCSS();
+
+	tinyMCEPopup.restoreSelection();
+	ed.dom.setAttrib(ed.selection.getNode(), 'style', tinyMCEPopup.editor.dom.serializeStyle(tinyMCEPopup.editor.dom.parseStyle(ce.style.cssText)));
+}
+
+function updateAction() {
+	applyAction();
+	tinyMCEPopup.close();
+}
+
+function generateCSS() {
+	var ce = document.getElementById('container'), f = document.forms[0], num = new RegExp('[0-9]+', 'g'), s, t;
+
+	ce.style.cssText = "";
+
+	// Build text styles
+	ce.style.fontFamily = f.text_font.value;
+	ce.style.fontSize = f.text_size.value + (isNum(f.text_size.value) ? (f.text_size_measurement.value || 'px') : "");
+	ce.style.fontStyle = f.text_style.value;
+	ce.style.lineHeight = f.text_lineheight.value + (isNum(f.text_lineheight.value) ? f.text_lineheight_measurement.value : "");
+	ce.style.textTransform = f.text_case.value;
+	ce.style.fontWeight = f.text_weight.value;
+	ce.style.fontVariant = f.text_variant.value;
+	ce.style.color = f.text_color.value;
+
+	s = "";
+	s += f.text_underline.checked ? " underline" : "";
+	s += f.text_overline.checked ? " overline" : "";
+	s += f.text_linethrough.checked ? " line-through" : "";
+	s += f.text_blink.checked ? " blink" : "";
+	s = s.length > 0 ? s.substring(1) : s;
+
+	if (f.text_none.checked)
+		s = "none";
+
+	ce.style.textDecoration = s;
+
+	// Build background styles
+
+	ce.style.backgroundColor = f.background_color.value;
+	ce.style.backgroundImage = f.background_image.value != "" ? "url(" + f.background_image.value + ")" : "";
+	ce.style.backgroundRepeat = f.background_repeat.value;
+	ce.style.backgroundAttachment = f.background_attachment.value;
+
+	if (f.background_hpos.value != "") {
+		s = "";
+		s += f.background_hpos.value + (isNum(f.background_hpos.value) ? f.background_hpos_measurement.value : "") + " ";
+		s += f.background_vpos.value + (isNum(f.background_vpos.value) ? f.background_vpos_measurement.value : "");
+		ce.style.backgroundPosition = s;
+	}
+
+	// Build block styles
+
+	ce.style.wordSpacing = f.block_wordspacing.value + (isNum(f.block_wordspacing.value) ? f.block_wordspacing_measurement.value : "");
+	ce.style.letterSpacing = f.block_letterspacing.value + (isNum(f.block_letterspacing.value) ? f.block_letterspacing_measurement.value : "");
+	ce.style.verticalAlign = f.block_vertical_alignment.value;
+	ce.style.textAlign = f.block_text_align.value;
+	ce.style.textIndent = f.block_text_indent.value + (isNum(f.block_text_indent.value) ? f.block_text_indent_measurement.value : "");
+	ce.style.whiteSpace = f.block_whitespace.value;
+	ce.style.display = f.block_display.value;
+
+	// Build box styles
+
+	ce.style.width = f.box_width.value + (isNum(f.box_width.value) ? f.box_width_measurement.value : "");
+	ce.style.height = f.box_height.value + (isNum(f.box_height.value) ? f.box_height_measurement.value : "");
+	ce.style.styleFloat = f.box_float.value;
+
+	if (tinymce.isGecko)
+		ce.style.cssFloat = f.box_float.value;
+
+	ce.style.clear = f.box_clear.value;
+
+	if (!f.box_padding_same.checked) {
+		ce.style.paddingTop = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");
+		ce.style.paddingRight = f.box_padding_right.value + (isNum(f.box_padding_right.value) ? f.box_padding_right_measurement.value : "");
+		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 : "");		
+
+	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 : "");
+		ce.style.marginRight = f.box_margin_right.value + (isNum(f.box_margin_right.value) ? f.box_margin_right_measurement.value : "");
+		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 : "");		
+
+	// Build border styles
+
+	if (!f.border_style_same.checked) {
+		ce.style.borderTopStyle = f.border_style_top.value;
+		ce.style.borderRightStyle = f.border_style_right.value;
+		ce.style.borderBottomStyle = f.border_style_bottom.value;
+		ce.style.borderLeftStyle = f.border_style_left.value;
+	} else
+		ce.style.borderStyle = f.border_style_top.value;
+
+	if (!f.border_width_same.checked) {
+		ce.style.borderTopWidth = f.border_width_top.value + (isNum(f.border_width_top.value) ? f.border_width_top_measurement.value : "");
+		ce.style.borderRightWidth = f.border_width_right.value + (isNum(f.border_width_right.value) ? f.border_width_right_measurement.value : "");
+		ce.style.borderBottomWidth = f.border_width_bottom.value + (isNum(f.border_width_bottom.value) ? f.border_width_bottom_measurement.value : "");
+		ce.style.borderLeftWidth = f.border_width_left.value + (isNum(f.border_width_left.value) ? f.border_width_left_measurement.value : "");
+	} else
+		ce.style.borderWidth = f.border_width_top.value;
+
+	if (!f.border_color_same.checked) {
+		ce.style.borderTopColor = f.border_color_top.value;
+		ce.style.borderRightColor = f.border_color_right.value;
+		ce.style.borderBottomColor = f.border_color_bottom.value;
+		ce.style.borderLeftColor = f.border_color_left.value;
+	} else
+		ce.style.borderColor = f.border_color_top.value;
+
+	// Build list styles
+
+	ce.style.listStyleType = f.list_type.value;
+	ce.style.listStylePosition = f.list_position.value;
+	ce.style.listStyleImage = f.list_bullet_image.value != "" ? "url(" + f.list_bullet_image.value + ")" : "";
+
+	// Build positioning styles
+
+	ce.style.position = f.positioning_type.value;
+	ce.style.visibility = f.positioning_visibility.value;
+
+	if (ce.style.width == "")
+		ce.style.width = f.positioning_width.value + (isNum(f.positioning_width.value) ? f.positioning_width_measurement.value : "");
+
+	if (ce.style.height == "")
+		ce.style.height = f.positioning_height.value + (isNum(f.positioning_height.value) ? f.positioning_height_measurement.value : "");
+
+	ce.style.zIndex = f.positioning_zindex.value;
+	ce.style.overflow = f.positioning_overflow.value;
+
+	if (!f.positioning_placement_same.checked) {
+		ce.style.top = f.positioning_placement_top.value + (isNum(f.positioning_placement_top.value) ? f.positioning_placement_top_measurement.value : "");
+		ce.style.right = f.positioning_placement_right.value + (isNum(f.positioning_placement_right.value) ? f.positioning_placement_right_measurement.value : "");
+		ce.style.bottom = f.positioning_placement_bottom.value + (isNum(f.positioning_placement_bottom.value) ? f.positioning_placement_bottom_measurement.value : "");
+		ce.style.left = f.positioning_placement_left.value + (isNum(f.positioning_placement_left.value) ? f.positioning_placement_left_measurement.value : "");
+	} else {
+		s = f.positioning_placement_top.value + (isNum(f.positioning_placement_top.value) ? f.positioning_placement_top_measurement.value : "");
+		ce.style.top = s;
+		ce.style.right = s;
+		ce.style.bottom = s;
+		ce.style.left = s;
+	}
+
+	if (!f.positioning_clip_same.checked) {
+		s = "rect(";
+		s += (isNum(f.positioning_clip_top.value) ? f.positioning_clip_top.value + f.positioning_clip_top_measurement.value : "auto") + " ";
+		s += (isNum(f.positioning_clip_right.value) ? f.positioning_clip_right.value + f.positioning_clip_right_measurement.value : "auto") + " ";
+		s += (isNum(f.positioning_clip_bottom.value) ? f.positioning_clip_bottom.value + f.positioning_clip_bottom_measurement.value : "auto") + " ";
+		s += (isNum(f.positioning_clip_left.value) ? f.positioning_clip_left.value + f.positioning_clip_left_measurement.value : "auto");
+		s += ")";
+
+		if (s != "rect(auto auto auto auto)")
+			ce.style.clip = s;
+	} else {
+		s = "rect(";
+		t = isNum(f.positioning_clip_top.value) ? f.positioning_clip_top.value + f.positioning_clip_top_measurement.value : "auto";
+		s += t + " ";
+		s += t + " ";
+		s += t + " ";
+		s += t + ")";
+
+		if (s != "rect(auto auto auto auto)")
+			ce.style.clip = s;
+	}
+
+	ce.style.cssText = ce.style.cssText;
+}
+
+function isNum(s) {
+	return new RegExp('[0-9]+', 'g').test(s);
+}
+
+function showDisabledControls() {
+	var f = document.forms, i, a;
+
+	for (i=0; i<f.length; i++) {
+		for (a=0; a<f[i].elements.length; a++) {
+			if (f[i].elements[a].disabled)
+				tinyMCEPopup.editor.dom.addClass(f[i].elements[a], "disabled");
+			else
+				tinyMCEPopup.editor.dom.removeClass(f[i].elements[a], "disabled");
+		}
+	}
+}
+
+function fillSelect(f, s, param, dval, sep, em) {
+	var i, ar, p, se;
+
+	f = document.forms[f];
+	sep = typeof(sep) == "undefined" ? ";" : sep;
+
+	if (em)
+		addSelectValue(f, s, "", "");
+
+	ar = tinyMCEPopup.getParam(param, dval).split(sep);
+	for (i=0; i<ar.length; i++) {
+		se = false;
+
+		if (ar[i].charAt(0) == '+') {
+			ar[i] = ar[i].substring(1);
+			se = true;
+		}
+
+		p = ar[i].split('=');
+
+		if (p.length > 1) {
+			addSelectValue(f, s, p[0], p[1]);
+
+			if (se)
+				selectByValue(f, s, p[1]);
+		} else {
+			addSelectValue(f, s, p[0], p[0]);
+
+			if (se)
+				selectByValue(f, s, p[0]);
+		}
+	}
+}
+
+function toggleSame(ce, pre) {
+	var el = document.forms[0].elements, i;
+
+	if (ce.checked) {
+		el[pre + "_top"].disabled = false;
+		el[pre + "_right"].disabled = true;
+		el[pre + "_bottom"].disabled = true;
+		el[pre + "_left"].disabled = true;
+
+		if (el[pre + "_top_measurement"]) {
+			el[pre + "_top_measurement"].disabled = false;
+			el[pre + "_right_measurement"].disabled = true;
+			el[pre + "_bottom_measurement"].disabled = true;
+			el[pre + "_left_measurement"].disabled = true;
+		}
+	} else {
+		el[pre + "_top"].disabled = false;
+		el[pre + "_right"].disabled = false;
+		el[pre + "_bottom"].disabled = false;
+		el[pre + "_left"].disabled = false;
+
+		if (el[pre + "_top_measurement"]) {
+			el[pre + "_top_measurement"].disabled = false;
+			el[pre + "_right_measurement"].disabled = false;
+			el[pre + "_bottom_measurement"].disabled = false;
+			el[pre + "_left_measurement"].disabled = false;
+		}
+	}
+
+	showDisabledControls();
+}
+
+function synch(fr, to) {
+	var f = document.forms[0];
+
+	f.elements[to].value = f.elements[fr].value;
+
+	if (f.elements[fr + "_measurement"])
+		selectByValue(f, to + "_measurement", f.elements[fr + "_measurement"].value);
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/webapp/web/js/tiny_mce/plugins/style/langs/en_dlg.js b/webapp/web/js/tiny_mce/plugins/style/langs/en_dlg.js
index 5026313e2..d9d77627b 100755
--- a/webapp/web/js/tiny_mce/plugins/style/langs/en_dlg.js
+++ b/webapp/web/js/tiny_mce/plugins/style/langs/en_dlg.js
@@ -1,63 +1,63 @@
-tinyMCE.addI18n('en.style_dlg',{
-title:"Edit CSS Style",
-apply:"Apply",
-text_tab:"Text",
-background_tab:"Background",
-block_tab:"Block",
-box_tab:"Box",
-border_tab:"Border",
-list_tab:"List",
-positioning_tab:"Positioning",
-text_props:"Text",
-text_font:"Font",
-text_size:"Size",
-text_weight:"Weight",
-text_style:"Style",
-text_variant:"Variant",
-text_lineheight:"Line height",
-text_case:"Case",
-text_color:"Color",
-text_decoration:"Decoration",
-text_overline:"overline",
-text_underline:"underline",
-text_striketrough:"strikethrough",
-text_blink:"blink",
-text_none:"none",
-background_color:"Background color",
-background_image:"Background image",
-background_repeat:"Repeat",
-background_attachment:"Attachment",
-background_hpos:"Horizontal position",
-background_vpos:"Vertical position",
-block_wordspacing:"Word spacing",
-block_letterspacing:"Letter spacing",
-block_vertical_alignment:"Vertical alignment",
-block_text_align:"Text align",
-block_text_indent:"Text indent",
-block_whitespace:"Whitespace",
-block_display:"Display",
-box_width:"Width",
-box_height:"Height",
-box_float:"Float",
-box_clear:"Clear",
-padding:"Padding",
-same:"Same for all",
-top:"Top",
-right:"Right",
-bottom:"Bottom",
-left:"Left",
-margin:"Margin",
-style:"Style",
-width:"Width",
-height:"Height",
-color:"Color",
-list_type:"Type",
-bullet_image:"Bullet image",
-position:"Position",
-positioning_type:"Type",
-visibility:"Visibility",
-zindex:"Z-index",
-overflow:"Overflow",
-placement:"Placement",
-clip:"Clip"
+tinyMCE.addI18n('en.style_dlg',{
+title:"Edit CSS Style",
+apply:"Apply",
+text_tab:"Text",
+background_tab:"Background",
+block_tab:"Block",
+box_tab:"Box",
+border_tab:"Border",
+list_tab:"List",
+positioning_tab:"Positioning",
+text_props:"Text",
+text_font:"Font",
+text_size:"Size",
+text_weight:"Weight",
+text_style:"Style",
+text_variant:"Variant",
+text_lineheight:"Line height",
+text_case:"Case",
+text_color:"Color",
+text_decoration:"Decoration",
+text_overline:"overline",
+text_underline:"underline",
+text_striketrough:"strikethrough",
+text_blink:"blink",
+text_none:"none",
+background_color:"Background color",
+background_image:"Background image",
+background_repeat:"Repeat",
+background_attachment:"Attachment",
+background_hpos:"Horizontal position",
+background_vpos:"Vertical position",
+block_wordspacing:"Word spacing",
+block_letterspacing:"Letter spacing",
+block_vertical_alignment:"Vertical alignment",
+block_text_align:"Text align",
+block_text_indent:"Text indent",
+block_whitespace:"Whitespace",
+block_display:"Display",
+box_width:"Width",
+box_height:"Height",
+box_float:"Float",
+box_clear:"Clear",
+padding:"Padding",
+same:"Same for all",
+top:"Top",
+right:"Right",
+bottom:"Bottom",
+left:"Left",
+margin:"Margin",
+style:"Style",
+width:"Width",
+height:"Height",
+color:"Color",
+list_type:"Type",
+bullet_image:"Bullet image",
+position:"Position",
+positioning_type:"Type",
+visibility:"Visibility",
+zindex:"Z-index",
+overflow:"Overflow",
+placement:"Placement",
+clip:"Clip"
 });
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/table/cell.htm b/webapp/web/js/tiny_mce/plugins/table/cell.htm
index 60264db8e..c93173167 100755
--- a/webapp/web/js/tiny_mce/plugins/table/cell.htm
+++ b/webapp/web/js/tiny_mce/plugins/table/cell.htm
@@ -1,184 +1,184 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#table_dlg.cell_title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="../../utils/form_utils.js"></script>
-	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
-	<script type="text/javascript" src="js/cell.js"></script>
-	<link href="css/cell.css" rel="stylesheet" type="text/css" />
-	<base target="_self" />
-</head>
-<body id="tablecell" style="display: none">
-	<form onsubmit="updateAction();return false;" action="#">
-		<div class="tabs">
-			<ul>
-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>
-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>
-			</ul>
-		</div>
-
-		<div class="panel_wrapper">
-			<div id="general_panel" class="panel current">
-				<fieldset>
-					<legend>{#table_dlg.general_props}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td><label for="align">{#table_dlg.align}</label></td>
-							<td>
-								<select id="align" name="align" class="mceFocus">
-									<option value="">{#not_set}</option>
-									<option value="center">{#table_dlg.align_middle}</option>
-									<option value="left">{#table_dlg.align_left}</option>
-									<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">
-									<option value="td">{#table_dlg.td}</option>
-									<option value="th">{#table_dlg.th}</option>
-								</select>
-							</td>
-						</tr>
-
-						<tr>
-							<td><label for="valign">{#table_dlg.valign}</label></td>
-							<td>
-								<select id="valign" name="valign">
-									<option value="">{#not_set}</option>
-									<option value="top">{#table_dlg.align_top}</option>
-									<option value="middle">{#table_dlg.align_middle}</option>
-									<option value="bottom">{#table_dlg.align_bottom}</option>
-								</select>
-							</td>
-
-							<td><label for="scope">{#table_dlg.scope}</label></td>
-							<td>
-								<select id="scope" name="scope">
-									<option value="">{#not_set}</option>
-									<option value="col">{#table.col}</option>
-									<option value="row">{#table.row}</option>
-									<option value="rowgroup">{#table_dlg.rowgroup}</option>
-									<option value="colgroup">{#table_dlg.colgroup}</option>
-								</select>
-							</td>
-
-						</tr>
-
-						<tr>
-							<td><label for="width">{#table_dlg.width}</label></td>
-							<td><input id="width" name="width" type="text" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
-
-							<td><label for="height">{#table_dlg.height}</label></td>
-							<td><input id="height" name="height" type="text" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
-						</tr>
-
-						<tr id="styleSelectRow">
-							<td><label for="class">{#class_name}</label></td>
-							<td colspan="3">
-								<select id="class" name="class" class="mceEditableSelect">
-									<option value="" selected="selected">{#not_set}</option>
-								</select>
-							</td>
-						</tr>
-					</table>
-				</fieldset>
-			</div>
-
-			<div id="advanced_panel" class="panel">
-				<fieldset>
-					<legend>{#table_dlg.advanced_props}</legend>
-
-					<table 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> 
-						</tr>
-
-						<tr>
-							<td><label for="style">{#table_dlg.style}</label></td>
-							<td><input type="text" id="style" name="style" value="" style="width: 200px;" onchange="changedStyle();" /></td>
-						</tr>
-
-						<tr>
-							<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>
-							</td> 
-						</tr>
-
-						<tr>
-							<td class="column1"><label for="lang">{#table_dlg.langcode}</label></td> 
-							<td>
-								<input id="lang" name="lang" type="text" value="" style="width: 200px" />
-							</td> 
-						</tr>
-
-						<tr>
-							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 
-							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" style="width: 200px" onchange="changedBackgroundImage();" /></td>
-										<td id="backgroundimagebrowsercontainer">&nbsp;</td>
-									</tr>
-								</table>
-							</td> 
-						</tr>
-
-						<tr>
-							<td class="column1"><label for="bordercolor">{#table_dlg.bordercolor}</label></td> 
-							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');changedColor();" /></td>
-										<td id="bordercolor_pickcontainer">&nbsp;</td>
-									</tr>
-								</table>
-							</td> 
-						</tr>
-
-						<tr>
-							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 
-							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>
-										<td id="bgcolor_pickcontainer">&nbsp;</td>
-									</tr>
-								</table>
-							</td> 
-						</tr>
-					</table>
-				</fieldset>
-			</div>
-		</div>
-
-		<div class="mceActionPanel">
-			<div>
-				<select id="action" name="action">
-					<option value="cell">{#table_dlg.cell_cell}</option>
-					<option value="row">{#table_dlg.cell_row}</option>
-					<option value="all">{#table_dlg.cell_all}</option>
-				</select>
-			</div>
-
-			<div style="float: left">
-				<div><input type="submit" id="insert" name="insert" value="{#update}" /></div>
-			</div>
-
-			<div style="float: right">
-				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-			</div>
-		</div>
-	</form>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#table_dlg.cell_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="js/cell.js"></script>
+	<link href="css/cell.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body id="tablecell" style="display: none">
+	<form onsubmit="updateAction();return false;" action="#">
+		<div class="tabs">
+			<ul>
+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>
+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<fieldset>
+					<legend>{#table_dlg.general_props}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td><label for="align">{#table_dlg.align}</label></td>
+							<td>
+								<select id="align" name="align" class="mceFocus">
+									<option value="">{#not_set}</option>
+									<option value="center">{#table_dlg.align_middle}</option>
+									<option value="left">{#table_dlg.align_left}</option>
+									<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">
+									<option value="td">{#table_dlg.td}</option>
+									<option value="th">{#table_dlg.th}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="valign">{#table_dlg.valign}</label></td>
+							<td>
+								<select id="valign" name="valign">
+									<option value="">{#not_set}</option>
+									<option value="top">{#table_dlg.align_top}</option>
+									<option value="middle">{#table_dlg.align_middle}</option>
+									<option value="bottom">{#table_dlg.align_bottom}</option>
+								</select>
+							</td>
+
+							<td><label for="scope">{#table_dlg.scope}</label></td>
+							<td>
+								<select id="scope" name="scope">
+									<option value="">{#not_set}</option>
+									<option value="col">{#table.col}</option>
+									<option value="row">{#table.row}</option>
+									<option value="rowgroup">{#table_dlg.rowgroup}</option>
+									<option value="colgroup">{#table_dlg.colgroup}</option>
+								</select>
+							</td>
+
+						</tr>
+
+						<tr>
+							<td><label for="width">{#table_dlg.width}</label></td>
+							<td><input id="width" name="width" type="text" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
+
+							<td><label for="height">{#table_dlg.height}</label></td>
+							<td><input id="height" name="height" type="text" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
+						</tr>
+
+						<tr id="styleSelectRow">
+							<td><label for="class">{#class_name}</label></td>
+							<td colspan="3">
+								<select id="class" name="class" class="mceEditableSelect">
+									<option value="" selected="selected">{#not_set}</option>
+								</select>
+							</td>
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="advanced_panel" class="panel">
+				<fieldset>
+					<legend>{#table_dlg.advanced_props}</legend>
+
+					<table 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> 
+						</tr>
+
+						<tr>
+							<td><label for="style">{#table_dlg.style}</label></td>
+							<td><input type="text" id="style" name="style" value="" style="width: 200px;" onchange="changedStyle();" /></td>
+						</tr>
+
+						<tr>
+							<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>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="lang">{#table_dlg.langcode}</label></td> 
+							<td>
+								<input id="lang" name="lang" type="text" value="" style="width: 200px" />
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" style="width: 200px" onchange="changedBackgroundImage();" /></td>
+										<td id="backgroundimagebrowsercontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="bordercolor">{#table_dlg.bordercolor}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');changedColor();" /></td>
+										<td id="bordercolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>
+										<td id="bgcolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div>
+				<select id="action" name="action">
+					<option value="cell">{#table_dlg.cell_cell}</option>
+					<option value="row">{#table_dlg.cell_row}</option>
+					<option value="all">{#table_dlg.cell_all}</option>
+				</select>
+			</div>
+
+			<div style="float: left">
+				<div><input type="submit" id="insert" name="insert" value="{#update}" /></div>
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+	</form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/table/css/cell.css b/webapp/web/js/tiny_mce/plugins/table/css/cell.css
index a067ecdfe..a47cc1a1e 100755
--- a/webapp/web/js/tiny_mce/plugins/table/css/cell.css
+++ b/webapp/web/js/tiny_mce/plugins/table/css/cell.css
@@ -1,17 +1,17 @@
-/* CSS file for cell dialog in the table plugin */
-
-.panel_wrapper div.current {
-	height: 200px;
-}
-
-.advfield {
-	width: 200px;
-}
-
-#action {
-	margin-bottom: 3px;
-}
-
-#class {
-	width: 150px;
+/* CSS file for cell dialog in the table plugin */
+
+.panel_wrapper div.current {
+	height: 200px;
+}
+
+.advfield {
+	width: 200px;
+}
+
+#action {
+	margin-bottom: 3px;
+}
+
+#class {
+	width: 150px;
 }
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/table/css/row.css b/webapp/web/js/tiny_mce/plugins/table/css/row.css
index 1f7755daf..0e397db3e 100755
--- a/webapp/web/js/tiny_mce/plugins/table/css/row.css
+++ b/webapp/web/js/tiny_mce/plugins/table/css/row.css
@@ -1,25 +1,25 @@
-/* CSS file for row dialog in the table plugin */
-
-.panel_wrapper div.current {
-	height: 200px;
-}
-
-.advfield {
-	width: 200px;
-}
-
-#action {
-	margin-bottom: 3px;
-}
-
-#rowtype,#align,#valign,#class,#height {
-	width: 150px;
-}
-
-#height {
-	width: 50px;	
-}
-
-.col2 {
-	padding-left: 20px;
-}
+/* CSS file for row dialog in the table plugin */
+
+.panel_wrapper div.current {
+	height: 200px;
+}
+
+.advfield {
+	width: 200px;
+}
+
+#action {
+	margin-bottom: 3px;
+}
+
+#rowtype,#align,#valign,#class,#height {
+	width: 150px;
+}
+
+#height {
+	width: 50px;	
+}
+
+.col2 {
+	padding-left: 20px;
+}
diff --git a/webapp/web/js/tiny_mce/plugins/table/css/table.css b/webapp/web/js/tiny_mce/plugins/table/css/table.css
index d11c3f69c..8f107831e 100755
--- a/webapp/web/js/tiny_mce/plugins/table/css/table.css
+++ b/webapp/web/js/tiny_mce/plugins/table/css/table.css
@@ -1,13 +1,13 @@
-/* CSS file for table dialog in the table plugin */
-
-.panel_wrapper div.current {
-	height: 245px;
-}
-
-.advfield {
-	width: 200px;
-}
-
-#class {
-	width: 150px;
-}
+/* CSS file for table dialog in the table plugin */
+
+.panel_wrapper div.current {
+	height: 245px;
+}
+
+.advfield {
+	width: 200px;
+}
+
+#class {
+	width: 150px;
+}
diff --git a/webapp/web/js/tiny_mce/plugins/table/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/table/editor_plugin_src.js
index 24635826f..9e4144ac9 100755
--- a/webapp/web/js/tiny_mce/plugins/table/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/table/editor_plugin_src.js
@@ -1,1115 +1,1115 @@
-/**
- * $Id: editor_plugin_src.js 853 2008-05-27 08:05:35Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	var each = tinymce.each;
-
-	tinymce.create('tinymce.plugins.TablePlugin', {
-		init : function(ed, url) {
-			var t = this;
-
-			t.editor = ed;
-			t.url = url;
-
-			// Register buttons
-			each([
-				['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(c) {
-				ed.addButton(c[0], {title : c[1], cmd : c[2], ui : c[3]});
-			});
-
-			ed.onInit.add(function() {
-				if (ed && ed.plugins.contextmenu) {
-					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {
-						var sm, se = ed.selection, el = se.getNode() || ed.getBody();
-
-						if (ed.dom.getParent(e, 'td') || ed.dom.getParent(e, 'th')) {
-							m.removeAll();
-
-							if (el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) {
-								m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});
-								m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});
-								m.addSeparator();
-							}
-
-							if (el.nodeName == 'IMG' && el.className.indexOf('mceItem') == -1) {
-								m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});
-								m.addSeparator();
-							}
-
-							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', ui : true, value : {action : 'insert'}});
-							m.add({title : 'table.props_desc', icon : 'table_props', cmd : 'mceInsertTable', ui : true});
-							m.add({title : 'table.del', icon : 'delete_table', cmd : 'mceTableDelete', ui : true});
-							m.addSeparator();
-
-							// Cell menu
-							sm = m.addMenu({title : 'table.cell'});
-							sm.add({title : 'table.cell_desc', icon : 'cell_props', cmd : 'mceTableCellProps', ui : true});
-							sm.add({title : 'table.split_cells_desc', icon : 'split_cells', cmd : 'mceTableSplitCells', ui : true});
-							sm.add({title : 'table.merge_cells_desc', icon : 'merge_cells', cmd : 'mceTableMergeCells', ui : true});
-
-							// Row menu
-							sm = m.addMenu({title : 'table.row'});
-							sm.add({title : 'table.row_desc', icon : 'row_props', cmd : 'mceTableRowProps', ui : true});
-							sm.add({title : 'table.row_before_desc', icon : 'row_before', cmd : 'mceTableInsertRowBefore'});
-							sm.add({title : 'table.row_after_desc', icon : 'row_after', cmd : 'mceTableInsertRowAfter'});
-							sm.add({title : 'table.delete_row_desc', icon : 'delete_row', cmd : 'mceTableDeleteRow'});
-							sm.addSeparator();
-							sm.add({title : 'table.cut_row_desc', icon : 'cut', cmd : 'mceTableCutRow'});
-							sm.add({title : 'table.copy_row_desc', icon : 'copy', cmd : 'mceTableCopyRow'});
-							sm.add({title : 'table.paste_row_before_desc', icon : 'paste', cmd : 'mceTablePasteRowBefore'});
-							sm.add({title : 'table.paste_row_after_desc', icon : 'paste', cmd : 'mceTablePasteRowAfter'});
-
-							// Column menu
-							sm = m.addMenu({title : 'table.col'});
-							sm.add({title : 'table.col_before_desc', icon : 'col_before', cmd : 'mceTableInsertColBefore'});
-							sm.add({title : 'table.col_after_desc', icon : 'col_after', cmd : 'mceTableInsertColAfter'});
-							sm.add({title : 'table.delete_col_desc', icon : 'delete_col', cmd : 'mceTableDeleteCol'});
-						} else
-							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', ui : true});
-					});
-				}
-			});
-
-			// Add undo level when new rows are created using the tab key
-			ed.onKeyDown.add(function(ed, e) {
-				if (e.keyCode == 9 && ed.dom.getParent(ed.selection.getNode(), 'TABLE')) {
-					if (!tinymce.isGecko && !tinymce.isOpera) {
-						tinyMCE.execInstanceCommand(ed.editorId, "mceTableMoveToNextRow", true);
-						return tinymce.dom.Event.cancel(e);
-					}
-
-					ed.undoManager.add();
-				}
-			});
-
-			// Select whole table is a table border is clicked
-			if (!tinymce.isIE) {
-				if (ed.getParam('table_selection', true)) {
-					ed.onClick.add(function(ed, e) {
-						e = e.target;
-
-						if (e.nodeName === 'TABLE')
-							ed.selection.select(e);
-					});
-				}
-			}
-
-			ed.onNodeChange.add(function(ed, cm, n) {
-				var p = ed.dom.getParent(n, 'td,th,caption');
-
-				cm.setActive('table', n.nodeName === 'TABLE' || !!p);
-				if (p && p.nodeName === 'CAPTION')
-					p = null;
-
-				cm.setDisabled('delete_table', !p);
-				cm.setDisabled('delete_col', !p);
-				cm.setDisabled('delete_table', !p);
-				cm.setDisabled('delete_row', !p);
-				cm.setDisabled('col_after', !p);
-				cm.setDisabled('col_before', !p);
-				cm.setDisabled('row_after', !p);
-				cm.setDisabled('row_before', !p);
-				cm.setDisabled('row_props', !p);
-				cm.setDisabled('cell_props', !p);
-				cm.setDisabled('split_cells', !p || (parseInt(ed.dom.getAttrib(p, 'colspan', '1')) < 2 && parseInt(ed.dom.getAttrib(p, 'rowspan', '1')) < 2));
-				cm.setDisabled('merge_cells', !p);
-			});
-
-			// Padd empty table cells
-			if (!tinymce.isIE) {
-				ed.onBeforeSetContent.add(function(ed, o) {
-					if (o.initial)
-						o.content = o.content.replace(/<(td|th)([^>]+|)>\s*<\/(td|th)>/g, tinymce.isOpera ? '<$1$2>&nbsp;</$1>' : '<$1$2><br mce_bogus="1" /></$1>');
-				});
-			}
-		},
-
-		execCommand : function(cmd, ui, val) {
-			var ed = this.editor, b;
-
-			// Is table command
-			switch (cmd) {
-				case "mceTableMoveToNextRow":
-				case "mceInsertTable":
-				case "mceTableRowProps":
-				case "mceTableCellProps":
-				case "mceTableSplitCells":
-				case "mceTableMergeCells":
-				case "mceTableInsertRowBefore":
-				case "mceTableInsertRowAfter":
-				case "mceTableDeleteRow":
-				case "mceTableInsertColBefore":
-				case "mceTableInsertColAfter":
-				case "mceTableDeleteCol":
-				case "mceTableCutRow":
-				case "mceTableCopyRow":
-				case "mceTablePasteRowBefore":
-				case "mceTablePasteRowAfter":
-				case "mceTableDelete":
-					ed.execCommand('mceBeginUndoLevel');
-					this._doExecCommand(cmd, ui, val);
-					ed.execCommand('mceEndUndoLevel');
-
-					return true;
-			}
-
-			// Pass to next handler in chain
-			return false;
-		},
-
-		getInfo : function() {
-			return {
-				longname : 'Tables',
-				author : 'Moxiecode Systems AB',
-				authorurl : 'http://tinymce.moxiecode.com',
-				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table',
-				version : tinymce.majorVersion + "." + tinymce.minorVersion
-			};
-		},
-
-		// Private plugin internal methods
-
-		/**
-		 * Executes the table commands.
-		 */
-		_doExecCommand : function(command, user_interface, value) {
-			var inst = this.editor, ed = inst, url = this.url;
-			var focusElm = inst.selection.getNode();
-			var trElm = inst.dom.getParent(focusElm, "tr");
-			var tdElm = inst.dom.getParent(focusElm, "td,th");
-			var tableElm = inst.dom.getParent(focusElm, "table");
-			var doc = inst.contentWindow.document;
-			var tableBorder = tableElm ? tableElm.getAttribute("border") : "";
-
-			// Get first TD if no TD found
-			if (trElm && tdElm == null)
-				tdElm = trElm.cells[0];
-
-			function inArray(ar, v) {
-				for (var i=0; i<ar.length; i++) {
-					// Is array
-					if (ar[i].length > 0 && inArray(ar[i], v))
-						return true;
-
-					// Found value
-					if (ar[i] == v)
-						return true;
-				}
-
-				return false;
-			}
-
-			function select(dx, dy) {
-				var td;
-
-				grid = getTableGrid(tableElm);
-				dx = dx || 0;
-				dy = dy || 0;
-				dx = Math.max(cpos.cellindex + dx, 0);
-				dy = Math.max(cpos.rowindex + dy, 0);
-
-				// Recalculate grid and select
-				inst.execCommand('mceRepaint');
-				td = getCell(grid, dy, dx);
-
-				if (td) {
-					inst.selection.select(td.firstChild || td);
-					inst.selection.collapse(1);
-				}
-			};
-
-			function makeTD() {
-				var newTD = doc.createElement("td");
-
-				if (!tinymce.isIE)
-					newTD.innerHTML = '<br mce_bogus="1"/>';
-			}
-
-			function getColRowSpan(td) {
-				var colspan = inst.dom.getAttrib(td, "colspan");
-				var rowspan = inst.dom.getAttrib(td, "rowspan");
-
-				colspan = colspan == "" ? 1 : parseInt(colspan);
-				rowspan = rowspan == "" ? 1 : parseInt(rowspan);
-
-				return {colspan : colspan, rowspan : rowspan};
-			}
-
-			function getCellPos(grid, td) {
-				var x, y;
-
-				for (y=0; y<grid.length; y++) {
-					for (x=0; x<grid[y].length; x++) {
-						if (grid[y][x] == td)
-							return {cellindex : x, rowindex : y};
-					}
-				}
-
-				return null;
-			}
-
-			function getCell(grid, row, col) {
-				if (grid[row] && grid[row][col])
-					return grid[row][col];
-
-				return null;
-			}
-
-			function getNextCell(table, cell) {
-				var cells = [], x = 0, i, j, cell, nextCell;
-
-				for (i = 0; i < table.rows.length; i++)
-					for (j = 0; j < table.rows[i].cells.length; j++, x++)
-						cells[x] = table.rows[i].cells[j];
-
-				for (i = 0; i < cells.length; i++)
-					if (cells[i] == cell)
-						if (nextCell = cells[i+1])
-							return nextCell;
-			}
-
-			function getTableGrid(table) {
-				var grid = [], rows = table.rows, x, y, td, sd, xstart, x2, y2;
-
-				for (y=0; y<rows.length; y++) {
-					for (x=0; x<rows[y].cells.length; x++) {
-						td = rows[y].cells[x];
-						sd = getColRowSpan(td);
-
-						// All ready filled
-						for (xstart = x; grid[y] && grid[y][xstart]; xstart++) ;
-
-						// Fill box
-						for (y2=y; y2<y+sd['rowspan']; y2++) {
-							if (!grid[y2])
-								grid[y2] = [];
-
-							for (x2=xstart; x2<xstart+sd['colspan']; x2++)
-								grid[y2][x2] = td;
-						}
-					}
-				}
-
-				return grid;
-			}
-
-			function trimRow(table, tr, td, new_tr) {
-				var grid = getTableGrid(table), cpos = getCellPos(grid, td);
-				var cells, lastElm;
-
-				// Time to crop away some
-				if (new_tr.cells.length != tr.childNodes.length) {
-					cells = tr.childNodes;
-					lastElm = null;
-
-					for (var x=0; td = getCell(grid, cpos.rowindex, x); x++) {
-						var remove = true;
-						var sd = getColRowSpan(td);
-
-						// Remove due to rowspan
-						if (inArray(cells, td)) {
-							new_tr.childNodes[x]._delete = true;
-						} else if ((lastElm == null || td != lastElm) && sd.colspan > 1) { // Remove due to colspan
-							for (var i=x; i<x+td.colSpan; i++)
-								new_tr.childNodes[i]._delete = true;
-						}
-
-						if ((lastElm == null || td != lastElm) && sd.rowspan > 1)
-							td.rowSpan = sd.rowspan + 1;
-
-						lastElm = td;
-					}
-
-					deleteMarked(tableElm);
-				}
-			}
-
-			function prevElm(node, name) {
-				while ((node = node.previousSibling) != null) {
-					if (node.nodeName == name)
-						return node;
-				}
-
-				return null;
-			}
-
-			function nextElm(node, names) {
-				var namesAr = names.split(',');
-
-				while ((node = node.nextSibling) != null) {
-					for (var i=0; i<namesAr.length; i++) {
-						if (node.nodeName.toLowerCase() == namesAr[i].toLowerCase() )
-							return node;
-					}
-				}
-
-				return null;
-			}
-
-			function deleteMarked(tbl) {
-				if (tbl.rows == 0)
-					return;
-
-				var tr = tbl.rows[0];
-				do {
-					var next = nextElm(tr, "TR");
-
-					// Delete row
-					if (tr._delete) {
-						tr.parentNode.removeChild(tr);
-						continue;
-					}
-
-					// Delete cells
-					var td = tr.cells[0];
-					if (td.cells > 1) {
-						do {
-							var nexttd = nextElm(td, "TD,TH");
-
-							if (td._delete)
-								td.parentNode.removeChild(td);
-						} while ((td = nexttd) != null);
-					}
-				} while ((tr = next) != null);
-			}
-
-			function addRows(td_elm, tr_elm, rowspan) {
-				// Add rows
-				td_elm.rowSpan = 1;
-				var trNext = nextElm(tr_elm, "TR");
-				for (var i=1; i<rowspan && trNext; i++) {
-					var newTD = doc.createElement("td");
-
-					if (!tinymce.isIE)
-						newTD.innerHTML = '<br mce_bogus="1"/>';
-
-					if (tinymce.isIE)
-						trNext.insertBefore(newTD, trNext.cells(td_elm.cellIndex));
-					else
-						trNext.insertBefore(newTD, trNext.cells[td_elm.cellIndex]);
-
-					trNext = nextElm(trNext, "TR");
-				}
-			}
-
-			function copyRow(doc, table, tr) {
-				var grid = getTableGrid(table);
-				var newTR = tr.cloneNode(false);
-				var cpos = getCellPos(grid, tr.cells[0]);
-				var lastCell = null;
-				var tableBorder = inst.dom.getAttrib(table, "border");
-				var tdElm = null;
-
-				for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
-					var newTD = null;
-
-					if (lastCell != tdElm) {
-						for (var i=0; i<tr.cells.length; i++) {
-							if (tdElm == tr.cells[i]) {
-								newTD = tdElm.cloneNode(true);
-								break;
-							}
-						}
-					}
-
-					if (newTD == null) {
-						newTD = doc.createElement("td");
-
-						if (!tinymce.isIE)
-							newTD.innerHTML = '<br mce_bogus="1"/>';
-					}
-
-					// Reset col/row span
-					newTD.colSpan = 1;
-					newTD.rowSpan = 1;
-
-					newTR.appendChild(newTD);
-
-					lastCell = tdElm;
-				}
-
-				return newTR;
-			}
-
-			// ---- Commands -----
-
-			// Handle commands
-			switch (command) {
-				case "mceTableMoveToNextRow":
-					var nextCell = getNextCell(tableElm, tdElm);
-
-					if (!nextCell) {
-						inst.execCommand("mceTableInsertRowAfter", tdElm);
-						nextCell = getNextCell(tableElm, tdElm);
-					}
-
-					inst.selection.select(nextCell);
-					inst.selection.collapse(true);
-
-					return true;
-
-				case "mceTableRowProps":
-					if (trElm == null)
-						return true;
-
-					if (user_interface) {
-						inst.windowManager.open({
-							url : url + '/row.htm',
-							width : 400 + parseInt(inst.getLang('table.rowprops_delta_width', 0)),
-							height : 295 + parseInt(inst.getLang('table.rowprops_delta_height', 0)),
-							inline : 1
-						}, {
-							plugin_url : url
-						});
-					}
-
-					return true;
-
-				case "mceTableCellProps":
-					if (tdElm == null)
-						return true;
-
-					if (user_interface) {
-						inst.windowManager.open({
-							url : url + '/cell.htm',
-							width : 400 + parseInt(inst.getLang('table.cellprops_delta_width', 0)),
-							height : 295 + parseInt(inst.getLang('table.cellprops_delta_height', 0)),
-							inline : 1
-						}, {
-							plugin_url : url
-						});
-					}
-
-					return true;
-
-				case "mceInsertTable":
-					if (user_interface) {
-						inst.windowManager.open({
-							url : url + '/table.htm',
-							width : 400 + parseInt(inst.getLang('table.table_delta_width', 0)),
-							height : 320 + parseInt(inst.getLang('table.table_delta_height', 0)),
-							inline : 1
-						}, {
-							plugin_url : url,
-							action : value ? value.action : 0
-						});
-					}
-
-					return true;
-
-				case "mceTableDelete":
-					var table = inst.dom.getParent(inst.selection.getNode(), "table");
-					if (table) {
-						table.parentNode.removeChild(table);
-						inst.execCommand('mceRepaint');
-					}
-					return true;
-
-				case "mceTableSplitCells":
-				case "mceTableMergeCells":
-				case "mceTableInsertRowBefore":
-				case "mceTableInsertRowAfter":
-				case "mceTableDeleteRow":
-				case "mceTableInsertColBefore":
-				case "mceTableInsertColAfter":
-				case "mceTableDeleteCol":
-				case "mceTableCutRow":
-				case "mceTableCopyRow":
-				case "mceTablePasteRowBefore":
-				case "mceTablePasteRowAfter":
-					// No table just return (invalid command)
-					if (!tableElm)
-						return true;
-
-					// Table has a tbody use that reference
-					// Changed logic by ApTest 2005.07.12 (www.aptest.com)
-					// Now lookk at the focused element and take its parentNode.  That will be a tbody or a table.
-					if (trElm && tableElm != trElm.parentNode)
-						tableElm = trElm.parentNode;
-
-					if (tableElm && trElm) {
-						switch (command) {
-							case "mceTableCutRow":
-								if (!trElm || !tdElm)
-									return true;
-
-								inst.tableRowClipboard = copyRow(doc, tableElm, trElm);
-								inst.execCommand("mceTableDeleteRow");
-								break;
-
-							case "mceTableCopyRow":
-								if (!trElm || !tdElm)
-									return true;
-
-								inst.tableRowClipboard = copyRow(doc, tableElm, trElm);
-								break;
-
-							case "mceTablePasteRowBefore":
-								if (!trElm || !tdElm)
-									return true;
-
-								var newTR = inst.tableRowClipboard.cloneNode(true);
-
-								var prevTR = prevElm(trElm, "TR");
-								if (prevTR != null)
-									trimRow(tableElm, prevTR, prevTR.cells[0], newTR);
-
-								trElm.parentNode.insertBefore(newTR, trElm);
-								break;
-
-							case "mceTablePasteRowAfter":
-								if (!trElm || !tdElm)
-									return true;
-								
-								var nextTR = nextElm(trElm, "TR");
-								var newTR = inst.tableRowClipboard.cloneNode(true);
-
-								trimRow(tableElm, trElm, tdElm, newTR);
-
-								if (nextTR == null)
-									trElm.parentNode.appendChild(newTR);
-								else
-									nextTR.parentNode.insertBefore(newTR, nextTR);
-
-								break;
-
-							case "mceTableInsertRowBefore":
-								if (!trElm || !tdElm)
-									return true;
-
-								var grid = getTableGrid(tableElm);
-								var cpos = getCellPos(grid, tdElm);
-								var newTR = doc.createElement("tr");
-								var lastTDElm = null;
-
-								cpos.rowindex--;
-								if (cpos.rowindex < 0)
-									cpos.rowindex = 0;
-
-								// Create cells
-								for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
-									if (tdElm != lastTDElm) {
-										var sd = getColRowSpan(tdElm);
-
-										if (sd['rowspan'] == 1) {
-											var newTD = doc.createElement("td");
-
-											if (!tinymce.isIE)
-												newTD.innerHTML = '<br mce_bogus="1"/>';
-
-											newTD.colSpan = tdElm.colSpan;
-
-											newTR.appendChild(newTD);
-										} else
-											tdElm.rowSpan = sd['rowspan'] + 1;
-
-										lastTDElm = tdElm;
-									}
-								}
-
-								trElm.parentNode.insertBefore(newTR, trElm);
-								select(0, 1);
-							break;
-
-							case "mceTableInsertRowAfter":
-								if (!trElm || !tdElm)
-									return true;
-
-								var grid = getTableGrid(tableElm);
-								var cpos = getCellPos(grid, tdElm);
-								var newTR = doc.createElement("tr");
-								var lastTDElm = null;
-
-								// Create cells
-								for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
-									if (tdElm != lastTDElm) {
-										var sd = getColRowSpan(tdElm);
-
-										if (sd['rowspan'] == 1) {
-											var newTD = doc.createElement("td");
-
-											if (!tinymce.isIE)
-												newTD.innerHTML = '<br mce_bogus="1"/>';
-
-											newTD.colSpan = tdElm.colSpan;
-
-											newTR.appendChild(newTD);
-										} else
-											tdElm.rowSpan = sd['rowspan'] + 1;
-
-										lastTDElm = tdElm;
-									}
-								}
-
-								if (newTR.hasChildNodes()) {
-									var nextTR = nextElm(trElm, "TR");
-									if (nextTR)
-										nextTR.parentNode.insertBefore(newTR, nextTR);
-									else
-										tableElm.appendChild(newTR);
-								}
-
-								select(0, 1);
-							break;
-
-							case "mceTableDeleteRow":
-								if (!trElm || !tdElm)
-									return true;
-
-								var grid = getTableGrid(tableElm);
-								var cpos = getCellPos(grid, tdElm);
-
-								// Only one row, remove whole table
-								if (grid.length == 1 && tableElm.nodeName == 'TBODY') {
-									inst.dom.remove(inst.dom.getParent(tableElm, "table"));
-									return true;
-								}
-
-								// Move down row spanned cells
-								var cells = trElm.cells;
-								var nextTR = nextElm(trElm, "TR");
-								for (var x=0; x<cells.length; x++) {
-									if (cells[x].rowSpan > 1) {
-										var newTD = cells[x].cloneNode(true);
-										var sd = getColRowSpan(cells[x]);
-
-										newTD.rowSpan = sd.rowspan - 1;
-
-										var nextTD = nextTR.cells[x];
-
-										if (nextTD == null)
-											nextTR.appendChild(newTD);
-										else
-											nextTR.insertBefore(newTD, nextTD);
-									}
-								}
-
-								// Delete cells
-								var lastTDElm = null;
-								for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
-									if (tdElm != lastTDElm) {
-										var sd = getColRowSpan(tdElm);
-
-										if (sd.rowspan > 1) {
-											tdElm.rowSpan = sd.rowspan - 1;
-										} else {
-											trElm = tdElm.parentNode;
-
-											if (trElm.parentNode)
-												trElm._delete = true;
-										}
-
-										lastTDElm = tdElm;
-									}
-								}
-
-								deleteMarked(tableElm);
-
-								select(0, -1);
-							break;
-
-							case "mceTableInsertColBefore":
-								if (!trElm || !tdElm)
-									return true;
-
-								var grid = getTableGrid(tableElm);
-								var cpos = getCellPos(grid, tdElm);
-								var lastTDElm = null;
-
-								for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
-									if (tdElm != lastTDElm) {
-										var sd = getColRowSpan(tdElm);
-
-										if (sd['colspan'] == 1) {
-											var newTD = doc.createElement(tdElm.nodeName);
-
-											if (!tinymce.isIE)
-												newTD.innerHTML = '<br mce_bogus="1"/>';
-
-											newTD.rowSpan = tdElm.rowSpan;
-
-											tdElm.parentNode.insertBefore(newTD, tdElm);
-										} else
-											tdElm.colSpan++;
-
-										lastTDElm = tdElm;
-									}
-								}
-
-								select();
-							break;
-
-							case "mceTableInsertColAfter":
-								if (!trElm || !tdElm)
-									return true;
-
-								var grid = getTableGrid(tableElm);
-								var cpos = getCellPos(grid, tdElm);
-								var lastTDElm = null;
-
-								for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
-									if (tdElm != lastTDElm) {
-										var sd = getColRowSpan(tdElm);
-
-										if (sd['colspan'] == 1) {
-											var newTD = doc.createElement(tdElm.nodeName);
-
-											if (!tinymce.isIE)
-												newTD.innerHTML = '<br mce_bogus="1"/>';
-
-											newTD.rowSpan = tdElm.rowSpan;
-
-											var nextTD = nextElm(tdElm, "TD,TH");
-											if (nextTD == null)
-												tdElm.parentNode.appendChild(newTD);
-											else
-												nextTD.parentNode.insertBefore(newTD, nextTD);
-										} else
-											tdElm.colSpan++;
-
-										lastTDElm = tdElm;
-									}
-								}
-
-								select(1);
-							break;
-
-							case "mceTableDeleteCol":
-								if (!trElm || !tdElm)
-									return true;
-
-								var grid = getTableGrid(tableElm);
-								var cpos = getCellPos(grid, tdElm);
-								var lastTDElm = null;
-
-								// Only one col, remove whole table
-								if ((grid.length > 1 && grid[0].length <= 1) && tableElm.nodeName == 'TBODY') {
-									inst.dom.remove(inst.dom.getParent(tableElm, "table"));
-									return true;
-								}
-
-								// Delete cells
-								for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
-									if (tdElm != lastTDElm) {
-										var sd = getColRowSpan(tdElm);
-
-										if (sd['colspan'] > 1)
-											tdElm.colSpan = sd['colspan'] - 1;
-										else {
-											if (tdElm.parentNode)
-												tdElm.parentNode.removeChild(tdElm);
-										}
-
-										lastTDElm = tdElm;
-									}
-								}
-
-								select(-1);
-							break;
-
-						case "mceTableSplitCells":
-							if (!trElm || !tdElm)
-								return true;
-
-							var spandata = getColRowSpan(tdElm);
-
-							var colspan = spandata["colspan"];
-							var rowspan = spandata["rowspan"];
-
-							// Needs splitting
-							if (colspan > 1 || rowspan > 1) {
-								// Generate cols
-								tdElm.colSpan = 1;
-								for (var i=1; i<colspan; i++) {
-									var newTD = doc.createElement("td");
-
-									if (!tinymce.isIE)
-										newTD.innerHTML = '<br mce_bogus="1"/>';
-
-									trElm.insertBefore(newTD, nextElm(tdElm, "TD,TH"));
-
-									if (rowspan > 1)
-										addRows(newTD, trElm, rowspan);
-								}
-
-								addRows(tdElm, trElm, rowspan);
-							}
-
-							// Apply visual aids
-							tableElm = inst.dom.getParent(inst.selection.getNode(), "table");
-							break;
-
-						case "mceTableMergeCells":
-							var rows = [];
-							var sel = inst.selection.getSel();
-							var grid = getTableGrid(tableElm);
-
-							if (tinymce.isIE || sel.rangeCount == 1) {
-								if (user_interface) {
-									// Setup template
-									var sp = getColRowSpan(tdElm);
-
-									inst.windowManager.open({
-										url : url + '/merge_cells.htm',
-										width : 240 + parseInt(inst.getLang('table.merge_cells_delta_width', 0)),
-										height : 110 + parseInt(inst.getLang('table.merge_cells_delta_height', 0)),
-										inline : 1
-									}, {
-										action : "update",
-										numcols : sp.colspan,
-										numrows : sp.rowspan,
-										plugin_url : url
-									});
-
-									return true;
-								} else {
-									var numRows = parseInt(value['numrows']);
-									var numCols = parseInt(value['numcols']);
-									var cpos = getCellPos(grid, tdElm);
-
-									if (("" + numRows) == "NaN")
-										numRows = 1;
-
-									if (("" + numCols) == "NaN")
-										numCols = 1;
-
-									// Get rows and cells
-									var tRows = tableElm.rows;
-									for (var y=cpos.rowindex; y<grid.length; y++) {
-										var rowCells = [];
-
-										for (var x=cpos.cellindex; x<grid[y].length; x++) {
-											var td = getCell(grid, y, x);
-
-											if (td && !inArray(rows, td) && !inArray(rowCells, td)) {
-												var cp = getCellPos(grid, td);
-
-												// Within range
-												if (cp.cellindex < cpos.cellindex+numCols && cp.rowindex < cpos.rowindex+numRows)
-													rowCells[rowCells.length] = td;
-											}
-										}
-
-										if (rowCells.length > 0)
-											rows[rows.length] = rowCells;
-
-										var td = getCell(grid, cpos.rowindex, cpos.cellindex);
-										each(ed.dom.select('br', td), function(e, i) {
-											if (i > 0 && ed.dom.getAttrib('mce_bogus'))
-												ed.dom.remove(e);
-										});
-									}
-
-									//return true;
-								}
-							} else {
-								var cells = [];
-								var sel = inst.selection.getSel();
-								var lastTR = null;
-								var curRow = null;
-								var x1 = -1, y1 = -1, x2, y2;
-
-								// Only one cell selected, whats the point?
-								if (sel.rangeCount < 2)
-									return true;
-
-								// Get all selected cells
-								for (var i=0; i<sel.rangeCount; i++) {
-									var rng = sel.getRangeAt(i);
-									var tdElm = rng.startContainer.childNodes[rng.startOffset];
-
-									if (!tdElm)
-										break;
-
-									if (tdElm.nodeName == "TD" || tdElm.nodeName == "TH")
-										cells[cells.length] = tdElm;
-								}
-
-								// Get rows and cells
-								var tRows = tableElm.rows;
-								for (var y=0; y<tRows.length; y++) {
-									var rowCells = [];
-
-									for (var x=0; x<tRows[y].cells.length; x++) {
-										var td = tRows[y].cells[x];
-
-										for (var i=0; i<cells.length; i++) {
-											if (td == cells[i]) {
-												rowCells[rowCells.length] = td;
-											}
-										}
-									}
-
-									if (rowCells.length > 0)
-										rows[rows.length] = rowCells;
-								}
-
-								// Find selected cells in grid and box
-								var curRow = [];
-								var lastTR = null;
-								for (var y=0; y<grid.length; y++) {
-									for (var x=0; x<grid[y].length; x++) {
-										grid[y][x]._selected = false;
-
-										for (var i=0; i<cells.length; i++) {
-											if (grid[y][x] == cells[i]) {
-												// Get start pos
-												if (x1 == -1) {
-													x1 = x;
-													y1 = y;
-												}
-
-												// Get end pos
-												x2 = x;
-												y2 = y;
-
-												grid[y][x]._selected = true;
-											}
-										}
-									}
-								}
-
-								// Is there gaps, if so deny
-								for (var y=y1; y<=y2; y++) {
-									for (var x=x1; x<=x2; x++) {
-										if (!grid[y][x]._selected) {
-											alert("Invalid selection for merge.");
-											return true;
-										}
-									}
-								}
-							}
-
-							// Validate selection and get total rowspan and colspan
-							var rowSpan = 1, colSpan = 1;
-
-							// Validate horizontal and get total colspan
-							var lastRowSpan = -1;
-							for (var y=0; y<rows.length; y++) {
-								var rowColSpan = 0;
-
-								for (var x=0; x<rows[y].length; x++) {
-									var sd = getColRowSpan(rows[y][x]);
-
-									rowColSpan += sd['colspan'];
-
-									if (lastRowSpan != -1 && sd['rowspan'] != lastRowSpan) {
-										alert("Invalid selection for merge.");
-										return true;
-									}
-
-									lastRowSpan = sd['rowspan'];
-								}
-
-								if (rowColSpan > colSpan)
-									colSpan = rowColSpan;
-
-								lastRowSpan = -1;
-							}
-
-							// Validate vertical and get total rowspan
-							var lastColSpan = -1;
-							for (var x=0; x<rows[0].length; x++) {
-								var colRowSpan = 0;
-
-								for (var y=0; y<rows.length; y++) {
-									var sd = getColRowSpan(rows[y][x]);
-
-									colRowSpan += sd['rowspan'];
-
-									if (lastColSpan != -1 && sd['colspan'] != lastColSpan) {
-										alert("Invalid selection for merge.");
-										return true;
-									}
-
-									lastColSpan = sd['colspan'];
-								}
-
-								if (colRowSpan > rowSpan)
-									rowSpan = colRowSpan;
-
-								lastColSpan = -1;
-							}
-
-							// Setup td
-							tdElm = rows[0][0];
-							tdElm.rowSpan = rowSpan;
-							tdElm.colSpan = colSpan;
-
-							// Merge cells
-							for (var y=0; y<rows.length; y++) {
-								for (var x=0; x<rows[y].length; x++) {
-									var html = rows[y][x].innerHTML;
-									var chk = html.replace(/[ \t\r\n]/g, "");
-
-									if (chk != "<br/>" && chk != "<br>" && chk != '<br mce_bogus="1"/>' && (x+y > 0))
-										tdElm.innerHTML += html;
-
-									// Not current cell
-									if (rows[y][x] != tdElm && !rows[y][x]._deleted) {
-										var cpos = getCellPos(grid, rows[y][x]);
-										var tr = rows[y][x].parentNode;
-
-										tr.removeChild(rows[y][x]);
-										rows[y][x]._deleted = true;
-
-										// Empty TR, remove it
-										if (!tr.hasChildNodes()) {
-											tr.parentNode.removeChild(tr);
-
-											var lastCell = null;
-											for (var x=0; cellElm = getCell(grid, cpos.rowindex, x); x++) {
-												if (cellElm != lastCell && cellElm.rowSpan > 1)
-													cellElm.rowSpan--;
-
-												lastCell = cellElm;
-											}
-
-											if (tdElm.rowSpan > 1)
-												tdElm.rowSpan--;
-										}
-									}
-								}
-							}
-
-							// Remove all but one bogus br
-							each(ed.dom.select('br', tdElm), function(e, i) {
-								if (i > 0 && ed.dom.getAttrib(e, 'mce_bogus'))
-									ed.dom.remove(e);
-							});
-
-							break;
-						}
-
-						tableElm = inst.dom.getParent(inst.selection.getNode(), "table");
-						inst.addVisual(tableElm);
-						inst.nodeChanged();
-					}
-
-				return true;
-			}
-
-			// Pass to next handler in chain
-			return false;
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('table', tinymce.plugins.TablePlugin);
+/**
+ * $Id: editor_plugin_src.js 853 2008-05-27 08:05:35Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('tinymce.plugins.TablePlugin', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+			t.url = url;
+
+			// Register buttons
+			each([
+				['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(c) {
+				ed.addButton(c[0], {title : c[1], cmd : c[2], ui : c[3]});
+			});
+
+			ed.onInit.add(function() {
+				if (ed && ed.plugins.contextmenu) {
+					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {
+						var sm, se = ed.selection, el = se.getNode() || ed.getBody();
+
+						if (ed.dom.getParent(e, 'td') || ed.dom.getParent(e, 'th')) {
+							m.removeAll();
+
+							if (el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) {
+								m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});
+								m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});
+								m.addSeparator();
+							}
+
+							if (el.nodeName == 'IMG' && el.className.indexOf('mceItem') == -1) {
+								m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});
+								m.addSeparator();
+							}
+
+							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', ui : true, value : {action : 'insert'}});
+							m.add({title : 'table.props_desc', icon : 'table_props', cmd : 'mceInsertTable', ui : true});
+							m.add({title : 'table.del', icon : 'delete_table', cmd : 'mceTableDelete', ui : true});
+							m.addSeparator();
+
+							// Cell menu
+							sm = m.addMenu({title : 'table.cell'});
+							sm.add({title : 'table.cell_desc', icon : 'cell_props', cmd : 'mceTableCellProps', ui : true});
+							sm.add({title : 'table.split_cells_desc', icon : 'split_cells', cmd : 'mceTableSplitCells', ui : true});
+							sm.add({title : 'table.merge_cells_desc', icon : 'merge_cells', cmd : 'mceTableMergeCells', ui : true});
+
+							// Row menu
+							sm = m.addMenu({title : 'table.row'});
+							sm.add({title : 'table.row_desc', icon : 'row_props', cmd : 'mceTableRowProps', ui : true});
+							sm.add({title : 'table.row_before_desc', icon : 'row_before', cmd : 'mceTableInsertRowBefore'});
+							sm.add({title : 'table.row_after_desc', icon : 'row_after', cmd : 'mceTableInsertRowAfter'});
+							sm.add({title : 'table.delete_row_desc', icon : 'delete_row', cmd : 'mceTableDeleteRow'});
+							sm.addSeparator();
+							sm.add({title : 'table.cut_row_desc', icon : 'cut', cmd : 'mceTableCutRow'});
+							sm.add({title : 'table.copy_row_desc', icon : 'copy', cmd : 'mceTableCopyRow'});
+							sm.add({title : 'table.paste_row_before_desc', icon : 'paste', cmd : 'mceTablePasteRowBefore'});
+							sm.add({title : 'table.paste_row_after_desc', icon : 'paste', cmd : 'mceTablePasteRowAfter'});
+
+							// Column menu
+							sm = m.addMenu({title : 'table.col'});
+							sm.add({title : 'table.col_before_desc', icon : 'col_before', cmd : 'mceTableInsertColBefore'});
+							sm.add({title : 'table.col_after_desc', icon : 'col_after', cmd : 'mceTableInsertColAfter'});
+							sm.add({title : 'table.delete_col_desc', icon : 'delete_col', cmd : 'mceTableDeleteCol'});
+						} else
+							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', ui : true});
+					});
+				}
+			});
+
+			// Add undo level when new rows are created using the tab key
+			ed.onKeyDown.add(function(ed, e) {
+				if (e.keyCode == 9 && ed.dom.getParent(ed.selection.getNode(), 'TABLE')) {
+					if (!tinymce.isGecko && !tinymce.isOpera) {
+						tinyMCE.execInstanceCommand(ed.editorId, "mceTableMoveToNextRow", true);
+						return tinymce.dom.Event.cancel(e);
+					}
+
+					ed.undoManager.add();
+				}
+			});
+
+			// Select whole table is a table border is clicked
+			if (!tinymce.isIE) {
+				if (ed.getParam('table_selection', true)) {
+					ed.onClick.add(function(ed, e) {
+						e = e.target;
+
+						if (e.nodeName === 'TABLE')
+							ed.selection.select(e);
+					});
+				}
+			}
+
+			ed.onNodeChange.add(function(ed, cm, n) {
+				var p = ed.dom.getParent(n, 'td,th,caption');
+
+				cm.setActive('table', n.nodeName === 'TABLE' || !!p);
+				if (p && p.nodeName === 'CAPTION')
+					p = null;
+
+				cm.setDisabled('delete_table', !p);
+				cm.setDisabled('delete_col', !p);
+				cm.setDisabled('delete_table', !p);
+				cm.setDisabled('delete_row', !p);
+				cm.setDisabled('col_after', !p);
+				cm.setDisabled('col_before', !p);
+				cm.setDisabled('row_after', !p);
+				cm.setDisabled('row_before', !p);
+				cm.setDisabled('row_props', !p);
+				cm.setDisabled('cell_props', !p);
+				cm.setDisabled('split_cells', !p || (parseInt(ed.dom.getAttrib(p, 'colspan', '1')) < 2 && parseInt(ed.dom.getAttrib(p, 'rowspan', '1')) < 2));
+				cm.setDisabled('merge_cells', !p);
+			});
+
+			// Padd empty table cells
+			if (!tinymce.isIE) {
+				ed.onBeforeSetContent.add(function(ed, o) {
+					if (o.initial)
+						o.content = o.content.replace(/<(td|th)([^>]+|)>\s*<\/(td|th)>/g, tinymce.isOpera ? '<$1$2>&nbsp;</$1>' : '<$1$2><br mce_bogus="1" /></$1>');
+				});
+			}
+		},
+
+		execCommand : function(cmd, ui, val) {
+			var ed = this.editor, b;
+
+			// Is table command
+			switch (cmd) {
+				case "mceTableMoveToNextRow":
+				case "mceInsertTable":
+				case "mceTableRowProps":
+				case "mceTableCellProps":
+				case "mceTableSplitCells":
+				case "mceTableMergeCells":
+				case "mceTableInsertRowBefore":
+				case "mceTableInsertRowAfter":
+				case "mceTableDeleteRow":
+				case "mceTableInsertColBefore":
+				case "mceTableInsertColAfter":
+				case "mceTableDeleteCol":
+				case "mceTableCutRow":
+				case "mceTableCopyRow":
+				case "mceTablePasteRowBefore":
+				case "mceTablePasteRowAfter":
+				case "mceTableDelete":
+					ed.execCommand('mceBeginUndoLevel');
+					this._doExecCommand(cmd, ui, val);
+					ed.execCommand('mceEndUndoLevel');
+
+					return true;
+			}
+
+			// Pass to next handler in chain
+			return false;
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Tables',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/table',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		},
+
+		// Private plugin internal methods
+
+		/**
+		 * Executes the table commands.
+		 */
+		_doExecCommand : function(command, user_interface, value) {
+			var inst = this.editor, ed = inst, url = this.url;
+			var focusElm = inst.selection.getNode();
+			var trElm = inst.dom.getParent(focusElm, "tr");
+			var tdElm = inst.dom.getParent(focusElm, "td,th");
+			var tableElm = inst.dom.getParent(focusElm, "table");
+			var doc = inst.contentWindow.document;
+			var tableBorder = tableElm ? tableElm.getAttribute("border") : "";
+
+			// Get first TD if no TD found
+			if (trElm && tdElm == null)
+				tdElm = trElm.cells[0];
+
+			function inArray(ar, v) {
+				for (var i=0; i<ar.length; i++) {
+					// Is array
+					if (ar[i].length > 0 && inArray(ar[i], v))
+						return true;
+
+					// Found value
+					if (ar[i] == v)
+						return true;
+				}
+
+				return false;
+			}
+
+			function select(dx, dy) {
+				var td;
+
+				grid = getTableGrid(tableElm);
+				dx = dx || 0;
+				dy = dy || 0;
+				dx = Math.max(cpos.cellindex + dx, 0);
+				dy = Math.max(cpos.rowindex + dy, 0);
+
+				// Recalculate grid and select
+				inst.execCommand('mceRepaint');
+				td = getCell(grid, dy, dx);
+
+				if (td) {
+					inst.selection.select(td.firstChild || td);
+					inst.selection.collapse(1);
+				}
+			};
+
+			function makeTD() {
+				var newTD = doc.createElement("td");
+
+				if (!tinymce.isIE)
+					newTD.innerHTML = '<br mce_bogus="1"/>';
+			}
+
+			function getColRowSpan(td) {
+				var colspan = inst.dom.getAttrib(td, "colspan");
+				var rowspan = inst.dom.getAttrib(td, "rowspan");
+
+				colspan = colspan == "" ? 1 : parseInt(colspan);
+				rowspan = rowspan == "" ? 1 : parseInt(rowspan);
+
+				return {colspan : colspan, rowspan : rowspan};
+			}
+
+			function getCellPos(grid, td) {
+				var x, y;
+
+				for (y=0; y<grid.length; y++) {
+					for (x=0; x<grid[y].length; x++) {
+						if (grid[y][x] == td)
+							return {cellindex : x, rowindex : y};
+					}
+				}
+
+				return null;
+			}
+
+			function getCell(grid, row, col) {
+				if (grid[row] && grid[row][col])
+					return grid[row][col];
+
+				return null;
+			}
+
+			function getNextCell(table, cell) {
+				var cells = [], x = 0, i, j, cell, nextCell;
+
+				for (i = 0; i < table.rows.length; i++)
+					for (j = 0; j < table.rows[i].cells.length; j++, x++)
+						cells[x] = table.rows[i].cells[j];
+
+				for (i = 0; i < cells.length; i++)
+					if (cells[i] == cell)
+						if (nextCell = cells[i+1])
+							return nextCell;
+			}
+
+			function getTableGrid(table) {
+				var grid = [], rows = table.rows, x, y, td, sd, xstart, x2, y2;
+
+				for (y=0; y<rows.length; y++) {
+					for (x=0; x<rows[y].cells.length; x++) {
+						td = rows[y].cells[x];
+						sd = getColRowSpan(td);
+
+						// All ready filled
+						for (xstart = x; grid[y] && grid[y][xstart]; xstart++) ;
+
+						// Fill box
+						for (y2=y; y2<y+sd['rowspan']; y2++) {
+							if (!grid[y2])
+								grid[y2] = [];
+
+							for (x2=xstart; x2<xstart+sd['colspan']; x2++)
+								grid[y2][x2] = td;
+						}
+					}
+				}
+
+				return grid;
+			}
+
+			function trimRow(table, tr, td, new_tr) {
+				var grid = getTableGrid(table), cpos = getCellPos(grid, td);
+				var cells, lastElm;
+
+				// Time to crop away some
+				if (new_tr.cells.length != tr.childNodes.length) {
+					cells = tr.childNodes;
+					lastElm = null;
+
+					for (var x=0; td = getCell(grid, cpos.rowindex, x); x++) {
+						var remove = true;
+						var sd = getColRowSpan(td);
+
+						// Remove due to rowspan
+						if (inArray(cells, td)) {
+							new_tr.childNodes[x]._delete = true;
+						} else if ((lastElm == null || td != lastElm) && sd.colspan > 1) { // Remove due to colspan
+							for (var i=x; i<x+td.colSpan; i++)
+								new_tr.childNodes[i]._delete = true;
+						}
+
+						if ((lastElm == null || td != lastElm) && sd.rowspan > 1)
+							td.rowSpan = sd.rowspan + 1;
+
+						lastElm = td;
+					}
+
+					deleteMarked(tableElm);
+				}
+			}
+
+			function prevElm(node, name) {
+				while ((node = node.previousSibling) != null) {
+					if (node.nodeName == name)
+						return node;
+				}
+
+				return null;
+			}
+
+			function nextElm(node, names) {
+				var namesAr = names.split(',');
+
+				while ((node = node.nextSibling) != null) {
+					for (var i=0; i<namesAr.length; i++) {
+						if (node.nodeName.toLowerCase() == namesAr[i].toLowerCase() )
+							return node;
+					}
+				}
+
+				return null;
+			}
+
+			function deleteMarked(tbl) {
+				if (tbl.rows == 0)
+					return;
+
+				var tr = tbl.rows[0];
+				do {
+					var next = nextElm(tr, "TR");
+
+					// Delete row
+					if (tr._delete) {
+						tr.parentNode.removeChild(tr);
+						continue;
+					}
+
+					// Delete cells
+					var td = tr.cells[0];
+					if (td.cells > 1) {
+						do {
+							var nexttd = nextElm(td, "TD,TH");
+
+							if (td._delete)
+								td.parentNode.removeChild(td);
+						} while ((td = nexttd) != null);
+					}
+				} while ((tr = next) != null);
+			}
+
+			function addRows(td_elm, tr_elm, rowspan) {
+				// Add rows
+				td_elm.rowSpan = 1;
+				var trNext = nextElm(tr_elm, "TR");
+				for (var i=1; i<rowspan && trNext; i++) {
+					var newTD = doc.createElement("td");
+
+					if (!tinymce.isIE)
+						newTD.innerHTML = '<br mce_bogus="1"/>';
+
+					if (tinymce.isIE)
+						trNext.insertBefore(newTD, trNext.cells(td_elm.cellIndex));
+					else
+						trNext.insertBefore(newTD, trNext.cells[td_elm.cellIndex]);
+
+					trNext = nextElm(trNext, "TR");
+				}
+			}
+
+			function copyRow(doc, table, tr) {
+				var grid = getTableGrid(table);
+				var newTR = tr.cloneNode(false);
+				var cpos = getCellPos(grid, tr.cells[0]);
+				var lastCell = null;
+				var tableBorder = inst.dom.getAttrib(table, "border");
+				var tdElm = null;
+
+				for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+					var newTD = null;
+
+					if (lastCell != tdElm) {
+						for (var i=0; i<tr.cells.length; i++) {
+							if (tdElm == tr.cells[i]) {
+								newTD = tdElm.cloneNode(true);
+								break;
+							}
+						}
+					}
+
+					if (newTD == null) {
+						newTD = doc.createElement("td");
+
+						if (!tinymce.isIE)
+							newTD.innerHTML = '<br mce_bogus="1"/>';
+					}
+
+					// Reset col/row span
+					newTD.colSpan = 1;
+					newTD.rowSpan = 1;
+
+					newTR.appendChild(newTD);
+
+					lastCell = tdElm;
+				}
+
+				return newTR;
+			}
+
+			// ---- Commands -----
+
+			// Handle commands
+			switch (command) {
+				case "mceTableMoveToNextRow":
+					var nextCell = getNextCell(tableElm, tdElm);
+
+					if (!nextCell) {
+						inst.execCommand("mceTableInsertRowAfter", tdElm);
+						nextCell = getNextCell(tableElm, tdElm);
+					}
+
+					inst.selection.select(nextCell);
+					inst.selection.collapse(true);
+
+					return true;
+
+				case "mceTableRowProps":
+					if (trElm == null)
+						return true;
+
+					if (user_interface) {
+						inst.windowManager.open({
+							url : url + '/row.htm',
+							width : 400 + parseInt(inst.getLang('table.rowprops_delta_width', 0)),
+							height : 295 + parseInt(inst.getLang('table.rowprops_delta_height', 0)),
+							inline : 1
+						}, {
+							plugin_url : url
+						});
+					}
+
+					return true;
+
+				case "mceTableCellProps":
+					if (tdElm == null)
+						return true;
+
+					if (user_interface) {
+						inst.windowManager.open({
+							url : url + '/cell.htm',
+							width : 400 + parseInt(inst.getLang('table.cellprops_delta_width', 0)),
+							height : 295 + parseInt(inst.getLang('table.cellprops_delta_height', 0)),
+							inline : 1
+						}, {
+							plugin_url : url
+						});
+					}
+
+					return true;
+
+				case "mceInsertTable":
+					if (user_interface) {
+						inst.windowManager.open({
+							url : url + '/table.htm',
+							width : 400 + parseInt(inst.getLang('table.table_delta_width', 0)),
+							height : 320 + parseInt(inst.getLang('table.table_delta_height', 0)),
+							inline : 1
+						}, {
+							plugin_url : url,
+							action : value ? value.action : 0
+						});
+					}
+
+					return true;
+
+				case "mceTableDelete":
+					var table = inst.dom.getParent(inst.selection.getNode(), "table");
+					if (table) {
+						table.parentNode.removeChild(table);
+						inst.execCommand('mceRepaint');
+					}
+					return true;
+
+				case "mceTableSplitCells":
+				case "mceTableMergeCells":
+				case "mceTableInsertRowBefore":
+				case "mceTableInsertRowAfter":
+				case "mceTableDeleteRow":
+				case "mceTableInsertColBefore":
+				case "mceTableInsertColAfter":
+				case "mceTableDeleteCol":
+				case "mceTableCutRow":
+				case "mceTableCopyRow":
+				case "mceTablePasteRowBefore":
+				case "mceTablePasteRowAfter":
+					// No table just return (invalid command)
+					if (!tableElm)
+						return true;
+
+					// Table has a tbody use that reference
+					// Changed logic by ApTest 2005.07.12 (www.aptest.com)
+					// Now lookk at the focused element and take its parentNode.  That will be a tbody or a table.
+					if (trElm && tableElm != trElm.parentNode)
+						tableElm = trElm.parentNode;
+
+					if (tableElm && trElm) {
+						switch (command) {
+							case "mceTableCutRow":
+								if (!trElm || !tdElm)
+									return true;
+
+								inst.tableRowClipboard = copyRow(doc, tableElm, trElm);
+								inst.execCommand("mceTableDeleteRow");
+								break;
+
+							case "mceTableCopyRow":
+								if (!trElm || !tdElm)
+									return true;
+
+								inst.tableRowClipboard = copyRow(doc, tableElm, trElm);
+								break;
+
+							case "mceTablePasteRowBefore":
+								if (!trElm || !tdElm)
+									return true;
+
+								var newTR = inst.tableRowClipboard.cloneNode(true);
+
+								var prevTR = prevElm(trElm, "TR");
+								if (prevTR != null)
+									trimRow(tableElm, prevTR, prevTR.cells[0], newTR);
+
+								trElm.parentNode.insertBefore(newTR, trElm);
+								break;
+
+							case "mceTablePasteRowAfter":
+								if (!trElm || !tdElm)
+									return true;
+								
+								var nextTR = nextElm(trElm, "TR");
+								var newTR = inst.tableRowClipboard.cloneNode(true);
+
+								trimRow(tableElm, trElm, tdElm, newTR);
+
+								if (nextTR == null)
+									trElm.parentNode.appendChild(newTR);
+								else
+									nextTR.parentNode.insertBefore(newTR, nextTR);
+
+								break;
+
+							case "mceTableInsertRowBefore":
+								if (!trElm || !tdElm)
+									return true;
+
+								var grid = getTableGrid(tableElm);
+								var cpos = getCellPos(grid, tdElm);
+								var newTR = doc.createElement("tr");
+								var lastTDElm = null;
+
+								cpos.rowindex--;
+								if (cpos.rowindex < 0)
+									cpos.rowindex = 0;
+
+								// Create cells
+								for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+									if (tdElm != lastTDElm) {
+										var sd = getColRowSpan(tdElm);
+
+										if (sd['rowspan'] == 1) {
+											var newTD = doc.createElement("td");
+
+											if (!tinymce.isIE)
+												newTD.innerHTML = '<br mce_bogus="1"/>';
+
+											newTD.colSpan = tdElm.colSpan;
+
+											newTR.appendChild(newTD);
+										} else
+											tdElm.rowSpan = sd['rowspan'] + 1;
+
+										lastTDElm = tdElm;
+									}
+								}
+
+								trElm.parentNode.insertBefore(newTR, trElm);
+								select(0, 1);
+							break;
+
+							case "mceTableInsertRowAfter":
+								if (!trElm || !tdElm)
+									return true;
+
+								var grid = getTableGrid(tableElm);
+								var cpos = getCellPos(grid, tdElm);
+								var newTR = doc.createElement("tr");
+								var lastTDElm = null;
+
+								// Create cells
+								for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+									if (tdElm != lastTDElm) {
+										var sd = getColRowSpan(tdElm);
+
+										if (sd['rowspan'] == 1) {
+											var newTD = doc.createElement("td");
+
+											if (!tinymce.isIE)
+												newTD.innerHTML = '<br mce_bogus="1"/>';
+
+											newTD.colSpan = tdElm.colSpan;
+
+											newTR.appendChild(newTD);
+										} else
+											tdElm.rowSpan = sd['rowspan'] + 1;
+
+										lastTDElm = tdElm;
+									}
+								}
+
+								if (newTR.hasChildNodes()) {
+									var nextTR = nextElm(trElm, "TR");
+									if (nextTR)
+										nextTR.parentNode.insertBefore(newTR, nextTR);
+									else
+										tableElm.appendChild(newTR);
+								}
+
+								select(0, 1);
+							break;
+
+							case "mceTableDeleteRow":
+								if (!trElm || !tdElm)
+									return true;
+
+								var grid = getTableGrid(tableElm);
+								var cpos = getCellPos(grid, tdElm);
+
+								// Only one row, remove whole table
+								if (grid.length == 1 && tableElm.nodeName == 'TBODY') {
+									inst.dom.remove(inst.dom.getParent(tableElm, "table"));
+									return true;
+								}
+
+								// Move down row spanned cells
+								var cells = trElm.cells;
+								var nextTR = nextElm(trElm, "TR");
+								for (var x=0; x<cells.length; x++) {
+									if (cells[x].rowSpan > 1) {
+										var newTD = cells[x].cloneNode(true);
+										var sd = getColRowSpan(cells[x]);
+
+										newTD.rowSpan = sd.rowspan - 1;
+
+										var nextTD = nextTR.cells[x];
+
+										if (nextTD == null)
+											nextTR.appendChild(newTD);
+										else
+											nextTR.insertBefore(newTD, nextTD);
+									}
+								}
+
+								// Delete cells
+								var lastTDElm = null;
+								for (var x=0; tdElm = getCell(grid, cpos.rowindex, x); x++) {
+									if (tdElm != lastTDElm) {
+										var sd = getColRowSpan(tdElm);
+
+										if (sd.rowspan > 1) {
+											tdElm.rowSpan = sd.rowspan - 1;
+										} else {
+											trElm = tdElm.parentNode;
+
+											if (trElm.parentNode)
+												trElm._delete = true;
+										}
+
+										lastTDElm = tdElm;
+									}
+								}
+
+								deleteMarked(tableElm);
+
+								select(0, -1);
+							break;
+
+							case "mceTableInsertColBefore":
+								if (!trElm || !tdElm)
+									return true;
+
+								var grid = getTableGrid(tableElm);
+								var cpos = getCellPos(grid, tdElm);
+								var lastTDElm = null;
+
+								for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
+									if (tdElm != lastTDElm) {
+										var sd = getColRowSpan(tdElm);
+
+										if (sd['colspan'] == 1) {
+											var newTD = doc.createElement(tdElm.nodeName);
+
+											if (!tinymce.isIE)
+												newTD.innerHTML = '<br mce_bogus="1"/>';
+
+											newTD.rowSpan = tdElm.rowSpan;
+
+											tdElm.parentNode.insertBefore(newTD, tdElm);
+										} else
+											tdElm.colSpan++;
+
+										lastTDElm = tdElm;
+									}
+								}
+
+								select();
+							break;
+
+							case "mceTableInsertColAfter":
+								if (!trElm || !tdElm)
+									return true;
+
+								var grid = getTableGrid(tableElm);
+								var cpos = getCellPos(grid, tdElm);
+								var lastTDElm = null;
+
+								for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
+									if (tdElm != lastTDElm) {
+										var sd = getColRowSpan(tdElm);
+
+										if (sd['colspan'] == 1) {
+											var newTD = doc.createElement(tdElm.nodeName);
+
+											if (!tinymce.isIE)
+												newTD.innerHTML = '<br mce_bogus="1"/>';
+
+											newTD.rowSpan = tdElm.rowSpan;
+
+											var nextTD = nextElm(tdElm, "TD,TH");
+											if (nextTD == null)
+												tdElm.parentNode.appendChild(newTD);
+											else
+												nextTD.parentNode.insertBefore(newTD, nextTD);
+										} else
+											tdElm.colSpan++;
+
+										lastTDElm = tdElm;
+									}
+								}
+
+								select(1);
+							break;
+
+							case "mceTableDeleteCol":
+								if (!trElm || !tdElm)
+									return true;
+
+								var grid = getTableGrid(tableElm);
+								var cpos = getCellPos(grid, tdElm);
+								var lastTDElm = null;
+
+								// Only one col, remove whole table
+								if ((grid.length > 1 && grid[0].length <= 1) && tableElm.nodeName == 'TBODY') {
+									inst.dom.remove(inst.dom.getParent(tableElm, "table"));
+									return true;
+								}
+
+								// Delete cells
+								for (var y=0; tdElm = getCell(grid, y, cpos.cellindex); y++) {
+									if (tdElm != lastTDElm) {
+										var sd = getColRowSpan(tdElm);
+
+										if (sd['colspan'] > 1)
+											tdElm.colSpan = sd['colspan'] - 1;
+										else {
+											if (tdElm.parentNode)
+												tdElm.parentNode.removeChild(tdElm);
+										}
+
+										lastTDElm = tdElm;
+									}
+								}
+
+								select(-1);
+							break;
+
+						case "mceTableSplitCells":
+							if (!trElm || !tdElm)
+								return true;
+
+							var spandata = getColRowSpan(tdElm);
+
+							var colspan = spandata["colspan"];
+							var rowspan = spandata["rowspan"];
+
+							// Needs splitting
+							if (colspan > 1 || rowspan > 1) {
+								// Generate cols
+								tdElm.colSpan = 1;
+								for (var i=1; i<colspan; i++) {
+									var newTD = doc.createElement("td");
+
+									if (!tinymce.isIE)
+										newTD.innerHTML = '<br mce_bogus="1"/>';
+
+									trElm.insertBefore(newTD, nextElm(tdElm, "TD,TH"));
+
+									if (rowspan > 1)
+										addRows(newTD, trElm, rowspan);
+								}
+
+								addRows(tdElm, trElm, rowspan);
+							}
+
+							// Apply visual aids
+							tableElm = inst.dom.getParent(inst.selection.getNode(), "table");
+							break;
+
+						case "mceTableMergeCells":
+							var rows = [];
+							var sel = inst.selection.getSel();
+							var grid = getTableGrid(tableElm);
+
+							if (tinymce.isIE || sel.rangeCount == 1) {
+								if (user_interface) {
+									// Setup template
+									var sp = getColRowSpan(tdElm);
+
+									inst.windowManager.open({
+										url : url + '/merge_cells.htm',
+										width : 240 + parseInt(inst.getLang('table.merge_cells_delta_width', 0)),
+										height : 110 + parseInt(inst.getLang('table.merge_cells_delta_height', 0)),
+										inline : 1
+									}, {
+										action : "update",
+										numcols : sp.colspan,
+										numrows : sp.rowspan,
+										plugin_url : url
+									});
+
+									return true;
+								} else {
+									var numRows = parseInt(value['numrows']);
+									var numCols = parseInt(value['numcols']);
+									var cpos = getCellPos(grid, tdElm);
+
+									if (("" + numRows) == "NaN")
+										numRows = 1;
+
+									if (("" + numCols) == "NaN")
+										numCols = 1;
+
+									// Get rows and cells
+									var tRows = tableElm.rows;
+									for (var y=cpos.rowindex; y<grid.length; y++) {
+										var rowCells = [];
+
+										for (var x=cpos.cellindex; x<grid[y].length; x++) {
+											var td = getCell(grid, y, x);
+
+											if (td && !inArray(rows, td) && !inArray(rowCells, td)) {
+												var cp = getCellPos(grid, td);
+
+												// Within range
+												if (cp.cellindex < cpos.cellindex+numCols && cp.rowindex < cpos.rowindex+numRows)
+													rowCells[rowCells.length] = td;
+											}
+										}
+
+										if (rowCells.length > 0)
+											rows[rows.length] = rowCells;
+
+										var td = getCell(grid, cpos.rowindex, cpos.cellindex);
+										each(ed.dom.select('br', td), function(e, i) {
+											if (i > 0 && ed.dom.getAttrib('mce_bogus'))
+												ed.dom.remove(e);
+										});
+									}
+
+									//return true;
+								}
+							} else {
+								var cells = [];
+								var sel = inst.selection.getSel();
+								var lastTR = null;
+								var curRow = null;
+								var x1 = -1, y1 = -1, x2, y2;
+
+								// Only one cell selected, whats the point?
+								if (sel.rangeCount < 2)
+									return true;
+
+								// Get all selected cells
+								for (var i=0; i<sel.rangeCount; i++) {
+									var rng = sel.getRangeAt(i);
+									var tdElm = rng.startContainer.childNodes[rng.startOffset];
+
+									if (!tdElm)
+										break;
+
+									if (tdElm.nodeName == "TD" || tdElm.nodeName == "TH")
+										cells[cells.length] = tdElm;
+								}
+
+								// Get rows and cells
+								var tRows = tableElm.rows;
+								for (var y=0; y<tRows.length; y++) {
+									var rowCells = [];
+
+									for (var x=0; x<tRows[y].cells.length; x++) {
+										var td = tRows[y].cells[x];
+
+										for (var i=0; i<cells.length; i++) {
+											if (td == cells[i]) {
+												rowCells[rowCells.length] = td;
+											}
+										}
+									}
+
+									if (rowCells.length > 0)
+										rows[rows.length] = rowCells;
+								}
+
+								// Find selected cells in grid and box
+								var curRow = [];
+								var lastTR = null;
+								for (var y=0; y<grid.length; y++) {
+									for (var x=0; x<grid[y].length; x++) {
+										grid[y][x]._selected = false;
+
+										for (var i=0; i<cells.length; i++) {
+											if (grid[y][x] == cells[i]) {
+												// Get start pos
+												if (x1 == -1) {
+													x1 = x;
+													y1 = y;
+												}
+
+												// Get end pos
+												x2 = x;
+												y2 = y;
+
+												grid[y][x]._selected = true;
+											}
+										}
+									}
+								}
+
+								// Is there gaps, if so deny
+								for (var y=y1; y<=y2; y++) {
+									for (var x=x1; x<=x2; x++) {
+										if (!grid[y][x]._selected) {
+											alert("Invalid selection for merge.");
+											return true;
+										}
+									}
+								}
+							}
+
+							// Validate selection and get total rowspan and colspan
+							var rowSpan = 1, colSpan = 1;
+
+							// Validate horizontal and get total colspan
+							var lastRowSpan = -1;
+							for (var y=0; y<rows.length; y++) {
+								var rowColSpan = 0;
+
+								for (var x=0; x<rows[y].length; x++) {
+									var sd = getColRowSpan(rows[y][x]);
+
+									rowColSpan += sd['colspan'];
+
+									if (lastRowSpan != -1 && sd['rowspan'] != lastRowSpan) {
+										alert("Invalid selection for merge.");
+										return true;
+									}
+
+									lastRowSpan = sd['rowspan'];
+								}
+
+								if (rowColSpan > colSpan)
+									colSpan = rowColSpan;
+
+								lastRowSpan = -1;
+							}
+
+							// Validate vertical and get total rowspan
+							var lastColSpan = -1;
+							for (var x=0; x<rows[0].length; x++) {
+								var colRowSpan = 0;
+
+								for (var y=0; y<rows.length; y++) {
+									var sd = getColRowSpan(rows[y][x]);
+
+									colRowSpan += sd['rowspan'];
+
+									if (lastColSpan != -1 && sd['colspan'] != lastColSpan) {
+										alert("Invalid selection for merge.");
+										return true;
+									}
+
+									lastColSpan = sd['colspan'];
+								}
+
+								if (colRowSpan > rowSpan)
+									rowSpan = colRowSpan;
+
+								lastColSpan = -1;
+							}
+
+							// Setup td
+							tdElm = rows[0][0];
+							tdElm.rowSpan = rowSpan;
+							tdElm.colSpan = colSpan;
+
+							// Merge cells
+							for (var y=0; y<rows.length; y++) {
+								for (var x=0; x<rows[y].length; x++) {
+									var html = rows[y][x].innerHTML;
+									var chk = html.replace(/[ \t\r\n]/g, "");
+
+									if (chk != "<br/>" && chk != "<br>" && chk != '<br mce_bogus="1"/>' && (x+y > 0))
+										tdElm.innerHTML += html;
+
+									// Not current cell
+									if (rows[y][x] != tdElm && !rows[y][x]._deleted) {
+										var cpos = getCellPos(grid, rows[y][x]);
+										var tr = rows[y][x].parentNode;
+
+										tr.removeChild(rows[y][x]);
+										rows[y][x]._deleted = true;
+
+										// Empty TR, remove it
+										if (!tr.hasChildNodes()) {
+											tr.parentNode.removeChild(tr);
+
+											var lastCell = null;
+											for (var x=0; cellElm = getCell(grid, cpos.rowindex, x); x++) {
+												if (cellElm != lastCell && cellElm.rowSpan > 1)
+													cellElm.rowSpan--;
+
+												lastCell = cellElm;
+											}
+
+											if (tdElm.rowSpan > 1)
+												tdElm.rowSpan--;
+										}
+									}
+								}
+							}
+
+							// Remove all but one bogus br
+							each(ed.dom.select('br', tdElm), function(e, i) {
+								if (i > 0 && ed.dom.getAttrib(e, 'mce_bogus'))
+									ed.dom.remove(e);
+							});
+
+							break;
+						}
+
+						tableElm = inst.dom.getParent(inst.selection.getNode(), "table");
+						inst.addVisual(tableElm);
+						inst.nodeChanged();
+					}
+
+				return true;
+			}
+
+			// Pass to next handler in chain
+			return false;
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('table', tinymce.plugins.TablePlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/table/js/cell.js b/webapp/web/js/tiny_mce/plugins/table/js/cell.js
index b7ee9c8f5..df6a0cb4e 100755
--- a/webapp/web/js/tiny_mce/plugins/table/js/cell.js
+++ b/webapp/web/js/tiny_mce/plugins/table/js/cell.js
@@ -1,266 +1,266 @@
-tinyMCEPopup.requireLangPack();
-
-var ed;
-
-function init() {
-	ed = tinyMCEPopup.editor;
-	tinyMCEPopup.resizeToInnerSize();
-
-	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
-	document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
-	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor')
-
-	var inst = ed;
-	var tdElm = ed.dom.getParent(ed.selection.getNode(), "td,th");
-	var formObj = document.forms[0];
-	var st = ed.dom.parseStyle(ed.dom.getAttrib(tdElm, "style"));
-
-	// Get table cell data
-	var celltype = tdElm.nodeName.toLowerCase();
-	var align = ed.dom.getAttrib(tdElm, 'align');
-	var valign = ed.dom.getAttrib(tdElm, 'valign');
-	var width = trimSize(getStyle(tdElm, 'width', 'width'));
-	var height = trimSize(getStyle(tdElm, 'height', 'height'));
-	var bordercolor = convertRGBToHex(getStyle(tdElm, 'bordercolor', 'borderLeftColor'));
-	var bgcolor = convertRGBToHex(getStyle(tdElm, 'bgcolor', 'backgroundColor'));
-	var className = ed.dom.getAttrib(tdElm, 'class');
-	var backgroundimage = getStyle(tdElm, 'background', 'backgroundImage').replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");;
-	var id = ed.dom.getAttrib(tdElm, 'id');
-	var lang = ed.dom.getAttrib(tdElm, 'lang');
-	var dir = ed.dom.getAttrib(tdElm, 'dir');
-	var scope = ed.dom.getAttrib(tdElm, 'scope');
-
-	// Setup form
-	addClassesToList('class', 'table_cell_styles');
-	TinyMCE_EditableSelects.init();
-
-	formObj.bordercolor.value = bordercolor;
-	formObj.bgcolor.value = bgcolor;
-	formObj.backgroundimage.value = backgroundimage;
-	formObj.width.value = width;
-	formObj.height.value = height;
-	formObj.id.value = id;
-	formObj.lang.value = lang;
-	formObj.style.value = ed.dom.serializeStyle(st);
-	selectByValue(formObj, 'align', align);
-	selectByValue(formObj, 'valign', valign);
-	selectByValue(formObj, 'class', className, true, true);
-	selectByValue(formObj, 'celltype', celltype);
-	selectByValue(formObj, 'dir', dir);
-	selectByValue(formObj, 'scope', scope);
-
-	// Resize some elements
-	if (isVisible('backgroundimagebrowser'))
-		document.getElementById('backgroundimage').style.width = '180px';
-
-	updateColor('bordercolor_pick', 'bordercolor');
-	updateColor('bgcolor_pick', 'bgcolor');
-}
-
-function updateAction() {
-	var el, inst = ed, tdElm, trElm, tableElm, formObj = document.forms[0];
-
-	tinyMCEPopup.restoreSelection();
-	el = ed.selection.getNode();
-	tdElm = ed.dom.getParent(el, "td,th");
-	trElm = ed.dom.getParent(el, "tr");
-	tableElm = ed.dom.getParent(el, "table");
-
-	ed.execCommand('mceBeginUndoLevel');
-
-	switch (getSelectValue(formObj, 'action')) {
-		case "cell":
-			var celltype = getSelectValue(formObj, 'celltype');
-			var scope = getSelectValue(formObj, 'scope');
-
-			if (ed.getParam("accessibility_warnings", 1)) {
-				if (celltype == "th" && scope == "") {
-					tinyMCEPopup.confirm(ed.getLang('table_dlg.missing_scope', '', true), function(s) {
-						if (s) {
-							updateCell(tdElm);
-
-							ed.addVisual();
-							ed.nodeChanged();
-							inst.execCommand('mceEndUndoLevel');
-							tinyMCEPopup.close();
-						}
-					});
-				}
-
-				return;
-			}
-
-			updateCell(tdElm);
-			break;
-
-		case "row":
-			var cell = trElm.firstChild;
-
-			if (cell.nodeName != "TD" && cell.nodeName != "TH")
-				cell = nextCell(cell);
-
-			do {
-				cell = updateCell(cell, true);
-			} while ((cell = nextCell(cell)) != null);
-
-			break;
-
-		case "all":
-			var rows = tableElm.getElementsByTagName("tr");
-
-			for (var i=0; i<rows.length; i++) {
-				var cell = rows[i].firstChild;
-
-				if (cell.nodeName != "TD" && cell.nodeName != "TH")
-					cell = nextCell(cell);
-
-				do {
-					cell = updateCell(cell, true);
-				} while ((cell = nextCell(cell)) != null);
-			}
-
-			break;
-	}
-
-	ed.addVisual();
-	ed.nodeChanged();
-	inst.execCommand('mceEndUndoLevel');
-	tinyMCEPopup.close();
-}
-
-function nextCell(elm) {
-	while ((elm = elm.nextSibling) != null) {
-		if (elm.nodeName == "TD" || elm.nodeName == "TH")
-			return elm;
-	}
-
-	return null;
-}
-
-function updateCell(td, skip_id) {
-	var inst = ed;
-	var formObj = document.forms[0];
-	var curCellType = td.nodeName.toLowerCase();
-	var celltype = getSelectValue(formObj, 'celltype');
-	var doc = inst.getDoc();
-	var dom = ed.dom;
-
-	if (!skip_id)
-		td.setAttribute('id', formObj.id.value);
-
-	td.setAttribute('align', formObj.align.value);
-	td.setAttribute('vAlign', formObj.valign.value);
-	td.setAttribute('lang', formObj.lang.value);
-	td.setAttribute('dir', getSelectValue(formObj, 'dir'));
-	td.setAttribute('style', ed.dom.serializeStyle(ed.dom.parseStyle(formObj.style.value)));
-	td.setAttribute('scope', formObj.scope.value);
-	ed.dom.setAttrib(td, 'class', getSelectValue(formObj, 'class'));
-
-	// Clear deprecated attributes
-	ed.dom.setAttrib(td, 'width', '');
-	ed.dom.setAttrib(td, 'height', '');
-	ed.dom.setAttrib(td, 'bgColor', '');
-	ed.dom.setAttrib(td, 'borderColor', '');
-	ed.dom.setAttrib(td, 'background', '');
-
-	// Set styles
-	td.style.width = getCSSSize(formObj.width.value);
-	td.style.height = getCSSSize(formObj.height.value);
-	if (formObj.bordercolor.value != "") {
-		td.style.borderColor = formObj.bordercolor.value;
-		td.style.borderStyle = td.style.borderStyle == "" ? "solid" : td.style.borderStyle;
-		td.style.borderWidth = td.style.borderWidth == "" ? "1px" : td.style.borderWidth;
-	} else
-		td.style.borderColor = '';
-
-	td.style.backgroundColor = formObj.bgcolor.value;
-
-	if (formObj.backgroundimage.value != "")
-		td.style.backgroundImage = "url('" + formObj.backgroundimage.value + "')";
-	else
-		td.style.backgroundImage = '';
-
-	if (curCellType != celltype) {
-		// changing to a different node type
-		var newCell = doc.createElement(celltype);
-
-		for (var c=0; c<td.childNodes.length; c++)
-			newCell.appendChild(td.childNodes[c].cloneNode(1));
-
-		for (var a=0; a<td.attributes.length; a++)
-			ed.dom.setAttrib(newCell, td.attributes[a].name, ed.dom.getAttrib(td, td.attributes[a].name));
-
-		td.parentNode.replaceChild(newCell, td);
-		td = newCell;
-	}
-
-	dom.setAttrib(td, 'style', dom.serializeStyle(dom.parseStyle(td.style.cssText)));
-
-	return td;
-}
-
-function changedBackgroundImage() {
-	var formObj = document.forms[0];
-	var st = ed.dom.parseStyle(formObj.style.value);
-
-	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
-
-	formObj.style.value = ed.dom.serializeStyle(st);
-}
-
-function changedSize() {
-	var formObj = document.forms[0];
-	var st = ed.dom.parseStyle(formObj.style.value);
-
-	var width = formObj.width.value;
-	if (width != "")
-		st['width'] = getCSSSize(width);
-	else
-		st['width'] = "";
-
-	var height = formObj.height.value;
-	if (height != "")
-		st['height'] = getCSSSize(height);
-	else
-		st['height'] = "";
-
-	formObj.style.value = ed.dom.serializeStyle(st);
-}
-
-function changedColor() {
-	var formObj = document.forms[0];
-	var st = ed.dom.parseStyle(formObj.style.value);
-
-	st['background-color'] = formObj.bgcolor.value;
-	st['border-color'] = formObj.bordercolor.value;
-
-	formObj.style.value = ed.dom.serializeStyle(st);
-}
-
-function changedStyle() {
-	var formObj = document.forms[0];
-	var st = ed.dom.parseStyle(formObj.style.value);
-
-	if (st['background-image'])
-		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
-	else
-		formObj.backgroundimage.value = '';
-
-	if (st['width'])
-		formObj.width.value = trimSize(st['width']);
-
-	if (st['height'])
-		formObj.height.value = trimSize(st['height']);
-
-	if (st['background-color']) {
-		formObj.bgcolor.value = st['background-color'];
-		updateColor('bgcolor_pick','bgcolor');
-	}
-
-	if (st['border-color']) {
-		formObj.bordercolor.value = st['border-color'];
-		updateColor('bordercolor_pick','bordercolor');
-	}
-}
-
-tinyMCEPopup.onInit.add(init);
+tinyMCEPopup.requireLangPack();
+
+var ed;
+
+function init() {
+	ed = tinyMCEPopup.editor;
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor')
+
+	var inst = ed;
+	var tdElm = ed.dom.getParent(ed.selection.getNode(), "td,th");
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(ed.dom.getAttrib(tdElm, "style"));
+
+	// Get table cell data
+	var celltype = tdElm.nodeName.toLowerCase();
+	var align = ed.dom.getAttrib(tdElm, 'align');
+	var valign = ed.dom.getAttrib(tdElm, 'valign');
+	var width = trimSize(getStyle(tdElm, 'width', 'width'));
+	var height = trimSize(getStyle(tdElm, 'height', 'height'));
+	var bordercolor = convertRGBToHex(getStyle(tdElm, 'bordercolor', 'borderLeftColor'));
+	var bgcolor = convertRGBToHex(getStyle(tdElm, 'bgcolor', 'backgroundColor'));
+	var className = ed.dom.getAttrib(tdElm, 'class');
+	var backgroundimage = getStyle(tdElm, 'background', 'backgroundImage').replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");;
+	var id = ed.dom.getAttrib(tdElm, 'id');
+	var lang = ed.dom.getAttrib(tdElm, 'lang');
+	var dir = ed.dom.getAttrib(tdElm, 'dir');
+	var scope = ed.dom.getAttrib(tdElm, 'scope');
+
+	// Setup form
+	addClassesToList('class', 'table_cell_styles');
+	TinyMCE_EditableSelects.init();
+
+	formObj.bordercolor.value = bordercolor;
+	formObj.bgcolor.value = bgcolor;
+	formObj.backgroundimage.value = backgroundimage;
+	formObj.width.value = width;
+	formObj.height.value = height;
+	formObj.id.value = id;
+	formObj.lang.value = lang;
+	formObj.style.value = ed.dom.serializeStyle(st);
+	selectByValue(formObj, 'align', align);
+	selectByValue(formObj, 'valign', valign);
+	selectByValue(formObj, 'class', className, true, true);
+	selectByValue(formObj, 'celltype', celltype);
+	selectByValue(formObj, 'dir', dir);
+	selectByValue(formObj, 'scope', scope);
+
+	// Resize some elements
+	if (isVisible('backgroundimagebrowser'))
+		document.getElementById('backgroundimage').style.width = '180px';
+
+	updateColor('bordercolor_pick', 'bordercolor');
+	updateColor('bgcolor_pick', 'bgcolor');
+}
+
+function updateAction() {
+	var el, inst = ed, tdElm, trElm, tableElm, formObj = document.forms[0];
+
+	tinyMCEPopup.restoreSelection();
+	el = ed.selection.getNode();
+	tdElm = ed.dom.getParent(el, "td,th");
+	trElm = ed.dom.getParent(el, "tr");
+	tableElm = ed.dom.getParent(el, "table");
+
+	ed.execCommand('mceBeginUndoLevel');
+
+	switch (getSelectValue(formObj, 'action')) {
+		case "cell":
+			var celltype = getSelectValue(formObj, 'celltype');
+			var scope = getSelectValue(formObj, 'scope');
+
+			if (ed.getParam("accessibility_warnings", 1)) {
+				if (celltype == "th" && scope == "") {
+					tinyMCEPopup.confirm(ed.getLang('table_dlg.missing_scope', '', true), function(s) {
+						if (s) {
+							updateCell(tdElm);
+
+							ed.addVisual();
+							ed.nodeChanged();
+							inst.execCommand('mceEndUndoLevel');
+							tinyMCEPopup.close();
+						}
+					});
+				}
+
+				return;
+			}
+
+			updateCell(tdElm);
+			break;
+
+		case "row":
+			var cell = trElm.firstChild;
+
+			if (cell.nodeName != "TD" && cell.nodeName != "TH")
+				cell = nextCell(cell);
+
+			do {
+				cell = updateCell(cell, true);
+			} while ((cell = nextCell(cell)) != null);
+
+			break;
+
+		case "all":
+			var rows = tableElm.getElementsByTagName("tr");
+
+			for (var i=0; i<rows.length; i++) {
+				var cell = rows[i].firstChild;
+
+				if (cell.nodeName != "TD" && cell.nodeName != "TH")
+					cell = nextCell(cell);
+
+				do {
+					cell = updateCell(cell, true);
+				} while ((cell = nextCell(cell)) != null);
+			}
+
+			break;
+	}
+
+	ed.addVisual();
+	ed.nodeChanged();
+	inst.execCommand('mceEndUndoLevel');
+	tinyMCEPopup.close();
+}
+
+function nextCell(elm) {
+	while ((elm = elm.nextSibling) != null) {
+		if (elm.nodeName == "TD" || elm.nodeName == "TH")
+			return elm;
+	}
+
+	return null;
+}
+
+function updateCell(td, skip_id) {
+	var inst = ed;
+	var formObj = document.forms[0];
+	var curCellType = td.nodeName.toLowerCase();
+	var celltype = getSelectValue(formObj, 'celltype');
+	var doc = inst.getDoc();
+	var dom = ed.dom;
+
+	if (!skip_id)
+		td.setAttribute('id', formObj.id.value);
+
+	td.setAttribute('align', formObj.align.value);
+	td.setAttribute('vAlign', formObj.valign.value);
+	td.setAttribute('lang', formObj.lang.value);
+	td.setAttribute('dir', getSelectValue(formObj, 'dir'));
+	td.setAttribute('style', ed.dom.serializeStyle(ed.dom.parseStyle(formObj.style.value)));
+	td.setAttribute('scope', formObj.scope.value);
+	ed.dom.setAttrib(td, 'class', getSelectValue(formObj, 'class'));
+
+	// Clear deprecated attributes
+	ed.dom.setAttrib(td, 'width', '');
+	ed.dom.setAttrib(td, 'height', '');
+	ed.dom.setAttrib(td, 'bgColor', '');
+	ed.dom.setAttrib(td, 'borderColor', '');
+	ed.dom.setAttrib(td, 'background', '');
+
+	// Set styles
+	td.style.width = getCSSSize(formObj.width.value);
+	td.style.height = getCSSSize(formObj.height.value);
+	if (formObj.bordercolor.value != "") {
+		td.style.borderColor = formObj.bordercolor.value;
+		td.style.borderStyle = td.style.borderStyle == "" ? "solid" : td.style.borderStyle;
+		td.style.borderWidth = td.style.borderWidth == "" ? "1px" : td.style.borderWidth;
+	} else
+		td.style.borderColor = '';
+
+	td.style.backgroundColor = formObj.bgcolor.value;
+
+	if (formObj.backgroundimage.value != "")
+		td.style.backgroundImage = "url('" + formObj.backgroundimage.value + "')";
+	else
+		td.style.backgroundImage = '';
+
+	if (curCellType != celltype) {
+		// changing to a different node type
+		var newCell = doc.createElement(celltype);
+
+		for (var c=0; c<td.childNodes.length; c++)
+			newCell.appendChild(td.childNodes[c].cloneNode(1));
+
+		for (var a=0; a<td.attributes.length; a++)
+			ed.dom.setAttrib(newCell, td.attributes[a].name, ed.dom.getAttrib(td, td.attributes[a].name));
+
+		td.parentNode.replaceChild(newCell, td);
+		td = newCell;
+	}
+
+	dom.setAttrib(td, 'style', dom.serializeStyle(dom.parseStyle(td.style.cssText)));
+
+	return td;
+}
+
+function changedBackgroundImage() {
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(formObj.style.value);
+
+	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
+
+	formObj.style.value = ed.dom.serializeStyle(st);
+}
+
+function changedSize() {
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(formObj.style.value);
+
+	var width = formObj.width.value;
+	if (width != "")
+		st['width'] = getCSSSize(width);
+	else
+		st['width'] = "";
+
+	var height = formObj.height.value;
+	if (height != "")
+		st['height'] = getCSSSize(height);
+	else
+		st['height'] = "";
+
+	formObj.style.value = ed.dom.serializeStyle(st);
+}
+
+function changedColor() {
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(formObj.style.value);
+
+	st['background-color'] = formObj.bgcolor.value;
+	st['border-color'] = formObj.bordercolor.value;
+
+	formObj.style.value = ed.dom.serializeStyle(st);
+}
+
+function changedStyle() {
+	var formObj = document.forms[0];
+	var st = ed.dom.parseStyle(formObj.style.value);
+
+	if (st['background-image'])
+		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+	else
+		formObj.backgroundimage.value = '';
+
+	if (st['width'])
+		formObj.width.value = trimSize(st['width']);
+
+	if (st['height'])
+		formObj.height.value = trimSize(st['height']);
+
+	if (st['background-color']) {
+		formObj.bgcolor.value = st['background-color'];
+		updateColor('bgcolor_pick','bgcolor');
+	}
+
+	if (st['border-color']) {
+		formObj.bordercolor.value = st['border-color'];
+		updateColor('bordercolor_pick','bordercolor');
+	}
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/webapp/web/js/tiny_mce/plugins/table/js/merge_cells.js b/webapp/web/js/tiny_mce/plugins/table/js/merge_cells.js
index 31d6df0ab..2fbe98fe5 100755
--- a/webapp/web/js/tiny_mce/plugins/table/js/merge_cells.js
+++ b/webapp/web/js/tiny_mce/plugins/table/js/merge_cells.js
@@ -1,29 +1,29 @@
-tinyMCEPopup.requireLangPack();
-
-function init() {
-	var f = document.forms[0], v;
-
-	tinyMCEPopup.resizeToInnerSize();
-
-	f.numcols.value = tinyMCEPopup.getWindowArg('numcols', 1);
-	f.numrows.value = tinyMCEPopup.getWindowArg('numrows', 1);
-}
-
-function mergeCells() {
-	var args = [], f = document.forms[0];
-
-	tinyMCEPopup.restoreSelection();
-
-	if (!AutoValidator.validate(f)) {
-		tinyMCEPopup.alert(tinyMCEPopup.getLang('invalid_data'));
-		return false;
-	}
-
-	args["numcols"] = f.numcols.value;
-	args["numrows"] = f.numrows.value;
-
-	tinyMCEPopup.execCommand("mceTableMergeCells", false, args);
-	tinyMCEPopup.close();
-}
-
-tinyMCEPopup.onInit.add(init);
+tinyMCEPopup.requireLangPack();
+
+function init() {
+	var f = document.forms[0], v;
+
+	tinyMCEPopup.resizeToInnerSize();
+
+	f.numcols.value = tinyMCEPopup.getWindowArg('numcols', 1);
+	f.numrows.value = tinyMCEPopup.getWindowArg('numrows', 1);
+}
+
+function mergeCells() {
+	var args = [], f = document.forms[0];
+
+	tinyMCEPopup.restoreSelection();
+
+	if (!AutoValidator.validate(f)) {
+		tinyMCEPopup.alert(tinyMCEPopup.getLang('invalid_data'));
+		return false;
+	}
+
+	args["numcols"] = f.numcols.value;
+	args["numrows"] = f.numrows.value;
+
+	tinyMCEPopup.execCommand("mceTableMergeCells", false, args);
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/webapp/web/js/tiny_mce/plugins/table/js/row.js b/webapp/web/js/tiny_mce/plugins/table/js/row.js
index d25f635f6..3a171624c 100755
--- a/webapp/web/js/tiny_mce/plugins/table/js/row.js
+++ b/webapp/web/js/tiny_mce/plugins/table/js/row.js
@@ -1,212 +1,212 @@
-tinyMCEPopup.requireLangPack();
-
-function init() {
-	tinyMCEPopup.resizeToInnerSize();
-
-	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
-	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
-
-	var inst = tinyMCEPopup.editor;
-	var dom = inst.dom;
-	var trElm = dom.getParent(inst.selection.getNode(), "tr");
-	var formObj = document.forms[0];
-	var st = dom.parseStyle(dom.getAttrib(trElm, "style"));
-
-	// Get table row data
-	var rowtype = trElm.parentNode.nodeName.toLowerCase();
-	var align = dom.getAttrib(trElm, 'align');
-	var valign = dom.getAttrib(trElm, 'valign');
-	var height = trimSize(getStyle(trElm, 'height', 'height'));
-	var className = dom.getAttrib(trElm, 'class');
-	var bgcolor = convertRGBToHex(getStyle(trElm, 'bgcolor', 'backgroundColor'));
-	var backgroundimage = getStyle(trElm, 'background', 'backgroundImage').replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");;
-	var id = dom.getAttrib(trElm, 'id');
-	var lang = dom.getAttrib(trElm, 'lang');
-	var dir = dom.getAttrib(trElm, 'dir');
-
-	// Setup form
-	addClassesToList('class', 'table_row_styles');
-	TinyMCE_EditableSelects.init();
-
-	formObj.bgcolor.value = bgcolor;
-	formObj.backgroundimage.value = backgroundimage;
-	formObj.height.value = height;
-	formObj.id.value = id;
-	formObj.lang.value = lang;
-	formObj.style.value = dom.serializeStyle(st);
-	selectByValue(formObj, 'align', align);
-	selectByValue(formObj, 'valign', valign);
-	selectByValue(formObj, 'class', className, true, true);
-	selectByValue(formObj, 'rowtype', rowtype);
-	selectByValue(formObj, 'dir', dir);
-
-	// Resize some elements
-	if (isVisible('backgroundimagebrowser'))
-		document.getElementById('backgroundimage').style.width = '180px';
-
-	updateColor('bgcolor_pick', 'bgcolor');
-}
-
-function updateAction() {
-	var inst = tinyMCEPopup.editor, dom = inst.dom, trElm, tableElm, formObj = document.forms[0];
-	var action = getSelectValue(formObj, 'action');
-
-	tinyMCEPopup.restoreSelection();
-	trElm = dom.getParent(inst.selection.getNode(), "tr");
-	tableElm = dom.getParent(inst.selection.getNode(), "table");
-
-	inst.execCommand('mceBeginUndoLevel');
-
-	switch (action) {
-		case "row":
-			updateRow(trElm);
-			break;
-
-		case "all":
-			var rows = tableElm.getElementsByTagName("tr");
-
-			for (var i=0; i<rows.length; i++)
-				updateRow(rows[i], true);
-
-			break;
-
-		case "odd":
-		case "even":
-			var rows = tableElm.getElementsByTagName("tr");
-
-			for (var i=0; i<rows.length; i++) {
-				if ((i % 2 == 0 && action == "odd") || (i % 2 != 0 && action == "even"))
-					updateRow(rows[i], true, true);
-			}
-
-			break;
-	}
-
-	inst.addVisual();
-	inst.nodeChanged();
-	inst.execCommand('mceEndUndoLevel');
-	tinyMCEPopup.close();
-}
-
-function updateRow(tr_elm, skip_id, skip_parent) {
-	var inst = tinyMCEPopup.editor;
-	var formObj = document.forms[0];
-	var dom = inst.dom;
-	var curRowType = tr_elm.parentNode.nodeName.toLowerCase();
-	var rowtype = getSelectValue(formObj, 'rowtype');
-	var doc = inst.getDoc();
-
-	// Update row element
-	if (!skip_id)
-		tr_elm.setAttribute('id', formObj.id.value);
-
-	tr_elm.setAttribute('align', getSelectValue(formObj, 'align'));
-	tr_elm.setAttribute('vAlign', getSelectValue(formObj, 'valign'));
-	tr_elm.setAttribute('lang', formObj.lang.value);
-	tr_elm.setAttribute('dir', getSelectValue(formObj, 'dir'));
-	tr_elm.setAttribute('style', dom.serializeStyle(dom.parseStyle(formObj.style.value)));
-	dom.setAttrib(tr_elm, 'class', getSelectValue(formObj, 'class'));
-
-	// Clear deprecated attributes
-	tr_elm.setAttribute('background', '');
-	tr_elm.setAttribute('bgColor', '');
-	tr_elm.setAttribute('height', '');
-
-	// Set styles
-	tr_elm.style.height = getCSSSize(formObj.height.value);
-	tr_elm.style.backgroundColor = formObj.bgcolor.value;
-
-	if (formObj.backgroundimage.value != "")
-		tr_elm.style.backgroundImage = "url('" + formObj.backgroundimage.value + "')";
-	else
-		tr_elm.style.backgroundImage = '';
-
-	// Setup new rowtype
-	if (curRowType != rowtype && !skip_parent) {
-		// first, clone the node we are working on
-		var newRow = tr_elm.cloneNode(1);
-
-		// next, find the parent of its new destination (creating it if necessary)
-		var theTable = dom.getParent(tr_elm, "table");
-		var dest = rowtype;
-		var newParent = null;
-		for (var i = 0; i < theTable.childNodes.length; i++) {
-			if (theTable.childNodes[i].nodeName.toLowerCase() == dest)
-				newParent = theTable.childNodes[i];
-		}
-
-		if (newParent == null) {
-			newParent = doc.createElement(dest);
-
-			if (dest == "thead") {
-				if (theTable.firstChild.nodeName == 'CAPTION')
-					inst.dom.insertAfter(newParent, theTable.firstChild);
-				else
-					theTable.insertBefore(newParent, theTable.firstChild);
-			} else
-				theTable.appendChild(newParent);
-		}
-
-		// append the row to the new parent
-		newParent.appendChild(newRow);
-
-		// remove the original
-		tr_elm.parentNode.removeChild(tr_elm);
-
-		// set tr_elm to the new node
-		tr_elm = newRow;
-	}
-
-	dom.setAttrib(tr_elm, 'style', dom.serializeStyle(dom.parseStyle(tr_elm.style.cssText)));
-}
-
-function changedBackgroundImage() {
-	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
-	var st = dom.parseStyle(formObj.style.value);
-
-	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
-
-	formObj.style.value = dom.serializeStyle(st);
-}
-
-function changedStyle() {
-	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
-	var st = dom.parseStyle(formObj.style.value);
-
-	if (st['background-image'])
-		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
-	else
-		formObj.backgroundimage.value = '';
-
-	if (st['height'])
-		formObj.height.value = trimSize(st['height']);
-
-	if (st['background-color']) {
-		formObj.bgcolor.value = st['background-color'];
-		updateColor('bgcolor_pick','bgcolor');
-	}
-}
-
-function changedSize() {
-	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
-	var st = dom.parseStyle(formObj.style.value);
-
-	var height = formObj.height.value;
-	if (height != "")
-		st['height'] = getCSSSize(height);
-	else
-		st['height'] = "";
-
-	formObj.style.value = dom.serializeStyle(st);
-}
-
-function changedColor() {
-	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
-	var st = dom.parseStyle(formObj.style.value);
-
-	st['background-color'] = formObj.bgcolor.value;
-
-	formObj.style.value = dom.serializeStyle(st);
-}
-
-tinyMCEPopup.onInit.add(init);
+tinyMCEPopup.requireLangPack();
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+
+	var inst = tinyMCEPopup.editor;
+	var dom = inst.dom;
+	var trElm = dom.getParent(inst.selection.getNode(), "tr");
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(dom.getAttrib(trElm, "style"));
+
+	// Get table row data
+	var rowtype = trElm.parentNode.nodeName.toLowerCase();
+	var align = dom.getAttrib(trElm, 'align');
+	var valign = dom.getAttrib(trElm, 'valign');
+	var height = trimSize(getStyle(trElm, 'height', 'height'));
+	var className = dom.getAttrib(trElm, 'class');
+	var bgcolor = convertRGBToHex(getStyle(trElm, 'bgcolor', 'backgroundColor'));
+	var backgroundimage = getStyle(trElm, 'background', 'backgroundImage').replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");;
+	var id = dom.getAttrib(trElm, 'id');
+	var lang = dom.getAttrib(trElm, 'lang');
+	var dir = dom.getAttrib(trElm, 'dir');
+
+	// Setup form
+	addClassesToList('class', 'table_row_styles');
+	TinyMCE_EditableSelects.init();
+
+	formObj.bgcolor.value = bgcolor;
+	formObj.backgroundimage.value = backgroundimage;
+	formObj.height.value = height;
+	formObj.id.value = id;
+	formObj.lang.value = lang;
+	formObj.style.value = dom.serializeStyle(st);
+	selectByValue(formObj, 'align', align);
+	selectByValue(formObj, 'valign', valign);
+	selectByValue(formObj, 'class', className, true, true);
+	selectByValue(formObj, 'rowtype', rowtype);
+	selectByValue(formObj, 'dir', dir);
+
+	// Resize some elements
+	if (isVisible('backgroundimagebrowser'))
+		document.getElementById('backgroundimage').style.width = '180px';
+
+	updateColor('bgcolor_pick', 'bgcolor');
+}
+
+function updateAction() {
+	var inst = tinyMCEPopup.editor, dom = inst.dom, trElm, tableElm, formObj = document.forms[0];
+	var action = getSelectValue(formObj, 'action');
+
+	tinyMCEPopup.restoreSelection();
+	trElm = dom.getParent(inst.selection.getNode(), "tr");
+	tableElm = dom.getParent(inst.selection.getNode(), "table");
+
+	inst.execCommand('mceBeginUndoLevel');
+
+	switch (action) {
+		case "row":
+			updateRow(trElm);
+			break;
+
+		case "all":
+			var rows = tableElm.getElementsByTagName("tr");
+
+			for (var i=0; i<rows.length; i++)
+				updateRow(rows[i], true);
+
+			break;
+
+		case "odd":
+		case "even":
+			var rows = tableElm.getElementsByTagName("tr");
+
+			for (var i=0; i<rows.length; i++) {
+				if ((i % 2 == 0 && action == "odd") || (i % 2 != 0 && action == "even"))
+					updateRow(rows[i], true, true);
+			}
+
+			break;
+	}
+
+	inst.addVisual();
+	inst.nodeChanged();
+	inst.execCommand('mceEndUndoLevel');
+	tinyMCEPopup.close();
+}
+
+function updateRow(tr_elm, skip_id, skip_parent) {
+	var inst = tinyMCEPopup.editor;
+	var formObj = document.forms[0];
+	var dom = inst.dom;
+	var curRowType = tr_elm.parentNode.nodeName.toLowerCase();
+	var rowtype = getSelectValue(formObj, 'rowtype');
+	var doc = inst.getDoc();
+
+	// Update row element
+	if (!skip_id)
+		tr_elm.setAttribute('id', formObj.id.value);
+
+	tr_elm.setAttribute('align', getSelectValue(formObj, 'align'));
+	tr_elm.setAttribute('vAlign', getSelectValue(formObj, 'valign'));
+	tr_elm.setAttribute('lang', formObj.lang.value);
+	tr_elm.setAttribute('dir', getSelectValue(formObj, 'dir'));
+	tr_elm.setAttribute('style', dom.serializeStyle(dom.parseStyle(formObj.style.value)));
+	dom.setAttrib(tr_elm, 'class', getSelectValue(formObj, 'class'));
+
+	// Clear deprecated attributes
+	tr_elm.setAttribute('background', '');
+	tr_elm.setAttribute('bgColor', '');
+	tr_elm.setAttribute('height', '');
+
+	// Set styles
+	tr_elm.style.height = getCSSSize(formObj.height.value);
+	tr_elm.style.backgroundColor = formObj.bgcolor.value;
+
+	if (formObj.backgroundimage.value != "")
+		tr_elm.style.backgroundImage = "url('" + formObj.backgroundimage.value + "')";
+	else
+		tr_elm.style.backgroundImage = '';
+
+	// Setup new rowtype
+	if (curRowType != rowtype && !skip_parent) {
+		// first, clone the node we are working on
+		var newRow = tr_elm.cloneNode(1);
+
+		// next, find the parent of its new destination (creating it if necessary)
+		var theTable = dom.getParent(tr_elm, "table");
+		var dest = rowtype;
+		var newParent = null;
+		for (var i = 0; i < theTable.childNodes.length; i++) {
+			if (theTable.childNodes[i].nodeName.toLowerCase() == dest)
+				newParent = theTable.childNodes[i];
+		}
+
+		if (newParent == null) {
+			newParent = doc.createElement(dest);
+
+			if (dest == "thead") {
+				if (theTable.firstChild.nodeName == 'CAPTION')
+					inst.dom.insertAfter(newParent, theTable.firstChild);
+				else
+					theTable.insertBefore(newParent, theTable.firstChild);
+			} else
+				theTable.appendChild(newParent);
+		}
+
+		// append the row to the new parent
+		newParent.appendChild(newRow);
+
+		// remove the original
+		tr_elm.parentNode.removeChild(tr_elm);
+
+		// set tr_elm to the new node
+		tr_elm = newRow;
+	}
+
+	dom.setAttrib(tr_elm, 'style', dom.serializeStyle(dom.parseStyle(tr_elm.style.cssText)));
+}
+
+function changedBackgroundImage() {
+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
+	var st = dom.parseStyle(formObj.style.value);
+
+	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedStyle() {
+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
+	var st = dom.parseStyle(formObj.style.value);
+
+	if (st['background-image'])
+		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+	else
+		formObj.backgroundimage.value = '';
+
+	if (st['height'])
+		formObj.height.value = trimSize(st['height']);
+
+	if (st['background-color']) {
+		formObj.bgcolor.value = st['background-color'];
+		updateColor('bgcolor_pick','bgcolor');
+	}
+}
+
+function changedSize() {
+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
+	var st = dom.parseStyle(formObj.style.value);
+
+	var height = formObj.height.value;
+	if (height != "")
+		st['height'] = getCSSSize(height);
+	else
+		st['height'] = "";
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedColor() {
+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
+	var st = dom.parseStyle(formObj.style.value);
+
+	st['background-color'] = formObj.bgcolor.value;
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/webapp/web/js/tiny_mce/plugins/table/js/table.js b/webapp/web/js/tiny_mce/plugins/table/js/table.js
index 822b4fcc1..6718511b7 100755
--- a/webapp/web/js/tiny_mce/plugins/table/js/table.js
+++ b/webapp/web/js/tiny_mce/plugins/table/js/table.js
@@ -1,410 +1,410 @@
-tinyMCEPopup.requireLangPack();
-
-var action, orgTableWidth, orgTableHeight, dom = tinyMCEPopup.editor.dom;
-
-function insertTable() {
-	var formObj = document.forms[0];
-	var inst = tinyMCEPopup.editor, dom = inst.dom;
-	var cols = 2, rows = 2, border = 0, cellpadding = -1, cellspacing = -1, align, width, height, className, caption, frame, rules;
-	var html = '', capEl, elm;
-	var cellLimit, rowLimit, colLimit;
-
-	tinyMCEPopup.restoreSelection();
-
-	if (!AutoValidator.validate(formObj)) {
-		tinyMCEPopup.alert(inst.getLang('invalid_data'));
-		return false;
-	}
-
-	elm = dom.getParent(inst.selection.getNode(), 'table');
-
-	// Get form data
-	cols = formObj.elements['cols'].value;
-	rows = formObj.elements['rows'].value;
-	border = formObj.elements['border'].value != "" ? formObj.elements['border'].value  : 0;
-	cellpadding = formObj.elements['cellpadding'].value != "" ? formObj.elements['cellpadding'].value : "";
-	cellspacing = formObj.elements['cellspacing'].value != "" ? formObj.elements['cellspacing'].value : "";
-	align = formObj.elements['align'].options[formObj.elements['align'].selectedIndex].value;
-	frame = formObj.elements['frame'].options[formObj.elements['frame'].selectedIndex].value;
-	rules = formObj.elements['rules'].options[formObj.elements['rules'].selectedIndex].value;
-	width = formObj.elements['width'].value;
-	height = formObj.elements['height'].value;
-	bordercolor = formObj.elements['bordercolor'].value;
-	bgcolor = formObj.elements['bgcolor'].value;
-	className = formObj.elements['class'].options[formObj.elements['class'].selectedIndex].value;
-	id = formObj.elements['id'].value;
-	summary = formObj.elements['summary'].value;
-	style = formObj.elements['style'].value;
-	dir = formObj.elements['dir'].value;
-	lang = formObj.elements['lang'].value;
-	background = formObj.elements['backgroundimage'].value;
-	caption = formObj.elements['caption'].checked;
-
-	cellLimit = tinyMCEPopup.getParam('table_cell_limit', false);
-	rowLimit = tinyMCEPopup.getParam('table_row_limit', false);
-	colLimit = tinyMCEPopup.getParam('table_col_limit', false);
-
-	// Validate table size
-	if (colLimit && cols > colLimit) {
-		tinyMCEPopup.alert(inst.getLang('table_dlg.col_limit').replace(/\{\$cols\}/g, colLimit));
-		return false;
-	} else if (rowLimit && rows > rowLimit) {
-		tinyMCEPopup.alert(inst.getLang('table_dlg.row_limit').replace(/\{\$rows\}/g, rowLimit));
-		return false;
-	} else if (cellLimit && cols * rows > cellLimit) {
-		tinyMCEPopup.alert(inst.getLang('table_dlg.cell_limit').replace(/\{\$cells\}/g, cellLimit));
-		return false;
-	}
-
-	// Update table
-	if (action == "update") {
-		inst.execCommand('mceBeginUndoLevel');
-
-		dom.setAttrib(elm, 'cellPadding', cellpadding, true);
-		dom.setAttrib(elm, 'cellSpacing', cellspacing, true);
-		dom.setAttrib(elm, 'border', border);
-		dom.setAttrib(elm, 'align', align);
-		dom.setAttrib(elm, 'frame', frame);
-		dom.setAttrib(elm, 'rules', rules);
-		dom.setAttrib(elm, 'class', className);
-		dom.setAttrib(elm, 'style', style);
-		dom.setAttrib(elm, 'id', id);
-		dom.setAttrib(elm, 'summary', summary);
-		dom.setAttrib(elm, 'dir', dir);
-		dom.setAttrib(elm, 'lang', lang);
-
-		capEl = inst.dom.select('caption', elm)[0];
-
-		if (capEl && !caption)
-			capEl.parentNode.removeChild(capEl);
-
-		if (!capEl && caption) {
-			capEl = elm.ownerDocument.createElement('caption');
-
-			if (!tinymce.isIE)
-				capEl.innerHTML = '<br mce_bogus="1"/>';
-
-			elm.insertBefore(capEl, elm.firstChild);
-		}
-
-		if (width && /(pt|em|cm)$/.test(width)) {
-			dom.setStyle(elm, 'width', width);
-			dom.setAttrib(elm, 'width', '');
-		} else {
-			dom.setAttrib(elm, 'width', width, true);
-			dom.setStyle(elm, 'width', '');
-		}
-
-		// Remove these since they are not valid XHTML
-		dom.setAttrib(elm, 'borderColor', '');
-		dom.setAttrib(elm, 'bgColor', '');
-		dom.setAttrib(elm, 'background', '');
-
-		if (height) {
-			dom.setStyle(elm, 'height', height);
-			dom.setAttrib(elm, 'height', '');
-		}
-
-		if (background != '')
-			elm.style.backgroundImage = "url('" + background + "')";
-		else
-			elm.style.backgroundImage = '';
-
-/*		if (tinyMCEPopup.getParam("inline_styles")) {
-			if (width != '')
-				elm.style.width = getCSSSize(width);
-		}*/
-
-		if (bordercolor != "") {
-			elm.style.borderColor = bordercolor;
-			elm.style.borderStyle = elm.style.borderStyle == "" ? "solid" : elm.style.borderStyle;
-			elm.style.borderWidth = border == "" ? "1px" : border;
-		} else
-			elm.style.borderColor = '';
-
-		elm.style.backgroundColor = bgcolor;
-		elm.style.height = getCSSSize(height);
-
-		inst.addVisual();
-
-		// Fix for stange MSIE align bug
-		//elm.outerHTML = elm.outerHTML;
-
-		inst.nodeChanged();
-		inst.execCommand('mceEndUndoLevel');
-
-		// Repaint if dimensions changed
-		if (formObj.width.value != orgTableWidth || formObj.height.value != orgTableHeight)
-			inst.execCommand('mceRepaint');
-
-		tinyMCEPopup.close();
-		return true;
-	}
-
-	// Create new table
-	html += '<table';
-
-	html += makeAttrib('id', id);
-	html += makeAttrib('border', border);
-	html += makeAttrib('cellpadding', cellpadding);
-	html += makeAttrib('cellspacing', cellspacing);
-
-	if (width && /(pt|em|cm)$/.test(width)) {
-		if (style)
-			style += '; ';
-
-		style += 'width: ' + width;
-	} else
-		html += makeAttrib('width', width);
-
-/*	if (height) {
-		if (style)
-			style += '; ';
-
-		style += 'height: ' + height;
-	}*/
-
-	//html += makeAttrib('height', height);
-	//html += makeAttrib('bordercolor', bordercolor);
-	//html += makeAttrib('bgcolor', bgcolor);
-	html += makeAttrib('align', align);
-	html += makeAttrib('frame', frame);
-	html += makeAttrib('rules', rules);
-	html += makeAttrib('class', className);
-	html += makeAttrib('style', style);
-	html += makeAttrib('summary', summary);
-	html += makeAttrib('dir', dir);
-	html += makeAttrib('lang', lang);
-	html += '>';
-
-	if (caption) {
-		if (!tinymce.isIE)
-			html += '<caption><br mce_bogus="1"/></caption>';
-		else
-			html += '<caption></caption>';
-	}
-
-	for (var y=0; y<rows; y++) {
-		html += "<tr>";
-
-		for (var x=0; x<cols; x++) {
-			if (!tinymce.isIE)
-				html += '<td><br mce_bogus="1"/></td>';
-			else
-				html += '<td></td>';
-		}
-
-		html += "</tr>";
-	}
-
-	html += "</table>";
-
-	inst.execCommand('mceBeginUndoLevel');
-	inst.execCommand('mceInsertContent', false, html);
-	inst.addVisual();
-	inst.execCommand('mceEndUndoLevel');
-
-	tinyMCEPopup.close();
-}
-
-function makeAttrib(attrib, value) {
-	var formObj = document.forms[0];
-	var valueElm = formObj.elements[attrib];
-
-	if (typeof(value) == "undefined" || value == null) {
-		value = "";
-
-		if (valueElm)
-			value = valueElm.value;
-	}
-
-	if (value == "")
-		return "";
-
-	// XML encode it
-	value = value.replace(/&/g, '&amp;');
-	value = value.replace(/\"/g, '&quot;');
-	value = value.replace(/</g, '&lt;');
-	value = value.replace(/>/g, '&gt;');
-
-	return ' ' + attrib + '="' + value + '"';
-}
-
-function init() {
-	tinyMCEPopup.resizeToInnerSize();
-
-	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
-	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
-	document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
-	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
-
-	var cols = 2, rows = 2, border = tinyMCEPopup.getParam('table_default_border', '0'), cellpadding = tinyMCEPopup.getParam('table_default_cellpadding', ''), cellspacing = tinyMCEPopup.getParam('table_default_cellspacing', '');
-	var align = "", width = "", height = "", bordercolor = "", bgcolor = "", className = "";
-	var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "", rules, frame;
-	var inst = tinyMCEPopup.editor, dom = inst.dom;
-	var formObj = document.forms[0];
-	var elm = dom.getParent(inst.selection.getNode(), "table");
-
-	action = tinyMCEPopup.getWindowArg('action');
-
-	if (!action)
-		action = elm ? "update" : "insert";
-
-	if (elm && action != "insert") {
-		var rowsAr = elm.rows;
-		var cols = 0;
-		for (var i=0; i<rowsAr.length; i++)
-			if (rowsAr[i].cells.length > cols)
-				cols = rowsAr[i].cells.length;
-
-		cols = cols;
-		rows = rowsAr.length;
-
-		st = dom.parseStyle(dom.getAttrib(elm, "style"));
-		border = trimSize(getStyle(elm, 'border', 'borderWidth'));
-		cellpadding = dom.getAttrib(elm, 'cellpadding', "");
-		cellspacing = dom.getAttrib(elm, 'cellspacing', "");
-		width = trimSize(getStyle(elm, 'width', 'width'));
-		height = trimSize(getStyle(elm, 'height', 'height'));
-		bordercolor = convertRGBToHex(getStyle(elm, 'bordercolor', 'borderLeftColor'));
-		bgcolor = convertRGBToHex(getStyle(elm, 'bgcolor', 'backgroundColor'));
-		align = dom.getAttrib(elm, 'align', align);
-		frame = dom.getAttrib(elm, 'frame');
-		rules = dom.getAttrib(elm, 'rules');
-		className = tinymce.trim(dom.getAttrib(elm, 'class').replace(/mceItem.+/g, ''));
-		id = dom.getAttrib(elm, 'id');
-		summary = dom.getAttrib(elm, 'summary');
-		style = dom.serializeStyle(st);
-		dir = dom.getAttrib(elm, 'dir');
-		lang = dom.getAttrib(elm, 'lang');
-		background = getStyle(elm, 'background', 'backgroundImage').replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
-		formObj.caption.checked = elm.getElementsByTagName('caption').length > 0;
-
-		orgTableWidth = width;
-		orgTableHeight = height;
-
-		action = "update";
-		formObj.insert.value = inst.getLang('update');
-	}
-
-	addClassesToList('class', "table_styles");
-	TinyMCE_EditableSelects.init();
-
-	// Update form
-	selectByValue(formObj, 'align', align);
-	selectByValue(formObj, 'frame', frame);
-	selectByValue(formObj, 'rules', rules);
-	selectByValue(formObj, 'class', className, true, true);
-	formObj.cols.value = cols;
-	formObj.rows.value = rows;
-	formObj.border.value = border;
-	formObj.cellpadding.value = cellpadding;
-	formObj.cellspacing.value = cellspacing;
-	formObj.width.value = width;
-	formObj.height.value = height;
-	formObj.bordercolor.value = bordercolor;
-	formObj.bgcolor.value = bgcolor;
-	formObj.id.value = id;
-	formObj.summary.value = summary;
-	formObj.style.value = style;
-	formObj.dir.value = dir;
-	formObj.lang.value = lang;
-	formObj.backgroundimage.value = background;
-
-	updateColor('bordercolor_pick', 'bordercolor');
-	updateColor('bgcolor_pick', 'bgcolor');
-
-	// Resize some elements
-	if (isVisible('backgroundimagebrowser'))
-		document.getElementById('backgroundimage').style.width = '180px';
-
-	// Disable some fields in update mode
-	if (action == "update") {
-		formObj.cols.disabled = true;
-		formObj.rows.disabled = true;
-	}
-}
-
-function changedSize() {
-	var formObj = document.forms[0];
-	var st = dom.parseStyle(formObj.style.value);
-
-/*	var width = formObj.width.value;
-	if (width != "")
-		st['width'] = tinyMCEPopup.getParam("inline_styles") ? getCSSSize(width) : "";
-	else
-		st['width'] = "";*/
-
-	var height = formObj.height.value;
-	if (height != "")
-		st['height'] = getCSSSize(height);
-	else
-		st['height'] = "";
-
-	formObj.style.value = dom.serializeStyle(st);
-}
-
-function changedBackgroundImage() {
-	var formObj = document.forms[0];
-	var st = dom.parseStyle(formObj.style.value);
-
-	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
-
-	formObj.style.value = dom.serializeStyle(st);
-}
-
-function changedBorder() {
-	var formObj = document.forms[0];
-	var st = dom.parseStyle(formObj.style.value);
-
-	// Update border width if the element has a color
-	if (formObj.border.value != "" && formObj.bordercolor.value != "")
-		st['border-width'] = formObj.border.value + "px";
-
-	formObj.style.value = dom.serializeStyle(st);
-}
-
-function changedColor() {
-	var formObj = document.forms[0];
-	var st = dom.parseStyle(formObj.style.value);
-
-	st['background-color'] = formObj.bgcolor.value;
-
-	if (formObj.bordercolor.value != "") {
-		st['border-color'] = formObj.bordercolor.value;
-
-		// Add border-width if it's missing
-		if (!st['border-width'])
-			st['border-width'] = formObj.border.value == "" ? "1px" : formObj.border.value + "px";
-	}
-
-	formObj.style.value = dom.serializeStyle(st);
-}
-
-function changedStyle() {
-	var formObj = document.forms[0];
-	var st = dom.parseStyle(formObj.style.value);
-
-	if (st['background-image'])
-		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
-	else
-		formObj.backgroundimage.value = '';
-
-	if (st['width'])
-		formObj.width.value = trimSize(st['width']);
-
-	if (st['height'])
-		formObj.height.value = trimSize(st['height']);
-
-	if (st['background-color']) {
-		formObj.bgcolor.value = st['background-color'];
-		updateColor('bgcolor_pick','bgcolor');
-	}
-
-	if (st['border-color']) {
-		formObj.bordercolor.value = st['border-color'];
-		updateColor('bordercolor_pick','bordercolor');
-	}
-}
-
-tinyMCEPopup.onInit.add(init);
+tinyMCEPopup.requireLangPack();
+
+var action, orgTableWidth, orgTableHeight, dom = tinyMCEPopup.editor.dom;
+
+function insertTable() {
+	var formObj = document.forms[0];
+	var inst = tinyMCEPopup.editor, dom = inst.dom;
+	var cols = 2, rows = 2, border = 0, cellpadding = -1, cellspacing = -1, align, width, height, className, caption, frame, rules;
+	var html = '', capEl, elm;
+	var cellLimit, rowLimit, colLimit;
+
+	tinyMCEPopup.restoreSelection();
+
+	if (!AutoValidator.validate(formObj)) {
+		tinyMCEPopup.alert(inst.getLang('invalid_data'));
+		return false;
+	}
+
+	elm = dom.getParent(inst.selection.getNode(), 'table');
+
+	// Get form data
+	cols = formObj.elements['cols'].value;
+	rows = formObj.elements['rows'].value;
+	border = formObj.elements['border'].value != "" ? formObj.elements['border'].value  : 0;
+	cellpadding = formObj.elements['cellpadding'].value != "" ? formObj.elements['cellpadding'].value : "";
+	cellspacing = formObj.elements['cellspacing'].value != "" ? formObj.elements['cellspacing'].value : "";
+	align = formObj.elements['align'].options[formObj.elements['align'].selectedIndex].value;
+	frame = formObj.elements['frame'].options[formObj.elements['frame'].selectedIndex].value;
+	rules = formObj.elements['rules'].options[formObj.elements['rules'].selectedIndex].value;
+	width = formObj.elements['width'].value;
+	height = formObj.elements['height'].value;
+	bordercolor = formObj.elements['bordercolor'].value;
+	bgcolor = formObj.elements['bgcolor'].value;
+	className = formObj.elements['class'].options[formObj.elements['class'].selectedIndex].value;
+	id = formObj.elements['id'].value;
+	summary = formObj.elements['summary'].value;
+	style = formObj.elements['style'].value;
+	dir = formObj.elements['dir'].value;
+	lang = formObj.elements['lang'].value;
+	background = formObj.elements['backgroundimage'].value;
+	caption = formObj.elements['caption'].checked;
+
+	cellLimit = tinyMCEPopup.getParam('table_cell_limit', false);
+	rowLimit = tinyMCEPopup.getParam('table_row_limit', false);
+	colLimit = tinyMCEPopup.getParam('table_col_limit', false);
+
+	// Validate table size
+	if (colLimit && cols > colLimit) {
+		tinyMCEPopup.alert(inst.getLang('table_dlg.col_limit').replace(/\{\$cols\}/g, colLimit));
+		return false;
+	} else if (rowLimit && rows > rowLimit) {
+		tinyMCEPopup.alert(inst.getLang('table_dlg.row_limit').replace(/\{\$rows\}/g, rowLimit));
+		return false;
+	} else if (cellLimit && cols * rows > cellLimit) {
+		tinyMCEPopup.alert(inst.getLang('table_dlg.cell_limit').replace(/\{\$cells\}/g, cellLimit));
+		return false;
+	}
+
+	// Update table
+	if (action == "update") {
+		inst.execCommand('mceBeginUndoLevel');
+
+		dom.setAttrib(elm, 'cellPadding', cellpadding, true);
+		dom.setAttrib(elm, 'cellSpacing', cellspacing, true);
+		dom.setAttrib(elm, 'border', border);
+		dom.setAttrib(elm, 'align', align);
+		dom.setAttrib(elm, 'frame', frame);
+		dom.setAttrib(elm, 'rules', rules);
+		dom.setAttrib(elm, 'class', className);
+		dom.setAttrib(elm, 'style', style);
+		dom.setAttrib(elm, 'id', id);
+		dom.setAttrib(elm, 'summary', summary);
+		dom.setAttrib(elm, 'dir', dir);
+		dom.setAttrib(elm, 'lang', lang);
+
+		capEl = inst.dom.select('caption', elm)[0];
+
+		if (capEl && !caption)
+			capEl.parentNode.removeChild(capEl);
+
+		if (!capEl && caption) {
+			capEl = elm.ownerDocument.createElement('caption');
+
+			if (!tinymce.isIE)
+				capEl.innerHTML = '<br mce_bogus="1"/>';
+
+			elm.insertBefore(capEl, elm.firstChild);
+		}
+
+		if (width && /(pt|em|cm)$/.test(width)) {
+			dom.setStyle(elm, 'width', width);
+			dom.setAttrib(elm, 'width', '');
+		} else {
+			dom.setAttrib(elm, 'width', width, true);
+			dom.setStyle(elm, 'width', '');
+		}
+
+		// Remove these since they are not valid XHTML
+		dom.setAttrib(elm, 'borderColor', '');
+		dom.setAttrib(elm, 'bgColor', '');
+		dom.setAttrib(elm, 'background', '');
+
+		if (height) {
+			dom.setStyle(elm, 'height', height);
+			dom.setAttrib(elm, 'height', '');
+		}
+
+		if (background != '')
+			elm.style.backgroundImage = "url('" + background + "')";
+		else
+			elm.style.backgroundImage = '';
+
+/*		if (tinyMCEPopup.getParam("inline_styles")) {
+			if (width != '')
+				elm.style.width = getCSSSize(width);
+		}*/
+
+		if (bordercolor != "") {
+			elm.style.borderColor = bordercolor;
+			elm.style.borderStyle = elm.style.borderStyle == "" ? "solid" : elm.style.borderStyle;
+			elm.style.borderWidth = border == "" ? "1px" : border;
+		} else
+			elm.style.borderColor = '';
+
+		elm.style.backgroundColor = bgcolor;
+		elm.style.height = getCSSSize(height);
+
+		inst.addVisual();
+
+		// Fix for stange MSIE align bug
+		//elm.outerHTML = elm.outerHTML;
+
+		inst.nodeChanged();
+		inst.execCommand('mceEndUndoLevel');
+
+		// Repaint if dimensions changed
+		if (formObj.width.value != orgTableWidth || formObj.height.value != orgTableHeight)
+			inst.execCommand('mceRepaint');
+
+		tinyMCEPopup.close();
+		return true;
+	}
+
+	// Create new table
+	html += '<table';
+
+	html += makeAttrib('id', id);
+	html += makeAttrib('border', border);
+	html += makeAttrib('cellpadding', cellpadding);
+	html += makeAttrib('cellspacing', cellspacing);
+
+	if (width && /(pt|em|cm)$/.test(width)) {
+		if (style)
+			style += '; ';
+
+		style += 'width: ' + width;
+	} else
+		html += makeAttrib('width', width);
+
+/*	if (height) {
+		if (style)
+			style += '; ';
+
+		style += 'height: ' + height;
+	}*/
+
+	//html += makeAttrib('height', height);
+	//html += makeAttrib('bordercolor', bordercolor);
+	//html += makeAttrib('bgcolor', bgcolor);
+	html += makeAttrib('align', align);
+	html += makeAttrib('frame', frame);
+	html += makeAttrib('rules', rules);
+	html += makeAttrib('class', className);
+	html += makeAttrib('style', style);
+	html += makeAttrib('summary', summary);
+	html += makeAttrib('dir', dir);
+	html += makeAttrib('lang', lang);
+	html += '>';
+
+	if (caption) {
+		if (!tinymce.isIE)
+			html += '<caption><br mce_bogus="1"/></caption>';
+		else
+			html += '<caption></caption>';
+	}
+
+	for (var y=0; y<rows; y++) {
+		html += "<tr>";
+
+		for (var x=0; x<cols; x++) {
+			if (!tinymce.isIE)
+				html += '<td><br mce_bogus="1"/></td>';
+			else
+				html += '<td></td>';
+		}
+
+		html += "</tr>";
+	}
+
+	html += "</table>";
+
+	inst.execCommand('mceBeginUndoLevel');
+	inst.execCommand('mceInsertContent', false, html);
+	inst.addVisual();
+	inst.execCommand('mceEndUndoLevel');
+
+	tinyMCEPopup.close();
+}
+
+function makeAttrib(attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib];
+
+	if (typeof(value) == "undefined" || value == null) {
+		value = "";
+
+		if (valueElm)
+			value = valueElm.value;
+	}
+
+	if (value == "")
+		return "";
+
+	// XML encode it
+	value = value.replace(/&/g, '&amp;');
+	value = value.replace(/\"/g, '&quot;');
+	value = value.replace(/</g, '&lt;');
+	value = value.replace(/>/g, '&gt;');
+
+	return ' ' + attrib + '="' + value + '"';
+}
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');
+	document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');
+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');
+
+	var cols = 2, rows = 2, border = tinyMCEPopup.getParam('table_default_border', '0'), cellpadding = tinyMCEPopup.getParam('table_default_cellpadding', ''), cellspacing = tinyMCEPopup.getParam('table_default_cellspacing', '');
+	var align = "", width = "", height = "", bordercolor = "", bgcolor = "", className = "";
+	var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "", rules, frame;
+	var inst = tinyMCEPopup.editor, dom = inst.dom;
+	var formObj = document.forms[0];
+	var elm = dom.getParent(inst.selection.getNode(), "table");
+
+	action = tinyMCEPopup.getWindowArg('action');
+
+	if (!action)
+		action = elm ? "update" : "insert";
+
+	if (elm && action != "insert") {
+		var rowsAr = elm.rows;
+		var cols = 0;
+		for (var i=0; i<rowsAr.length; i++)
+			if (rowsAr[i].cells.length > cols)
+				cols = rowsAr[i].cells.length;
+
+		cols = cols;
+		rows = rowsAr.length;
+
+		st = dom.parseStyle(dom.getAttrib(elm, "style"));
+		border = trimSize(getStyle(elm, 'border', 'borderWidth'));
+		cellpadding = dom.getAttrib(elm, 'cellpadding', "");
+		cellspacing = dom.getAttrib(elm, 'cellspacing', "");
+		width = trimSize(getStyle(elm, 'width', 'width'));
+		height = trimSize(getStyle(elm, 'height', 'height'));
+		bordercolor = convertRGBToHex(getStyle(elm, 'bordercolor', 'borderLeftColor'));
+		bgcolor = convertRGBToHex(getStyle(elm, 'bgcolor', 'backgroundColor'));
+		align = dom.getAttrib(elm, 'align', align);
+		frame = dom.getAttrib(elm, 'frame');
+		rules = dom.getAttrib(elm, 'rules');
+		className = tinymce.trim(dom.getAttrib(elm, 'class').replace(/mceItem.+/g, ''));
+		id = dom.getAttrib(elm, 'id');
+		summary = dom.getAttrib(elm, 'summary');
+		style = dom.serializeStyle(st);
+		dir = dom.getAttrib(elm, 'dir');
+		lang = dom.getAttrib(elm, 'lang');
+		background = getStyle(elm, 'background', 'backgroundImage').replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+		formObj.caption.checked = elm.getElementsByTagName('caption').length > 0;
+
+		orgTableWidth = width;
+		orgTableHeight = height;
+
+		action = "update";
+		formObj.insert.value = inst.getLang('update');
+	}
+
+	addClassesToList('class', "table_styles");
+	TinyMCE_EditableSelects.init();
+
+	// Update form
+	selectByValue(formObj, 'align', align);
+	selectByValue(formObj, 'frame', frame);
+	selectByValue(formObj, 'rules', rules);
+	selectByValue(formObj, 'class', className, true, true);
+	formObj.cols.value = cols;
+	formObj.rows.value = rows;
+	formObj.border.value = border;
+	formObj.cellpadding.value = cellpadding;
+	formObj.cellspacing.value = cellspacing;
+	formObj.width.value = width;
+	formObj.height.value = height;
+	formObj.bordercolor.value = bordercolor;
+	formObj.bgcolor.value = bgcolor;
+	formObj.id.value = id;
+	formObj.summary.value = summary;
+	formObj.style.value = style;
+	formObj.dir.value = dir;
+	formObj.lang.value = lang;
+	formObj.backgroundimage.value = background;
+
+	updateColor('bordercolor_pick', 'bordercolor');
+	updateColor('bgcolor_pick', 'bgcolor');
+
+	// Resize some elements
+	if (isVisible('backgroundimagebrowser'))
+		document.getElementById('backgroundimage').style.width = '180px';
+
+	// Disable some fields in update mode
+	if (action == "update") {
+		formObj.cols.disabled = true;
+		formObj.rows.disabled = true;
+	}
+}
+
+function changedSize() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+/*	var width = formObj.width.value;
+	if (width != "")
+		st['width'] = tinyMCEPopup.getParam("inline_styles") ? getCSSSize(width) : "";
+	else
+		st['width'] = "";*/
+
+	var height = formObj.height.value;
+	if (height != "")
+		st['height'] = getCSSSize(height);
+	else
+		st['height'] = "";
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedBackgroundImage() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedBorder() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+	// Update border width if the element has a color
+	if (formObj.border.value != "" && formObj.bordercolor.value != "")
+		st['border-width'] = formObj.border.value + "px";
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedColor() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+	st['background-color'] = formObj.bgcolor.value;
+
+	if (formObj.bordercolor.value != "") {
+		st['border-color'] = formObj.bordercolor.value;
+
+		// Add border-width if it's missing
+		if (!st['border-width'])
+			st['border-width'] = formObj.border.value == "" ? "1px" : formObj.border.value + "px";
+	}
+
+	formObj.style.value = dom.serializeStyle(st);
+}
+
+function changedStyle() {
+	var formObj = document.forms[0];
+	var st = dom.parseStyle(formObj.style.value);
+
+	if (st['background-image'])
+		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");
+	else
+		formObj.backgroundimage.value = '';
+
+	if (st['width'])
+		formObj.width.value = trimSize(st['width']);
+
+	if (st['height'])
+		formObj.height.value = trimSize(st['height']);
+
+	if (st['background-color']) {
+		formObj.bgcolor.value = st['background-color'];
+		updateColor('bgcolor_pick','bgcolor');
+	}
+
+	if (st['border-color']) {
+		formObj.bordercolor.value = st['border-color'];
+		updateColor('bordercolor_pick','bordercolor');
+	}
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/webapp/web/js/tiny_mce/plugins/table/langs/en_dlg.js b/webapp/web/js/tiny_mce/plugins/table/langs/en_dlg.js
index 000332a35..a33c987c0 100755
--- a/webapp/web/js/tiny_mce/plugins/table/langs/en_dlg.js
+++ b/webapp/web/js/tiny_mce/plugins/table/langs/en_dlg.js
@@ -1,74 +1,74 @@
-tinyMCE.addI18n('en.table_dlg',{
-general_tab:"General",
-advanced_tab:"Advanced",
-general_props:"General properties",
-advanced_props:"Advanced properties",
-rowtype:"Row in table part",
-title:"Insert/Modify table",
-width:"Width",
-height:"Height",
-cols:"Cols",
-rows:"Rows",
-cellspacing:"Cellspacing",
-cellpadding:"Cellpadding",
-border:"Border",
-align:"Alignment",
-align_default:"Default",
-align_left:"Left",
-align_right:"Right",
-align_middle:"Center",
-row_title:"Table row properties",
-cell_title:"Table cell properties",
-cell_type:"Cell type",
-valign:"Vertical alignment",
-align_top:"Top",
-align_bottom:"Bottom",
-bordercolor:"Border color",
-bgcolor:"Background color",
-merge_cells_title:"Merge table cells",
-id:"Id",
-style:"Style",
-langdir:"Language direction",
-langcode:"Language code",
-mime:"Target MIME type",
-ltr:"Left to right",
-rtl:"Right to left",
-bgimage:"Background image",
-summary:"Summary",
-td:"Data",
-th:"Header",
-cell_cell:"Update current cell",
-cell_row:"Update all cells in row",
-cell_all:"Update all cells in table",
-row_row:"Update current row",
-row_odd:"Update odd rows in table",
-row_even:"Update even rows in table",
-row_all:"Update all rows in table",
-thead:"Table Head",
-tbody:"Table Body",
-tfoot:"Table Foot",
-scope:"Scope",
-rowgroup:"Row Group",
-colgroup:"Col Group",
-col_limit:"You've exceeded the maximum number of columns of {$cols}.",
-row_limit:"You've exceeded the maximum number of rows of {$rows}.",
-cell_limit:"You've exceeded the maximum number of cells of {$cells}.",
-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.",
-caption:"Table caption",
-frame:"Frame",
-frame_none:"none",
-frame_groups:"groups",
-frame_rows:"rows",
-frame_cols:"cols",
-frame_all:"all",
-rules:"Rules",
-rules_void:"void",
-rules_above:"above",
-rules_below:"below",
-rules_hsides:"hsides",
-rules_lhs:"lhs",
-rules_rhs:"rhs",
-rules_vsides:"vsides",
-rules_box:"box",
-rules_border:"border"
+tinyMCE.addI18n('en.table_dlg',{
+general_tab:"General",
+advanced_tab:"Advanced",
+general_props:"General properties",
+advanced_props:"Advanced properties",
+rowtype:"Row in table part",
+title:"Insert/Modify table",
+width:"Width",
+height:"Height",
+cols:"Cols",
+rows:"Rows",
+cellspacing:"Cellspacing",
+cellpadding:"Cellpadding",
+border:"Border",
+align:"Alignment",
+align_default:"Default",
+align_left:"Left",
+align_right:"Right",
+align_middle:"Center",
+row_title:"Table row properties",
+cell_title:"Table cell properties",
+cell_type:"Cell type",
+valign:"Vertical alignment",
+align_top:"Top",
+align_bottom:"Bottom",
+bordercolor:"Border color",
+bgcolor:"Background color",
+merge_cells_title:"Merge table cells",
+id:"Id",
+style:"Style",
+langdir:"Language direction",
+langcode:"Language code",
+mime:"Target MIME type",
+ltr:"Left to right",
+rtl:"Right to left",
+bgimage:"Background image",
+summary:"Summary",
+td:"Data",
+th:"Header",
+cell_cell:"Update current cell",
+cell_row:"Update all cells in row",
+cell_all:"Update all cells in table",
+row_row:"Update current row",
+row_odd:"Update odd rows in table",
+row_even:"Update even rows in table",
+row_all:"Update all rows in table",
+thead:"Table Head",
+tbody:"Table Body",
+tfoot:"Table Foot",
+scope:"Scope",
+rowgroup:"Row Group",
+colgroup:"Col Group",
+col_limit:"You've exceeded the maximum number of columns of {$cols}.",
+row_limit:"You've exceeded the maximum number of rows of {$rows}.",
+cell_limit:"You've exceeded the maximum number of cells of {$cells}.",
+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.",
+caption:"Table caption",
+frame:"Frame",
+frame_none:"none",
+frame_groups:"groups",
+frame_rows:"rows",
+frame_cols:"cols",
+frame_all:"all",
+rules:"Rules",
+rules_void:"void",
+rules_above:"above",
+rules_below:"below",
+rules_hsides:"hsides",
+rules_lhs:"lhs",
+rules_rhs:"rhs",
+rules_vsides:"vsides",
+rules_box:"box",
+rules_border:"border"
 });
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/table/merge_cells.htm b/webapp/web/js/tiny_mce/plugins/table/merge_cells.htm
index 9d34a886b..f2dcbec5f 100755
--- a/webapp/web/js/tiny_mce/plugins/table/merge_cells.htm
+++ b/webapp/web/js/tiny_mce/plugins/table/merge_cells.htm
@@ -1,38 +1,38 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#table_dlg.merge_cells_title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="../../utils/validate.js"></script>
-	<script type="text/javascript" src="js/merge_cells.js"></script>
-	<base target="_self" />
-</head>
-<body style="margin: 8px" style="display: none">
-<form onsubmit="mergeCells();return false;" action="#">
-	<fieldset>
-		<legend>{#table_dlg.merge_cells_title}</legend>
-		  <table border="0" cellpadding="0" cellspacing="3" width="100%">
-			  <tr>
-				<td>{#table_dlg.cols}:</td>
-				<td align="right"><input type="text" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" /></td>
-			  </tr>
-			  <tr>
-				<td>{#table_dlg.rows}:</td>
-				<td align="right"><input type="text" name="numrows" value="" class="number min1" style="width: 30px" /></td>
-			  </tr>
-		  </table>
-	</fieldset>
-
-	<div class="mceActionPanel">
-		<div style="float: left">
-			<input type="submit" id="insert" name="insert" value="{#update}" />
-		</div>
-
-		<div style="float: right">
-			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-		</div>
-	</div>
-</form>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#table_dlg.merge_cells_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/validate.js"></script>
+	<script type="text/javascript" src="js/merge_cells.js"></script>
+	<base target="_self" />
+</head>
+<body style="margin: 8px" style="display: none">
+<form onsubmit="mergeCells();return false;" action="#">
+	<fieldset>
+		<legend>{#table_dlg.merge_cells_title}</legend>
+		  <table border="0" cellpadding="0" cellspacing="3" width="100%">
+			  <tr>
+				<td>{#table_dlg.cols}:</td>
+				<td align="right"><input type="text" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" /></td>
+			  </tr>
+			  <tr>
+				<td>{#table_dlg.rows}:</td>
+				<td align="right"><input type="text" name="numrows" value="" class="number min1" style="width: 30px" /></td>
+			  </tr>
+		  </table>
+	</fieldset>
+
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="submit" id="insert" name="insert" value="{#update}" />
+		</div>
+
+		<div style="float: right">
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+</form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/table/row.htm b/webapp/web/js/tiny_mce/plugins/table/row.htm
index fe75bf607..4a709d363 100755
--- a/webapp/web/js/tiny_mce/plugins/table/row.htm
+++ b/webapp/web/js/tiny_mce/plugins/table/row.htm
@@ -1,161 +1,161 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#table_dlg.row_title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="../../utils/form_utils.js"></script>
-	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
-	<script type="text/javascript" src="js/row.js"></script>
-	<link href="css/row.css" rel="stylesheet" type="text/css" />
-	<base target="_self" />
-</head>
-<body id="tablerow" style="display: none">
-	<form onsubmit="updateAction();return false;">
-		<div class="tabs">
-			<ul>
-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>
-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>
-			</ul>
-		</div>
-
-		<div class="panel_wrapper">
-			<div id="general_panel" class="panel current">
-				<fieldset>
-					<legend>{#table_dlg.general_props}</legend>
-
-					<table border="0" cellpadding="4" cellspacing="0">
-						<tr>
-							<td><label for="rowtype">{#table_dlg.rowtype}</label></td>
-							<td class="col2">
-								<select id="rowtype" name="rowtype" class="mceFocus">
-									<option value="thead">{#table_dlg.thead}</option>
-									<option value="tbody">{#table_dlg.tbody}</option>
-									<option value="tfoot">{#table_dlg.tfoot}</option>
-								</select>
-							</td>
-						</tr>
-
-						<tr>
-							<td><label for="align">{#table_dlg.align}</label></td>
-							<td class="col2">
-								<select id="align" name="align">
-									<option value="">{#not_set}</option>
-									<option value="center">{#table_dlg.align_middle}</option>
-									<option value="left">{#table_dlg.align_left}</option>
-									<option value="right">{#table_dlg.align_right}</option>
-								</select>
-							</td>
-						</tr>
-
-						<tr>
-							<td><label for="valign">{#table_dlg.valign}</label></td>
-							<td class="col2">
-								<select id="valign" name="valign">
-									<option value="">{#not_set}</option>
-									<option value="top">{#table_dlg.align_top}</option>
-									<option value="middle">{#table_dlg.align_middle}</option>
-									<option value="bottom">{#table_dlg.align_bottom}</option>
-								</select>
-							</td>
-						</tr>
-
-						<tr id="styleSelectRow">
-							<td><label for="class">{#class_name}</label></td>
-							<td class="col2">
-								<select id="class" name="class" class="mceEditableSelect">
-									<option value="" selected="selected">{#not_set}</option>
-								</select>
-							</td>
-						</tr>
-
-						<tr>
-							<td><label for="height">{#table_dlg.height}</label></td>
-							<td class="col2"><input name="height" type="text" id="height" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
-						</tr>
-					</table>
-				</fieldset>
-			</div>
-
-			<div id="advanced_panel" class="panel">
-				<fieldset>
-					<legend>{#table_dlg.advanced_props}</legend>
-
-					<table 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> 
-						</tr>
-
-						<tr>
-							<td><label for="style">{#table_dlg.style}</label></td>
-							<td><input type="text" id="style" name="style" value="" style="width: 200px;" onchange="changedStyle();" /></td>
-						</tr>
-
-						<tr>
-							<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>
-							</td> 
-						</tr>
-
-						<tr>
-							<td class="column1"><label for="lang">{#table_dlg.langcode}</label></td> 
-							<td>
-								<input id="lang" name="lang" type="text" value="" style="width: 200px" />
-							</td> 
-						</tr>
-
-						<tr>
-							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 
-							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" style="width: 200px" onchange="changedBackgroundImage();" /></td>
-										<td id="backgroundimagebrowsercontainer">&nbsp;</td>
-									</tr>
-								</table>
-							</td> 
-						</tr>
-
-						<tr>
-							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 
-							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>
-										<td id="bgcolor_pickcontainer">&nbsp;</td>
-									</tr>
-								</table>
-							</td> 
-						</tr>
-					</table>
-				</fieldset>
-			</div>
-		</div>
-
-		<div class="mceActionPanel">
-			<div>
-				<select id="action" name="action">
-					<option value="row">{#table_dlg.row_row}</option>
-					<option value="odd">{#table_dlg.row_odd}</option>
-					<option value="even">{#table_dlg.row_even}</option>
-					<option value="all">{#table_dlg.row_all}</option>
-				</select>
-			</div>
-
-			<div style="float: left">
-				<div><input type="submit" id="insert" name="insert" value="{#update}" /></div>
-			</div>
-
-			<div style="float: right">
-				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-			</div>
-		</div>
-	</form>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#table_dlg.row_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="js/row.js"></script>
+	<link href="css/row.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body id="tablerow" style="display: none">
+	<form onsubmit="updateAction();return false;">
+		<div class="tabs">
+			<ul>
+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>
+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<fieldset>
+					<legend>{#table_dlg.general_props}</legend>
+
+					<table border="0" cellpadding="4" cellspacing="0">
+						<tr>
+							<td><label for="rowtype">{#table_dlg.rowtype}</label></td>
+							<td class="col2">
+								<select id="rowtype" name="rowtype" class="mceFocus">
+									<option value="thead">{#table_dlg.thead}</option>
+									<option value="tbody">{#table_dlg.tbody}</option>
+									<option value="tfoot">{#table_dlg.tfoot}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="align">{#table_dlg.align}</label></td>
+							<td class="col2">
+								<select id="align" name="align">
+									<option value="">{#not_set}</option>
+									<option value="center">{#table_dlg.align_middle}</option>
+									<option value="left">{#table_dlg.align_left}</option>
+									<option value="right">{#table_dlg.align_right}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="valign">{#table_dlg.valign}</label></td>
+							<td class="col2">
+								<select id="valign" name="valign">
+									<option value="">{#not_set}</option>
+									<option value="top">{#table_dlg.align_top}</option>
+									<option value="middle">{#table_dlg.align_middle}</option>
+									<option value="bottom">{#table_dlg.align_bottom}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr id="styleSelectRow">
+							<td><label for="class">{#class_name}</label></td>
+							<td class="col2">
+								<select id="class" name="class" class="mceEditableSelect">
+									<option value="" selected="selected">{#not_set}</option>
+								</select>
+							</td>
+						</tr>
+
+						<tr>
+							<td><label for="height">{#table_dlg.height}</label></td>
+							<td class="col2"><input name="height" type="text" id="height" value="" size="4" maxlength="4" onchange="changedSize();" /></td>
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+
+			<div id="advanced_panel" class="panel">
+				<fieldset>
+					<legend>{#table_dlg.advanced_props}</legend>
+
+					<table 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> 
+						</tr>
+
+						<tr>
+							<td><label for="style">{#table_dlg.style}</label></td>
+							<td><input type="text" id="style" name="style" value="" style="width: 200px;" onchange="changedStyle();" /></td>
+						</tr>
+
+						<tr>
+							<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>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="lang">{#table_dlg.langcode}</label></td> 
+							<td>
+								<input id="lang" name="lang" type="text" value="" style="width: 200px" />
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" style="width: 200px" onchange="changedBackgroundImage();" /></td>
+										<td id="backgroundimagebrowsercontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>
+										<td id="bgcolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div>
+				<select id="action" name="action">
+					<option value="row">{#table_dlg.row_row}</option>
+					<option value="odd">{#table_dlg.row_odd}</option>
+					<option value="even">{#table_dlg.row_even}</option>
+					<option value="all">{#table_dlg.row_all}</option>
+				</select>
+			</div>
+
+			<div style="float: left">
+				<div><input type="submit" id="insert" name="insert" value="{#update}" /></div>
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+	</form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/table/table.htm b/webapp/web/js/tiny_mce/plugins/table/table.htm
index 75136e607..74982fa13 100755
--- a/webapp/web/js/tiny_mce/plugins/table/table.htm
+++ b/webapp/web/js/tiny_mce/plugins/table/table.htm
@@ -1,193 +1,193 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#table_dlg.title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="../../utils/form_utils.js"></script>
-	<script type="text/javascript" src="../../utils/validate.js"></script>
-	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
-	<script type="text/javascript" src="js/table.js"></script>
-	<link href="css/table.css" rel="stylesheet" type="text/css" />
-	<base target="_self" />
-</head>
-<body id="table" style="display: none">
-	<form onsubmit="insertTable();return false;" action="#">
-		<div class="tabs">
-			<ul>
-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>
-				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>
-			</ul>
-		</div>
-
-		<div class="panel_wrapper">
-			<div id="general_panel" class="panel current">
-				<fieldset>
-					<legend>{#table_dlg.general_props}</legend>
-					  <table border="0" cellpadding="4" cellspacing="0" width="100%">
-							  <tr>
-								<td><label id="colslabel" for="cols">{#table_dlg.cols}</label></td>
-								<td><input id="cols" name="cols" type="text" value="" size="3" maxlength="3" class="required number min1 mceFocus" /></td>
-								<td><label id="rowslabel" for="rows">{#table_dlg.rows}</label></td>
-								<td><input id="rows" name="rows" type="text" value="" size="3" maxlength="3" class="required number min1" /></td>
-							  </tr>
-							  <tr>
-								<td><label id="cellpaddinglabel" for="cellpadding">{#table_dlg.cellpadding}</label></td>
-								<td><input id="cellpadding" name="cellpadding" type="text" value="" size="3" maxlength="3" class="number" /></td>
-								<td><label id="cellspacinglabel" for="cellspacing">{#table_dlg.cellspacing}</label></td>
-								<td><input id="cellspacing" name="cellspacing" type="text" value="" size="3" maxlength="3" class="number" /></td>
-							  </tr>
-							  <tr>
-								<td><label id="alignlabel" for="align">{#table_dlg.align}</label></td>
-								<td><select id="align" name="align">
-									<option value="">{#not_set}</option>
-									<option value="center">{#table_dlg.align_middle}</option>
-									<option value="left">{#table_dlg.align_left}</option>
-									<option value="right">{#table_dlg.align_right}</option>
-								  </select></td>
-								<td><label id="borderlabel" for="border">{#table_dlg.border}</label></td>
-								<td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="changedBorder();" class="number" /></td>
-							  </tr>
-							  <tr id="width_row">
-								<td><label id="widthlabel" for="width">{#table_dlg.width}</label></td>
-								<td><input name="width" type="text" id="width" value="" size="4" maxlength="4" onchange="changedSize();" class="size" /></td>
-								<td><label id="heightlabel" for="height">{#table_dlg.height}</label></td>
-								<td><input name="height" type="text" id="height" value="" size="4" maxlength="4" onchange="changedSize();" class="size" /></td>
-							  </tr>
-							  <tr id="styleSelectRow">
-								<td><label id="classlabel" for="class">{#class_name}</label></td>
-								<td colspan="3">
-								 <select id="class" name="class" class="mceEditableSelect">
-									<option value="" selected>{#not_set}</option>
-								 </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> 
-							  </tr>
-							</table>
-				</fieldset>
-			</div>
-
-			<div id="advanced_panel" class="panel">
-				<fieldset>
-					<legend>{#table_dlg.advanced_props}</legend>
-
-					<table 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> 
-						</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> 
-						</tr>
-
-						<tr>
-							<td><label for="style">{#table_dlg.style}</label></td>
-							<td><input type="text" id="style" name="style" value="" class="advfield" onchange="changedStyle();" /></td>
-						</tr>
-
-						<tr>
-							<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> 
-						</tr>
-
-						<tr>
-							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 
-							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" class="advfield" onchange="changedBackgroundImage();" /></td>
-										<td id="backgroundimagebrowsercontainer">&nbsp;</td>
-									</tr>
-								</table>
-							</td> 
-						</tr>
-
-						<tr>
-							<td class="column1"><label for="frame">{#table_dlg.frame}</label></td> 
-							<td>
-								<select id="frame" name="frame" 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> 
-								</select>
-							</td> 
-						</tr>
-
-						<tr>
-							<td class="column1"><label for="rules">{#table_dlg.rules}</label></td> 
-							<td>
-								<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> 
-						</tr>
-
-						<tr>
-							<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>
-							</td> 
-						</tr>
-
-						<tr>
-							<td class="column1"><label for="bordercolor">{#table_dlg.bordercolor}</label></td> 
-							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');changedColor();" /></td>
-										<td id="bordercolor_pickcontainer">&nbsp;</td>
-									</tr>
-								</table>
-							</td> 
-						</tr>
-
-						<tr>
-							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 
-							<td>
-								<table border="0" cellpadding="0" cellspacing="0">
-									<tr>
-										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>
-										<td id="bgcolor_pickcontainer">&nbsp;</td>
-									</tr>
-								</table>
-							</td> 
-						</tr>
-					</table>
-				</fieldset>
-			</div>
-		</div>
-
-		<div class="mceActionPanel">
-			<div style="float: left">
-				<input type="submit" id="insert" name="insert" value="{#insert}" />
-			</div>
-
-			<div style="float: right">
-				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-			</div>
-		</div>
-	</form>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#table_dlg.title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/validate.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="js/table.js"></script>
+	<link href="css/table.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body id="table" style="display: none">
+	<form onsubmit="insertTable();return false;" action="#">
+		<div class="tabs">
+			<ul>
+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>
+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<fieldset>
+					<legend>{#table_dlg.general_props}</legend>
+					  <table border="0" cellpadding="4" cellspacing="0" width="100%">
+							  <tr>
+								<td><label id="colslabel" for="cols">{#table_dlg.cols}</label></td>
+								<td><input id="cols" name="cols" type="text" value="" size="3" maxlength="3" class="required number min1 mceFocus" /></td>
+								<td><label id="rowslabel" for="rows">{#table_dlg.rows}</label></td>
+								<td><input id="rows" name="rows" type="text" value="" size="3" maxlength="3" class="required number min1" /></td>
+							  </tr>
+							  <tr>
+								<td><label id="cellpaddinglabel" for="cellpadding">{#table_dlg.cellpadding}</label></td>
+								<td><input id="cellpadding" name="cellpadding" type="text" value="" size="3" maxlength="3" class="number" /></td>
+								<td><label id="cellspacinglabel" for="cellspacing">{#table_dlg.cellspacing}</label></td>
+								<td><input id="cellspacing" name="cellspacing" type="text" value="" size="3" maxlength="3" class="number" /></td>
+							  </tr>
+							  <tr>
+								<td><label id="alignlabel" for="align">{#table_dlg.align}</label></td>
+								<td><select id="align" name="align">
+									<option value="">{#not_set}</option>
+									<option value="center">{#table_dlg.align_middle}</option>
+									<option value="left">{#table_dlg.align_left}</option>
+									<option value="right">{#table_dlg.align_right}</option>
+								  </select></td>
+								<td><label id="borderlabel" for="border">{#table_dlg.border}</label></td>
+								<td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="changedBorder();" class="number" /></td>
+							  </tr>
+							  <tr id="width_row">
+								<td><label id="widthlabel" for="width">{#table_dlg.width}</label></td>
+								<td><input name="width" type="text" id="width" value="" size="4" maxlength="4" onchange="changedSize();" class="size" /></td>
+								<td><label id="heightlabel" for="height">{#table_dlg.height}</label></td>
+								<td><input name="height" type="text" id="height" value="" size="4" maxlength="4" onchange="changedSize();" class="size" /></td>
+							  </tr>
+							  <tr id="styleSelectRow">
+								<td><label id="classlabel" for="class">{#class_name}</label></td>
+								<td colspan="3">
+								 <select id="class" name="class" class="mceEditableSelect">
+									<option value="" selected>{#not_set}</option>
+								 </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> 
+							  </tr>
+							</table>
+				</fieldset>
+			</div>
+
+			<div id="advanced_panel" class="panel">
+				<fieldset>
+					<legend>{#table_dlg.advanced_props}</legend>
+
+					<table 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> 
+						</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> 
+						</tr>
+
+						<tr>
+							<td><label for="style">{#table_dlg.style}</label></td>
+							<td><input type="text" id="style" name="style" value="" class="advfield" onchange="changedStyle();" /></td>
+						</tr>
+
+						<tr>
+							<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> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" class="advfield" onchange="changedBackgroundImage();" /></td>
+										<td id="backgroundimagebrowsercontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="frame">{#table_dlg.frame}</label></td> 
+							<td>
+								<select id="frame" name="frame" 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> 
+								</select>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="rules">{#table_dlg.rules}</label></td> 
+							<td>
+								<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> 
+						</tr>
+
+						<tr>
+							<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>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="bordercolor">{#table_dlg.bordercolor}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');changedColor();" /></td>
+										<td id="bordercolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+
+						<tr>
+							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 
+							<td>
+								<table border="0" cellpadding="0" cellspacing="0">
+									<tr>
+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>
+										<td id="bgcolor_pickcontainer">&nbsp;</td>
+									</tr>
+								</table>
+							</td> 
+						</tr>
+					</table>
+				</fieldset>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div style="float: left">
+				<input type="submit" id="insert" name="insert" value="{#insert}" />
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+	</form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/template/blank.htm b/webapp/web/js/tiny_mce/plugins/template/blank.htm
index ecde53fae..538a3b12c 100755
--- a/webapp/web/js/tiny_mce/plugins/template/blank.htm
+++ b/webapp/web/js/tiny_mce/plugins/template/blank.htm
@@ -1,12 +1,12 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>blank_page</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<script type="text/javascript">
-		parent.TemplateDialog.loadCSSFiles(document);
-	</script>
-</head>
-<body id="mceTemplatePreview" class="mceContentBody">
-
-</body>
-</html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>blank_page</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<script type="text/javascript">
+		parent.TemplateDialog.loadCSSFiles(document);
+	</script>
+</head>
+<body id="mceTemplatePreview" class="mceContentBody">
+
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/template/css/template.css b/webapp/web/js/tiny_mce/plugins/template/css/template.css
index 2d23a4938..0a03f2e5c 100755
--- a/webapp/web/js/tiny_mce/plugins/template/css/template.css
+++ b/webapp/web/js/tiny_mce/plugins/template/css/template.css
@@ -1,23 +1,23 @@
-#frmbody {
-	padding: 10px;
-	background-color: #FFF;
-	border: 1px solid #CCC;
-}
-
-.frmRow {
-	margin-bottom: 10px;
-}
-
-#templatesrc {
-	border: none;
-	width: 320px;
-	height: 240px;
-}
-
-.title {
-	padding-bottom: 5px;
-}
-
-.mceActionPanel {
-	padding-top: 5px;
-}
+#frmbody {
+	padding: 10px;
+	background-color: #FFF;
+	border: 1px solid #CCC;
+}
+
+.frmRow {
+	margin-bottom: 10px;
+}
+
+#templatesrc {
+	border: none;
+	width: 320px;
+	height: 240px;
+}
+
+.title {
+	padding-bottom: 5px;
+}
+
+.mceActionPanel {
+	padding-top: 5px;
+}
diff --git a/webapp/web/js/tiny_mce/plugins/template/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/template/editor_plugin_src.js
index 73ab39e02..a69a71982 100755
--- a/webapp/web/js/tiny_mce/plugins/template/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/template/editor_plugin_src.js
@@ -1,156 +1,156 @@
-/**
- * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	var each = tinymce.each;
-
-	tinymce.create('tinymce.plugins.TemplatePlugin', {
-		init : function(ed, url) {
-			var t = this;
-
-			t.editor = ed;
-
-			// Register commands
-			ed.addCommand('mceTemplate', function(ui) {
-				ed.windowManager.open({
-					file : url + '/template.htm',
-					width : ed.getParam('template_popup_width', 750),
-					height : ed.getParam('template_popup_height', 600),
-					inline : 1
-				}, {
-					plugin_url : url
-				});
-			});
-
-			ed.addCommand('mceInsertTemplate', t._insertTemplate, t);
-
-			// Register buttons
-			ed.addButton('template', {title : 'template.desc', cmd : 'mceTemplate'});
-
-			ed.onPreProcess.add(function(ed, o) {
-				var dom = ed.dom;
-
-				each(dom.select('div', o.node), function(e) {
-					if (dom.hasClass(e, 'mceTmpl')) {
-						each(dom.select('*', e), function(e) {
-							if (dom.hasClass(e, ed.getParam('template_mdate_classes', 'mdate').replace(/\s+/g, '|')))
-								e.innerHTML = t._getDateTime(new Date(), ed.getParam("template_mdate_format", ed.getLang("template.mdate_format")));
-						});
-
-						t._replaceVals(e);
-					}
-				});
-			});
-		},
-
-		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(ui, v) {
-			var t = this, ed = t.editor, h, el, dom = ed.dom, sel = ed.selection.getContent();
-
-			h = v.content;
-
-			each(t.editor.getParam('template_replace_values'), function(v, k) {
-				if (typeof(v) != 'function')
-					h = h.replace(new RegExp('\\{\\$' + k + '\\}', 'g'), v);
-			});
-
-			el = dom.create('div', null, h);
-
-			// Find template element within div
-			n = dom.select('.mceTmpl', el);
-			if (n && n.length > 0) {
-				el = dom.create('div', null);
-				el.appendChild(n[0].cloneNode(true));
-			}
-
-			function hasClass(n, c) {
-				return new RegExp('\\b' + c + '\\b', 'g').test(n.className);
-			};
-
-			each(dom.select('*', el), function(n) {
-				// Replace cdate
-				if (hasClass(n, ed.getParam('template_cdate_classes', 'cdate').replace(/\s+/g, '|')))
-					n.innerHTML = t._getDateTime(new Date(), ed.getParam("template_cdate_format", ed.getLang("template.cdate_format")));
-
-				// Replace mdate
-				if (hasClass(n, ed.getParam('template_mdate_classes', 'mdate').replace(/\s+/g, '|')))
-					n.innerHTML = t._getDateTime(new Date(), ed.getParam("template_mdate_format", ed.getLang("template.mdate_format")));
-
-				// Replace selection
-				if (hasClass(n, ed.getParam('template_selected_content_classes', 'selcontent').replace(/\s+/g, '|')))
-					n.innerHTML = sel;
-			});
-
-			t._replaceVals(el);
-
-			ed.execCommand('mceInsertContent', false, el.innerHTML);
-			ed.addVisual();
-		},
-
-		_replaceVals : function(e) {
-			var dom = this.editor.dom, vl = this.editor.getParam('template_replace_values');
-
-			each(dom.select('*', e), function(e) {
-				each(vl, function(v, k) {
-					if (dom.hasClass(e, k)) {
-						if (typeof(vl[k]) == 'function')
-							vl[k](e);
-					}
-				});
-			});
-		},
-
-		_getDateTime : function(d, fmt) {
-				if (!fmt)
-					return "";
-
-				function addZeros(value, len) {
-					var i;
-
-					value = "" + value;
-
-					if (value.length < len) {
-						for (i=0; i<(len-value.length); i++)
-							value = "0" + value;
-					}
-
-					return value;
-				}
-
-				fmt = fmt.replace("%D", "%m/%d/%y");
-				fmt = fmt.replace("%r", "%I:%M:%S %p");
-				fmt = fmt.replace("%Y", "" + d.getFullYear());
-				fmt = fmt.replace("%y", "" + d.getYear());
-				fmt = fmt.replace("%m", addZeros(d.getMonth()+1, 2));
-				fmt = fmt.replace("%d", addZeros(d.getDate(), 2));
-				fmt = fmt.replace("%H", "" + addZeros(d.getHours(), 2));
-				fmt = fmt.replace("%M", "" + addZeros(d.getMinutes(), 2));
-				fmt = fmt.replace("%S", "" + addZeros(d.getSeconds(), 2));
-				fmt = fmt.replace("%I", "" + ((d.getHours() + 11) % 12 + 1));
-				fmt = fmt.replace("%p", "" + (d.getHours() < 12 ? "AM" : "PM"));
-				fmt = fmt.replace("%B", "" + tinyMCE.getLang("template_months_long").split(',')[d.getMonth()]);
-				fmt = fmt.replace("%b", "" + tinyMCE.getLang("template_months_short").split(',')[d.getMonth()]);
-				fmt = fmt.replace("%A", "" + tinyMCE.getLang("template_day_long").split(',')[d.getDay()]);
-				fmt = fmt.replace("%a", "" + tinyMCE.getLang("template_day_short").split(',')[d.getDay()]);
-				fmt = fmt.replace("%%", "%");
-
-				return fmt;
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('template', tinymce.plugins.TemplatePlugin);
+/**
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('tinymce.plugins.TemplatePlugin', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceTemplate', function(ui) {
+				ed.windowManager.open({
+					file : url + '/template.htm',
+					width : ed.getParam('template_popup_width', 750),
+					height : ed.getParam('template_popup_height', 600),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceInsertTemplate', t._insertTemplate, t);
+
+			// Register buttons
+			ed.addButton('template', {title : 'template.desc', cmd : 'mceTemplate'});
+
+			ed.onPreProcess.add(function(ed, o) {
+				var dom = ed.dom;
+
+				each(dom.select('div', o.node), function(e) {
+					if (dom.hasClass(e, 'mceTmpl')) {
+						each(dom.select('*', e), function(e) {
+							if (dom.hasClass(e, ed.getParam('template_mdate_classes', 'mdate').replace(/\s+/g, '|')))
+								e.innerHTML = t._getDateTime(new Date(), ed.getParam("template_mdate_format", ed.getLang("template.mdate_format")));
+						});
+
+						t._replaceVals(e);
+					}
+				});
+			});
+		},
+
+		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(ui, v) {
+			var t = this, ed = t.editor, h, el, dom = ed.dom, sel = ed.selection.getContent();
+
+			h = v.content;
+
+			each(t.editor.getParam('template_replace_values'), function(v, k) {
+				if (typeof(v) != 'function')
+					h = h.replace(new RegExp('\\{\\$' + k + '\\}', 'g'), v);
+			});
+
+			el = dom.create('div', null, h);
+
+			// Find template element within div
+			n = dom.select('.mceTmpl', el);
+			if (n && n.length > 0) {
+				el = dom.create('div', null);
+				el.appendChild(n[0].cloneNode(true));
+			}
+
+			function hasClass(n, c) {
+				return new RegExp('\\b' + c + '\\b', 'g').test(n.className);
+			};
+
+			each(dom.select('*', el), function(n) {
+				// Replace cdate
+				if (hasClass(n, ed.getParam('template_cdate_classes', 'cdate').replace(/\s+/g, '|')))
+					n.innerHTML = t._getDateTime(new Date(), ed.getParam("template_cdate_format", ed.getLang("template.cdate_format")));
+
+				// Replace mdate
+				if (hasClass(n, ed.getParam('template_mdate_classes', 'mdate').replace(/\s+/g, '|')))
+					n.innerHTML = t._getDateTime(new Date(), ed.getParam("template_mdate_format", ed.getLang("template.mdate_format")));
+
+				// Replace selection
+				if (hasClass(n, ed.getParam('template_selected_content_classes', 'selcontent').replace(/\s+/g, '|')))
+					n.innerHTML = sel;
+			});
+
+			t._replaceVals(el);
+
+			ed.execCommand('mceInsertContent', false, el.innerHTML);
+			ed.addVisual();
+		},
+
+		_replaceVals : function(e) {
+			var dom = this.editor.dom, vl = this.editor.getParam('template_replace_values');
+
+			each(dom.select('*', e), function(e) {
+				each(vl, function(v, k) {
+					if (dom.hasClass(e, k)) {
+						if (typeof(vl[k]) == 'function')
+							vl[k](e);
+					}
+				});
+			});
+		},
+
+		_getDateTime : function(d, fmt) {
+				if (!fmt)
+					return "";
+
+				function addZeros(value, len) {
+					var i;
+
+					value = "" + value;
+
+					if (value.length < len) {
+						for (i=0; i<(len-value.length); i++)
+							value = "0" + value;
+					}
+
+					return value;
+				}
+
+				fmt = fmt.replace("%D", "%m/%d/%y");
+				fmt = fmt.replace("%r", "%I:%M:%S %p");
+				fmt = fmt.replace("%Y", "" + d.getFullYear());
+				fmt = fmt.replace("%y", "" + d.getYear());
+				fmt = fmt.replace("%m", addZeros(d.getMonth()+1, 2));
+				fmt = fmt.replace("%d", addZeros(d.getDate(), 2));
+				fmt = fmt.replace("%H", "" + addZeros(d.getHours(), 2));
+				fmt = fmt.replace("%M", "" + addZeros(d.getMinutes(), 2));
+				fmt = fmt.replace("%S", "" + addZeros(d.getSeconds(), 2));
+				fmt = fmt.replace("%I", "" + ((d.getHours() + 11) % 12 + 1));
+				fmt = fmt.replace("%p", "" + (d.getHours() < 12 ? "AM" : "PM"));
+				fmt = fmt.replace("%B", "" + tinyMCE.getLang("template_months_long").split(',')[d.getMonth()]);
+				fmt = fmt.replace("%b", "" + tinyMCE.getLang("template_months_short").split(',')[d.getMonth()]);
+				fmt = fmt.replace("%A", "" + tinyMCE.getLang("template_day_long").split(',')[d.getDay()]);
+				fmt = fmt.replace("%a", "" + tinyMCE.getLang("template_day_short").split(',')[d.getDay()]);
+				fmt = fmt.replace("%%", "%");
+
+				return fmt;
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('template', tinymce.plugins.TemplatePlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/template/js/template.js b/webapp/web/js/tiny_mce/plugins/template/js/template.js
index 24045d731..7eab2ebbd 100755
--- a/webapp/web/js/tiny_mce/plugins/template/js/template.js
+++ b/webapp/web/js/tiny_mce/plugins/template/js/template.js
@@ -1,106 +1,106 @@
-tinyMCEPopup.requireLangPack();
-
-var TemplateDialog = {
-	preInit : function() {
-		var url = tinyMCEPopup.getParam("template_external_list_url");
-
-		if (url != null)
-			document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></sc'+'ript>');
-	},
-
-	init : function() {
-		var ed = tinyMCEPopup.editor, tsrc, sel, x, u;
-
- 		tsrc = ed.getParam("template_templates", false);
- 		sel = document.getElementById('tpath');
-
-		// Setup external template list
-		if (!tsrc && typeof(tinyMCETemplateList) != 'undefined') {
-			for (x=0, tsrc = []; x<tinyMCETemplateList.length; x++)
-				tsrc.push({title : tinyMCETemplateList[x][0], src : tinyMCETemplateList[x][1], description : tinyMCETemplateList[x][2]});
-		}
-
-		for (x=0; x<tsrc.length; x++)
-			sel.options[sel.options.length] = new Option(tsrc[x].title, tinyMCEPopup.editor.documentBaseURI.toAbsolute(tsrc[x].src));
-
-		this.resize();
-		this.tsrc = tsrc;
-	},
-
-	resize : function() {
-		var w, h, e;
-
-		if (!self.innerWidth) {
-			w = document.body.clientWidth - 50;
-			h = document.body.clientHeight - 160;
-		} else {
-			w = self.innerWidth - 50;
-			h = self.innerHeight - 170;
-		}
-
-		e = document.getElementById('templatesrc');
-
-		if (e) {
-			e.style.height = Math.abs(h) + 'px';
-			e.style.width  = Math.abs(w - 5) + 'px';
-		}
-	},
-
-	loadCSSFiles : function(d) {
-		var ed = tinyMCEPopup.editor;
-
-		tinymce.each(ed.getParam("content_css", '').split(','), function(u) {
-			d.write('<link href="' + ed.documentBaseURI.toAbsolute(u) + '" rel="stylesheet" type="text/css" />');
-		});
-	},
-
-	selectTemplate : function(u, ti) {
-		var d = window.frames['templatesrc'].document, x, tsrc = this.tsrc;
-
-		if (!u)
-			return;
-
-		d.body.innerHTML = this.templateHTML = this.getFileContents(u);
-
-		for (x=0; x<tsrc.length; x++) {
-			if (tsrc[x].title == ti)
-				document.getElementById('tmpldesc').innerHTML = tsrc[x].description || '';
-		}
-	},
-
- 	insert : function() {
-		tinyMCEPopup.execCommand('mceInsertTemplate', false, {
-			content : this.templateHTML,
-			selection : tinyMCEPopup.editor.selection.getContent()
-		});
-
-		tinyMCEPopup.close();
-	},
-
-	getFileContents : function(u) {
-		var x, d, t = 'text/plain';
-
-		function g(s) {
-			x = 0;
-
-			try {
-				x = new ActiveXObject(s);
-			} catch (s) {
-			}
-
-			return x;
-		};
-
-		x = window.ActiveXObject ? g('Msxml2.XMLHTTP') || g('Microsoft.XMLHTTP') : new XMLHttpRequest();
-
-		// Synchronous AJAX load file
-		x.overrideMimeType && x.overrideMimeType(t);
-		x.open("GET", u, false);
-		x.send(null);
-
-		return x.responseText;
-	}
-};
-
-TemplateDialog.preInit();
-tinyMCEPopup.onInit.add(TemplateDialog.init, TemplateDialog);
+tinyMCEPopup.requireLangPack();
+
+var TemplateDialog = {
+	preInit : function() {
+		var url = tinyMCEPopup.getParam("template_external_list_url");
+
+		if (url != null)
+			document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></sc'+'ript>');
+	},
+
+	init : function() {
+		var ed = tinyMCEPopup.editor, tsrc, sel, x, u;
+
+ 		tsrc = ed.getParam("template_templates", false);
+ 		sel = document.getElementById('tpath');
+
+		// Setup external template list
+		if (!tsrc && typeof(tinyMCETemplateList) != 'undefined') {
+			for (x=0, tsrc = []; x<tinyMCETemplateList.length; x++)
+				tsrc.push({title : tinyMCETemplateList[x][0], src : tinyMCETemplateList[x][1], description : tinyMCETemplateList[x][2]});
+		}
+
+		for (x=0; x<tsrc.length; x++)
+			sel.options[sel.options.length] = new Option(tsrc[x].title, tinyMCEPopup.editor.documentBaseURI.toAbsolute(tsrc[x].src));
+
+		this.resize();
+		this.tsrc = tsrc;
+	},
+
+	resize : function() {
+		var w, h, e;
+
+		if (!self.innerWidth) {
+			w = document.body.clientWidth - 50;
+			h = document.body.clientHeight - 160;
+		} else {
+			w = self.innerWidth - 50;
+			h = self.innerHeight - 170;
+		}
+
+		e = document.getElementById('templatesrc');
+
+		if (e) {
+			e.style.height = Math.abs(h) + 'px';
+			e.style.width  = Math.abs(w - 5) + 'px';
+		}
+	},
+
+	loadCSSFiles : function(d) {
+		var ed = tinyMCEPopup.editor;
+
+		tinymce.each(ed.getParam("content_css", '').split(','), function(u) {
+			d.write('<link href="' + ed.documentBaseURI.toAbsolute(u) + '" rel="stylesheet" type="text/css" />');
+		});
+	},
+
+	selectTemplate : function(u, ti) {
+		var d = window.frames['templatesrc'].document, x, tsrc = this.tsrc;
+
+		if (!u)
+			return;
+
+		d.body.innerHTML = this.templateHTML = this.getFileContents(u);
+
+		for (x=0; x<tsrc.length; x++) {
+			if (tsrc[x].title == ti)
+				document.getElementById('tmpldesc').innerHTML = tsrc[x].description || '';
+		}
+	},
+
+ 	insert : function() {
+		tinyMCEPopup.execCommand('mceInsertTemplate', false, {
+			content : this.templateHTML,
+			selection : tinyMCEPopup.editor.selection.getContent()
+		});
+
+		tinyMCEPopup.close();
+	},
+
+	getFileContents : function(u) {
+		var x, d, t = 'text/plain';
+
+		function g(s) {
+			x = 0;
+
+			try {
+				x = new ActiveXObject(s);
+			} catch (s) {
+			}
+
+			return x;
+		};
+
+		x = window.ActiveXObject ? g('Msxml2.XMLHTTP') || g('Microsoft.XMLHTTP') : new XMLHttpRequest();
+
+		// Synchronous AJAX load file
+		x.overrideMimeType && x.overrideMimeType(t);
+		x.open("GET", u, false);
+		x.send(null);
+
+		return x.responseText;
+	}
+};
+
+TemplateDialog.preInit();
+tinyMCEPopup.onInit.add(TemplateDialog.init, TemplateDialog);
diff --git a/webapp/web/js/tiny_mce/plugins/template/langs/en_dlg.js b/webapp/web/js/tiny_mce/plugins/template/langs/en_dlg.js
index 2471c3fa0..1f7f74473 100755
--- a/webapp/web/js/tiny_mce/plugins/template/langs/en_dlg.js
+++ b/webapp/web/js/tiny_mce/plugins/template/langs/en_dlg.js
@@ -1,15 +1,15 @@
-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"
+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
diff --git a/webapp/web/js/tiny_mce/plugins/template/template.htm b/webapp/web/js/tiny_mce/plugins/template/template.htm
index 2b71c6eb4..600b91b68 100755
--- a/webapp/web/js/tiny_mce/plugins/template/template.htm
+++ b/webapp/web/js/tiny_mce/plugins/template/template.htm
@@ -1,39 +1,39 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#template_dlg.title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="js/template.js"></script>
-	<link href="css/template.css" rel="stylesheet" type="text/css" />
-	<base target="_self" />
-</head>
-<body onresize="TemplateDialog.resize();"> 
-	<form onsubmit="TemplateDialog.insert();return false;">
-		<div id="frmbody">
-			<div class="title">{#template_dlg.desc}</div>
-			<div class="frmRow"><label for="tpath" title="{#template_dlg.select}">{#template_dlg.label}:</label>
-			<select id="tpath" name="tpath" onchange="TemplateDialog.selectTemplate(this.options[this.selectedIndex].value, this.options[this.selectedIndex].text);" class="mceFocus">
-				<option value="">{#template_dlg.select}...</option>
-			</select>
-			<span id="warning"></span></div>
-			<div class="frmRow"><label for="tdesc">{#template_dlg.desc_label}:</label>
-			<span id="tmpldesc"></span></div>
-			<fieldset>
-				<legend>{#template_dlg.preview}</legend>
-				<iframe id="templatesrc" name="templatesrc" src="blank.htm" width="690" height="400" frameborder="0"></iframe>
-			</fieldset>
-		</div>
-		
-		<div class="mceActionPanel">
-			<div style="float: left">
-				<input type="submit" id="insert" name="insert" value="{#insert}" />
-			</div>
-
-			<div style="float: right">
-				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-			</div>
-
-			<br style="clear:both" />
-		</div>
-	</form>
-</body> 
-</html> 
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#template_dlg.title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/template.js"></script>
+	<link href="css/template.css" rel="stylesheet" type="text/css" />
+	<base target="_self" />
+</head>
+<body onresize="TemplateDialog.resize();"> 
+	<form onsubmit="TemplateDialog.insert();return false;">
+		<div id="frmbody">
+			<div class="title">{#template_dlg.desc}</div>
+			<div class="frmRow"><label for="tpath" title="{#template_dlg.select}">{#template_dlg.label}:</label>
+			<select id="tpath" name="tpath" onchange="TemplateDialog.selectTemplate(this.options[this.selectedIndex].value, this.options[this.selectedIndex].text);" class="mceFocus">
+				<option value="">{#template_dlg.select}...</option>
+			</select>
+			<span id="warning"></span></div>
+			<div class="frmRow"><label for="tdesc">{#template_dlg.desc_label}:</label>
+			<span id="tmpldesc"></span></div>
+			<fieldset>
+				<legend>{#template_dlg.preview}</legend>
+				<iframe id="templatesrc" name="templatesrc" src="blank.htm" width="690" height="400" frameborder="0"></iframe>
+			</fieldset>
+		</div>
+		
+		<div class="mceActionPanel">
+			<div style="float: left">
+				<input type="submit" id="insert" name="insert" value="{#insert}" />
+			</div>
+
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+			</div>
+
+			<br style="clear:both" />
+		</div>
+	</form>
+</body> 
+</html> 
diff --git a/webapp/web/js/tiny_mce/plugins/visualchars/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/visualchars/editor_plugin_src.js
index 02ec4e698..cee79db0e 100755
--- a/webapp/web/js/tiny_mce/plugins/visualchars/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/visualchars/editor_plugin_src.js
@@ -1,73 +1,73 @@
-/**
- * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.VisualChars', {
-		init : function(ed, url) {
-			var t = this;
-
-			t.editor = ed;
-
-			// Register commands
-			ed.addCommand('mceVisualChars', t._toggleVisualChars, t);
-
-			// Register buttons
-			ed.addButton('visualchars', {title : 'visualchars.desc', cmd : 'mceVisualChars'});
-
-			ed.onBeforeGetContent.add(function(ed, o) {
-				if (t.state) {
-					t.state = true;
-					t._toggleVisualChars();
-				}
-			});
-		},
-
-		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
-			};
-		},
-
-		// Private methods
-
-		_toggleVisualChars : function() {
-			var t = this, ed = t.editor, nl, i, h, d = ed.getDoc(), b = ed.getBody(), nv, s = ed.selection, bo;
-
-			t.state = !t.state;
-			ed.controlManager.setActive('visualchars', t.state);
-
-			if (t.state) {
-				nl = [];
-				tinymce.walk(b, function(n) {
-					if (n.nodeType == 3 && n.nodeValue && n.nodeValue.indexOf('\u00a0') != -1)
-						nl.push(n);
-				}, 'childNodes');
-
-				for (i=0; i<nl.length; i++) {
-					nv = nl[i].nodeValue;
-					nv = nv.replace(/(\u00a0+)/g, '<span class="mceItemHidden mceVisualNbsp">$1</span>');
-					nv = nv.replace(/\u00a0/g, '\u00b7');
-					ed.dom.setOuterHTML(nl[i], nv, d);
-				}
-			} else {
-				nl = tinymce.grep(ed.dom.select('span', b), function(n) {
-					return ed.dom.hasClass(n, 'mceVisualNbsp');
-				});
-
-				for (i=0; i<nl.length; i++)
-					ed.dom.setOuterHTML(nl[i], nl[i].innerHTML.replace(/(&middot;|\u00b7)/g, '&nbsp;'), d);
-			}
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('visualchars', tinymce.plugins.VisualChars);
+/**
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.VisualChars', {
+		init : function(ed, url) {
+			var t = this;
+
+			t.editor = ed;
+
+			// Register commands
+			ed.addCommand('mceVisualChars', t._toggleVisualChars, t);
+
+			// Register buttons
+			ed.addButton('visualchars', {title : 'visualchars.desc', cmd : 'mceVisualChars'});
+
+			ed.onBeforeGetContent.add(function(ed, o) {
+				if (t.state) {
+					t.state = true;
+					t._toggleVisualChars();
+				}
+			});
+		},
+
+		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
+			};
+		},
+
+		// Private methods
+
+		_toggleVisualChars : function() {
+			var t = this, ed = t.editor, nl, i, h, d = ed.getDoc(), b = ed.getBody(), nv, s = ed.selection, bo;
+
+			t.state = !t.state;
+			ed.controlManager.setActive('visualchars', t.state);
+
+			if (t.state) {
+				nl = [];
+				tinymce.walk(b, function(n) {
+					if (n.nodeType == 3 && n.nodeValue && n.nodeValue.indexOf('\u00a0') != -1)
+						nl.push(n);
+				}, 'childNodes');
+
+				for (i=0; i<nl.length; i++) {
+					nv = nl[i].nodeValue;
+					nv = nv.replace(/(\u00a0+)/g, '<span class="mceItemHidden mceVisualNbsp">$1</span>');
+					nv = nv.replace(/\u00a0/g, '\u00b7');
+					ed.dom.setOuterHTML(nl[i], nv, d);
+				}
+			} else {
+				nl = tinymce.grep(ed.dom.select('span', b), function(n) {
+					return ed.dom.hasClass(n, 'mceVisualNbsp');
+				});
+
+				for (i=0; i<nl.length; i++)
+					ed.dom.setOuterHTML(nl[i], nl[i].innerHTML.replace(/(&middot;|\u00b7)/g, '&nbsp;'), d);
+			}
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('visualchars', tinymce.plugins.VisualChars);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/abbr.htm b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/abbr.htm
index 580028432..fb43a7846 100755
--- a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/abbr.htm
+++ b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/abbr.htm
@@ -1,149 +1,149 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#xhtmlxtras_dlg.title_abbr_element}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="../../utils/form_utils.js"></script>
-	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
-	<script type="text/javascript" src="js/element_common.js"></script>
-	<script type="text/javascript" src="js/abbr.js"></script>
-	<link rel="stylesheet" type="text/css" href="css/popup.css" />
-	<base target="_self" />
-</head>
-<body style="display: none">
-<form onsubmit="insertAbbr();return false;" action="#">
-	<div class="tabs">
-		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
-			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
-		</ul>
-	</div>
-
-	<div class="panel_wrapper">
-		<div id="general_panel" class="panel current">
-			<fieldset>
-				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
-				<table 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> 
-					</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> 
-					</tr>
-					<tr>
-						<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> 
-							</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> 
-					</tr>
-					<tr>
-						<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>
-						</td> 
-					</tr>
-					<tr>
-						<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> 
-					</tr>
-				</table>
-			</fieldset>
-		</div>
-		<div id="events_panel" class="panel">
-			<fieldset>
-				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
-
-				<table 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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
-						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
-					</tr>
-				</table>
-			</fieldset>
-		</div>
-	</div>
-	<div class="mceActionPanel">
-		<div style="float: left">
-			<input type="submit" id="insert" name="insert" value="{#update}" />
-		</div>
-		<div style="float: left">
-			<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeAbbr();" style="display: none;" />
-		</div>
-		<div style="float: right">
-			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-		</div>
-	</div>
-
-</form>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#xhtmlxtras_dlg.title_abbr_element}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="js/element_common.js"></script>
+	<script type="text/javascript" src="js/abbr.js"></script>
+	<link rel="stylesheet" type="text/css" href="css/popup.css" />
+	<base target="_self" />
+</head>
+<body style="display: none">
+<form onsubmit="insertAbbr();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
+				<table 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> 
+					</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> 
+					</tr>
+					<tr>
+						<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> 
+							</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> 
+					</tr>
+					<tr>
+						<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>
+						</td> 
+					</tr>
+					<tr>
+						<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> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+		<div id="events_panel" class="panel">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
+
+				<table 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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="submit" id="insert" name="insert" value="{#update}" />
+		</div>
+		<div style="float: left">
+			<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeAbbr();" style="display: none;" />
+		</div>
+		<div style="float: right">
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+
+</form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/acronym.htm b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/acronym.htm
index 54e4c9d9e..3cbe57e88 100755
--- a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/acronym.htm
+++ b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/acronym.htm
@@ -1,149 +1,149 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#xhtmlxtras_dlg.title_acronym_element}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="../../utils/form_utils.js"></script>
-	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
-	<script type="text/javascript" src="js/element_common.js"></script>
-	<script type="text/javascript" src="js/acronym.js"></script>
-	<link rel="stylesheet" type="text/css" href="css/popup.css" />
-	<base target="_self" />
-</head>
-<body style="display: none">
-<form onsubmit="insertAcronym();return false;" action="#">
-	<div class="tabs">
-		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
-			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
-		</ul>
-	</div>
-
-	<div class="panel_wrapper">
-		<div id="general_panel" class="panel current">
-			<fieldset>
-				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
-				<table 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> 
-					</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> 
-					</tr>
-					<tr>
-						<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> 
-							</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> 
-					</tr>
-					<tr>
-						<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>
-						</td> 
-					</tr>
-					<tr>
-						<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> 
-					</tr>
-				</table>
-			</fieldset>
-		</div>
-		<div id="events_panel" class="panel">
-			<fieldset>
-				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
-
-				<table 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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
-						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
-					</tr>
-				</table>
-			</fieldset>
-		</div>
-	</div>
-	<div class="mceActionPanel">
-		<div style="float: left">
-			<input type="submit" id="insert" name="insert" value="{#update}" />
-		</div>
-		<div style="float: left">
-			<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeAcronym();" style="display: none;" />
-		</div>
-		<div style="float: right">
-			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-		</div>
-	</div>
-
-</form>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#xhtmlxtras_dlg.title_acronym_element}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="js/element_common.js"></script>
+	<script type="text/javascript" src="js/acronym.js"></script>
+	<link rel="stylesheet" type="text/css" href="css/popup.css" />
+	<base target="_self" />
+</head>
+<body style="display: none">
+<form onsubmit="insertAcronym();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
+				<table 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> 
+					</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> 
+					</tr>
+					<tr>
+						<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> 
+							</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> 
+					</tr>
+					<tr>
+						<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>
+						</td> 
+					</tr>
+					<tr>
+						<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> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+		<div id="events_panel" class="panel">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
+
+				<table 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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="submit" id="insert" name="insert" value="{#update}" />
+		</div>
+		<div style="float: left">
+			<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeAcronym();" style="display: none;" />
+		</div>
+		<div style="float: right">
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+
+</form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/attributes.htm b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/attributes.htm
index cfbb409ab..1d882007d 100755
--- a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/attributes.htm
+++ b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/attributes.htm
@@ -1,154 +1,154 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#xhtmlxtras_dlg.attribs_title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
-	<script type="text/javascript" src="../../utils/form_utils.js"></script>
-	<script type="text/javascript" src="js/attributes.js"></script>
-	<link rel="stylesheet" type="text/css" href="css/attributes.css" />
-	<base target="_self" />
-</head>
-<body style="display: none">
-<form onsubmit="insertAction();return false;" action="#">
-	<div class="tabs">
-		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_attrib_tab}</a></span></li>
-			<li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_events_tab}</a></span></li>
-		</ul>
-	</div>
-
-	<div class="panel_wrapper">
-		<div id="general_panel" class="panel current">
-			<fieldset>
-				<legend>{#xhtmlxtras_dlg.attribute_attrib_tab}</legend>
-				<table 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> 
-					</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> 
-					</tr>
-					<tr>
-						<td><label id="classlabel" for="classlist">{#class_name}</label></td>
-						<td>
-							<select id="classlist" name="classlist" class="mceEditableSelect">
-								<option value="" selected>{#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="" /></td> 
-					</tr>
-					<tr>
-						<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>
-						</td> 
-					</tr>
-					<tr>
-						<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> 
-					</tr>
-					<tr>
-							<td><label id="tabindexlabel" for="tabindex">{#xhtmlxtras_dlg.attribute_label_tabindex}</label></td>
-							<td><input type="text" id="tabindex" name="tabindex" value="" /></td>
-						</tr>
-
-						<tr>
-							<td><label id="accesskeylabel" for="accesskey">{#xhtmlxtras_dlg.attribute_label_accesskey}</label></td>
-							<td><input type="text" id="accesskey" name="accesskey" value="" /></td>
-						</tr>
-				</table>
-			</fieldset>
-		</div>
-		<div id="events_panel" class="panel">
-			<fieldset>
-				<legend>{#xhtmlxtras_dlg.attribute_events_tab}</legend>
-
-				<table 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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
-						<td><input id="onkeyup" name="onkeyup" type="text" value="" /></td> 
-					</tr>
-				</table>
-			</fieldset>
-		</div>
-	</div>
-	<div class="mceActionPanel">
-		<div style="float: left">
-			<input type="submit" id="insert" name="insert" value="{#insert}" />
-		</div>
-		<div style="float: right">
-			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-		</div>
-	</div>
-
-</form>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#xhtmlxtras_dlg.attribs_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="js/attributes.js"></script>
+	<link rel="stylesheet" type="text/css" href="css/attributes.css" />
+	<base target="_self" />
+</head>
+<body style="display: none">
+<form onsubmit="insertAction();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_attrib_tab}</a></span></li>
+			<li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_events_tab}</a></span></li>
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.attribute_attrib_tab}</legend>
+				<table 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> 
+					</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> 
+					</tr>
+					<tr>
+						<td><label id="classlabel" for="classlist">{#class_name}</label></td>
+						<td>
+							<select id="classlist" name="classlist" class="mceEditableSelect">
+								<option value="" selected>{#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="" /></td> 
+					</tr>
+					<tr>
+						<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>
+						</td> 
+					</tr>
+					<tr>
+						<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> 
+					</tr>
+					<tr>
+							<td><label id="tabindexlabel" for="tabindex">{#xhtmlxtras_dlg.attribute_label_tabindex}</label></td>
+							<td><input type="text" id="tabindex" name="tabindex" value="" /></td>
+						</tr>
+
+						<tr>
+							<td><label id="accesskeylabel" for="accesskey">{#xhtmlxtras_dlg.attribute_label_accesskey}</label></td>
+							<td><input type="text" id="accesskey" name="accesskey" value="" /></td>
+						</tr>
+				</table>
+			</fieldset>
+		</div>
+		<div id="events_panel" class="panel">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.attribute_events_tab}</legend>
+
+				<table 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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
+						<td><input id="onkeyup" name="onkeyup" type="text" value="" /></td> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="submit" id="insert" name="insert" value="{#insert}" />
+		</div>
+		<div style="float: right">
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+
+</form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/cite.htm b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/cite.htm
index 7d9eaba4d..aa24db6dd 100755
--- a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/cite.htm
+++ b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/cite.htm
@@ -1,149 +1,149 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#xhtmlxtras_dlg.title_cite_element}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="../../utils/form_utils.js"></script>
-	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
-	<script type="text/javascript" src="js/element_common.js"></script>
-	<script type="text/javascript" src="js/cite.js"></script>
-	<link rel="stylesheet" type="text/css" href="css/popup.css" />
-	<base target="_self" />
-</head>
-<body style="display: none">
-<form onsubmit="insertCite();return false;" action="#">
-	<div class="tabs">
-		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
-			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
-		</ul>
-	</div>
-
-	<div class="panel_wrapper">
-		<div id="general_panel" class="panel current">
-			<fieldset>
-				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
-				<table 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> 
-					</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> 
-					</tr>
-					<tr>
-						<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> 
-							</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> 
-					</tr>
-					<tr>
-						<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>
-						</td> 
-					</tr>
-					<tr>
-						<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> 
-					</tr>
-				</table>
-			</fieldset>
-		</div>
-		<div id="events_panel" class="panel">
-			<fieldset>
-				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
-
-				<table 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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
-						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
-					</tr>
-				</table>
-			</fieldset>
-		</div>
-	</div>
-	<div class="mceActionPanel">
-		<div style="float: left">
-			<input type="submit" id="insert" name="insert" value="{#update}" />
-		</div>
-		<div style="float: left">
-			<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeCite();" style="display: none;" />
-		</div>
-		<div style="float: right">
-			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-		</div>
-	</div>
-
-</form>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#xhtmlxtras_dlg.title_cite_element}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="js/element_common.js"></script>
+	<script type="text/javascript" src="js/cite.js"></script>
+	<link rel="stylesheet" type="text/css" href="css/popup.css" />
+	<base target="_self" />
+</head>
+<body style="display: none">
+<form onsubmit="insertCite();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
+				<table 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> 
+					</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> 
+					</tr>
+					<tr>
+						<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> 
+							</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> 
+					</tr>
+					<tr>
+						<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>
+						</td> 
+					</tr>
+					<tr>
+						<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> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+		<div id="events_panel" class="panel">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
+
+				<table 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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="submit" id="insert" name="insert" value="{#update}" />
+		</div>
+		<div style="float: left">
+			<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeCite();" style="display: none;" />
+		</div>
+		<div style="float: right">
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+
+</form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/css/attributes.css b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/css/attributes.css
index 9a6a235c3..85b1b376d 100755
--- a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/css/attributes.css
+++ b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/css/attributes.css
@@ -1,11 +1,11 @@
-.panel_wrapper div.current {
-	height: 290px;
-}
-
-#id, #style, #title, #dir, #hreflang, #lang, #classlist, #tabindex, #accesskey {
-	width: 200px;
-}
-
-#events_panel input {
-	width: 200px;
-}
+.panel_wrapper div.current {
+	height: 290px;
+}
+
+#id, #style, #title, #dir, #hreflang, #lang, #classlist, #tabindex, #accesskey {
+	width: 200px;
+}
+
+#events_panel input {
+	width: 200px;
+}
diff --git a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/css/popup.css b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/css/popup.css
index e67114dba..034b98527 100755
--- a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/css/popup.css
+++ b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/css/popup.css
@@ -1,9 +1,9 @@
-input.field, select.field {width:200px;}
-input.picker {width:179px; margin-left: 5px;}
-input.disabled {border-color:#F2F2F2;}
-img.picker {vertical-align:text-bottom; cursor:pointer;}
-h1 {padding: 0 0 5px 0;}
-.panel_wrapper div.current {height:160px;}
-#xhtmlxtrasdel .panel_wrapper div.current, #xhtmlxtrasins .panel_wrapper div.current {height: 230px;}
-a.browse span {display:block; width:20px; height:20px; background:url('../../../themes/advanced/img/icons.gif') -140px -20px;}
-#datetime {width:180px;}
+input.field, select.field {width:200px;}
+input.picker {width:179px; margin-left: 5px;}
+input.disabled {border-color:#F2F2F2;}
+img.picker {vertical-align:text-bottom; cursor:pointer;}
+h1 {padding: 0 0 5px 0;}
+.panel_wrapper div.current {height:160px;}
+#xhtmlxtrasdel .panel_wrapper div.current, #xhtmlxtrasins .panel_wrapper div.current {height: 230px;}
+a.browse span {display:block; width:20px; height:20px; background:url('../../../themes/advanced/img/icons.gif') -140px -20px;}
+#datetime {width:180px;}
diff --git a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/del.htm b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/del.htm
index d03c4568a..f67e84ff0 100755
--- a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/del.htm
+++ b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/del.htm
@@ -1,170 +1,170 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#xhtmlxtras_dlg.title_del_element}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="../../utils/form_utils.js"></script>
-	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
-	<script type="text/javascript" src="js/element_common.js"></script>
-	<script type="text/javascript" src="js/del.js"></script>
-	<link rel="stylesheet" type="text/css" href="css/popup.css" />
-	<base target="_self" />
-</head>
-<body id="xhtmlxtrasins" style="display: none">
-<form onsubmit="insertDel();return false;" action="#">
-	<div class="tabs">
-		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
-			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
-		</ul>
-	</div>
-
-	<div class="panel_wrapper">
-		<div id="general_panel" class="panel current">
-			<fieldset>
-				<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>
-				<table border="0" cellpadding="0" cellspacing="4">
-					<tr>
-						<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td>
-						<td>
-							<table border="0" cellspacing="0" cellpadding="0">
-								<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"><span class="datetime" alt="{#xhtmlxtras_dlg.insert_date}" 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> 
-					</tr>
-				</table>
-			</fieldset>
-			<fieldset>
-				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
-				<table 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> 
-					</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> 
-					</tr>
-					<tr>
-						<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> 
-							</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> 
-					</tr>
-					<tr>
-						<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>
-						</td> 
-					</tr>
-					<tr>
-						<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> 
-					</tr>
-				</table>
-			</fieldset>
-		</div>
-		<div id="events_panel" class="panel">
-			<fieldset>
-				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
-
-				<table 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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
-						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
-					</tr>
-				</table>
-			</fieldset>
-		</div>
-	</div>
-	<div class="mceActionPanel">
-		<div style="float: left">
-			<input type="submit" id="insert" name="insert" value="{#update}" />
-		</div>
-		<div style="float: left">
-			<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeDel();" style="display: none;" />
-		</div>
-		<div style="float: right">
-			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-		</div>
-	</div>
-
-</form>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#xhtmlxtras_dlg.title_del_element}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="js/element_common.js"></script>
+	<script type="text/javascript" src="js/del.js"></script>
+	<link rel="stylesheet" type="text/css" href="css/popup.css" />
+	<base target="_self" />
+</head>
+<body id="xhtmlxtrasins" style="display: none">
+<form onsubmit="insertDel();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>
+				<table border="0" cellpadding="0" cellspacing="4">
+					<tr>
+						<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td>
+						<td>
+							<table border="0" cellspacing="0" cellpadding="0">
+								<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"><span class="datetime" alt="{#xhtmlxtras_dlg.insert_date}" 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> 
+					</tr>
+				</table>
+			</fieldset>
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
+				<table 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> 
+					</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> 
+					</tr>
+					<tr>
+						<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> 
+							</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> 
+					</tr>
+					<tr>
+						<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>
+						</td> 
+					</tr>
+					<tr>
+						<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> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+		<div id="events_panel" class="panel">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
+
+				<table 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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="submit" id="insert" name="insert" value="{#update}" />
+		</div>
+		<div style="float: left">
+			<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeDel();" style="display: none;" />
+		</div>
+		<div style="float: right">
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+
+</form>
+
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
index 143ed9216..375c6e911 100755
--- a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
+++ b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js
@@ -1,134 +1,134 @@
-/**
- * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	tinymce.create('tinymce.plugins.XHTMLXtrasPlugin', {
-		init : function(ed, url) {
-			// Register commands
-			ed.addCommand('mceCite', function() {
-				ed.windowManager.open({
-					file : url + '/cite.htm',
-					width : 350 + parseInt(ed.getLang('xhtmlxtras.cite_delta_width', 0)),
-					height : 250 + parseInt(ed.getLang('xhtmlxtras.cite_delta_height', 0)),
-					inline : 1
-				}, {
-					plugin_url : url
-				});
-			});
-
-			ed.addCommand('mceAcronym', function() {
-				ed.windowManager.open({
-					file : url + '/acronym.htm',
-					width : 350 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)),
-					height : 250 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)),
-					inline : 1
-				}, {
-					plugin_url : url
-				});
-			});
-
-			ed.addCommand('mceAbbr', function() {
-				ed.windowManager.open({
-					file : url + '/abbr.htm',
-					width : 350 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)),
-					height : 250 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)),
-					inline : 1
-				}, {
-					plugin_url : url
-				});
-			});
-
-			ed.addCommand('mceDel', function() {
-				ed.windowManager.open({
-					file : url + '/del.htm',
-					width : 340 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)),
-					height : 310 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)),
-					inline : 1
-				}, {
-					plugin_url : url
-				});
-			});
-
-			ed.addCommand('mceIns', function() {
-				ed.windowManager.open({
-					file : url + '/ins.htm',
-					width : 340 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)),
-					height : 310 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)),
-					inline : 1
-				}, {
-					plugin_url : url
-				});
-			});
-
-			ed.addCommand('mceAttributes', function() {
-				ed.windowManager.open({
-					file : url + '/attributes.htm',
-					width : 380,
-					height : 370,
-					inline : 1
-				}, {
-					plugin_url : url
-				});
-			});
-
-			// Register buttons
-			ed.addButton('cite', {title : 'xhtmlxtras.cite_desc', cmd : 'mceCite'});
-			ed.addButton('acronym', {title : 'xhtmlxtras.acronym_desc', cmd : 'mceAcronym'});
-			ed.addButton('abbr', {title : 'xhtmlxtras.abbr_desc', cmd : 'mceAbbr'});
-			ed.addButton('del', {title : 'xhtmlxtras.del_desc', cmd : 'mceDel'});
-			ed.addButton('ins', {title : 'xhtmlxtras.ins_desc', cmd : 'mceIns'});
-			ed.addButton('attribs', {title : 'xhtmlxtras.attribs_desc', cmd : 'mceAttributes'});
-
-			if (tinymce.isIE) {
-				function fix(ed, o) {
-					if (o.set) {
-						o.content = o.content.replace(/<abbr([^>]+)>/gi, '<html:abbr $1>');
-						o.content = o.content.replace(/<\/abbr>/gi, '</html:abbr>');
-					}
-				};
-
-				ed.onBeforeSetContent.add(fix);
-				ed.onPostProcess.add(fix);
-			}
-
-			ed.onNodeChange.add(function(ed, cm, n, co) {
-				n = ed.dom.getParent(n, 'CITE,ACRONYM,ABBR,DEL,INS');
-
-				cm.setDisabled('cite', co);
-				cm.setDisabled('acronym', co);
-				cm.setDisabled('abbr', co);
-				cm.setDisabled('del', co);
-				cm.setDisabled('ins', co);
-				cm.setDisabled('attribs', n && n.nodeName == 'BODY');
-
-				if (n) {
-					cm.setDisabled(n.nodeName.toLowerCase(), 0);
-					cm.setActive(n.nodeName.toLowerCase(), 1);
-				} else {
-					cm.setActive('cite', 0);
-					cm.setActive('acronym', 0);
-					cm.setActive('abbr', 0);
-					cm.setActive('del', 0);
-					cm.setActive('ins', 0);
-				}
-			});
-		},
-
-		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
-			};
-		}
-	});
-
-	// Register plugin
-	tinymce.PluginManager.add('xhtmlxtras', tinymce.plugins.XHTMLXtrasPlugin);
+/**
+ * $Id: editor_plugin_src.js 201 2007-02-12 15:56:56Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.XHTMLXtrasPlugin', {
+		init : function(ed, url) {
+			// Register commands
+			ed.addCommand('mceCite', function() {
+				ed.windowManager.open({
+					file : url + '/cite.htm',
+					width : 350 + parseInt(ed.getLang('xhtmlxtras.cite_delta_width', 0)),
+					height : 250 + parseInt(ed.getLang('xhtmlxtras.cite_delta_height', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceAcronym', function() {
+				ed.windowManager.open({
+					file : url + '/acronym.htm',
+					width : 350 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)),
+					height : 250 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceAbbr', function() {
+				ed.windowManager.open({
+					file : url + '/abbr.htm',
+					width : 350 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)),
+					height : 250 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceDel', function() {
+				ed.windowManager.open({
+					file : url + '/del.htm',
+					width : 340 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)),
+					height : 310 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceIns', function() {
+				ed.windowManager.open({
+					file : url + '/ins.htm',
+					width : 340 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)),
+					height : 310 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)),
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			ed.addCommand('mceAttributes', function() {
+				ed.windowManager.open({
+					file : url + '/attributes.htm',
+					width : 380,
+					height : 370,
+					inline : 1
+				}, {
+					plugin_url : url
+				});
+			});
+
+			// Register buttons
+			ed.addButton('cite', {title : 'xhtmlxtras.cite_desc', cmd : 'mceCite'});
+			ed.addButton('acronym', {title : 'xhtmlxtras.acronym_desc', cmd : 'mceAcronym'});
+			ed.addButton('abbr', {title : 'xhtmlxtras.abbr_desc', cmd : 'mceAbbr'});
+			ed.addButton('del', {title : 'xhtmlxtras.del_desc', cmd : 'mceDel'});
+			ed.addButton('ins', {title : 'xhtmlxtras.ins_desc', cmd : 'mceIns'});
+			ed.addButton('attribs', {title : 'xhtmlxtras.attribs_desc', cmd : 'mceAttributes'});
+
+			if (tinymce.isIE) {
+				function fix(ed, o) {
+					if (o.set) {
+						o.content = o.content.replace(/<abbr([^>]+)>/gi, '<html:abbr $1>');
+						o.content = o.content.replace(/<\/abbr>/gi, '</html:abbr>');
+					}
+				};
+
+				ed.onBeforeSetContent.add(fix);
+				ed.onPostProcess.add(fix);
+			}
+
+			ed.onNodeChange.add(function(ed, cm, n, co) {
+				n = ed.dom.getParent(n, 'CITE,ACRONYM,ABBR,DEL,INS');
+
+				cm.setDisabled('cite', co);
+				cm.setDisabled('acronym', co);
+				cm.setDisabled('abbr', co);
+				cm.setDisabled('del', co);
+				cm.setDisabled('ins', co);
+				cm.setDisabled('attribs', n && n.nodeName == 'BODY');
+
+				if (n) {
+					cm.setDisabled(n.nodeName.toLowerCase(), 0);
+					cm.setActive(n.nodeName.toLowerCase(), 1);
+				} else {
+					cm.setActive('cite', 0);
+					cm.setActive('acronym', 0);
+					cm.setActive('abbr', 0);
+					cm.setActive('del', 0);
+					cm.setActive('ins', 0);
+				}
+			});
+		},
+
+		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
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('xhtmlxtras', tinymce.plugins.XHTMLXtrasPlugin);
 })();
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/ins.htm b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/ins.htm
index c0f056ff3..2411e8204 100755
--- a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/ins.htm
+++ b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/ins.htm
@@ -1,170 +1,170 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#xhtmlxtras_dlg.title_ins_element}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="../../utils/form_utils.js"></script>
-	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
-	<script type="text/javascript" src="js/element_common.js"></script>
-	<script type="text/javascript" src="js/ins.js"></script>
-	<link rel="stylesheet" type="text/css" href="css/popup.css" />
-	<base target="_self" />
-</head>
-<body id="xhtmlxtrasins" style="display: none">
-<form onsubmit="insertIns();return false;" action="#">
-	<div class="tabs">
-		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
-			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
-		</ul>
-	</div>
-
-	<div class="panel_wrapper">
-		<div id="general_panel" class="panel current">
-			<fieldset>
-				<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>
-				<table border="0" cellpadding="0" cellspacing="4">
-					<tr>
-						<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td> 
-						<td>
-							<table border="0" cellspacing="0" cellpadding="0">
-								<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"><span class="datetime" alt="{#xhtmlxtras_dlg.insert_date}" 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> 
-					</tr>
-				</table>
-			</fieldset>
-			<fieldset>
-				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
-				<table 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> 
-					</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> 
-					</tr>
-					<tr>
-						<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> 
-							</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> 
-					</tr>
-					<tr>
-						<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>
-						</td> 
-					</tr>
-					<tr>
-						<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> 
-					</tr>
-				</table>
-			</fieldset>
-		</div>
-		<div id="events_panel" class="panel">
-			<fieldset>
-				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
-
-				<table 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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<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> 
-					</tr>
-
-					<tr>
-						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
-						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
-					</tr>
-				</table>
-			</fieldset>
-		</div>
-	</div>
-	<div class="mceActionPanel">
-		<div style="float: left">
-			<input type="submit" id="insert" name="insert" value="{#update}" />
-		</div>
-		<div style="float: left">
-			<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeIns();" style="display: none;" />
-		</div>
-		<div style="float: right">
-			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-		</div>
-	</div>
-
-</form>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#xhtmlxtras_dlg.title_ins_element}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="js/element_common.js"></script>
+	<script type="text/javascript" src="js/ins.js"></script>
+	<link rel="stylesheet" type="text/css" href="css/popup.css" />
+	<base target="_self" />
+</head>
+<body id="xhtmlxtrasins" style="display: none">
+<form onsubmit="insertIns();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>
+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>
+				<table border="0" cellpadding="0" cellspacing="4">
+					<tr>
+						<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td> 
+						<td>
+							<table border="0" cellspacing="0" cellpadding="0">
+								<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"><span class="datetime" alt="{#xhtmlxtras_dlg.insert_date}" 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> 
+					</tr>
+				</table>
+			</fieldset>
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>
+				<table 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> 
+					</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> 
+					</tr>
+					<tr>
+						<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> 
+							</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> 
+					</tr>
+					<tr>
+						<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>
+						</td> 
+					</tr>
+					<tr>
+						<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> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+		<div id="events_panel" class="panel">
+			<fieldset>
+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>
+
+				<table 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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<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> 
+					</tr>
+
+					<tr>
+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 
+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 
+					</tr>
+				</table>
+			</fieldset>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="submit" id="insert" name="insert" value="{#update}" />
+		</div>
+		<div style="float: left">
+			<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeIns();" style="display: none;" />
+		</div>
+		<div style="float: right">
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+
+</form>
+
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/abbr.js b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/abbr.js
index e84b6a837..2f4ec11b8 100755
--- a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/abbr.js
+++ b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/abbr.js
@@ -1,25 +1,25 @@
- /**
- * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
- *
- * @author Moxiecode - based on work by Andrew Tetlaw
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-function init() {
-	SXE.initElementDialog('abbr');
-	if (SXE.currentAction == "update") {
-		SXE.showRemoveButton();
-	}
-}
-
-function insertAbbr() {
-	SXE.insertElement(tinymce.isIE ? 'html:abbr' : 'abbr');
-	tinyMCEPopup.close();
-}
-
-function removeAbbr() {
-	SXE.removeElement('abbr');
-	tinyMCEPopup.close();
-}
-
-tinyMCEPopup.onInit.add(init);
+ /**
+ * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
+ *
+ * @author Moxiecode - based on work by Andrew Tetlaw
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+function init() {
+	SXE.initElementDialog('abbr');
+	if (SXE.currentAction == "update") {
+		SXE.showRemoveButton();
+	}
+}
+
+function insertAbbr() {
+	SXE.insertElement(tinymce.isIE ? 'html:abbr' : 'abbr');
+	tinyMCEPopup.close();
+}
+
+function removeAbbr() {
+	SXE.removeElement('abbr');
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/acronym.js b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/acronym.js
index 933d122cb..4a3215d3b 100755
--- a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/acronym.js
+++ b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/acronym.js
@@ -1,25 +1,25 @@
- /**
- * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
- *
- * @author Moxiecode - based on work by Andrew Tetlaw
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-function init() {
-	SXE.initElementDialog('acronym');
-	if (SXE.currentAction == "update") {
-		SXE.showRemoveButton();
-	}
-}
-
-function insertAcronym() {
-	SXE.insertElement('acronym');
-	tinyMCEPopup.close();
-}
-
-function removeAcronym() {
-	SXE.removeElement('acronym');
-	tinyMCEPopup.close();
-}
-
-tinyMCEPopup.onInit.add(init);
+ /**
+ * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
+ *
+ * @author Moxiecode - based on work by Andrew Tetlaw
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+function init() {
+	SXE.initElementDialog('acronym');
+	if (SXE.currentAction == "update") {
+		SXE.showRemoveButton();
+	}
+}
+
+function insertAcronym() {
+	SXE.insertElement('acronym');
+	tinyMCEPopup.close();
+}
+
+function removeAcronym() {
+	SXE.removeElement('acronym');
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/attributes.js b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/attributes.js
index 23c7fa4c2..b336ce16b 100755
--- a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/attributes.js
+++ b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/attributes.js
@@ -1,123 +1,123 @@
- /**
- * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
- *
- * @author Moxiecode - based on work by Andrew Tetlaw
- * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
- */
-
-function init() {
-	tinyMCEPopup.resizeToInnerSize();
-	var inst = tinyMCEPopup.editor;
-	var dom = inst.dom;
-	var elm = inst.selection.getNode();
-	var f = document.forms[0];
-	var onclick = dom.getAttrib(elm, 'onclick');
-
-	setFormValue('title', dom.getAttrib(elm, 'title'));
-	setFormValue('id', dom.getAttrib(elm, 'id'));
-	setFormValue('style', dom.getAttrib(elm, "style"));
-	setFormValue('dir', dom.getAttrib(elm, 'dir'));
-	setFormValue('lang', dom.getAttrib(elm, 'lang'));
-	setFormValue('tabindex', dom.getAttrib(elm, 'tabindex', typeof(elm.tabindex) != "undefined" ? elm.tabindex : ""));
-	setFormValue('accesskey', dom.getAttrib(elm, 'accesskey', typeof(elm.accesskey) != "undefined" ? elm.accesskey : ""));
-	setFormValue('onfocus', dom.getAttrib(elm, 'onfocus'));
-	setFormValue('onblur', dom.getAttrib(elm, 'onblur'));
-	setFormValue('onclick', onclick);
-	setFormValue('ondblclick', dom.getAttrib(elm, 'ondblclick'));
-	setFormValue('onmousedown', dom.getAttrib(elm, 'onmousedown'));
-	setFormValue('onmouseup', dom.getAttrib(elm, 'onmouseup'));
-	setFormValue('onmouseover', dom.getAttrib(elm, 'onmouseover'));
-	setFormValue('onmousemove', dom.getAttrib(elm, 'onmousemove'));
-	setFormValue('onmouseout', dom.getAttrib(elm, 'onmouseout'));
-	setFormValue('onkeypress', dom.getAttrib(elm, 'onkeypress'));
-	setFormValue('onkeydown', dom.getAttrib(elm, 'onkeydown'));
-	setFormValue('onkeyup', dom.getAttrib(elm, 'onkeyup'));
-	className = dom.getAttrib(elm, 'class');
-
-	addClassesToList('classlist', 'advlink_styles');
-	selectByValue(f, 'classlist', className, true);
-
-	TinyMCE_EditableSelects.init();
-}
-
-function setFormValue(name, value) {
-	if(value && document.forms[0].elements[name]){
-		document.forms[0].elements[name].value = value;
-	}
-}
-
-function insertAction() {
-	var inst = tinyMCEPopup.editor;
-	var elm = inst.selection.getNode();
-
-	tinyMCEPopup.execCommand("mceBeginUndoLevel");	
-	setAllAttribs(elm);
-	tinyMCEPopup.execCommand("mceEndUndoLevel");
-	tinyMCEPopup.close();
-}
-
-function setAttrib(elm, attrib, value) {
-	var formObj = document.forms[0];
-	var valueElm = formObj.elements[attrib.toLowerCase()];
-	var inst = tinyMCEPopup.editor;
-	var dom = inst.dom;
-
-	if (typeof(value) == "undefined" || value == null) {
-		value = "";
-
-		if (valueElm)
-			value = valueElm.value;
-	}
-
-	if (value != "") {
-		dom.setAttrib(elm, attrib.toLowerCase(), value);
-
-		if (attrib == "style")
-			attrib = "style.cssText";
-
-		if (attrib.substring(0, 2) == 'on')
-			value = 'return true;' + value;
-
-		if (attrib == "class")
-			attrib = "className";
-
-		elm[attrib]=value;
-	} else
-		elm.removeAttribute(attrib);
-}
-
-function setAllAttribs(elm) {
-	var f = document.forms[0];
-
-	setAttrib(elm, 'title');
-	setAttrib(elm, 'id');
-	setAttrib(elm, 'style');
-	setAttrib(elm, 'class', getSelectValue(f, 'classlist'));
-	setAttrib(elm, 'dir');
-	setAttrib(elm, 'lang');
-	setAttrib(elm, 'tabindex');
-	setAttrib(elm, 'accesskey');
-	setAttrib(elm, 'onfocus');
-	setAttrib(elm, 'onblur');
-	setAttrib(elm, 'onclick');
-	setAttrib(elm, 'ondblclick');
-	setAttrib(elm, 'onmousedown');
-	setAttrib(elm, 'onmouseup');
-	setAttrib(elm, 'onmouseover');
-	setAttrib(elm, 'onmousemove');
-	setAttrib(elm, 'onmouseout');
-	setAttrib(elm, 'onkeypress');
-	setAttrib(elm, 'onkeydown');
-	setAttrib(elm, 'onkeyup');
-
-	// Refresh in old MSIE
-//	if (tinyMCE.isMSIE5)
-//		elm.outerHTML = elm.outerHTML;
-}
-
-function insertAttribute() {
-	tinyMCEPopup.close();
-}
-
-tinyMCEPopup.onInit.add(init);
-tinyMCEPopup.requireLangPack();
+ /**
+ * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
+ *
+ * @author Moxiecode - based on work by Andrew Tetlaw
+ * @copyright Copyright © 2004-2006, Moxiecode Systems AB, All rights reserved.
+ */
+
+function init() {
+	tinyMCEPopup.resizeToInnerSize();
+	var inst = tinyMCEPopup.editor;
+	var dom = inst.dom;
+	var elm = inst.selection.getNode();
+	var f = document.forms[0];
+	var onclick = dom.getAttrib(elm, 'onclick');
+
+	setFormValue('title', dom.getAttrib(elm, 'title'));
+	setFormValue('id', dom.getAttrib(elm, 'id'));
+	setFormValue('style', dom.getAttrib(elm, "style"));
+	setFormValue('dir', dom.getAttrib(elm, 'dir'));
+	setFormValue('lang', dom.getAttrib(elm, 'lang'));
+	setFormValue('tabindex', dom.getAttrib(elm, 'tabindex', typeof(elm.tabindex) != "undefined" ? elm.tabindex : ""));
+	setFormValue('accesskey', dom.getAttrib(elm, 'accesskey', typeof(elm.accesskey) != "undefined" ? elm.accesskey : ""));
+	setFormValue('onfocus', dom.getAttrib(elm, 'onfocus'));
+	setFormValue('onblur', dom.getAttrib(elm, 'onblur'));
+	setFormValue('onclick', onclick);
+	setFormValue('ondblclick', dom.getAttrib(elm, 'ondblclick'));
+	setFormValue('onmousedown', dom.getAttrib(elm, 'onmousedown'));
+	setFormValue('onmouseup', dom.getAttrib(elm, 'onmouseup'));
+	setFormValue('onmouseover', dom.getAttrib(elm, 'onmouseover'));
+	setFormValue('onmousemove', dom.getAttrib(elm, 'onmousemove'));
+	setFormValue('onmouseout', dom.getAttrib(elm, 'onmouseout'));
+	setFormValue('onkeypress', dom.getAttrib(elm, 'onkeypress'));
+	setFormValue('onkeydown', dom.getAttrib(elm, 'onkeydown'));
+	setFormValue('onkeyup', dom.getAttrib(elm, 'onkeyup'));
+	className = dom.getAttrib(elm, 'class');
+
+	addClassesToList('classlist', 'advlink_styles');
+	selectByValue(f, 'classlist', className, true);
+
+	TinyMCE_EditableSelects.init();
+}
+
+function setFormValue(name, value) {
+	if(value && document.forms[0].elements[name]){
+		document.forms[0].elements[name].value = value;
+	}
+}
+
+function insertAction() {
+	var inst = tinyMCEPopup.editor;
+	var elm = inst.selection.getNode();
+
+	tinyMCEPopup.execCommand("mceBeginUndoLevel");	
+	setAllAttribs(elm);
+	tinyMCEPopup.execCommand("mceEndUndoLevel");
+	tinyMCEPopup.close();
+}
+
+function setAttrib(elm, attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib.toLowerCase()];
+	var inst = tinyMCEPopup.editor;
+	var dom = inst.dom;
+
+	if (typeof(value) == "undefined" || value == null) {
+		value = "";
+
+		if (valueElm)
+			value = valueElm.value;
+	}
+
+	if (value != "") {
+		dom.setAttrib(elm, attrib.toLowerCase(), value);
+
+		if (attrib == "style")
+			attrib = "style.cssText";
+
+		if (attrib.substring(0, 2) == 'on')
+			value = 'return true;' + value;
+
+		if (attrib == "class")
+			attrib = "className";
+
+		elm[attrib]=value;
+	} else
+		elm.removeAttribute(attrib);
+}
+
+function setAllAttribs(elm) {
+	var f = document.forms[0];
+
+	setAttrib(elm, 'title');
+	setAttrib(elm, 'id');
+	setAttrib(elm, 'style');
+	setAttrib(elm, 'class', getSelectValue(f, 'classlist'));
+	setAttrib(elm, 'dir');
+	setAttrib(elm, 'lang');
+	setAttrib(elm, 'tabindex');
+	setAttrib(elm, 'accesskey');
+	setAttrib(elm, 'onfocus');
+	setAttrib(elm, 'onblur');
+	setAttrib(elm, 'onclick');
+	setAttrib(elm, 'ondblclick');
+	setAttrib(elm, 'onmousedown');
+	setAttrib(elm, 'onmouseup');
+	setAttrib(elm, 'onmouseover');
+	setAttrib(elm, 'onmousemove');
+	setAttrib(elm, 'onmouseout');
+	setAttrib(elm, 'onkeypress');
+	setAttrib(elm, 'onkeydown');
+	setAttrib(elm, 'onkeyup');
+
+	// Refresh in old MSIE
+//	if (tinyMCE.isMSIE5)
+//		elm.outerHTML = elm.outerHTML;
+}
+
+function insertAttribute() {
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
+tinyMCEPopup.requireLangPack();
diff --git a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/cite.js b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/cite.js
index c36f7fd87..b8b0ccd72 100755
--- a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/cite.js
+++ b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/cite.js
@@ -1,25 +1,25 @@
- /**
- * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
- *
- * @author Moxiecode - based on work by Andrew Tetlaw
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-function init() {
-	SXE.initElementDialog('cite');
-	if (SXE.currentAction == "update") {
-		SXE.showRemoveButton();
-	}
-}
-
-function insertCite() {
-	SXE.insertElement('cite');
-	tinyMCEPopup.close();
-}
-
-function removeCite() {
-	SXE.removeElement('cite');
-	tinyMCEPopup.close();
-}
-
-tinyMCEPopup.onInit.add(init);
+ /**
+ * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
+ *
+ * @author Moxiecode - based on work by Andrew Tetlaw
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+function init() {
+	SXE.initElementDialog('cite');
+	if (SXE.currentAction == "update") {
+		SXE.showRemoveButton();
+	}
+}
+
+function insertCite() {
+	SXE.insertElement('cite');
+	tinyMCEPopup.close();
+}
+
+function removeCite() {
+	SXE.removeElement('cite');
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/del.js b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/del.js
index 005a619c7..60d1e51ae 100755
--- a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/del.js
+++ b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/del.js
@@ -1,50 +1,50 @@
- /**
- * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
- *
- * @author Moxiecode - based on work by Andrew Tetlaw
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-function init() {
-	SXE.initElementDialog('del');
-	if (SXE.currentAction == "update") {
-		setFormValue('datetime', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'datetime'));
-		setFormValue('cite', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'cite'));
-		SXE.showRemoveButton();
-	}
-}
-
-function setElementAttribs(elm) {
-	setAllCommonAttribs(elm);
-	setAttrib(elm, 'datetime');
-	setAttrib(elm, 'cite');
-}
-
-function insertDel() {
-	var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'DEL');
-
-	tinyMCEPopup.execCommand('mceBeginUndoLevel');
-	if (elm == null) {
-		var s = SXE.inst.selection.getContent();
-		if(s.length > 0) {
-			tinyMCEPopup.execCommand('mceInsertContent', false, '<del id="#sxe_temp_del#">' + s + '</del>');
-			var elementArray = tinymce.grep(SXE.inst.dom.select('del'), function(n) {return n.id == '#sxe_temp_del#';});
-			for (var i=0; i<elementArray.length; i++) {
-				var elm = elementArray[i];
-				setElementAttribs(elm);
-			}
-		}
-	} else {
-		setElementAttribs(elm);
-	}
-	tinyMCEPopup.editor.nodeChanged();
-	tinyMCEPopup.execCommand('mceEndUndoLevel');
-	tinyMCEPopup.close();
-}
-
-function removeDel() {
-	SXE.removeElement('del');
-	tinyMCEPopup.close();
-}
-
-tinyMCEPopup.onInit.add(init);
+ /**
+ * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
+ *
+ * @author Moxiecode - based on work by Andrew Tetlaw
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+function init() {
+	SXE.initElementDialog('del');
+	if (SXE.currentAction == "update") {
+		setFormValue('datetime', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'datetime'));
+		setFormValue('cite', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'cite'));
+		SXE.showRemoveButton();
+	}
+}
+
+function setElementAttribs(elm) {
+	setAllCommonAttribs(elm);
+	setAttrib(elm, 'datetime');
+	setAttrib(elm, 'cite');
+}
+
+function insertDel() {
+	var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'DEL');
+
+	tinyMCEPopup.execCommand('mceBeginUndoLevel');
+	if (elm == null) {
+		var s = SXE.inst.selection.getContent();
+		if(s.length > 0) {
+			tinyMCEPopup.execCommand('mceInsertContent', false, '<del id="#sxe_temp_del#">' + s + '</del>');
+			var elementArray = tinymce.grep(SXE.inst.dom.select('del'), function(n) {return n.id == '#sxe_temp_del#';});
+			for (var i=0; i<elementArray.length; i++) {
+				var elm = elementArray[i];
+				setElementAttribs(elm);
+			}
+		}
+	} else {
+		setElementAttribs(elm);
+	}
+	tinyMCEPopup.editor.nodeChanged();
+	tinyMCEPopup.execCommand('mceEndUndoLevel');
+	tinyMCEPopup.close();
+}
+
+function removeDel() {
+	SXE.removeElement('del');
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/element_common.js b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/element_common.js
index cc11835fa..b8e24e865 100755
--- a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/element_common.js
+++ b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/element_common.js
@@ -1,221 +1,221 @@
- /**
- * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
- *
- * @author Moxiecode - based on work by Andrew Tetlaw
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-tinyMCEPopup.requireLangPack();
-
-function initCommonAttributes(elm) {
-	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
-
-	// Setup form data for common element attributes
-	setFormValue('title', dom.getAttrib(elm, 'title'));
-	setFormValue('id', dom.getAttrib(elm, 'id'));
-	selectByValue(formObj, 'class', dom.getAttrib(elm, 'class'), true);
-	setFormValue('style', dom.getAttrib(elm, 'style'));
-	selectByValue(formObj, 'dir', dom.getAttrib(elm, 'dir'));
-	setFormValue('lang', dom.getAttrib(elm, 'lang'));
-	setFormValue('onfocus', dom.getAttrib(elm, 'onfocus'));
-	setFormValue('onblur', dom.getAttrib(elm, 'onblur'));
-	setFormValue('onclick', dom.getAttrib(elm, 'onclick'));
-	setFormValue('ondblclick', dom.getAttrib(elm, 'ondblclick'));
-	setFormValue('onmousedown', dom.getAttrib(elm, 'onmousedown'));
-	setFormValue('onmouseup', dom.getAttrib(elm, 'onmouseup'));
-	setFormValue('onmouseover', dom.getAttrib(elm, 'onmouseover'));
-	setFormValue('onmousemove', dom.getAttrib(elm, 'onmousemove'));
-	setFormValue('onmouseout', dom.getAttrib(elm, 'onmouseout'));
-	setFormValue('onkeypress', dom.getAttrib(elm, 'onkeypress'));
-	setFormValue('onkeydown', dom.getAttrib(elm, 'onkeydown'));
-	setFormValue('onkeyup', dom.getAttrib(elm, 'onkeyup'));
-}
-
-function setFormValue(name, value) {
-	if(document.forms[0].elements[name]) document.forms[0].elements[name].value = value;
-}
-
-function insertDateTime(id) {
-	document.getElementById(id).value = getDateTime(new Date(), "%Y-%m-%dT%H:%M:%S");
-}
-
-function getDateTime(d, fmt) {
-	fmt = fmt.replace("%D", "%m/%d/%y");
-	fmt = fmt.replace("%r", "%I:%M:%S %p");
-	fmt = fmt.replace("%Y", "" + d.getFullYear());
-	fmt = fmt.replace("%y", "" + d.getYear());
-	fmt = fmt.replace("%m", addZeros(d.getMonth()+1, 2));
-	fmt = fmt.replace("%d", addZeros(d.getDate(), 2));
-	fmt = fmt.replace("%H", "" + addZeros(d.getHours(), 2));
-	fmt = fmt.replace("%M", "" + addZeros(d.getMinutes(), 2));
-	fmt = fmt.replace("%S", "" + addZeros(d.getSeconds(), 2));
-	fmt = fmt.replace("%I", "" + ((d.getHours() + 11) % 12 + 1));
-	fmt = fmt.replace("%p", "" + (d.getHours() < 12 ? "AM" : "PM"));
-	fmt = fmt.replace("%%", "%");
-
-	return fmt;
-}
-
-function addZeros(value, len) {
-	var i;
-
-	value = "" + value;
-
-	if (value.length < len) {
-		for (i=0; i<(len-value.length); i++)
-			value = "0" + value;
-	}
-
-	return value;
-}
-
-function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
-	if (!form_obj || !form_obj.elements[field_name])
-		return;
-
-	var sel = form_obj.elements[field_name];
-
-	var found = false;
-	for (var i=0; i<sel.options.length; i++) {
-		var option = sel.options[i];
-
-		if (option.value == value || (ignore_case && option.value.toLowerCase() == value.toLowerCase())) {
-			option.selected = true;
-			found = true;
-		} else
-			option.selected = false;
-	}
-
-	if (!found && add_custom && value != '') {
-		var option = new Option('Value: ' + value, value);
-		option.selected = true;
-		sel.options[sel.options.length] = option;
-	}
-
-	return found;
-}
-
-function setAttrib(elm, attrib, value) {
-	var formObj = document.forms[0];
-	var valueElm = formObj.elements[attrib.toLowerCase()];
-	tinyMCEPopup.editor.dom.setAttrib(elm, attrib, value || valueElm.value);
-}
-
-function setAllCommonAttribs(elm) {
-	setAttrib(elm, 'title');
-	setAttrib(elm, 'id');
-	setAttrib(elm, 'class');
-	setAttrib(elm, 'style');
-	setAttrib(elm, 'dir');
-	setAttrib(elm, 'lang');
-	/*setAttrib(elm, 'onfocus');
-	setAttrib(elm, 'onblur');
-	setAttrib(elm, 'onclick');
-	setAttrib(elm, 'ondblclick');
-	setAttrib(elm, 'onmousedown');
-	setAttrib(elm, 'onmouseup');
-	setAttrib(elm, 'onmouseover');
-	setAttrib(elm, 'onmousemove');
-	setAttrib(elm, 'onmouseout');
-	setAttrib(elm, 'onkeypress');
-	setAttrib(elm, 'onkeydown');
-	setAttrib(elm, 'onkeyup');*/
-}
-
-SXE = {
-	currentAction : "insert",
-	inst : tinyMCEPopup.editor,
-	updateElement : null
-}
-
-SXE.focusElement = SXE.inst.selection.getNode();
-
-SXE.initElementDialog = function(element_name) {
-	addClassesToList('class', 'xhtmlxtras_styles');
-	TinyMCE_EditableSelects.init();
-
-	element_name = element_name.toLowerCase();
-	var elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase());
-	if (elm != null && elm.nodeName.toUpperCase() == element_name.toUpperCase()) {
-		SXE.currentAction = "update";
-	}
-
-	if (SXE.currentAction == "update") {
-		initCommonAttributes(elm);
-		SXE.updateElement = elm;
-	}
-
-	document.forms[0].insert.value = tinyMCEPopup.getLang(SXE.currentAction, 'Insert', true); 
-}
-
-SXE.insertElement = function(element_name) {
-	var elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase()), h, tagName;
-
-	tinyMCEPopup.execCommand('mceBeginUndoLevel');
-	if (elm == null) {
-		var s = SXE.inst.selection.getContent();
-		if(s.length > 0) {
-			tagName = element_name;
-
-			if (tinymce.isIE && element_name.indexOf('html:') == 0)
-				element_name = element_name.substring(5).toLowerCase();
-
-			h = '<' + tagName + ' id="#sxe_temp_' + element_name + '#">' + s + '</' + tagName + '>';
-
-			tinyMCEPopup.execCommand('mceInsertContent', false, h);
-
-			var elementArray = tinymce.grep(SXE.inst.dom.select(element_name), function(n) {return n.id == '#sxe_temp_' + element_name + '#';});
-			for (var i=0; i<elementArray.length; i++) {
-				var elm = elementArray[i];
-
-				elm.id = '';
-				elm.setAttribute('id', '');
-				elm.removeAttribute('id');
-
-				setAllCommonAttribs(elm);
-			}
-		}
-	} else {
-		setAllCommonAttribs(elm);
-	}
-	SXE.inst.nodeChanged();
-	tinyMCEPopup.execCommand('mceEndUndoLevel');
-}
-
-SXE.removeElement = function(element_name){
-	element_name = element_name.toLowerCase();
-	elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase());
-	if(elm && elm.nodeName.toUpperCase() == element_name.toUpperCase()){
-		tinyMCEPopup.execCommand('mceBeginUndoLevel');
-		tinyMCE.execCommand('mceRemoveNode', false, elm);
-		SXE.inst.nodeChanged();
-		tinyMCEPopup.execCommand('mceEndUndoLevel');
-	}
-}
-
-SXE.showRemoveButton = function() {
-		document.getElementById("remove").style.display = 'block';
-}
-
-SXE.containsClass = function(elm,cl) {
-	return (elm.className.indexOf(cl) > -1) ? true : false;
-}
-
-SXE.removeClass = function(elm,cl) {
-	if(elm.className == null || elm.className == "" || !SXE.containsClass(elm,cl)) {
-		return true;
-	}
-	var classNames = elm.className.split(" ");
-	var newClassNames = "";
-	for (var x = 0, cnl = classNames.length; x < cnl; x++) {
-		if (classNames[x] != cl) {
-			newClassNames += (classNames[x] + " ");
-		}
-	}
-	elm.className = newClassNames.substring(0,newClassNames.length-1); //removes extra space at the end
-}
-
-SXE.addClass = function(elm,cl) {
-	if(!SXE.containsClass(elm,cl)) elm.className ? elm.className += " " + cl : elm.className = cl;
-	return true;
+ /**
+ * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
+ *
+ * @author Moxiecode - based on work by Andrew Tetlaw
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+tinyMCEPopup.requireLangPack();
+
+function initCommonAttributes(elm) {
+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;
+
+	// Setup form data for common element attributes
+	setFormValue('title', dom.getAttrib(elm, 'title'));
+	setFormValue('id', dom.getAttrib(elm, 'id'));
+	selectByValue(formObj, 'class', dom.getAttrib(elm, 'class'), true);
+	setFormValue('style', dom.getAttrib(elm, 'style'));
+	selectByValue(formObj, 'dir', dom.getAttrib(elm, 'dir'));
+	setFormValue('lang', dom.getAttrib(elm, 'lang'));
+	setFormValue('onfocus', dom.getAttrib(elm, 'onfocus'));
+	setFormValue('onblur', dom.getAttrib(elm, 'onblur'));
+	setFormValue('onclick', dom.getAttrib(elm, 'onclick'));
+	setFormValue('ondblclick', dom.getAttrib(elm, 'ondblclick'));
+	setFormValue('onmousedown', dom.getAttrib(elm, 'onmousedown'));
+	setFormValue('onmouseup', dom.getAttrib(elm, 'onmouseup'));
+	setFormValue('onmouseover', dom.getAttrib(elm, 'onmouseover'));
+	setFormValue('onmousemove', dom.getAttrib(elm, 'onmousemove'));
+	setFormValue('onmouseout', dom.getAttrib(elm, 'onmouseout'));
+	setFormValue('onkeypress', dom.getAttrib(elm, 'onkeypress'));
+	setFormValue('onkeydown', dom.getAttrib(elm, 'onkeydown'));
+	setFormValue('onkeyup', dom.getAttrib(elm, 'onkeyup'));
+}
+
+function setFormValue(name, value) {
+	if(document.forms[0].elements[name]) document.forms[0].elements[name].value = value;
+}
+
+function insertDateTime(id) {
+	document.getElementById(id).value = getDateTime(new Date(), "%Y-%m-%dT%H:%M:%S");
+}
+
+function getDateTime(d, fmt) {
+	fmt = fmt.replace("%D", "%m/%d/%y");
+	fmt = fmt.replace("%r", "%I:%M:%S %p");
+	fmt = fmt.replace("%Y", "" + d.getFullYear());
+	fmt = fmt.replace("%y", "" + d.getYear());
+	fmt = fmt.replace("%m", addZeros(d.getMonth()+1, 2));
+	fmt = fmt.replace("%d", addZeros(d.getDate(), 2));
+	fmt = fmt.replace("%H", "" + addZeros(d.getHours(), 2));
+	fmt = fmt.replace("%M", "" + addZeros(d.getMinutes(), 2));
+	fmt = fmt.replace("%S", "" + addZeros(d.getSeconds(), 2));
+	fmt = fmt.replace("%I", "" + ((d.getHours() + 11) % 12 + 1));
+	fmt = fmt.replace("%p", "" + (d.getHours() < 12 ? "AM" : "PM"));
+	fmt = fmt.replace("%%", "%");
+
+	return fmt;
+}
+
+function addZeros(value, len) {
+	var i;
+
+	value = "" + value;
+
+	if (value.length < len) {
+		for (i=0; i<(len-value.length); i++)
+			value = "0" + value;
+	}
+
+	return value;
+}
+
+function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
+	if (!form_obj || !form_obj.elements[field_name])
+		return;
+
+	var sel = form_obj.elements[field_name];
+
+	var found = false;
+	for (var i=0; i<sel.options.length; i++) {
+		var option = sel.options[i];
+
+		if (option.value == value || (ignore_case && option.value.toLowerCase() == value.toLowerCase())) {
+			option.selected = true;
+			found = true;
+		} else
+			option.selected = false;
+	}
+
+	if (!found && add_custom && value != '') {
+		var option = new Option('Value: ' + value, value);
+		option.selected = true;
+		sel.options[sel.options.length] = option;
+	}
+
+	return found;
+}
+
+function setAttrib(elm, attrib, value) {
+	var formObj = document.forms[0];
+	var valueElm = formObj.elements[attrib.toLowerCase()];
+	tinyMCEPopup.editor.dom.setAttrib(elm, attrib, value || valueElm.value);
+}
+
+function setAllCommonAttribs(elm) {
+	setAttrib(elm, 'title');
+	setAttrib(elm, 'id');
+	setAttrib(elm, 'class');
+	setAttrib(elm, 'style');
+	setAttrib(elm, 'dir');
+	setAttrib(elm, 'lang');
+	/*setAttrib(elm, 'onfocus');
+	setAttrib(elm, 'onblur');
+	setAttrib(elm, 'onclick');
+	setAttrib(elm, 'ondblclick');
+	setAttrib(elm, 'onmousedown');
+	setAttrib(elm, 'onmouseup');
+	setAttrib(elm, 'onmouseover');
+	setAttrib(elm, 'onmousemove');
+	setAttrib(elm, 'onmouseout');
+	setAttrib(elm, 'onkeypress');
+	setAttrib(elm, 'onkeydown');
+	setAttrib(elm, 'onkeyup');*/
+}
+
+SXE = {
+	currentAction : "insert",
+	inst : tinyMCEPopup.editor,
+	updateElement : null
+}
+
+SXE.focusElement = SXE.inst.selection.getNode();
+
+SXE.initElementDialog = function(element_name) {
+	addClassesToList('class', 'xhtmlxtras_styles');
+	TinyMCE_EditableSelects.init();
+
+	element_name = element_name.toLowerCase();
+	var elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase());
+	if (elm != null && elm.nodeName.toUpperCase() == element_name.toUpperCase()) {
+		SXE.currentAction = "update";
+	}
+
+	if (SXE.currentAction == "update") {
+		initCommonAttributes(elm);
+		SXE.updateElement = elm;
+	}
+
+	document.forms[0].insert.value = tinyMCEPopup.getLang(SXE.currentAction, 'Insert', true); 
+}
+
+SXE.insertElement = function(element_name) {
+	var elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase()), h, tagName;
+
+	tinyMCEPopup.execCommand('mceBeginUndoLevel');
+	if (elm == null) {
+		var s = SXE.inst.selection.getContent();
+		if(s.length > 0) {
+			tagName = element_name;
+
+			if (tinymce.isIE && element_name.indexOf('html:') == 0)
+				element_name = element_name.substring(5).toLowerCase();
+
+			h = '<' + tagName + ' id="#sxe_temp_' + element_name + '#">' + s + '</' + tagName + '>';
+
+			tinyMCEPopup.execCommand('mceInsertContent', false, h);
+
+			var elementArray = tinymce.grep(SXE.inst.dom.select(element_name), function(n) {return n.id == '#sxe_temp_' + element_name + '#';});
+			for (var i=0; i<elementArray.length; i++) {
+				var elm = elementArray[i];
+
+				elm.id = '';
+				elm.setAttribute('id', '');
+				elm.removeAttribute('id');
+
+				setAllCommonAttribs(elm);
+			}
+		}
+	} else {
+		setAllCommonAttribs(elm);
+	}
+	SXE.inst.nodeChanged();
+	tinyMCEPopup.execCommand('mceEndUndoLevel');
+}
+
+SXE.removeElement = function(element_name){
+	element_name = element_name.toLowerCase();
+	elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase());
+	if(elm && elm.nodeName.toUpperCase() == element_name.toUpperCase()){
+		tinyMCEPopup.execCommand('mceBeginUndoLevel');
+		tinyMCE.execCommand('mceRemoveNode', false, elm);
+		SXE.inst.nodeChanged();
+		tinyMCEPopup.execCommand('mceEndUndoLevel');
+	}
+}
+
+SXE.showRemoveButton = function() {
+		document.getElementById("remove").style.display = 'block';
+}
+
+SXE.containsClass = function(elm,cl) {
+	return (elm.className.indexOf(cl) > -1) ? true : false;
+}
+
+SXE.removeClass = function(elm,cl) {
+	if(elm.className == null || elm.className == "" || !SXE.containsClass(elm,cl)) {
+		return true;
+	}
+	var classNames = elm.className.split(" ");
+	var newClassNames = "";
+	for (var x = 0, cnl = classNames.length; x < cnl; x++) {
+		if (classNames[x] != cl) {
+			newClassNames += (classNames[x] + " ");
+		}
+	}
+	elm.className = newClassNames.substring(0,newClassNames.length-1); //removes extra space at the end
+}
+
+SXE.addClass = function(elm,cl) {
+	if(!SXE.containsClass(elm,cl)) elm.className ? elm.className += " " + cl : elm.className = cl;
+	return true;
 }
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/ins.js b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/ins.js
index b03ca1b5e..2bd0dd518 100755
--- a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/ins.js
+++ b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/js/ins.js
@@ -1,49 +1,49 @@
- /**
- * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
- *
- * @author Moxiecode - based on work by Andrew Tetlaw
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-function init() {
-	SXE.initElementDialog('ins');
-	if (SXE.currentAction == "update") {
-		setFormValue('datetime', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'datetime'));
-		setFormValue('cite', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'cite'));
-		SXE.showRemoveButton();
-	}
-}
-
-function setElementAttribs(elm) {
-	setAllCommonAttribs(elm);
-	setAttrib(elm, 'datetime');
-	setAttrib(elm, 'cite');
-}
-
-function insertIns() {
-	var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'INS');
-	tinyMCEPopup.execCommand('mceBeginUndoLevel');
-	if (elm == null) {
-		var s = SXE.inst.selection.getContent();
-		if(s.length > 0) {
-			tinyMCEPopup.execCommand('mceInsertContent', false, '<ins id="#sxe_temp_ins#">' + s + '</ins>');
-			var elementArray = tinymce.grep(SXE.inst.dom.select('ins'), function(n) {return n.id == '#sxe_temp_ins#';});
-			for (var i=0; i<elementArray.length; i++) {
-				var elm = elementArray[i];
-				setElementAttribs(elm);
-			}
-		}
-	} else {
-		setElementAttribs(elm);
-	}
-	tinyMCEPopup.editor.nodeChanged();
-	tinyMCEPopup.execCommand('mceEndUndoLevel');
-	tinyMCEPopup.close();
-}
-
-function removeIns() {
-	SXE.removeElement('ins');
-	tinyMCEPopup.close();
-}
-
-tinyMCEPopup.onInit.add(init);
+ /**
+ * $Id: editor_plugin_src.js 42 2006-08-08 14:32:24Z spocke $
+ *
+ * @author Moxiecode - based on work by Andrew Tetlaw
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+function init() {
+	SXE.initElementDialog('ins');
+	if (SXE.currentAction == "update") {
+		setFormValue('datetime', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'datetime'));
+		setFormValue('cite', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'cite'));
+		SXE.showRemoveButton();
+	}
+}
+
+function setElementAttribs(elm) {
+	setAllCommonAttribs(elm);
+	setAttrib(elm, 'datetime');
+	setAttrib(elm, 'cite');
+}
+
+function insertIns() {
+	var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'INS');
+	tinyMCEPopup.execCommand('mceBeginUndoLevel');
+	if (elm == null) {
+		var s = SXE.inst.selection.getContent();
+		if(s.length > 0) {
+			tinyMCEPopup.execCommand('mceInsertContent', false, '<ins id="#sxe_temp_ins#">' + s + '</ins>');
+			var elementArray = tinymce.grep(SXE.inst.dom.select('ins'), function(n) {return n.id == '#sxe_temp_ins#';});
+			for (var i=0; i<elementArray.length; i++) {
+				var elm = elementArray[i];
+				setElementAttribs(elm);
+			}
+		}
+	} else {
+		setElementAttribs(elm);
+	}
+	tinyMCEPopup.editor.nodeChanged();
+	tinyMCEPopup.execCommand('mceEndUndoLevel');
+	tinyMCEPopup.close();
+}
+
+function removeIns() {
+	SXE.removeElement('ins');
+	tinyMCEPopup.close();
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
index 45b6b267b..ee6016704 100755
--- a/webapp/web/js/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
+++ b/webapp/web/js/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js
@@ -1,32 +1,32 @@
-tinyMCE.addI18n('en.xhtmlxtras_dlg',{
-attribute_label_title:"Title",
-attribute_label_id:"ID",
-attribute_label_class:"Class",
-attribute_label_style:"Style",
-attribute_label_cite:"Cite",
-attribute_label_datetime:"Date/Time",
-attribute_label_langdir:"Text Direction",
-attribute_option_ltr:"Left to right",
-attribute_option_rtl:"Right to left",
-attribute_label_langcode:"Language",
-attribute_label_tabindex:"TabIndex",
-attribute_label_accesskey:"AccessKey",
-attribute_events_tab:"Events",
-attribute_attrib_tab:"Attributes",
-general_tab:"General",
-attrib_tab:"Attributes",
-events_tab:"Events",
-fieldset_general_tab:"General Settings",
-fieldset_attrib_tab:"Element Attributes",
-fieldset_events_tab:"Element Events",
-title_ins_element:"Insertion Element",
-title_del_element:"Deletion Element",
-title_acronym_element:"Acronym Element",
-title_abbr_element:"Abbreviation Element",
-title_cite_element:"Citation Element",
-remove:"Remove",
-insert_date:"Insert current date/time",
-option_ltr:"Left to right",
-option_rtl:"Right to left",
-attribs_title:"Insert/Edit Attributes"
+tinyMCE.addI18n('en.xhtmlxtras_dlg',{
+attribute_label_title:"Title",
+attribute_label_id:"ID",
+attribute_label_class:"Class",
+attribute_label_style:"Style",
+attribute_label_cite:"Cite",
+attribute_label_datetime:"Date/Time",
+attribute_label_langdir:"Text Direction",
+attribute_option_ltr:"Left to right",
+attribute_option_rtl:"Right to left",
+attribute_label_langcode:"Language",
+attribute_label_tabindex:"TabIndex",
+attribute_label_accesskey:"AccessKey",
+attribute_events_tab:"Events",
+attribute_attrib_tab:"Attributes",
+general_tab:"General",
+attrib_tab:"Attributes",
+events_tab:"Events",
+fieldset_general_tab:"General Settings",
+fieldset_attrib_tab:"Element Attributes",
+fieldset_events_tab:"Element Events",
+title_ins_element:"Insertion Element",
+title_del_element:"Deletion Element",
+title_acronym_element:"Acronym Element",
+title_abbr_element:"Abbreviation Element",
+title_cite_element:"Citation Element",
+remove:"Remove",
+insert_date:"Insert current date/time",
+option_ltr:"Left to right",
+option_rtl:"Right to left",
+attribs_title:"Insert/Edit Attributes"
 });
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/themes/advanced/about.htm b/webapp/web/js/tiny_mce/themes/advanced/about.htm
index 4ef2a29c5..4e73b14d1 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/about.htm
+++ b/webapp/web/js/tiny_mce/themes/advanced/about.htm
@@ -1,56 +1,56 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#advanced_dlg.about_title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="js/about.js"></script>
-</head>
-<body id="about" style="display: none">
-		<div class="tabs">
-			<ul>
-				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.about_general}</a></span></li>
-				<li id="help_tab" style="display:none"><span><a href="javascript:mcTabs.displayTab('help_tab','help_panel');" onmousedown="return false;">{#advanced_dlg.about_help}</a></span></li>
-				<li id="plugins_tab"><span><a href="javascript:mcTabs.displayTab('plugins_tab','plugins_panel');" onmousedown="return false;">{#advanced_dlg.about_plugins}</a></span></li>
-			</ul>
-		</div>
-
-		<div class="panel_wrapper">
-			<div id="general_panel" class="panel current">
-				<h3>{#advanced_dlg.about_title}</h3>
-				<p>Version: <span id="version"></span> (<span id="date"></span>)</p>
-				<p>TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under <a href="../../license.txt" target="_blank">LGPL</a>
-				by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.</p>
-				<p>Copyright &copy; 2003-2008, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.</p>
-				<p>For more information about this software visit the <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE website</a>.</p>
-
-				<div id="buttoncontainer">
-					<a href="http://www.moxiecode.com" target="_blank"><img src="http://tinymce.moxiecode.com/images/gotmoxie.png" alt="Got Moxie?" border="0" /></a>
-					<a href="http://sourceforge.net/projects/tinymce/" target="_blank"><img src="http://sourceforge.net/sflogo.php?group_id=103281" alt="Hosted By Sourceforge" border="0" /></a>
-					<a href="http://www.freshmeat.net/projects/tinymce" target="_blank"><img src="http://tinymce.moxiecode.com/images/fm.gif" alt="Also on freshmeat" border="0" /></a>
-				</div>
-			</div>
-
-			<div id="plugins_panel" class="panel">
-				<div id="pluginscontainer">
-					<h3>{#advanced_dlg.about_loaded}</h3>
-
-					<div id="plugintablecontainer">
-					</div>
-
-					<p>&nbsp;</p>
-				</div>
-			</div>
-
-			<div id="help_panel" class="panel noscroll" style="overflow: visible;">
-				<div id="iframecontainer"></div>
-			</div>
-		</div>
-
-		<div class="mceActionPanel">
-			<div style="float: right">
-				<input type="button" id="cancel" name="cancel" value="{#close}" onclick="tinyMCEPopup.close();" />
-			</div>
-		</div>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#advanced_dlg.about_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="js/about.js"></script>
+</head>
+<body id="about" style="display: none">
+		<div class="tabs">
+			<ul>
+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.about_general}</a></span></li>
+				<li id="help_tab" style="display:none"><span><a href="javascript:mcTabs.displayTab('help_tab','help_panel');" onmousedown="return false;">{#advanced_dlg.about_help}</a></span></li>
+				<li id="plugins_tab"><span><a href="javascript:mcTabs.displayTab('plugins_tab','plugins_panel');" onmousedown="return false;">{#advanced_dlg.about_plugins}</a></span></li>
+			</ul>
+		</div>
+
+		<div class="panel_wrapper">
+			<div id="general_panel" class="panel current">
+				<h3>{#advanced_dlg.about_title}</h3>
+				<p>Version: <span id="version"></span> (<span id="date"></span>)</p>
+				<p>TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under <a href="../../license.txt" target="_blank">LGPL</a>
+				by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.</p>
+				<p>Copyright &copy; 2003-2008, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.</p>
+				<p>For more information about this software visit the <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE website</a>.</p>
+
+				<div id="buttoncontainer">
+					<a href="http://www.moxiecode.com" target="_blank"><img src="http://tinymce.moxiecode.com/images/gotmoxie.png" alt="Got Moxie?" border="0" /></a>
+					<a href="http://sourceforge.net/projects/tinymce/" target="_blank"><img src="http://sourceforge.net/sflogo.php?group_id=103281" alt="Hosted By Sourceforge" border="0" /></a>
+					<a href="http://www.freshmeat.net/projects/tinymce" target="_blank"><img src="http://tinymce.moxiecode.com/images/fm.gif" alt="Also on freshmeat" border="0" /></a>
+				</div>
+			</div>
+
+			<div id="plugins_panel" class="panel">
+				<div id="pluginscontainer">
+					<h3>{#advanced_dlg.about_loaded}</h3>
+
+					<div id="plugintablecontainer">
+					</div>
+
+					<p>&nbsp;</p>
+				</div>
+			</div>
+
+			<div id="help_panel" class="panel noscroll" style="overflow: visible;">
+				<div id="iframecontainer"></div>
+			</div>
+		</div>
+
+		<div class="mceActionPanel">
+			<div style="float: right">
+				<input type="button" id="cancel" name="cancel" value="{#close}" onclick="tinyMCEPopup.close();" />
+			</div>
+		</div>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/themes/advanced/anchor.htm b/webapp/web/js/tiny_mce/themes/advanced/anchor.htm
index 9e4c0b91a..054cde57c 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/anchor.htm
+++ b/webapp/web/js/tiny_mce/themes/advanced/anchor.htm
@@ -1,32 +1,32 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#advanced_dlg.anchor_title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="js/anchor.js"></script>
-	<base target="_self" />
-</head>
-<body style="display: none">
-<form onsubmit="AnchorDialog.update();return false;" action="#">
-	<table border="0" cellpadding="4" cellspacing="0">
-		<tr>
-			<td colspan="2" class="title">{#advanced_dlg.anchor_title}</td>
-		</tr>
-		<tr>
-			<td nowrap="nowrap">{#advanced_dlg.anchor_name}:</td>
-			<td><input name="anchorName" type="text" class="mceFocus" id="anchorName" value="" style="width: 200px" /></td>
-		</tr>
-	</table>
-
-	<div class="mceActionPanel">
-		<div style="float: left">
-			<input type="submit" id="insert" name="insert" value="{#update}" />
-		</div>
-
-		<div style="float: right">
-			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-		</div>
-	</div>
-</form>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#advanced_dlg.anchor_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/anchor.js"></script>
+	<base target="_self" />
+</head>
+<body style="display: none">
+<form onsubmit="AnchorDialog.update();return false;" action="#">
+	<table border="0" cellpadding="4" cellspacing="0">
+		<tr>
+			<td colspan="2" class="title">{#advanced_dlg.anchor_title}</td>
+		</tr>
+		<tr>
+			<td nowrap="nowrap">{#advanced_dlg.anchor_name}:</td>
+			<td><input name="anchorName" type="text" class="mceFocus" id="anchorName" value="" style="width: 200px" /></td>
+		</tr>
+	</table>
+
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="submit" id="insert" name="insert" value="{#update}" />
+		</div>
+
+		<div style="float: right">
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+</form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/themes/advanced/charmap.htm b/webapp/web/js/tiny_mce/themes/advanced/charmap.htm
index e4c734484..8ca011331 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/charmap.htm
+++ b/webapp/web/js/tiny_mce/themes/advanced/charmap.htm
@@ -1,54 +1,54 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#advanced_dlg.charmap_title}</title>
-	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="js/charmap.js"></script>
-	<base target="_self" />
-</head>
-<body id="charmap" style="display:none">
-<table align="center" border="0" cellspacing="0" cellpadding="2">
-    <tr>
-        <td colspan="2" class="title">{#advanced_dlg.charmap_title}</td>
-    </tr>
-    <tr>
-        <td id="charmapView" rowspan="2" align="left" valign="top">
-			<!-- Chars will be rendered here -->
-        </td>
-        <td width="100" align="center" valign="top">
-            <table border="0" cellpadding="0" cellspacing="0" width="100" style="height:100px">
-                <tr>
-                    <td id="codeV">&nbsp;</td>
-                </tr>
-                <tr>
-                    <td id="codeN">&nbsp;</td>
-                </tr>
-            </table>
-        </td>
-    </tr>
-    <tr>
-        <td valign="bottom" style="padding-bottom: 3px;">
-            <table width="100" align="center" border="0" cellpadding="2" cellspacing="0">
-                <tr>
-                    <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">HTML-Code</td>
-                </tr>
-                <tr>
-                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeA" align="center">&nbsp;</td>
-                </tr>
-                <tr>
-                    <td style="font-size: 1px;">&nbsp;</td>
-                </tr>
-                <tr>
-                    <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">NUM-Code</td>
-                </tr>
-                <tr>
-                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeB" align="center">&nbsp;</td>
-                </tr>
-            </table>
-        </td>
-    </tr>
-</table>
-
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#advanced_dlg.charmap_title}</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/charmap.js"></script>
+	<base target="_self" />
+</head>
+<body id="charmap" style="display:none">
+<table align="center" border="0" cellspacing="0" cellpadding="2">
+    <tr>
+        <td colspan="2" class="title">{#advanced_dlg.charmap_title}</td>
+    </tr>
+    <tr>
+        <td id="charmapView" rowspan="2" align="left" valign="top">
+			<!-- Chars will be rendered here -->
+        </td>
+        <td width="100" align="center" valign="top">
+            <table border="0" cellpadding="0" cellspacing="0" width="100" style="height:100px">
+                <tr>
+                    <td id="codeV">&nbsp;</td>
+                </tr>
+                <tr>
+                    <td id="codeN">&nbsp;</td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+    <tr>
+        <td valign="bottom" style="padding-bottom: 3px;">
+            <table width="100" align="center" border="0" cellpadding="2" cellspacing="0">
+                <tr>
+                    <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">HTML-Code</td>
+                </tr>
+                <tr>
+                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeA" align="center">&nbsp;</td>
+                </tr>
+                <tr>
+                    <td style="font-size: 1px;">&nbsp;</td>
+                </tr>
+                <tr>
+                    <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">NUM-Code</td>
+                </tr>
+                <tr>
+                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeB" align="center">&nbsp;</td>
+                </tr>
+            </table>
+        </td>
+    </tr>
+</table>
+
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/themes/advanced/color_picker.htm b/webapp/web/js/tiny_mce/themes/advanced/color_picker.htm
index a8f297c60..4cab76899 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/color_picker.htm
+++ b/webapp/web/js/tiny_mce/themes/advanced/color_picker.htm
@@ -1,76 +1,76 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#advanced_dlg.colorpicker_title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="js/color_picker.js"></script>
-	<base target="_self" />
-</head>
-<body id="colorpicker" style="display: none">
-<form onsubmit="insertAction();return false" action="#">
-	<div class="tabs">
-		<ul>
-			<li id="picker_tab" class="current"><span><a href="javascript:mcTabs.displayTab('picker_tab','picker_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_picker_tab}</a></span></li>
-			<li id="rgb_tab"><span><a href="javascript:;" onclick="generateWebColors();mcTabs.displayTab('rgb_tab','rgb_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_palette_tab}</a></span></li>
-			<li id="named_tab"><span><a  href="javascript:;" onclick="generateNamedColors();javascript:mcTabs.displayTab('named_tab','named_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_named_tab}</a></span></li>
-		</ul>
-	</div>
-
-	<div class="panel_wrapper">
-		<div id="picker_panel" class="panel current">
-			<fieldset>
-				<legend>{#advanced_dlg.colorpicker_picker_title}</legend>
-				<div id="picker">
-					<img id="colors" src="img/colorpicker.jpg" onclick="computeColor(event)" onmousedown="isMouseDown = true;return false;" onmouseup="isMouseDown = false;" onmousemove="if (isMouseDown && isMouseOver) computeColor(event); return false;" onmouseover="isMouseOver=true;" onmouseout="isMouseOver=false;" />
-
-					<div id="light">
-						<!-- Will be filled with divs -->
-					</div>
-
-					<br style="clear: both" />
-				</div>
-			</fieldset>
-		</div>
-
-		<div id="rgb_panel" class="panel">
-			<fieldset>
-				<legend>{#advanced_dlg.colorpicker_palette_title}</legend>
-				<div id="webcolors">
-					<!-- Gets filled with web safe colors-->
-				</div>
-
-				<br style="clear: both" />
-			</fieldset>
-		</div>
-
-		<div id="named_panel" class="panel">
-			<fieldset>
-				<legend>{#advanced_dlg.colorpicker_named_title}</legend>
-				<div id="namedcolors">
-					<!-- Gets filled with named colors-->
-				</div>
-
-				<br style="clear: both" />
-
-				<div id="colornamecontainer">
-					{#advanced_dlg.colorpicker_name} <span id="colorname"></span>
-				</div>
-			</fieldset>
-		</div>
-	</div>
-
-	<div class="mceActionPanel">
-		<div style="float: left">
-			<input type="submit" id="insert" name="insert" value="{#apply}" />
-		</div>
-
-		<div id="preview"></div>
-
-		<div id="previewblock">
-			<label for="color">{#advanced_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" maxlength="8" class="text mceFocus" />
-		</div>
-	</div>
-</form>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#advanced_dlg.colorpicker_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="js/color_picker.js"></script>
+	<base target="_self" />
+</head>
+<body id="colorpicker" style="display: none">
+<form onsubmit="insertAction();return false" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="picker_tab" class="current"><span><a href="javascript:mcTabs.displayTab('picker_tab','picker_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_picker_tab}</a></span></li>
+			<li id="rgb_tab"><span><a href="javascript:;" onclick="generateWebColors();mcTabs.displayTab('rgb_tab','rgb_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_palette_tab}</a></span></li>
+			<li id="named_tab"><span><a  href="javascript:;" onclick="generateNamedColors();javascript:mcTabs.displayTab('named_tab','named_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_named_tab}</a></span></li>
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="picker_panel" class="panel current">
+			<fieldset>
+				<legend>{#advanced_dlg.colorpicker_picker_title}</legend>
+				<div id="picker">
+					<img id="colors" src="img/colorpicker.jpg" onclick="computeColor(event)" onmousedown="isMouseDown = true;return false;" onmouseup="isMouseDown = false;" onmousemove="if (isMouseDown && isMouseOver) computeColor(event); return false;" onmouseover="isMouseOver=true;" onmouseout="isMouseOver=false;" />
+
+					<div id="light">
+						<!-- Will be filled with divs -->
+					</div>
+
+					<br style="clear: both" />
+				</div>
+			</fieldset>
+		</div>
+
+		<div id="rgb_panel" class="panel">
+			<fieldset>
+				<legend>{#advanced_dlg.colorpicker_palette_title}</legend>
+				<div id="webcolors">
+					<!-- Gets filled with web safe colors-->
+				</div>
+
+				<br style="clear: both" />
+			</fieldset>
+		</div>
+
+		<div id="named_panel" class="panel">
+			<fieldset>
+				<legend>{#advanced_dlg.colorpicker_named_title}</legend>
+				<div id="namedcolors">
+					<!-- Gets filled with named colors-->
+				</div>
+
+				<br style="clear: both" />
+
+				<div id="colornamecontainer">
+					{#advanced_dlg.colorpicker_name} <span id="colorname"></span>
+				</div>
+			</fieldset>
+		</div>
+	</div>
+
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="submit" id="insert" name="insert" value="{#apply}" />
+		</div>
+
+		<div id="preview"></div>
+
+		<div id="previewblock">
+			<label for="color">{#advanced_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" maxlength="8" class="text mceFocus" />
+		</div>
+	</div>
+</form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/themes/advanced/editor_template_src.js b/webapp/web/js/tiny_mce/themes/advanced/editor_template_src.js
index c4be859ab..37c61d337 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/editor_template_src.js
+++ b/webapp/web/js/tiny_mce/themes/advanced/editor_template_src.js
@@ -1,1062 +1,1062 @@
-/**
- * $Id: editor_template_src.js 901 2008-08-18 11:44:21Z spocke $
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	var DOM = tinymce.DOM, Event = tinymce.dom.Event, extend = tinymce.extend, each = tinymce.each, Cookie = tinymce.util.Cookie, lastExtID, explode = tinymce.explode;
-
-	// Tell it to load theme specific language pack(s)
-	tinymce.ThemeManager.requireLangPack('advanced');
-
-	tinymce.create('tinymce.themes.AdvancedTheme', {
-		// Control name lookup, format: title, command
-		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(ed, url) {
-			var t = this, s, v;
-	
-			t.editor = ed;
-			t.url = url;
-			t.onResolveName = new tinymce.util.Dispatcher(this);
-
-			// Default settings
-			t.settings = s = extend({
-				theme_advanced_path : true,
-				theme_advanced_toolbar_location : 'bottom',
-				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",
-				theme_advanced_blockformats : "p,address,pre,h1,h2,h3,h4,h5,h6",
-				theme_advanced_toolbar_align : "center",
-				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_font_sizes : "1,2,3,4,5,6,7",
-				theme_advanced_more_colors : 1,
-				theme_advanced_row_height : 23,
-				theme_advanced_resize_horizontal : 1,
-				theme_advanced_resizing_use_cookie : 1,
-				readonly : ed.settings.readonly
-			}, ed.settings);
-
-			if ((v = s.theme_advanced_path_location) && v != 'none')
-				s.theme_advanced_statusbar_location = s.theme_advanced_path_location;
-
-			if (s.theme_advanced_statusbar_location == 'none')
-				s.theme_advanced_statusbar_location = 0;
-
-			// Init editor
-			ed.onInit.add(function() {
-				ed.onNodeChange.add(t._nodeChanged, t);
-
-				if (ed.settings.content_css !== false)
-					ed.dom.loadCSS(ed.baseURI.toAbsolute("themes/advanced/skins/" + ed.settings.skin + "/content.css"));
-			});
-
-			ed.onSetProgressState.add(function(ed, b, ti) {
-				var co, id = ed.id, tb;
-
-				if (b) {
-					t.progressTimer = setTimeout(function() {
-						co = ed.getContainer();
-						co = co.insertBefore(DOM.create('DIV', {style : 'position:relative'}), co.firstChild);
-						tb = DOM.get(ed.id + '_tbl');
-
-						DOM.add(co, 'div', {id : id + '_blocker', 'class' : 'mceBlocker', style : {width : tb.clientWidth + 2, height : tb.clientHeight + 2}});
-						DOM.add(co, 'div', {id : id + '_progress', 'class' : 'mceProgress', style : {left : tb.clientWidth / 2, top : tb.clientHeight / 2}});
-					}, ti || 0);
-				} else {
-					DOM.remove(id + '_blocker');
-					DOM.remove(id + '_progress');
-					clearTimeout(t.progressTimer);
-				}
-			});
-
-			DOM.loadCSS(ed.baseURI.toAbsolute(s.editor_css || "themes/advanced/skins/" + ed.settings.skin + "/ui.css"));
-
-			if (s.skin_variant)
-				DOM.loadCSS(ed.baseURI.toAbsolute(s.editor_css || "themes/advanced/skins/" + ed.settings.skin + "/ui_" + s.skin_variant + ".css"));
-		},
-
-		createControl : function(n, cf) {
-			var cd, c;
-
-			if (c = cf.createControl(n))
-				return c;
-
-			switch (n) {
-				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 ((cd = this.controls[n]))
-				return cf.createButton(n, {title : "advanced." + cd[0], cmd : cd[1], ui : cd[2], value : cd[3]});
-		},
-
-		execCommand : function(cmd, ui, val) {
-			var f = this['_' + cmd];
-
-			if (f) {
-				f.call(this, ui, val);
-				return true;
-			}
-
-			return false;
-		},
-
-		_importClasses : function(e) {
-			var ed = this.editor, c = ed.controlManager.get('styleselect');
-
-			if (c.getLength() == 0) {
-				each(ed.dom.getClasses(), function(o) {
-					c.add(o['class'], o['class']);
-				});
-			}
-		},
-
-		_createStyleSelect : function(n) {
-			var t = this, ed = t.editor, cf = ed.controlManager, c = cf.createListBox('styleselect', {
-				title : 'advanced.style_select',
-				onselect : function(v) {
-					if (c.selectedValue === v) {
-						ed.execCommand('mceSetStyleInfo', 0, {command : 'removeformat'});
-						c.select();
-						return false;
-					} else
-						ed.execCommand('mceSetCSSClass', 0, v);
-				}
-			});
-
-			if (c) {
-				each(ed.getParam('theme_advanced_styles', '', 'hash'), function(v, k) {
-					if (v)
-						c.add(t.editor.translate(k), v);
-				});
-
-				c.onPostRender.add(function(ed, n) {
-					Event.add(n.id + '_text', 'focus', t._importClasses, t);
-					Event.add(n.id + '_text', 'mousedown', t._importClasses, t);
-				});
-			}
-
-			return c;
-		},
-
-		_createFontSelect : function() {
-			var c, t = this, ed = t.editor;
-
-			c = ed.controlManager.createListBox('fontselect', {title : 'advanced.fontdefault', cmd : 'FontName'});
-			if (c) {
-				each(ed.getParam('theme_advanced_fonts', t.settings.theme_advanced_fonts, 'hash'), function(v, k) {
-					c.add(ed.translate(k), v, {style : v.indexOf('dings') == -1 ? 'font-family:' + v : ''});
-				});
-			}
-
-			return c;
-		},
-
-		_createFontSizeSelect : function() {
-			var t = this, ed = t.editor, c, lo = [
-				"1 (8 pt)",
-				"2 (10 pt)",
-				"3 (12 pt)",
-				"4 (14 pt)",
-				"5 (18 pt)",
-				"6 (24 pt)",
-				"7 (36 pt)"
-			], fz = [8, 10, 12, 14, 18, 24, 36];
-
-			c = ed.controlManager.createListBox('fontsizeselect', {title : 'advanced.font_size', cmd : 'FontSize'});
-			if (c) {
-				each(ed.getParam('theme_advanced_font_sizes', t.settings.theme_advanced_font_sizes, 'hash'), function(v, k) {
-					c.add(k != v ? k : lo[parseInt(v) - 1], v, {'style' : 'font-size:' + fz[v - 1] + 'pt', 'class' : 'mceFontSize' + v});
-				});
-			}
-
-			return c;
-		},
-
-		_createBlockFormats : function() {
-			var c, fmts = {
-				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'
-			}, t = this;
-
-			c = t.editor.controlManager.createListBox('formatselect', {title : 'advanced.block', cmd : 'FormatBlock'});
-			if (c) {
-				each(t.editor.getParam('theme_advanced_blockformats', t.settings.theme_advanced_blockformats, 'hash'), function(v, k) {
-					c.add(t.editor.translate(k != v ? k : fmts[v]), v, {'class' : 'mce_formatPreview mce_' + v});
-				});
-			}
-
-			return c;
-		},
-
-		_createForeColorMenu : function() {
-			var c, t = this, s = t.settings, o = {}, v;
-
-			if (s.theme_advanced_more_colors) {
-				o.more_colors_func = function() {
-					t._mceColorPicker(0, {
-						color : c.value,
-						func : function(co) {
-							c.setColor(co);
-						}
-					});
-				};
-			}
-
-			if (v = s.theme_advanced_text_colors)
-				o.colors = v;
-
-			o.title = 'advanced.forecolor_desc';
-			o.cmd = 'ForeColor';
-			o.scope = this;
-
-			c = t.editor.controlManager.createColorSplitButton('forecolor', o);
-
-			return c;
-		},
-
-		_createBackColorMenu : function() {
-			var c, t = this, s = t.settings, o = {}, v;
-
-			if (s.theme_advanced_more_colors) {
-				o.more_colors_func = function() {
-					t._mceColorPicker(0, {
-						color : c.value,
-						func : function(co) {
-							c.setColor(co);
-						}
-					});
-				};
-			}
-
-			if (v = s.theme_advanced_background_colors)
-				o.colors = v;
-
-			o.title = 'advanced.backcolor_desc';
-			o.cmd = 'HiliteColor';
-			o.scope = this;
-
-			c = t.editor.controlManager.createColorSplitButton('backcolor', o);
-
-			return c;
-		},
-
-		renderUI : function(o) {
-			var n, ic, tb, t = this, ed = t.editor, s = t.settings, sc, p, nl;
-
-			n = p = DOM.create('span', {id : ed.id + '_parent', 'class' : 'mceEditor ' + ed.settings.skin + 'Skin' + (s.skin_variant ? ' ' + ed.settings.skin + 'Skin' + t._ufirst(s.skin_variant) : '')});
-
-			if (!DOM.boxModel)
-				n = DOM.add(n, 'div', {'class' : 'mceOldBoxModel'});
-
-			n = sc = DOM.add(n, 'table', {id : ed.id + '_tbl', 'class' : 'mceLayout', cellSpacing : 0, cellPadding : 0});
-			n = tb = DOM.add(n, 'tbody');
-
-			switch ((s.theme_advanced_layout_manager || '').toLowerCase()) {
-				case "rowlayout":
-					ic = t._rowLayout(s, tb, o);
-					break;
-
-				case "customlayout":
-					ic = ed.execCallback("theme_advanced_custom_layout", s, tb, o, p);
-					break;
-
-				default:
-					ic = t._simpleLayout(s, tb, o, p);
-			}
-
-			n = o.targetNode;
-
-			// Add classes to first and last TRs
-			nl = DOM.stdMode ? sc.getElementsByTagName('tr') : sc.rows; // Quick fix for IE 8
-			DOM.addClass(nl[0], 'mceFirst');
-			DOM.addClass(nl[nl.length - 1], 'mceLast');
-
-			// Add classes to first and last TDs
-			each(DOM.select('tr', tb), function(n) {
-				DOM.addClass(n.firstChild, 'mceFirst');
-				DOM.addClass(n.childNodes[n.childNodes.length - 1], 'mceLast');
-			});
-
-			if (DOM.get(s.theme_advanced_toolbar_container))
-				DOM.get(s.theme_advanced_toolbar_container).appendChild(p);
-			else
-				DOM.insertAfter(p, n);
-
-			Event.add(ed.id + '_path_row', 'click', function(e) {
-				e = e.target;
-
-				if (e.nodeName == 'A') {
-					t._sel(e.className.replace(/^.*mcePath_([0-9]+).*$/, '$1'));
-
-					return Event.cancel(e);
-				}
-			});
-/*
-			if (DOM.get(ed.id + '_path_row')) {
-				Event.add(ed.id + '_tbl', 'mouseover', function(e) {
-					var re;
-	
-					e = e.target;
-
-					if (e.nodeName == 'SPAN' && DOM.hasClass(e.parentNode, 'mceButton')) {
-						re = DOM.get(ed.id + '_path_row');
-						t.lastPath = re.innerHTML;
-						DOM.setHTML(re, e.parentNode.title);
-					}
-				});
-
-				Event.add(ed.id + '_tbl', 'mouseout', function(e) {
-					if (t.lastPath) {
-						DOM.setHTML(ed.id + '_path_row', t.lastPath);
-						t.lastPath = 0;
-					}
-				});
-			}
-*/
-
-			if (!ed.getParam('accessibility_focus') || ed.getParam('tab_focus'))
-				Event.add(DOM.add(p, 'a', {href : '#'}, '<!-- IE -->'), 'focus', function() {tinyMCE.get(ed.id).focus();});
-
-			if (s.theme_advanced_toolbar_location == 'external')
-				o.deltaHeight = 0;
-
-			t.deltaHeight = o.deltaHeight;
-			o.targetNode = null;
-
-			return {
-				iframeContainer : ic,
-				editorContainer : ed.id + '_parent',
-				sizeContainer : sc,
-				deltaHeight : o.deltaHeight
-			};
-		},
-
-		getInfo : function() {
-			return {
-				longname : 'Advanced theme',
-				author : 'Moxiecode Systems AB',
-				authorurl : 'http://tinymce.moxiecode.com',
-				version : tinymce.majorVersion + "." + tinymce.minorVersion
-			}
-		},
-
-		resizeBy : function(dw, dh) {
-			var e = DOM.get(this.editor.id + '_tbl');
-
-			this.resizeTo(e.clientWidth + dw, e.clientHeight + dh);
-		},
-
-		resizeTo : function(w, h) {
-			var ed = this.editor, s = ed.settings, e = DOM.get(ed.id + '_tbl'), ifr = DOM.get(ed.id + '_ifr'), dh;
-
-			// Boundery fix box
-			w = Math.max(s.theme_advanced_resizing_min_width || 100, w);
-			h = Math.max(s.theme_advanced_resizing_min_height || 100, h);
-			w = Math.min(s.theme_advanced_resizing_max_width || 0xFFFF, w);
-			h = Math.min(s.theme_advanced_resizing_max_height || 0xFFFF, h);
-
-			// Calc difference between iframe and container
-			dh = e.clientHeight - ifr.clientHeight;
-
-			// Resize iframe and container
-			DOM.setStyle(ifr, 'height', h - dh);
-			DOM.setStyles(e, {width : w, height : h});
-		},
-
-		destroy : function() {
-			var id = this.editor.id;
-
-			Event.clear(id + '_resize');
-			Event.clear(id + '_path_row');
-			Event.clear(id + '_external_close');
-		},
-
-		// Internal functions
-
-		_simpleLayout : function(s, tb, o, p) {
-			var t = this, ed = t.editor, lo = s.theme_advanced_toolbar_location, sl = s.theme_advanced_statusbar_location, n, ic, etb, c;
-
-			if (s.readonly) {
-				n = DOM.add(tb, 'tr');
-				n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});
-				return ic;
-			}
-
-			// Create toolbar container at top
-			if (lo == 'top')
-				t._addToolbars(tb, o);
-
-			// Create external toolbar
-			if (lo == 'external') {
-				n = c = DOM.create('div', {style : 'position:relative'});
-				n = DOM.add(n, 'div', {id : ed.id + '_external', 'class' : 'mceExternalToolbar'});
-				DOM.add(n, 'a', {id : ed.id + '_external_close', href : 'javascript:;', 'class' : 'mceExternalClose'});
-				n = DOM.add(n, 'table', {id : ed.id + '_tblext', cellSpacing : 0, cellPadding : 0});
-				etb = DOM.add(n, 'tbody');
-
-				if (p.firstChild.className == 'mceOldBoxModel')
-					p.firstChild.appendChild(c);
-				else
-					p.insertBefore(c, p.firstChild);
-
-				t._addToolbars(etb, o);
-
-				ed.onMouseUp.add(function() {
-					var e = DOM.get(ed.id + '_external');
-					DOM.show(e);
-
-					DOM.hide(lastExtID);
-
-					var f = Event.add(ed.id + '_external_close', 'click', function() {
-						DOM.hide(ed.id + '_external');
-						Event.remove(ed.id + '_external_close', 'click', f);
-					});
-
-					DOM.show(e);
-					DOM.setStyle(e, 'top', 0 - DOM.getRect(ed.id + '_tblext').h - 1);
-
-					// Fixes IE rendering bug
-					DOM.hide(e);
-					DOM.show(e);
-					e.style.filter = '';
-
-					lastExtID = ed.id + '_external';
-
-					e = null;
-				});
-			}
-
-			if (sl == 'top')
-				t._addStatusBar(tb, o);
-
-			// Create iframe container
-			if (!s.theme_advanced_toolbar_container) {
-				n = DOM.add(tb, 'tr');
-				n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});
-			}
-
-			// Create toolbar container at bottom
-			if (lo == 'bottom')
-				t._addToolbars(tb, o);
-
-			if (sl == 'bottom')
-				t._addStatusBar(tb, o);
-
-			return ic;
-		},
-
-		_rowLayout : function(s, tb, o) {
-			var t = this, ed = t.editor, dc, da, cf = ed.controlManager, n, ic, to, a;
-
-			dc = s.theme_advanced_containers_default_class || '';
-			da = s.theme_advanced_containers_default_align || 'center';
-
-			each(explode(s.theme_advanced_containers || ''), function(c, i) {
-				var v = s['theme_advanced_container_' + c] || '';
-
-				switch (v.toLowerCase()) {
-					case 'mceeditor':
-						n = DOM.add(tb, 'tr');
-						n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});
-						break;
-
-					case 'mceelementpath':
-						t._addStatusBar(tb, o);
-						break;
-
-					default:
-						a = (s['theme_advanced_container_' + c + '_align'] || da).toLowerCase();
-						a = 'mce' + t._ufirst(a);
-
-						n = DOM.add(DOM.add(tb, 'tr'), 'td', {
-							'class' : 'mceToolbar ' + (s['theme_advanced_container_' + c + '_class'] || dc) + ' ' + a || da
-						});
-
-						to = cf.createToolbar("toolbar" + i);
-						t._addControls(v, to);
-						DOM.setHTML(n, to.renderHTML());
-						o.deltaHeight -= s.theme_advanced_row_height;
-				}
-			});
-
-			return ic;
-		},
-
-		_addControls : function(v, tb) {
-			var t = this, s = t.settings, di, cf = t.editor.controlManager;
-
-			if (s.theme_advanced_disable && !t._disabled) {
-				di = {};
-
-				each(explode(s.theme_advanced_disable), function(v) {
-					di[v] = 1;
-				});
-
-				t._disabled = di;
-			} else
-				di = t._disabled;
-
-			each(explode(v), function(n) {
-				var c;
-
-				if (di && di[n])
-					return;
-
-				// Compatiblity with 2.x
-				if (n == 'tablecontrols') {
-					each(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"], function(n) {
-						n = t.createControl(n, cf);
-
-						if (n)
-							tb.add(n);
-					});
-
-					return;
-				}
-
-				c = t.createControl(n, cf);
-
-				if (c)
-					tb.add(c);
-			});
-		},
-
-		_addToolbars : function(c, o) {
-			var t = this, i, tb, ed = t.editor, s = t.settings, v, cf = ed.controlManager, di, n, h = [], a;
-
-			a = s.theme_advanced_toolbar_align.toLowerCase();
-			a = 'mce' + t._ufirst(a);
-
-			n = DOM.add(DOM.add(c, 'tr'), 'td', {'class' : 'mceToolbar ' + a});
-
-			if (!ed.getParam('accessibility_focus') || ed.getParam('tab_focus'))
-				h.push(DOM.createHTML('a', {href : '#', onfocus : 'tinyMCE.get(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));
-
-			h.push(DOM.createHTML('a', {href : '#', accesskey : 'q', title : ed.getLang("advanced.toolbar_focus")}, '<!-- IE -->'));
-
-			// Create toolbar and add the controls
-			for (i=1; (v = s['theme_advanced_buttons' + i]); i++) {
-				tb = cf.createToolbar("toolbar" + i, {'class' : 'mceToolbarRow' + i});
-
-				if (s['theme_advanced_buttons' + i + '_add'])
-					v += ',' + s['theme_advanced_buttons' + i + '_add'];
-
-				if (s['theme_advanced_buttons' + i + '_add_before'])
-					v = s['theme_advanced_buttons' + i + '_add_before'] + ',' + v;
-
-				t._addControls(v, tb);
-
-				//n.appendChild(n = tb.render());
-				h.push(tb.renderHTML());
-
-				o.deltaHeight -= s.theme_advanced_row_height;
-			}
-
-			h.push(DOM.createHTML('a', {href : '#', accesskey : 'z', title : ed.getLang("advanced.toolbar_focus"), onfocus : 'tinyMCE.getInstanceById(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));
-			DOM.setHTML(n, h.join(''));
-		},
-
-		_addStatusBar : function(tb, o) {
-			var n, t = this, ed = t.editor, s = t.settings, r, mf, me, td;
-
-			n = DOM.add(tb, 'tr');
-			n = td = DOM.add(n, 'td', {'class' : 'mceStatusbar'});
-			n = DOM.add(n, 'div', {id : ed.id + '_path_row'}, s.theme_advanced_path ? ed.translate('advanced.path') + ': ' : '&nbsp;');
-			DOM.add(n, 'a', {href : '#', accesskey : 'x'});
-
-			if (s.theme_advanced_resizing && !tinymce.isOldWebKit) {
-				DOM.add(td, 'a', {id : ed.id + '_resize', href : 'javascript:;', onclick : "return false;", 'class' : 'mceResize'});
-
-				if (s.theme_advanced_resizing_use_cookie) {
-					ed.onPostRender.add(function() {
-						var o = Cookie.getHash("TinyMCE_" + ed.id + "_size"), c = DOM.get(ed.id + '_tbl');
-
-						if (!o)
-							return;
-
-						if (s.theme_advanced_resize_horizontal)
-							c.style.width = Math.max(10, o.cw) + 'px';
-
-						c.style.height = Math.max(10, o.ch) + 'px';
-						DOM.get(ed.id + '_ifr').style.height = Math.max(10, parseInt(o.ch) + t.deltaHeight) + 'px';
-					});
-				}
-
-				ed.onPostRender.add(function() {
-					Event.add(ed.id + '_resize', 'mousedown', function(e) {
-						var c, p, w, h, n, pa;
-
-						// Measure container
-						c = DOM.get(ed.id + '_tbl');
-						w = c.clientWidth;
-						h = c.clientHeight;
-
-						miw = s.theme_advanced_resizing_min_width || 100;
-						mih = s.theme_advanced_resizing_min_height || 100;
-						maw = s.theme_advanced_resizing_max_width || 0xFFFF;
-						mah = s.theme_advanced_resizing_max_height || 0xFFFF;
-
-						// Setup placeholder
-						p = DOM.add(DOM.get(ed.id + '_parent'), 'div', {'class' : 'mcePlaceHolder'});
-						DOM.setStyles(p, {width : w, height : h});
-
-						// Replace with placeholder
-						DOM.hide(c);
-						DOM.show(p);
-
-						// Create internal resize obj
-						r = {
-							x : e.screenX,
-							y : e.screenY,
-							w : w,
-							h : h,
-							dx : null,
-							dy : null
-						};
-
-						// Start listening
-						mf = Event.add(DOM.doc, 'mousemove', function(e) {
-							var w, h;
-
-							// Calc delta values
-							r.dx = e.screenX - r.x;
-							r.dy = e.screenY - r.y;
-
-							// Boundery fix box
-							w = Math.max(miw, r.w + r.dx);
-							h = Math.max(mih, r.h + r.dy);
-							w = Math.min(maw, w);
-							h = Math.min(mah, h);
-
-							// Resize placeholder
-							if (s.theme_advanced_resize_horizontal)
-								p.style.width = w + 'px';
-
-							p.style.height = h + 'px';
-
-							return Event.cancel(e);
-						});
-
-						me = Event.add(DOM.doc, 'mouseup', function(e) {
-							var ifr;
-
-							// Stop listening
-							Event.remove(DOM.doc, 'mousemove', mf);
-							Event.remove(DOM.doc, 'mouseup', me);
-
-							c.style.display = '';
-							DOM.remove(p);
-
-							if (r.dx === null)
-								return;
-
-							ifr = DOM.get(ed.id + '_ifr');
-
-							if (s.theme_advanced_resize_horizontal)
-								c.style.width = Math.max(10, r.w + r.dx) + 'px';
-
-							c.style.height = Math.max(10, r.h + r.dy) + 'px';
-							ifr.style.height = Math.max(10, ifr.clientHeight + r.dy) + 'px';
-
-							if (s.theme_advanced_resizing_use_cookie) {
-								Cookie.setHash("TinyMCE_" + ed.id + "_size", {
-									cw : r.w + r.dx,
-									ch : r.h + r.dy
-								});
-							}
-						});
-
-						return Event.cancel(e);
-					});
-				});
-			}
-
-			o.deltaHeight -= 21;
-			n = tb = null;
-		},
-
-		_nodeChanged : function(ed, cm, n, co) {
-			var t = this, p, de = 0, v, c, s = t.settings;
-
-			if (s.readonly)
-				return;
-
-			tinymce.each(t.stateControls, function(c) {
-				cm.setActive(c, ed.queryCommandState(t.controls[c][1]));
-			});
-
-			cm.setActive('visualaid', ed.hasVisual);
-			cm.setDisabled('undo', !ed.undoManager.hasUndo() && !ed.typing);
-			cm.setDisabled('redo', !ed.undoManager.hasRedo());
-			cm.setDisabled('outdent', !ed.queryCommandState('Outdent'));
-
-			p = DOM.getParent(n, 'A');
-			if (c = cm.get('link')) {
-				if (!p || !p.name) {
-					c.setDisabled(!p && co);
-					c.setActive(!!p);
-				}
-			}
-
-			if (c = cm.get('unlink')) {
-				c.setDisabled(!p && co);
-				c.setActive(!!p && !p.name);
-			}
-
-			if (c = cm.get('anchor')) {
-				c.setActive(!!p && p.name);
-
-				if (tinymce.isWebKit) {
-					p = DOM.getParent(n, 'IMG');
-					c.setActive(!!p && DOM.getAttrib(p, 'mce_name') == 'a');
-				}
-			}
-
-			p = DOM.getParent(n, 'IMG');
-			if (c = cm.get('image'))
-				c.setActive(!!p && n.className.indexOf('mceItem') == -1);
-
-			if (c = cm.get('styleselect')) {
-				if (n.className) {
-					t._importClasses();
-					c.select(n.className);
-				} else
-					c.select();
-			}
-
-			if (c = cm.get('formatselect')) {
-				p = DOM.getParent(n, DOM.isBlock);
-
-				if (p)
-					c.select(p.nodeName.toLowerCase());
-			}
-
-			if (c = cm.get('fontselect'))
-				c.select(ed.queryCommandValue('FontName'));
-
-			if (c = cm.get('fontsizeselect'))
-				c.select('' + ed.queryCommandValue('FontSize'));
-
-			if (s.theme_advanced_path && s.theme_advanced_statusbar_location) {
-				p = DOM.get(ed.id + '_path') || DOM.add(ed.id + '_path_row', 'span', {id : ed.id + '_path'});
-				DOM.setHTML(p, '');
-
-				ed.dom.getParent(n, function(n) {
-					var na = n.nodeName.toLowerCase(), u, pi, ti = '';
-
-					// Ignore non element and hidden elements
-					if (n.nodeType != 1 || (DOM.hasClass(n, 'mceItemHidden') || DOM.hasClass(n, 'mceItemRemoved')))
-						return;
-
-					// Fake name
-					if (v = DOM.getAttrib(n, 'mce_name'))
-						na = v;
-	
-					// Handle prefix
-					if (tinymce.isIE && n.scopeName !== 'HTML')
-						na = n.scopeName + ':' + na;
-
-					// Remove internal prefix
-					na = na.replace(/mce\:/g, '');
-
-					// Handle node name
-					switch (na) {
-						case 'b':
-							na = 'strong';
-							break;
-
-						case 'i':
-							na = 'em';
-							break;
-
-						case 'img':
-							if (v = DOM.getAttrib(n, 'src'))
-								ti += 'src: ' + v + ' ';
-
-							break;
-
-						case 'a':
-							if (v = DOM.getAttrib(n, 'name')) {
-								ti += 'name: ' + v + ' ';
-								na += '#' + v;
-							}
-
-							if (v = DOM.getAttrib(n, 'href'))
-								ti += 'href: ' + v + ' ';
-
-							break;
-
-						case 'font':
-							if (s.convert_fonts_to_spans)
-								na = 'span';
-
-							if (v = DOM.getAttrib(n, 'face'))
-								ti += 'font: ' + v + ' ';
-
-							if (v = DOM.getAttrib(n, 'size'))
-								ti += 'size: ' + v + ' ';
-
-							if (v = DOM.getAttrib(n, 'color'))
-								ti += 'color: ' + v + ' ';
-
-							break;
-
-						case 'span':
-							if (v = DOM.getAttrib(n, 'style'))
-								ti += 'style: ' + v + ' ';
-
-							break;
-					}
-
-					if (v = DOM.getAttrib(n, 'id'))
-						ti += 'id: ' + v + ' ';
-
-					if (v = n.className) {
-						v = v.replace(/(webkit-[\w\-]+|Apple-[\w\-]+|mceItem\w+|mceVisualAid)/g, '');
-
-						if (v && v.indexOf('mceItem') == -1) {
-							ti += 'class: ' + v + ' ';
-
-							if (DOM.isBlock(n) || na == 'img' || na == 'span')
-								na += '.' + v;
-						}
-					}
-
-					na = na.replace(/(html:)/g, '');
-					na = {name : na, node : n, title : ti};
-					t.onResolveName.dispatch(t, na);
-					ti = na.title;
-					na = na.name;
-
-					//u = "javascript:tinymce.EditorManager.get('" + ed.id + "').theme._sel('" + (de++) + "');";
-					pi = DOM.create('a', {'href' : "javascript:;", onmousedown : "return false;", title : ti, 'class' : 'mcePath_' + (de++)}, na);
-
-					if (p.hasChildNodes()) {
-						p.insertBefore(DOM.doc.createTextNode(' \u00bb '), p.firstChild);
-						p.insertBefore(pi, p.firstChild);
-					} else
-						p.appendChild(pi);
-				}, ed.getBody());
-			}
-		},
-
-		// Commands gets called by execCommand
-
-		_sel : function(v) {
-			this.editor.execCommand('mceSelectNodeDepth', false, v);
-		},
-
-		_mceInsertAnchor : function(ui, v) {
-			var ed = this.editor;
-
-			ed.windowManager.open({
-				url : tinymce.baseURL + '/themes/advanced/anchor.htm',
-				width : 320 + parseInt(ed.getLang('advanced.anchor_delta_width', 0)),
-				height : 90 + parseInt(ed.getLang('advanced.anchor_delta_height', 0)),
-				inline : true
-			}, {
-				theme_url : this.url
-			});
-		},
-
-		_mceCharMap : function() {
-			var ed = this.editor;
-
-			ed.windowManager.open({
-				url : tinymce.baseURL + '/themes/advanced/charmap.htm',
-				width : 550 + parseInt(ed.getLang('advanced.charmap_delta_width', 0)),
-				height : 250 + parseInt(ed.getLang('advanced.charmap_delta_height', 0)),
-				inline : true
-			}, {
-				theme_url : this.url
-			});
-		},
-
-		_mceHelp : function() {
-			var ed = this.editor;
-
-			ed.windowManager.open({
-				url : tinymce.baseURL + '/themes/advanced/about.htm',
-				width : 480,
-				height : 380,
-				inline : true
-			}, {
-				theme_url : this.url
-			});
-		},
-
-		_mceColorPicker : function(u, v) {
-			var ed = this.editor;
-
-			v = v || {};
-
-			ed.windowManager.open({
-				url : tinymce.baseURL + '/themes/advanced/color_picker.htm',
-				width : 375 + parseInt(ed.getLang('advanced.colorpicker_delta_width', 0)),
-				height : 250 + parseInt(ed.getLang('advanced.colorpicker_delta_height', 0)),
-				close_previous : false,
-				inline : true
-			}, {
-				input_color : v.color,
-				func : v.func,
-				theme_url : this.url
-			});
-		},
-
-		_mceCodeEditor : function(ui, val) {
-			var ed = this.editor;
-
-			ed.windowManager.open({
-				url : tinymce.baseURL + '/themes/advanced/source_editor.htm',
-				width : parseInt(ed.getParam("theme_advanced_source_editor_width", 720)),
-				height : parseInt(ed.getParam("theme_advanced_source_editor_height", 580)),
-				inline : true,
-				resizable : true,
-				maximizable : true
-			}, {
-				theme_url : this.url
-			});
-		},
-
-		_mceImage : function(ui, val) {
-			var ed = this.editor;
-
-			// Internal image object like a flash placeholder
-			if (ed.dom.getAttrib(ed.selection.getNode(), 'class').indexOf('mceItem') != -1)
-				return;
-
-			ed.windowManager.open({
-				url : tinymce.baseURL + '/themes/advanced/image.htm',
-				width : 355 + parseInt(ed.getLang('advanced.image_delta_width', 0)),
-				height : 275 + parseInt(ed.getLang('advanced.image_delta_height', 0)),
-				inline : true
-			}, {
-				theme_url : this.url
-			});
-		},
-
-		_mceLink : function(ui, val) {
-			var ed = this.editor;
-
-			ed.windowManager.open({
-				url : tinymce.baseURL + '/themes/advanced/link.htm',
-				width : 310 + parseInt(ed.getLang('advanced.link_delta_width', 0)),
-				height : 200 + parseInt(ed.getLang('advanced.link_delta_height', 0)),
-				inline : true
-			}, {
-				theme_url : this.url
-			});
-		},
-
-		_mceNewDocument : function() {
-			var ed = this.editor;
-
-			ed.windowManager.confirm('advanced.newdocument', function(s) {
-				if (s)
-					ed.execCommand('mceSetContent', false, '');
-			});
-		},
-
-		_mceForeColor : function() {
-			var t = this;
-
-			this._mceColorPicker(0, {
-				color: t.fgColor,
-				func : function(co) {
-					t.fgColor = co;
-					t.editor.execCommand('ForeColor', false, co);
-				}
-			});
-		},
-
-		_mceBackColor : function() {
-			var t = this;
-
-			this._mceColorPicker(0, {
-				color: t.bgColor,
-				func : function(co) {
-					t.bgColor = co;
-					t.editor.execCommand('HiliteColor', false, co);
-				}
-			});
-		},
-
-		_ufirst : function(s) {
-			return s.substring(0, 1).toUpperCase() + s.substring(1);
-		}
-	});
-
-	tinymce.ThemeManager.add('advanced', tinymce.themes.AdvancedTheme);
+/**
+ * $Id: editor_template_src.js 901 2008-08-18 11:44:21Z spocke $
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, extend = tinymce.extend, each = tinymce.each, Cookie = tinymce.util.Cookie, lastExtID, explode = tinymce.explode;
+
+	// Tell it to load theme specific language pack(s)
+	tinymce.ThemeManager.requireLangPack('advanced');
+
+	tinymce.create('tinymce.themes.AdvancedTheme', {
+		// Control name lookup, format: title, command
+		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(ed, url) {
+			var t = this, s, v;
+	
+			t.editor = ed;
+			t.url = url;
+			t.onResolveName = new tinymce.util.Dispatcher(this);
+
+			// Default settings
+			t.settings = s = extend({
+				theme_advanced_path : true,
+				theme_advanced_toolbar_location : 'bottom',
+				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",
+				theme_advanced_blockformats : "p,address,pre,h1,h2,h3,h4,h5,h6",
+				theme_advanced_toolbar_align : "center",
+				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_font_sizes : "1,2,3,4,5,6,7",
+				theme_advanced_more_colors : 1,
+				theme_advanced_row_height : 23,
+				theme_advanced_resize_horizontal : 1,
+				theme_advanced_resizing_use_cookie : 1,
+				readonly : ed.settings.readonly
+			}, ed.settings);
+
+			if ((v = s.theme_advanced_path_location) && v != 'none')
+				s.theme_advanced_statusbar_location = s.theme_advanced_path_location;
+
+			if (s.theme_advanced_statusbar_location == 'none')
+				s.theme_advanced_statusbar_location = 0;
+
+			// Init editor
+			ed.onInit.add(function() {
+				ed.onNodeChange.add(t._nodeChanged, t);
+
+				if (ed.settings.content_css !== false)
+					ed.dom.loadCSS(ed.baseURI.toAbsolute("themes/advanced/skins/" + ed.settings.skin + "/content.css"));
+			});
+
+			ed.onSetProgressState.add(function(ed, b, ti) {
+				var co, id = ed.id, tb;
+
+				if (b) {
+					t.progressTimer = setTimeout(function() {
+						co = ed.getContainer();
+						co = co.insertBefore(DOM.create('DIV', {style : 'position:relative'}), co.firstChild);
+						tb = DOM.get(ed.id + '_tbl');
+
+						DOM.add(co, 'div', {id : id + '_blocker', 'class' : 'mceBlocker', style : {width : tb.clientWidth + 2, height : tb.clientHeight + 2}});
+						DOM.add(co, 'div', {id : id + '_progress', 'class' : 'mceProgress', style : {left : tb.clientWidth / 2, top : tb.clientHeight / 2}});
+					}, ti || 0);
+				} else {
+					DOM.remove(id + '_blocker');
+					DOM.remove(id + '_progress');
+					clearTimeout(t.progressTimer);
+				}
+			});
+
+			DOM.loadCSS(ed.baseURI.toAbsolute(s.editor_css || "themes/advanced/skins/" + ed.settings.skin + "/ui.css"));
+
+			if (s.skin_variant)
+				DOM.loadCSS(ed.baseURI.toAbsolute(s.editor_css || "themes/advanced/skins/" + ed.settings.skin + "/ui_" + s.skin_variant + ".css"));
+		},
+
+		createControl : function(n, cf) {
+			var cd, c;
+
+			if (c = cf.createControl(n))
+				return c;
+
+			switch (n) {
+				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 ((cd = this.controls[n]))
+				return cf.createButton(n, {title : "advanced." + cd[0], cmd : cd[1], ui : cd[2], value : cd[3]});
+		},
+
+		execCommand : function(cmd, ui, val) {
+			var f = this['_' + cmd];
+
+			if (f) {
+				f.call(this, ui, val);
+				return true;
+			}
+
+			return false;
+		},
+
+		_importClasses : function(e) {
+			var ed = this.editor, c = ed.controlManager.get('styleselect');
+
+			if (c.getLength() == 0) {
+				each(ed.dom.getClasses(), function(o) {
+					c.add(o['class'], o['class']);
+				});
+			}
+		},
+
+		_createStyleSelect : function(n) {
+			var t = this, ed = t.editor, cf = ed.controlManager, c = cf.createListBox('styleselect', {
+				title : 'advanced.style_select',
+				onselect : function(v) {
+					if (c.selectedValue === v) {
+						ed.execCommand('mceSetStyleInfo', 0, {command : 'removeformat'});
+						c.select();
+						return false;
+					} else
+						ed.execCommand('mceSetCSSClass', 0, v);
+				}
+			});
+
+			if (c) {
+				each(ed.getParam('theme_advanced_styles', '', 'hash'), function(v, k) {
+					if (v)
+						c.add(t.editor.translate(k), v);
+				});
+
+				c.onPostRender.add(function(ed, n) {
+					Event.add(n.id + '_text', 'focus', t._importClasses, t);
+					Event.add(n.id + '_text', 'mousedown', t._importClasses, t);
+				});
+			}
+
+			return c;
+		},
+
+		_createFontSelect : function() {
+			var c, t = this, ed = t.editor;
+
+			c = ed.controlManager.createListBox('fontselect', {title : 'advanced.fontdefault', cmd : 'FontName'});
+			if (c) {
+				each(ed.getParam('theme_advanced_fonts', t.settings.theme_advanced_fonts, 'hash'), function(v, k) {
+					c.add(ed.translate(k), v, {style : v.indexOf('dings') == -1 ? 'font-family:' + v : ''});
+				});
+			}
+
+			return c;
+		},
+
+		_createFontSizeSelect : function() {
+			var t = this, ed = t.editor, c, lo = [
+				"1 (8 pt)",
+				"2 (10 pt)",
+				"3 (12 pt)",
+				"4 (14 pt)",
+				"5 (18 pt)",
+				"6 (24 pt)",
+				"7 (36 pt)"
+			], fz = [8, 10, 12, 14, 18, 24, 36];
+
+			c = ed.controlManager.createListBox('fontsizeselect', {title : 'advanced.font_size', cmd : 'FontSize'});
+			if (c) {
+				each(ed.getParam('theme_advanced_font_sizes', t.settings.theme_advanced_font_sizes, 'hash'), function(v, k) {
+					c.add(k != v ? k : lo[parseInt(v) - 1], v, {'style' : 'font-size:' + fz[v - 1] + 'pt', 'class' : 'mceFontSize' + v});
+				});
+			}
+
+			return c;
+		},
+
+		_createBlockFormats : function() {
+			var c, fmts = {
+				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'
+			}, t = this;
+
+			c = t.editor.controlManager.createListBox('formatselect', {title : 'advanced.block', cmd : 'FormatBlock'});
+			if (c) {
+				each(t.editor.getParam('theme_advanced_blockformats', t.settings.theme_advanced_blockformats, 'hash'), function(v, k) {
+					c.add(t.editor.translate(k != v ? k : fmts[v]), v, {'class' : 'mce_formatPreview mce_' + v});
+				});
+			}
+
+			return c;
+		},
+
+		_createForeColorMenu : function() {
+			var c, t = this, s = t.settings, o = {}, v;
+
+			if (s.theme_advanced_more_colors) {
+				o.more_colors_func = function() {
+					t._mceColorPicker(0, {
+						color : c.value,
+						func : function(co) {
+							c.setColor(co);
+						}
+					});
+				};
+			}
+
+			if (v = s.theme_advanced_text_colors)
+				o.colors = v;
+
+			o.title = 'advanced.forecolor_desc';
+			o.cmd = 'ForeColor';
+			o.scope = this;
+
+			c = t.editor.controlManager.createColorSplitButton('forecolor', o);
+
+			return c;
+		},
+
+		_createBackColorMenu : function() {
+			var c, t = this, s = t.settings, o = {}, v;
+
+			if (s.theme_advanced_more_colors) {
+				o.more_colors_func = function() {
+					t._mceColorPicker(0, {
+						color : c.value,
+						func : function(co) {
+							c.setColor(co);
+						}
+					});
+				};
+			}
+
+			if (v = s.theme_advanced_background_colors)
+				o.colors = v;
+
+			o.title = 'advanced.backcolor_desc';
+			o.cmd = 'HiliteColor';
+			o.scope = this;
+
+			c = t.editor.controlManager.createColorSplitButton('backcolor', o);
+
+			return c;
+		},
+
+		renderUI : function(o) {
+			var n, ic, tb, t = this, ed = t.editor, s = t.settings, sc, p, nl;
+
+			n = p = DOM.create('span', {id : ed.id + '_parent', 'class' : 'mceEditor ' + ed.settings.skin + 'Skin' + (s.skin_variant ? ' ' + ed.settings.skin + 'Skin' + t._ufirst(s.skin_variant) : '')});
+
+			if (!DOM.boxModel)
+				n = DOM.add(n, 'div', {'class' : 'mceOldBoxModel'});
+
+			n = sc = DOM.add(n, 'table', {id : ed.id + '_tbl', 'class' : 'mceLayout', cellSpacing : 0, cellPadding : 0});
+			n = tb = DOM.add(n, 'tbody');
+
+			switch ((s.theme_advanced_layout_manager || '').toLowerCase()) {
+				case "rowlayout":
+					ic = t._rowLayout(s, tb, o);
+					break;
+
+				case "customlayout":
+					ic = ed.execCallback("theme_advanced_custom_layout", s, tb, o, p);
+					break;
+
+				default:
+					ic = t._simpleLayout(s, tb, o, p);
+			}
+
+			n = o.targetNode;
+
+			// Add classes to first and last TRs
+			nl = DOM.stdMode ? sc.getElementsByTagName('tr') : sc.rows; // Quick fix for IE 8
+			DOM.addClass(nl[0], 'mceFirst');
+			DOM.addClass(nl[nl.length - 1], 'mceLast');
+
+			// Add classes to first and last TDs
+			each(DOM.select('tr', tb), function(n) {
+				DOM.addClass(n.firstChild, 'mceFirst');
+				DOM.addClass(n.childNodes[n.childNodes.length - 1], 'mceLast');
+			});
+
+			if (DOM.get(s.theme_advanced_toolbar_container))
+				DOM.get(s.theme_advanced_toolbar_container).appendChild(p);
+			else
+				DOM.insertAfter(p, n);
+
+			Event.add(ed.id + '_path_row', 'click', function(e) {
+				e = e.target;
+
+				if (e.nodeName == 'A') {
+					t._sel(e.className.replace(/^.*mcePath_([0-9]+).*$/, '$1'));
+
+					return Event.cancel(e);
+				}
+			});
+/*
+			if (DOM.get(ed.id + '_path_row')) {
+				Event.add(ed.id + '_tbl', 'mouseover', function(e) {
+					var re;
+	
+					e = e.target;
+
+					if (e.nodeName == 'SPAN' && DOM.hasClass(e.parentNode, 'mceButton')) {
+						re = DOM.get(ed.id + '_path_row');
+						t.lastPath = re.innerHTML;
+						DOM.setHTML(re, e.parentNode.title);
+					}
+				});
+
+				Event.add(ed.id + '_tbl', 'mouseout', function(e) {
+					if (t.lastPath) {
+						DOM.setHTML(ed.id + '_path_row', t.lastPath);
+						t.lastPath = 0;
+					}
+				});
+			}
+*/
+
+			if (!ed.getParam('accessibility_focus') || ed.getParam('tab_focus'))
+				Event.add(DOM.add(p, 'a', {href : '#'}, '<!-- IE -->'), 'focus', function() {tinyMCE.get(ed.id).focus();});
+
+			if (s.theme_advanced_toolbar_location == 'external')
+				o.deltaHeight = 0;
+
+			t.deltaHeight = o.deltaHeight;
+			o.targetNode = null;
+
+			return {
+				iframeContainer : ic,
+				editorContainer : ed.id + '_parent',
+				sizeContainer : sc,
+				deltaHeight : o.deltaHeight
+			};
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Advanced theme',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			}
+		},
+
+		resizeBy : function(dw, dh) {
+			var e = DOM.get(this.editor.id + '_tbl');
+
+			this.resizeTo(e.clientWidth + dw, e.clientHeight + dh);
+		},
+
+		resizeTo : function(w, h) {
+			var ed = this.editor, s = ed.settings, e = DOM.get(ed.id + '_tbl'), ifr = DOM.get(ed.id + '_ifr'), dh;
+
+			// Boundery fix box
+			w = Math.max(s.theme_advanced_resizing_min_width || 100, w);
+			h = Math.max(s.theme_advanced_resizing_min_height || 100, h);
+			w = Math.min(s.theme_advanced_resizing_max_width || 0xFFFF, w);
+			h = Math.min(s.theme_advanced_resizing_max_height || 0xFFFF, h);
+
+			// Calc difference between iframe and container
+			dh = e.clientHeight - ifr.clientHeight;
+
+			// Resize iframe and container
+			DOM.setStyle(ifr, 'height', h - dh);
+			DOM.setStyles(e, {width : w, height : h});
+		},
+
+		destroy : function() {
+			var id = this.editor.id;
+
+			Event.clear(id + '_resize');
+			Event.clear(id + '_path_row');
+			Event.clear(id + '_external_close');
+		},
+
+		// Internal functions
+
+		_simpleLayout : function(s, tb, o, p) {
+			var t = this, ed = t.editor, lo = s.theme_advanced_toolbar_location, sl = s.theme_advanced_statusbar_location, n, ic, etb, c;
+
+			if (s.readonly) {
+				n = DOM.add(tb, 'tr');
+				n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});
+				return ic;
+			}
+
+			// Create toolbar container at top
+			if (lo == 'top')
+				t._addToolbars(tb, o);
+
+			// Create external toolbar
+			if (lo == 'external') {
+				n = c = DOM.create('div', {style : 'position:relative'});
+				n = DOM.add(n, 'div', {id : ed.id + '_external', 'class' : 'mceExternalToolbar'});
+				DOM.add(n, 'a', {id : ed.id + '_external_close', href : 'javascript:;', 'class' : 'mceExternalClose'});
+				n = DOM.add(n, 'table', {id : ed.id + '_tblext', cellSpacing : 0, cellPadding : 0});
+				etb = DOM.add(n, 'tbody');
+
+				if (p.firstChild.className == 'mceOldBoxModel')
+					p.firstChild.appendChild(c);
+				else
+					p.insertBefore(c, p.firstChild);
+
+				t._addToolbars(etb, o);
+
+				ed.onMouseUp.add(function() {
+					var e = DOM.get(ed.id + '_external');
+					DOM.show(e);
+
+					DOM.hide(lastExtID);
+
+					var f = Event.add(ed.id + '_external_close', 'click', function() {
+						DOM.hide(ed.id + '_external');
+						Event.remove(ed.id + '_external_close', 'click', f);
+					});
+
+					DOM.show(e);
+					DOM.setStyle(e, 'top', 0 - DOM.getRect(ed.id + '_tblext').h - 1);
+
+					// Fixes IE rendering bug
+					DOM.hide(e);
+					DOM.show(e);
+					e.style.filter = '';
+
+					lastExtID = ed.id + '_external';
+
+					e = null;
+				});
+			}
+
+			if (sl == 'top')
+				t._addStatusBar(tb, o);
+
+			// Create iframe container
+			if (!s.theme_advanced_toolbar_container) {
+				n = DOM.add(tb, 'tr');
+				n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});
+			}
+
+			// Create toolbar container at bottom
+			if (lo == 'bottom')
+				t._addToolbars(tb, o);
+
+			if (sl == 'bottom')
+				t._addStatusBar(tb, o);
+
+			return ic;
+		},
+
+		_rowLayout : function(s, tb, o) {
+			var t = this, ed = t.editor, dc, da, cf = ed.controlManager, n, ic, to, a;
+
+			dc = s.theme_advanced_containers_default_class || '';
+			da = s.theme_advanced_containers_default_align || 'center';
+
+			each(explode(s.theme_advanced_containers || ''), function(c, i) {
+				var v = s['theme_advanced_container_' + c] || '';
+
+				switch (v.toLowerCase()) {
+					case 'mceeditor':
+						n = DOM.add(tb, 'tr');
+						n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});
+						break;
+
+					case 'mceelementpath':
+						t._addStatusBar(tb, o);
+						break;
+
+					default:
+						a = (s['theme_advanced_container_' + c + '_align'] || da).toLowerCase();
+						a = 'mce' + t._ufirst(a);
+
+						n = DOM.add(DOM.add(tb, 'tr'), 'td', {
+							'class' : 'mceToolbar ' + (s['theme_advanced_container_' + c + '_class'] || dc) + ' ' + a || da
+						});
+
+						to = cf.createToolbar("toolbar" + i);
+						t._addControls(v, to);
+						DOM.setHTML(n, to.renderHTML());
+						o.deltaHeight -= s.theme_advanced_row_height;
+				}
+			});
+
+			return ic;
+		},
+
+		_addControls : function(v, tb) {
+			var t = this, s = t.settings, di, cf = t.editor.controlManager;
+
+			if (s.theme_advanced_disable && !t._disabled) {
+				di = {};
+
+				each(explode(s.theme_advanced_disable), function(v) {
+					di[v] = 1;
+				});
+
+				t._disabled = di;
+			} else
+				di = t._disabled;
+
+			each(explode(v), function(n) {
+				var c;
+
+				if (di && di[n])
+					return;
+
+				// Compatiblity with 2.x
+				if (n == 'tablecontrols') {
+					each(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"], function(n) {
+						n = t.createControl(n, cf);
+
+						if (n)
+							tb.add(n);
+					});
+
+					return;
+				}
+
+				c = t.createControl(n, cf);
+
+				if (c)
+					tb.add(c);
+			});
+		},
+
+		_addToolbars : function(c, o) {
+			var t = this, i, tb, ed = t.editor, s = t.settings, v, cf = ed.controlManager, di, n, h = [], a;
+
+			a = s.theme_advanced_toolbar_align.toLowerCase();
+			a = 'mce' + t._ufirst(a);
+
+			n = DOM.add(DOM.add(c, 'tr'), 'td', {'class' : 'mceToolbar ' + a});
+
+			if (!ed.getParam('accessibility_focus') || ed.getParam('tab_focus'))
+				h.push(DOM.createHTML('a', {href : '#', onfocus : 'tinyMCE.get(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));
+
+			h.push(DOM.createHTML('a', {href : '#', accesskey : 'q', title : ed.getLang("advanced.toolbar_focus")}, '<!-- IE -->'));
+
+			// Create toolbar and add the controls
+			for (i=1; (v = s['theme_advanced_buttons' + i]); i++) {
+				tb = cf.createToolbar("toolbar" + i, {'class' : 'mceToolbarRow' + i});
+
+				if (s['theme_advanced_buttons' + i + '_add'])
+					v += ',' + s['theme_advanced_buttons' + i + '_add'];
+
+				if (s['theme_advanced_buttons' + i + '_add_before'])
+					v = s['theme_advanced_buttons' + i + '_add_before'] + ',' + v;
+
+				t._addControls(v, tb);
+
+				//n.appendChild(n = tb.render());
+				h.push(tb.renderHTML());
+
+				o.deltaHeight -= s.theme_advanced_row_height;
+			}
+
+			h.push(DOM.createHTML('a', {href : '#', accesskey : 'z', title : ed.getLang("advanced.toolbar_focus"), onfocus : 'tinyMCE.getInstanceById(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));
+			DOM.setHTML(n, h.join(''));
+		},
+
+		_addStatusBar : function(tb, o) {
+			var n, t = this, ed = t.editor, s = t.settings, r, mf, me, td;
+
+			n = DOM.add(tb, 'tr');
+			n = td = DOM.add(n, 'td', {'class' : 'mceStatusbar'});
+			n = DOM.add(n, 'div', {id : ed.id + '_path_row'}, s.theme_advanced_path ? ed.translate('advanced.path') + ': ' : '&nbsp;');
+			DOM.add(n, 'a', {href : '#', accesskey : 'x'});
+
+			if (s.theme_advanced_resizing && !tinymce.isOldWebKit) {
+				DOM.add(td, 'a', {id : ed.id + '_resize', href : 'javascript:;', onclick : "return false;", 'class' : 'mceResize'});
+
+				if (s.theme_advanced_resizing_use_cookie) {
+					ed.onPostRender.add(function() {
+						var o = Cookie.getHash("TinyMCE_" + ed.id + "_size"), c = DOM.get(ed.id + '_tbl');
+
+						if (!o)
+							return;
+
+						if (s.theme_advanced_resize_horizontal)
+							c.style.width = Math.max(10, o.cw) + 'px';
+
+						c.style.height = Math.max(10, o.ch) + 'px';
+						DOM.get(ed.id + '_ifr').style.height = Math.max(10, parseInt(o.ch) + t.deltaHeight) + 'px';
+					});
+				}
+
+				ed.onPostRender.add(function() {
+					Event.add(ed.id + '_resize', 'mousedown', function(e) {
+						var c, p, w, h, n, pa;
+
+						// Measure container
+						c = DOM.get(ed.id + '_tbl');
+						w = c.clientWidth;
+						h = c.clientHeight;
+
+						miw = s.theme_advanced_resizing_min_width || 100;
+						mih = s.theme_advanced_resizing_min_height || 100;
+						maw = s.theme_advanced_resizing_max_width || 0xFFFF;
+						mah = s.theme_advanced_resizing_max_height || 0xFFFF;
+
+						// Setup placeholder
+						p = DOM.add(DOM.get(ed.id + '_parent'), 'div', {'class' : 'mcePlaceHolder'});
+						DOM.setStyles(p, {width : w, height : h});
+
+						// Replace with placeholder
+						DOM.hide(c);
+						DOM.show(p);
+
+						// Create internal resize obj
+						r = {
+							x : e.screenX,
+							y : e.screenY,
+							w : w,
+							h : h,
+							dx : null,
+							dy : null
+						};
+
+						// Start listening
+						mf = Event.add(DOM.doc, 'mousemove', function(e) {
+							var w, h;
+
+							// Calc delta values
+							r.dx = e.screenX - r.x;
+							r.dy = e.screenY - r.y;
+
+							// Boundery fix box
+							w = Math.max(miw, r.w + r.dx);
+							h = Math.max(mih, r.h + r.dy);
+							w = Math.min(maw, w);
+							h = Math.min(mah, h);
+
+							// Resize placeholder
+							if (s.theme_advanced_resize_horizontal)
+								p.style.width = w + 'px';
+
+							p.style.height = h + 'px';
+
+							return Event.cancel(e);
+						});
+
+						me = Event.add(DOM.doc, 'mouseup', function(e) {
+							var ifr;
+
+							// Stop listening
+							Event.remove(DOM.doc, 'mousemove', mf);
+							Event.remove(DOM.doc, 'mouseup', me);
+
+							c.style.display = '';
+							DOM.remove(p);
+
+							if (r.dx === null)
+								return;
+
+							ifr = DOM.get(ed.id + '_ifr');
+
+							if (s.theme_advanced_resize_horizontal)
+								c.style.width = Math.max(10, r.w + r.dx) + 'px';
+
+							c.style.height = Math.max(10, r.h + r.dy) + 'px';
+							ifr.style.height = Math.max(10, ifr.clientHeight + r.dy) + 'px';
+
+							if (s.theme_advanced_resizing_use_cookie) {
+								Cookie.setHash("TinyMCE_" + ed.id + "_size", {
+									cw : r.w + r.dx,
+									ch : r.h + r.dy
+								});
+							}
+						});
+
+						return Event.cancel(e);
+					});
+				});
+			}
+
+			o.deltaHeight -= 21;
+			n = tb = null;
+		},
+
+		_nodeChanged : function(ed, cm, n, co) {
+			var t = this, p, de = 0, v, c, s = t.settings;
+
+			if (s.readonly)
+				return;
+
+			tinymce.each(t.stateControls, function(c) {
+				cm.setActive(c, ed.queryCommandState(t.controls[c][1]));
+			});
+
+			cm.setActive('visualaid', ed.hasVisual);
+			cm.setDisabled('undo', !ed.undoManager.hasUndo() && !ed.typing);
+			cm.setDisabled('redo', !ed.undoManager.hasRedo());
+			cm.setDisabled('outdent', !ed.queryCommandState('Outdent'));
+
+			p = DOM.getParent(n, 'A');
+			if (c = cm.get('link')) {
+				if (!p || !p.name) {
+					c.setDisabled(!p && co);
+					c.setActive(!!p);
+				}
+			}
+
+			if (c = cm.get('unlink')) {
+				c.setDisabled(!p && co);
+				c.setActive(!!p && !p.name);
+			}
+
+			if (c = cm.get('anchor')) {
+				c.setActive(!!p && p.name);
+
+				if (tinymce.isWebKit) {
+					p = DOM.getParent(n, 'IMG');
+					c.setActive(!!p && DOM.getAttrib(p, 'mce_name') == 'a');
+				}
+			}
+
+			p = DOM.getParent(n, 'IMG');
+			if (c = cm.get('image'))
+				c.setActive(!!p && n.className.indexOf('mceItem') == -1);
+
+			if (c = cm.get('styleselect')) {
+				if (n.className) {
+					t._importClasses();
+					c.select(n.className);
+				} else
+					c.select();
+			}
+
+			if (c = cm.get('formatselect')) {
+				p = DOM.getParent(n, DOM.isBlock);
+
+				if (p)
+					c.select(p.nodeName.toLowerCase());
+			}
+
+			if (c = cm.get('fontselect'))
+				c.select(ed.queryCommandValue('FontName'));
+
+			if (c = cm.get('fontsizeselect'))
+				c.select('' + ed.queryCommandValue('FontSize'));
+
+			if (s.theme_advanced_path && s.theme_advanced_statusbar_location) {
+				p = DOM.get(ed.id + '_path') || DOM.add(ed.id + '_path_row', 'span', {id : ed.id + '_path'});
+				DOM.setHTML(p, '');
+
+				ed.dom.getParent(n, function(n) {
+					var na = n.nodeName.toLowerCase(), u, pi, ti = '';
+
+					// Ignore non element and hidden elements
+					if (n.nodeType != 1 || (DOM.hasClass(n, 'mceItemHidden') || DOM.hasClass(n, 'mceItemRemoved')))
+						return;
+
+					// Fake name
+					if (v = DOM.getAttrib(n, 'mce_name'))
+						na = v;
+	
+					// Handle prefix
+					if (tinymce.isIE && n.scopeName !== 'HTML')
+						na = n.scopeName + ':' + na;
+
+					// Remove internal prefix
+					na = na.replace(/mce\:/g, '');
+
+					// Handle node name
+					switch (na) {
+						case 'b':
+							na = 'strong';
+							break;
+
+						case 'i':
+							na = 'em';
+							break;
+
+						case 'img':
+							if (v = DOM.getAttrib(n, 'src'))
+								ti += 'src: ' + v + ' ';
+
+							break;
+
+						case 'a':
+							if (v = DOM.getAttrib(n, 'name')) {
+								ti += 'name: ' + v + ' ';
+								na += '#' + v;
+							}
+
+							if (v = DOM.getAttrib(n, 'href'))
+								ti += 'href: ' + v + ' ';
+
+							break;
+
+						case 'font':
+							if (s.convert_fonts_to_spans)
+								na = 'span';
+
+							if (v = DOM.getAttrib(n, 'face'))
+								ti += 'font: ' + v + ' ';
+
+							if (v = DOM.getAttrib(n, 'size'))
+								ti += 'size: ' + v + ' ';
+
+							if (v = DOM.getAttrib(n, 'color'))
+								ti += 'color: ' + v + ' ';
+
+							break;
+
+						case 'span':
+							if (v = DOM.getAttrib(n, 'style'))
+								ti += 'style: ' + v + ' ';
+
+							break;
+					}
+
+					if (v = DOM.getAttrib(n, 'id'))
+						ti += 'id: ' + v + ' ';
+
+					if (v = n.className) {
+						v = v.replace(/(webkit-[\w\-]+|Apple-[\w\-]+|mceItem\w+|mceVisualAid)/g, '');
+
+						if (v && v.indexOf('mceItem') == -1) {
+							ti += 'class: ' + v + ' ';
+
+							if (DOM.isBlock(n) || na == 'img' || na == 'span')
+								na += '.' + v;
+						}
+					}
+
+					na = na.replace(/(html:)/g, '');
+					na = {name : na, node : n, title : ti};
+					t.onResolveName.dispatch(t, na);
+					ti = na.title;
+					na = na.name;
+
+					//u = "javascript:tinymce.EditorManager.get('" + ed.id + "').theme._sel('" + (de++) + "');";
+					pi = DOM.create('a', {'href' : "javascript:;", onmousedown : "return false;", title : ti, 'class' : 'mcePath_' + (de++)}, na);
+
+					if (p.hasChildNodes()) {
+						p.insertBefore(DOM.doc.createTextNode(' \u00bb '), p.firstChild);
+						p.insertBefore(pi, p.firstChild);
+					} else
+						p.appendChild(pi);
+				}, ed.getBody());
+			}
+		},
+
+		// Commands gets called by execCommand
+
+		_sel : function(v) {
+			this.editor.execCommand('mceSelectNodeDepth', false, v);
+		},
+
+		_mceInsertAnchor : function(ui, v) {
+			var ed = this.editor;
+
+			ed.windowManager.open({
+				url : tinymce.baseURL + '/themes/advanced/anchor.htm',
+				width : 320 + parseInt(ed.getLang('advanced.anchor_delta_width', 0)),
+				height : 90 + parseInt(ed.getLang('advanced.anchor_delta_height', 0)),
+				inline : true
+			}, {
+				theme_url : this.url
+			});
+		},
+
+		_mceCharMap : function() {
+			var ed = this.editor;
+
+			ed.windowManager.open({
+				url : tinymce.baseURL + '/themes/advanced/charmap.htm',
+				width : 550 + parseInt(ed.getLang('advanced.charmap_delta_width', 0)),
+				height : 250 + parseInt(ed.getLang('advanced.charmap_delta_height', 0)),
+				inline : true
+			}, {
+				theme_url : this.url
+			});
+		},
+
+		_mceHelp : function() {
+			var ed = this.editor;
+
+			ed.windowManager.open({
+				url : tinymce.baseURL + '/themes/advanced/about.htm',
+				width : 480,
+				height : 380,
+				inline : true
+			}, {
+				theme_url : this.url
+			});
+		},
+
+		_mceColorPicker : function(u, v) {
+			var ed = this.editor;
+
+			v = v || {};
+
+			ed.windowManager.open({
+				url : tinymce.baseURL + '/themes/advanced/color_picker.htm',
+				width : 375 + parseInt(ed.getLang('advanced.colorpicker_delta_width', 0)),
+				height : 250 + parseInt(ed.getLang('advanced.colorpicker_delta_height', 0)),
+				close_previous : false,
+				inline : true
+			}, {
+				input_color : v.color,
+				func : v.func,
+				theme_url : this.url
+			});
+		},
+
+		_mceCodeEditor : function(ui, val) {
+			var ed = this.editor;
+
+			ed.windowManager.open({
+				url : tinymce.baseURL + '/themes/advanced/source_editor.htm',
+				width : parseInt(ed.getParam("theme_advanced_source_editor_width", 720)),
+				height : parseInt(ed.getParam("theme_advanced_source_editor_height", 580)),
+				inline : true,
+				resizable : true,
+				maximizable : true
+			}, {
+				theme_url : this.url
+			});
+		},
+
+		_mceImage : function(ui, val) {
+			var ed = this.editor;
+
+			// Internal image object like a flash placeholder
+			if (ed.dom.getAttrib(ed.selection.getNode(), 'class').indexOf('mceItem') != -1)
+				return;
+
+			ed.windowManager.open({
+				url : tinymce.baseURL + '/themes/advanced/image.htm',
+				width : 355 + parseInt(ed.getLang('advanced.image_delta_width', 0)),
+				height : 275 + parseInt(ed.getLang('advanced.image_delta_height', 0)),
+				inline : true
+			}, {
+				theme_url : this.url
+			});
+		},
+
+		_mceLink : function(ui, val) {
+			var ed = this.editor;
+
+			ed.windowManager.open({
+				url : tinymce.baseURL + '/themes/advanced/link.htm',
+				width : 310 + parseInt(ed.getLang('advanced.link_delta_width', 0)),
+				height : 200 + parseInt(ed.getLang('advanced.link_delta_height', 0)),
+				inline : true
+			}, {
+				theme_url : this.url
+			});
+		},
+
+		_mceNewDocument : function() {
+			var ed = this.editor;
+
+			ed.windowManager.confirm('advanced.newdocument', function(s) {
+				if (s)
+					ed.execCommand('mceSetContent', false, '');
+			});
+		},
+
+		_mceForeColor : function() {
+			var t = this;
+
+			this._mceColorPicker(0, {
+				color: t.fgColor,
+				func : function(co) {
+					t.fgColor = co;
+					t.editor.execCommand('ForeColor', false, co);
+				}
+			});
+		},
+
+		_mceBackColor : function() {
+			var t = this;
+
+			this._mceColorPicker(0, {
+				color: t.bgColor,
+				func : function(co) {
+					t.bgColor = co;
+					t.editor.execCommand('HiliteColor', false, co);
+				}
+			});
+		},
+
+		_ufirst : function(s) {
+			return s.substring(0, 1).toUpperCase() + s.substring(1);
+		}
+	});
+
+	tinymce.ThemeManager.add('advanced', tinymce.themes.AdvancedTheme);
 }());
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/themes/advanced/image.htm b/webapp/web/js/tiny_mce/themes/advanced/image.htm
index 6c366469c..bd92b0048 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/image.htm
+++ b/webapp/web/js/tiny_mce/themes/advanced/image.htm
@@ -1,86 +1,86 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#advanced_dlg.image_title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="../../utils/form_utils.js"></script>
-	<script type="text/javascript" src="js/image.js"></script>
-	<base target="_self" />
-</head>
-<body id="image" style="display: none">
-<form onsubmit="ImageDialog.update();return false;" action="#">
-	<div class="tabs">
-		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.image_title}</a></span></li>
-		</ul>
-	</div>
-
-	<div class="panel_wrapper">
-		<div id="general_panel" class="panel current">
-     <table border="0" cellpadding="4" cellspacing="0">
-          <tr>
-            <td nowrap="nowrap"><label for="src">{#advanced_dlg.image_src}</label></td>
-            <td><table border="0" cellspacing="0" cellpadding="0">
-                <tr>
-                  <td><input id="src" name="src" type="text" class="mceFocus" value="" style="width: 200px" onchange="ImageDialog.getImageData();" /></td>
-                  <td id="srcbrowsercontainer">&nbsp;</td>
-                </tr>
-              </table></td>
-          </tr>
-		  <tr>
-			<td><label for="image_list">{#advanced_dlg.image_list}</label></td>
-			<td><select id="image_list" name="image_list" onchange="document.getElementById('src').value=this.options[this.selectedIndex].value;document.getElementById('alt').value=this.options[this.selectedIndex].text;"></select></td>
-		  </tr>
-          <tr>
-            <td nowrap="nowrap"><label for="alt">{#advanced_dlg.image_alt}</label></td>
-            <td><input id="alt" name="alt" type="text" value="" style="width: 200px" /></td>
-          </tr>
-          <tr>
-            <td nowrap="nowrap"><label for="align">{#advanced_dlg.image_align}</label></td>
-            <td><select id="align" name="align" onchange="ImageDialog.updateStyle();">
-                <option value="">{#not_set}</option>
-                <option value="baseline">{#advanced_dlg.image_align_baseline}</option>
-                <option value="top">{#advanced_dlg.image_align_top}</option>
-                <option value="middle">{#advanced_dlg.image_align_middle}</option>
-                <option value="bottom">{#advanced_dlg.image_align_bottom}</option>
-                <option value="text-top">{#advanced_dlg.image_align_texttop}</option>
-                <option value="text-bottom">{#advanced_dlg.image_align_textbottom}</option>
-                <option value="left">{#advanced_dlg.image_align_left}</option>
-                <option value="right">{#advanced_dlg.image_align_right}</option>
-              </select></td>
-          </tr>
-          <tr>
-            <td nowrap="nowrap"><label for="width">{#advanced_dlg.image_dimensions}</label></td>
-            <td><input id="width" name="width" type="text" value="" size="3" maxlength="5" />
-              x
-              <input id="height" name="height" type="text" value="" size="3" maxlength="5" /></td>
-          </tr>
-          <tr>
-            <td nowrap="nowrap"><label for="border">{#advanced_dlg.image_border}</label></td>
-            <td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>
-          </tr>
-          <tr>
-            <td nowrap="nowrap"><label for="vspace">{#advanced_dlg.image_vspace}</label></td>
-            <td><input id="vspace" name="vspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>
-          </tr>
-          <tr>
-            <td nowrap="nowrap"><label for="hspace">{#advanced_dlg.image_hspace}</label></td>
-            <td><input id="hspace" name="hspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>
-          </tr>
-        </table>
-		</div>
-	</div>
-
-	<div class="mceActionPanel">
-		<div style="float: left">
-			<input type="submit" id="insert" name="insert" value="{#insert}" />
-		</div>
-
-		<div style="float: right">
-			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-		</div>
-	</div>
-</form>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#advanced_dlg.image_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="js/image.js"></script>
+	<base target="_self" />
+</head>
+<body id="image" style="display: none">
+<form onsubmit="ImageDialog.update();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.image_title}</a></span></li>
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+     <table border="0" cellpadding="4" cellspacing="0">
+          <tr>
+            <td nowrap="nowrap"><label for="src">{#advanced_dlg.image_src}</label></td>
+            <td><table border="0" cellspacing="0" cellpadding="0">
+                <tr>
+                  <td><input id="src" name="src" type="text" class="mceFocus" value="" style="width: 200px" onchange="ImageDialog.getImageData();" /></td>
+                  <td id="srcbrowsercontainer">&nbsp;</td>
+                </tr>
+              </table></td>
+          </tr>
+		  <tr>
+			<td><label for="image_list">{#advanced_dlg.image_list}</label></td>
+			<td><select id="image_list" name="image_list" onchange="document.getElementById('src').value=this.options[this.selectedIndex].value;document.getElementById('alt').value=this.options[this.selectedIndex].text;"></select></td>
+		  </tr>
+          <tr>
+            <td nowrap="nowrap"><label for="alt">{#advanced_dlg.image_alt}</label></td>
+            <td><input id="alt" name="alt" type="text" value="" style="width: 200px" /></td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap"><label for="align">{#advanced_dlg.image_align}</label></td>
+            <td><select id="align" name="align" onchange="ImageDialog.updateStyle();">
+                <option value="">{#not_set}</option>
+                <option value="baseline">{#advanced_dlg.image_align_baseline}</option>
+                <option value="top">{#advanced_dlg.image_align_top}</option>
+                <option value="middle">{#advanced_dlg.image_align_middle}</option>
+                <option value="bottom">{#advanced_dlg.image_align_bottom}</option>
+                <option value="text-top">{#advanced_dlg.image_align_texttop}</option>
+                <option value="text-bottom">{#advanced_dlg.image_align_textbottom}</option>
+                <option value="left">{#advanced_dlg.image_align_left}</option>
+                <option value="right">{#advanced_dlg.image_align_right}</option>
+              </select></td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap"><label for="width">{#advanced_dlg.image_dimensions}</label></td>
+            <td><input id="width" name="width" type="text" value="" size="3" maxlength="5" />
+              x
+              <input id="height" name="height" type="text" value="" size="3" maxlength="5" /></td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap"><label for="border">{#advanced_dlg.image_border}</label></td>
+            <td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap"><label for="vspace">{#advanced_dlg.image_vspace}</label></td>
+            <td><input id="vspace" name="vspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>
+          </tr>
+          <tr>
+            <td nowrap="nowrap"><label for="hspace">{#advanced_dlg.image_hspace}</label></td>
+            <td><input id="hspace" name="hspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>
+          </tr>
+        </table>
+		</div>
+	</div>
+
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="submit" id="insert" name="insert" value="{#insert}" />
+		</div>
+
+		<div style="float: right">
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+</form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/themes/advanced/js/about.js b/webapp/web/js/tiny_mce/themes/advanced/js/about.js
index 9081e1ddc..277550fb5 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/js/about.js
+++ b/webapp/web/js/tiny_mce/themes/advanced/js/about.js
@@ -1,72 +1,72 @@
-tinyMCEPopup.requireLangPack();
-
-function init() {
-	var ed, tcont;
-
-	tinyMCEPopup.resizeToInnerSize();
-	ed = tinyMCEPopup.editor;
-
-	// Give FF some time
-	window.setTimeout('insertHelpIFrame();', 10);
-
-	tcont = document.getElementById('plugintablecontainer');
-	document.getElementById('plugins_tab').style.display = 'none';
-
-	var html = "";
-	html += '<table id="plugintable">';
-	html += '<thead>';
-	html += '<tr>';
-	html += '<td>' + ed.getLang('advanced_dlg.about_plugin') + '</td>';
-	html += '<td>' + ed.getLang('advanced_dlg.about_author') + '</td>';
-	html += '<td>' + ed.getLang('advanced_dlg.about_version') + '</td>';
-	html += '</tr>';
-	html += '</thead>';
-	html += '<tbody>';
-
-	tinymce.each(ed.plugins, function(p, n) {
-		var info;
-
-		if (!p.getInfo)
-			return;
-
-		html += '<tr>';
-
-		info = p.getInfo();
-
-		if (info.infourl != null && info.infourl != '')
-			html += '<td width="50%" title="' + n + '"><a href="' + info.infourl + '" target="_blank">' + info.longname + '</a></td>';
-		else
-			html += '<td width="50%" title="' + n + '">' + info.longname + '</td>';
-
-		if (info.authorurl != null && info.authorurl != '')
-			html += '<td width="35%"><a href="' + info.authorurl + '" target="_blank">' + info.author + '</a></td>';
-		else
-			html += '<td width="35%">' + info.author + '</td>';
-
-		html += '<td width="15%">' + info.version + '</td>';
-		html += '</tr>';
-
-		document.getElementById('plugins_tab').style.display = '';
-
-	});
-
-	html += '</tbody>';
-	html += '</table>';
-
-	tcont.innerHTML = html;
-
-	tinyMCEPopup.dom.get('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;
-	tinyMCEPopup.dom.get('date').innerHTML = tinymce.releaseDate;
-}
-
-function insertHelpIFrame() {
-	var html;
-
-	if (tinyMCEPopup.getParam('docs_url')) {
-		html = '<iframe width="100%" height="300" src="' + tinyMCEPopup.editor.baseURI.toAbsolute(tinyMCEPopup.getParam('docs_url')) + '"></iframe>';
-		document.getElementById('iframecontainer').innerHTML = html;
-		document.getElementById('help_tab').style.display = 'block';
-	}
-}
-
-tinyMCEPopup.onInit.add(init);
+tinyMCEPopup.requireLangPack();
+
+function init() {
+	var ed, tcont;
+
+	tinyMCEPopup.resizeToInnerSize();
+	ed = tinyMCEPopup.editor;
+
+	// Give FF some time
+	window.setTimeout('insertHelpIFrame();', 10);
+
+	tcont = document.getElementById('plugintablecontainer');
+	document.getElementById('plugins_tab').style.display = 'none';
+
+	var html = "";
+	html += '<table id="plugintable">';
+	html += '<thead>';
+	html += '<tr>';
+	html += '<td>' + ed.getLang('advanced_dlg.about_plugin') + '</td>';
+	html += '<td>' + ed.getLang('advanced_dlg.about_author') + '</td>';
+	html += '<td>' + ed.getLang('advanced_dlg.about_version') + '</td>';
+	html += '</tr>';
+	html += '</thead>';
+	html += '<tbody>';
+
+	tinymce.each(ed.plugins, function(p, n) {
+		var info;
+
+		if (!p.getInfo)
+			return;
+
+		html += '<tr>';
+
+		info = p.getInfo();
+
+		if (info.infourl != null && info.infourl != '')
+			html += '<td width="50%" title="' + n + '"><a href="' + info.infourl + '" target="_blank">' + info.longname + '</a></td>';
+		else
+			html += '<td width="50%" title="' + n + '">' + info.longname + '</td>';
+
+		if (info.authorurl != null && info.authorurl != '')
+			html += '<td width="35%"><a href="' + info.authorurl + '" target="_blank">' + info.author + '</a></td>';
+		else
+			html += '<td width="35%">' + info.author + '</td>';
+
+		html += '<td width="15%">' + info.version + '</td>';
+		html += '</tr>';
+
+		document.getElementById('plugins_tab').style.display = '';
+
+	});
+
+	html += '</tbody>';
+	html += '</table>';
+
+	tcont.innerHTML = html;
+
+	tinyMCEPopup.dom.get('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;
+	tinyMCEPopup.dom.get('date').innerHTML = tinymce.releaseDate;
+}
+
+function insertHelpIFrame() {
+	var html;
+
+	if (tinyMCEPopup.getParam('docs_url')) {
+		html = '<iframe width="100%" height="300" src="' + tinyMCEPopup.editor.baseURI.toAbsolute(tinyMCEPopup.getParam('docs_url')) + '"></iframe>';
+		document.getElementById('iframecontainer').innerHTML = html;
+		document.getElementById('help_tab').style.display = 'block';
+	}
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/webapp/web/js/tiny_mce/themes/advanced/js/anchor.js b/webapp/web/js/tiny_mce/themes/advanced/js/anchor.js
index b5efd1ec9..76f4f7dd2 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/js/anchor.js
+++ b/webapp/web/js/tiny_mce/themes/advanced/js/anchor.js
@@ -1,37 +1,37 @@
-tinyMCEPopup.requireLangPack();
-
-var AnchorDialog = {
-	init : function(ed) {
-		var action, elm, f = document.forms[0];
-
-		this.editor = ed;
-		elm = ed.dom.getParent(ed.selection.getNode(), 'A,IMG');
-		v = ed.dom.getAttrib(elm, 'name');
-
-		if (v) {
-			this.action = 'update';
-			f.anchorName.value = v;
-		}
-
-		f.insert.value = ed.getLang(elm ? 'update' : 'insert');
-	},
-
-	update : function() {
-		var ed = this.editor;
-		
-		tinyMCEPopup.restoreSelection();
-
-		if (this.action != 'update')
-			ed.selection.collapse(1);
-
-		// Webkit acts weird if empty inline element is inserted so we need to use a image instead
-		if (tinymce.isWebKit)
-			ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('img', {mce_name : 'a', name : document.forms[0].anchorName.value, 'class' : 'mceItemAnchor'}));
-		else
-			ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('a', {name : document.forms[0].anchorName.value, 'class' : 'mceItemAnchor'}, ''));
-
-		tinyMCEPopup.close();
-	}
-};
-
-tinyMCEPopup.onInit.add(AnchorDialog.init, AnchorDialog);
+tinyMCEPopup.requireLangPack();
+
+var AnchorDialog = {
+	init : function(ed) {
+		var action, elm, f = document.forms[0];
+
+		this.editor = ed;
+		elm = ed.dom.getParent(ed.selection.getNode(), 'A,IMG');
+		v = ed.dom.getAttrib(elm, 'name');
+
+		if (v) {
+			this.action = 'update';
+			f.anchorName.value = v;
+		}
+
+		f.insert.value = ed.getLang(elm ? 'update' : 'insert');
+	},
+
+	update : function() {
+		var ed = this.editor;
+		
+		tinyMCEPopup.restoreSelection();
+
+		if (this.action != 'update')
+			ed.selection.collapse(1);
+
+		// Webkit acts weird if empty inline element is inserted so we need to use a image instead
+		if (tinymce.isWebKit)
+			ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('img', {mce_name : 'a', name : document.forms[0].anchorName.value, 'class' : 'mceItemAnchor'}));
+		else
+			ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('a', {name : document.forms[0].anchorName.value, 'class' : 'mceItemAnchor'}, ''));
+
+		tinyMCEPopup.close();
+	}
+};
+
+tinyMCEPopup.onInit.add(AnchorDialog.init, AnchorDialog);
diff --git a/webapp/web/js/tiny_mce/themes/advanced/js/charmap.js b/webapp/web/js/tiny_mce/themes/advanced/js/charmap.js
index 8467ef603..d9fd8d327 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/js/charmap.js
+++ b/webapp/web/js/tiny_mce/themes/advanced/js/charmap.js
@@ -1,325 +1,325 @@
-tinyMCEPopup.requireLangPack();
-
-var charmap = [
-	['&nbsp;',    '&#160;',  true, 'no-break space'],
-	['&amp;',     '&#38;',   true, 'ampersand'],
-	['&quot;',    '&#34;',   true, 'quotation mark'],
-// finance
-	['&cent;',    '&#162;',  true, 'cent sign'],
-	['&euro;',    '&#8364;', true, 'euro sign'],
-	['&pound;',   '&#163;',  true, 'pound sign'],
-	['&yen;',     '&#165;',  true, 'yen sign'],
-// signs
-	['&copy;',    '&#169;',  true, 'copyright sign'],
-	['&reg;',     '&#174;',  true, 'registered sign'],
-	['&trade;',   '&#8482;', true, 'trade mark sign'],
-	['&permil;',  '&#8240;', true, 'per mille sign'],
-	['&micro;',   '&#181;',  true, 'micro sign'],
-	['&middot;',  '&#183;',  true, 'middle dot'],
-	['&bull;',    '&#8226;', true, 'bullet'],
-	['&hellip;',  '&#8230;', true, 'three dot leader'],
-	['&prime;',   '&#8242;', true, 'minutes / feet'],
-	['&Prime;',   '&#8243;', true, 'seconds / inches'],
-	['&sect;',    '&#167;',  true, 'section sign'],
-	['&para;',    '&#182;',  true, 'paragraph sign'],
-	['&szlig;',   '&#223;',  true, 'sharp s / ess-zed'],
-// quotations
-	['&lsaquo;',  '&#8249;', true, 'single left-pointing angle quotation mark'],
-	['&rsaquo;',  '&#8250;', true, 'single right-pointing angle quotation mark'],
-	['&laquo;',   '&#171;',  true, 'left pointing guillemet'],
-	['&raquo;',   '&#187;',  true, 'right pointing guillemet'],
-	['&lsquo;',   '&#8216;', true, 'left single quotation mark'],
-	['&rsquo;',   '&#8217;', true, 'right single quotation mark'],
-	['&ldquo;',   '&#8220;', true, 'left double quotation mark'],
-	['&rdquo;',   '&#8221;', true, 'right double quotation mark'],
-	['&sbquo;',   '&#8218;', true, 'single low-9 quotation mark'],
-	['&bdquo;',   '&#8222;', true, 'double low-9 quotation mark'],
-	['&lt;',      '&#60;',   true, 'less-than sign'],
-	['&gt;',      '&#62;',   true, 'greater-than sign'],
-	['&le;',      '&#8804;', true, 'less-than or equal to'],
-	['&ge;',      '&#8805;', true, 'greater-than or equal to'],
-	['&ndash;',   '&#8211;', true, 'en dash'],
-	['&mdash;',   '&#8212;', true, 'em dash'],
-	['&macr;',    '&#175;',  true, 'macron'],
-	['&oline;',   '&#8254;', true, 'overline'],
-	['&curren;',  '&#164;',  true, 'currency sign'],
-	['&brvbar;',  '&#166;',  true, 'broken bar'],
-	['&uml;',     '&#168;',  true, 'diaeresis'],
-	['&iexcl;',   '&#161;',  true, 'inverted exclamation mark'],
-	['&iquest;',  '&#191;',  true, 'turned question mark'],
-	['&circ;',    '&#710;',  true, 'circumflex accent'],
-	['&tilde;',   '&#732;',  true, 'small tilde'],
-	['&deg;',     '&#176;',  true, 'degree sign'],
-	['&minus;',   '&#8722;', true, 'minus sign'],
-	['&plusmn;',  '&#177;',  true, 'plus-minus sign'],
-	['&divide;',  '&#247;',  true, 'division sign'],
-	['&frasl;',   '&#8260;', true, 'fraction slash'],
-	['&times;',   '&#215;',  true, 'multiplication sign'],
-	['&sup1;',    '&#185;',  true, 'superscript one'],
-	['&sup2;',    '&#178;',  true, 'superscript two'],
-	['&sup3;',    '&#179;',  true, 'superscript three'],
-	['&frac14;',  '&#188;',  true, 'fraction one quarter'],
-	['&frac12;',  '&#189;',  true, 'fraction one half'],
-	['&frac34;',  '&#190;',  true, 'fraction three quarters'],
-// math / logical
-	['&fnof;',    '&#402;',  true, 'function / florin'],
-	['&int;',     '&#8747;', true, 'integral'],
-	['&sum;',     '&#8721;', true, 'n-ary sumation'],
-	['&infin;',   '&#8734;', true, 'infinity'],
-	['&radic;',   '&#8730;', true, 'square root'],
-	['&sim;',     '&#8764;', false,'similar to'],
-	['&cong;',    '&#8773;', false,'approximately equal to'],
-	['&asymp;',   '&#8776;', true, 'almost equal to'],
-	['&ne;',      '&#8800;', true, 'not equal to'],
-	['&equiv;',   '&#8801;', true, 'identical to'],
-	['&isin;',    '&#8712;', false,'element of'],
-	['&notin;',   '&#8713;', false,'not an element of'],
-	['&ni;',      '&#8715;', false,'contains as member'],
-	['&prod;',    '&#8719;', true, 'n-ary product'],
-	['&and;',     '&#8743;', false,'logical and'],
-	['&or;',      '&#8744;', false,'logical or'],
-	['&not;',     '&#172;',  true, 'not sign'],
-	['&cap;',     '&#8745;', true, 'intersection'],
-	['&cup;',     '&#8746;', false,'union'],
-	['&part;',    '&#8706;', true, 'partial differential'],
-	['&forall;',  '&#8704;', false,'for all'],
-	['&exist;',   '&#8707;', false,'there exists'],
-	['&empty;',   '&#8709;', false,'diameter'],
-	['&nabla;',   '&#8711;', false,'backward difference'],
-	['&lowast;',  '&#8727;', false,'asterisk operator'],
-	['&prop;',    '&#8733;', false,'proportional to'],
-	['&ang;',     '&#8736;', false,'angle'],
-// undefined
-	['&acute;',   '&#180;',  true, 'acute accent'],
-	['&cedil;',   '&#184;',  true, 'cedilla'],
-	['&ordf;',    '&#170;',  true, 'feminine ordinal indicator'],
-	['&ordm;',    '&#186;',  true, 'masculine ordinal indicator'],
-	['&dagger;',  '&#8224;', true, 'dagger'],
-	['&Dagger;',  '&#8225;', true, 'double dagger'],
-// alphabetical special chars
-	['&Agrave;',  '&#192;',  true, 'A - grave'],
-	['&Aacute;',  '&#193;',  true, 'A - acute'],
-	['&Acirc;',   '&#194;',  true, 'A - circumflex'],
-	['&Atilde;',  '&#195;',  true, 'A - tilde'],
-	['&Auml;',    '&#196;',  true, 'A - diaeresis'],
-	['&Aring;',   '&#197;',  true, 'A - ring above'],
-	['&AElig;',   '&#198;',  true, 'ligature AE'],
-	['&Ccedil;',  '&#199;',  true, 'C - cedilla'],
-	['&Egrave;',  '&#200;',  true, 'E - grave'],
-	['&Eacute;',  '&#201;',  true, 'E - acute'],
-	['&Ecirc;',   '&#202;',  true, 'E - circumflex'],
-	['&Euml;',    '&#203;',  true, 'E - diaeresis'],
-	['&Igrave;',  '&#204;',  true, 'I - grave'],
-	['&Iacute;',  '&#205;',  true, 'I - acute'],
-	['&Icirc;',   '&#206;',  true, 'I - circumflex'],
-	['&Iuml;',    '&#207;',  true, 'I - diaeresis'],
-	['&ETH;',     '&#208;',  true, 'ETH'],
-	['&Ntilde;',  '&#209;',  true, 'N - tilde'],
-	['&Ograve;',  '&#210;',  true, 'O - grave'],
-	['&Oacute;',  '&#211;',  true, 'O - acute'],
-	['&Ocirc;',   '&#212;',  true, 'O - circumflex'],
-	['&Otilde;',  '&#213;',  true, 'O - tilde'],
-	['&Ouml;',    '&#214;',  true, 'O - diaeresis'],
-	['&Oslash;',  '&#216;',  true, 'O - slash'],
-	['&OElig;',   '&#338;',  true, 'ligature OE'],
-	['&Scaron;',  '&#352;',  true, 'S - caron'],
-	['&Ugrave;',  '&#217;',  true, 'U - grave'],
-	['&Uacute;',  '&#218;',  true, 'U - acute'],
-	['&Ucirc;',   '&#219;',  true, 'U - circumflex'],
-	['&Uuml;',    '&#220;',  true, 'U - diaeresis'],
-	['&Yacute;',  '&#221;',  true, 'Y - acute'],
-	['&Yuml;',    '&#376;',  true, 'Y - diaeresis'],
-	['&THORN;',   '&#222;',  true, 'THORN'],
-	['&agrave;',  '&#224;',  true, 'a - grave'],
-	['&aacute;',  '&#225;',  true, 'a - acute'],
-	['&acirc;',   '&#226;',  true, 'a - circumflex'],
-	['&atilde;',  '&#227;',  true, 'a - tilde'],
-	['&auml;',    '&#228;',  true, 'a - diaeresis'],
-	['&aring;',   '&#229;',  true, 'a - ring above'],
-	['&aelig;',   '&#230;',  true, 'ligature ae'],
-	['&ccedil;',  '&#231;',  true, 'c - cedilla'],
-	['&egrave;',  '&#232;',  true, 'e - grave'],
-	['&eacute;',  '&#233;',  true, 'e - acute'],
-	['&ecirc;',   '&#234;',  true, 'e - circumflex'],
-	['&euml;',    '&#235;',  true, 'e - diaeresis'],
-	['&igrave;',  '&#236;',  true, 'i - grave'],
-	['&iacute;',  '&#237;',  true, 'i - acute'],
-	['&icirc;',   '&#238;',  true, 'i - circumflex'],
-	['&iuml;',    '&#239;',  true, 'i - diaeresis'],
-	['&eth;',     '&#240;',  true, 'eth'],
-	['&ntilde;',  '&#241;',  true, 'n - tilde'],
-	['&ograve;',  '&#242;',  true, 'o - grave'],
-	['&oacute;',  '&#243;',  true, 'o - acute'],
-	['&ocirc;',   '&#244;',  true, 'o - circumflex'],
-	['&otilde;',  '&#245;',  true, 'o - tilde'],
-	['&ouml;',    '&#246;',  true, 'o - diaeresis'],
-	['&oslash;',  '&#248;',  true, 'o slash'],
-	['&oelig;',   '&#339;',  true, 'ligature oe'],
-	['&scaron;',  '&#353;',  true, 's - caron'],
-	['&ugrave;',  '&#249;',  true, 'u - grave'],
-	['&uacute;',  '&#250;',  true, 'u - acute'],
-	['&ucirc;',   '&#251;',  true, 'u - circumflex'],
-	['&uuml;',    '&#252;',  true, 'u - diaeresis'],
-	['&yacute;',  '&#253;',  true, 'y - acute'],
-	['&thorn;',   '&#254;',  true, 'thorn'],
-	['&yuml;',    '&#255;',  true, 'y - diaeresis'],
-    ['&Alpha;',   '&#913;',  true, 'Alpha'],
-	['&Beta;',    '&#914;',  true, 'Beta'],
-	['&Gamma;',   '&#915;',  true, 'Gamma'],
-	['&Delta;',   '&#916;',  true, 'Delta'],
-	['&Epsilon;', '&#917;',  true, 'Epsilon'],
-	['&Zeta;',    '&#918;',  true, 'Zeta'],
-	['&Eta;',     '&#919;',  true, 'Eta'],
-	['&Theta;',   '&#920;',  true, 'Theta'],
-	['&Iota;',    '&#921;',  true, 'Iota'],
-	['&Kappa;',   '&#922;',  true, 'Kappa'],
-	['&Lambda;',  '&#923;',  true, 'Lambda'],
-	['&Mu;',      '&#924;',  true, 'Mu'],
-	['&Nu;',      '&#925;',  true, 'Nu'],
-	['&Xi;',      '&#926;',  true, 'Xi'],
-	['&Omicron;', '&#927;',  true, 'Omicron'],
-	['&Pi;',      '&#928;',  true, 'Pi'],
-	['&Rho;',     '&#929;',  true, 'Rho'],
-	['&Sigma;',   '&#931;',  true, 'Sigma'],
-	['&Tau;',     '&#932;',  true, 'Tau'],
-	['&Upsilon;', '&#933;',  true, 'Upsilon'],
-	['&Phi;',     '&#934;',  true, 'Phi'],
-	['&Chi;',     '&#935;',  true, 'Chi'],
-	['&Psi;',     '&#936;',  true, 'Psi'],
-	['&Omega;',   '&#937;',  true, 'Omega'],
-	['&alpha;',   '&#945;',  true, 'alpha'],
-	['&beta;',    '&#946;',  true, 'beta'],
-	['&gamma;',   '&#947;',  true, 'gamma'],
-	['&delta;',   '&#948;',  true, 'delta'],
-	['&epsilon;', '&#949;',  true, 'epsilon'],
-	['&zeta;',    '&#950;',  true, 'zeta'],
-	['&eta;',     '&#951;',  true, 'eta'],
-	['&theta;',   '&#952;',  true, 'theta'],
-	['&iota;',    '&#953;',  true, 'iota'],
-	['&kappa;',   '&#954;',  true, 'kappa'],
-	['&lambda;',  '&#955;',  true, 'lambda'],
-	['&mu;',      '&#956;',  true, 'mu'],
-	['&nu;',      '&#957;',  true, 'nu'],
-	['&xi;',      '&#958;',  true, 'xi'],
-	['&omicron;', '&#959;',  true, 'omicron'],
-	['&pi;',      '&#960;',  true, 'pi'],
-	['&rho;',     '&#961;',  true, 'rho'],
-	['&sigmaf;',  '&#962;',  true, 'final sigma'],
-	['&sigma;',   '&#963;',  true, 'sigma'],
-	['&tau;',     '&#964;',  true, 'tau'],
-	['&upsilon;', '&#965;',  true, 'upsilon'],
-	['&phi;',     '&#966;',  true, 'phi'],
-	['&chi;',     '&#967;',  true, 'chi'],
-	['&psi;',     '&#968;',  true, 'psi'],
-	['&omega;',   '&#969;',  true, 'omega'],
-// symbols
-	['&alefsym;', '&#8501;', false,'alef symbol'],
-	['&piv;',     '&#982;',  false,'pi symbol'],
-	['&real;',    '&#8476;', false,'real part symbol'],
-	['&thetasym;','&#977;',  false,'theta symbol'],
-	['&upsih;',   '&#978;',  false,'upsilon - hook symbol'],
-	['&weierp;',  '&#8472;', false,'Weierstrass p'],
-	['&image;',   '&#8465;', false,'imaginary part'],
-// arrows
-	['&larr;',    '&#8592;', true, 'leftwards arrow'],
-	['&uarr;',    '&#8593;', true, 'upwards arrow'],
-	['&rarr;',    '&#8594;', true, 'rightwards arrow'],
-	['&darr;',    '&#8595;', true, 'downwards arrow'],
-	['&harr;',    '&#8596;', true, 'left right arrow'],
-	['&crarr;',   '&#8629;', false,'carriage return'],
-	['&lArr;',    '&#8656;', false,'leftwards double arrow'],
-	['&uArr;',    '&#8657;', false,'upwards double arrow'],
-	['&rArr;',    '&#8658;', false,'rightwards double arrow'],
-	['&dArr;',    '&#8659;', false,'downwards double arrow'],
-	['&hArr;',    '&#8660;', false,'left right double arrow'],
-	['&there4;',  '&#8756;', false,'therefore'],
-	['&sub;',     '&#8834;', false,'subset of'],
-	['&sup;',     '&#8835;', false,'superset of'],
-	['&nsub;',    '&#8836;', false,'not a subset of'],
-	['&sube;',    '&#8838;', false,'subset of or equal to'],
-	['&supe;',    '&#8839;', false,'superset of or equal to'],
-	['&oplus;',   '&#8853;', false,'circled plus'],
-	['&otimes;',  '&#8855;', false,'circled times'],
-	['&perp;',    '&#8869;', false,'perpendicular'],
-	['&sdot;',    '&#8901;', false,'dot operator'],
-	['&lceil;',   '&#8968;', false,'left ceiling'],
-	['&rceil;',   '&#8969;', false,'right ceiling'],
-	['&lfloor;',  '&#8970;', false,'left floor'],
-	['&rfloor;',  '&#8971;', false,'right floor'],
-	['&lang;',    '&#9001;', false,'left-pointing angle bracket'],
-	['&rang;',    '&#9002;', false,'right-pointing angle bracket'],
-	['&loz;',     '&#9674;', true,'lozenge'],
-	['&spades;',  '&#9824;', false,'black spade suit'],
-	['&clubs;',   '&#9827;', true, 'black club suit'],
-	['&hearts;',  '&#9829;', true, 'black heart suit'],
-	['&diams;',   '&#9830;', true, 'black diamond suit'],
-	['&ensp;',    '&#8194;', false,'en space'],
-	['&emsp;',    '&#8195;', false,'em space'],
-	['&thinsp;',  '&#8201;', false,'thin space'],
-	['&zwnj;',    '&#8204;', false,'zero width non-joiner'],
-	['&zwj;',     '&#8205;', false,'zero width joiner'],
-	['&lrm;',     '&#8206;', false,'left-to-right mark'],
-	['&rlm;',     '&#8207;', false,'right-to-left mark'],
-	['&shy;',     '&#173;',  false,'soft hyphen']
-];
-
-tinyMCEPopup.onInit.add(function() {
-	tinyMCEPopup.dom.setHTML('charmapView', renderCharMapHTML());
-});
-
-function renderCharMapHTML() {
-	var charsPerRow = 20, tdWidth=20, tdHeight=20, i;
-	var html = '<table border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) + '"><tr height="' + tdHeight + '">';
-	var cols=-1;
-
-	for (i=0; i<charmap.length; i++) {
-		if (charmap[i][2]==true) {
-			cols++;
-			html += ''
-				+ '<td class="charmap">'
-				+ '<a onmouseover="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" onfocus="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" href="javascript:void(0)" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + '">'
-				+ charmap[i][1]
-				+ '</a></td>';
-			if ((cols+1) % charsPerRow == 0)
-				html += '</tr><tr height="' + tdHeight + '">';
-		}
-	 }
-
-	if (cols % charsPerRow > 0) {
-		var padd = charsPerRow - (cols % charsPerRow);
-		for (var i=0; i<padd-1; i++)
-			html += '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap">&nbsp;</td>';
-	}
-
-	html += '</tr></table>';
-
-	return html;
-}
-
-function insertChar(chr) {
-	tinyMCEPopup.execCommand('mceInsertContent', false, '&#' + chr + ';');
-
-	// Refocus in window
-	if (tinyMCEPopup.isWindow)
-		window.focus();
-
-	tinyMCEPopup.editor.focus();
-	tinyMCEPopup.close();
-}
-
-function previewChar(codeA, codeB, codeN) {
-	var elmA = document.getElementById('codeA');
-	var elmB = document.getElementById('codeB');
-	var elmV = document.getElementById('codeV');
-	var elmN = document.getElementById('codeN');
-
-	if (codeA=='#160;') {
-		elmV.innerHTML = '__';
-	} else {
-		elmV.innerHTML = '&' + codeA;
-	}
-
-	elmB.innerHTML = '&amp;' + codeA;
-	elmA.innerHTML = '&amp;' + codeB;
-	elmN.innerHTML = codeN;
-}
+tinyMCEPopup.requireLangPack();
+
+var charmap = [
+	['&nbsp;',    '&#160;',  true, 'no-break space'],
+	['&amp;',     '&#38;',   true, 'ampersand'],
+	['&quot;',    '&#34;',   true, 'quotation mark'],
+// finance
+	['&cent;',    '&#162;',  true, 'cent sign'],
+	['&euro;',    '&#8364;', true, 'euro sign'],
+	['&pound;',   '&#163;',  true, 'pound sign'],
+	['&yen;',     '&#165;',  true, 'yen sign'],
+// signs
+	['&copy;',    '&#169;',  true, 'copyright sign'],
+	['&reg;',     '&#174;',  true, 'registered sign'],
+	['&trade;',   '&#8482;', true, 'trade mark sign'],
+	['&permil;',  '&#8240;', true, 'per mille sign'],
+	['&micro;',   '&#181;',  true, 'micro sign'],
+	['&middot;',  '&#183;',  true, 'middle dot'],
+	['&bull;',    '&#8226;', true, 'bullet'],
+	['&hellip;',  '&#8230;', true, 'three dot leader'],
+	['&prime;',   '&#8242;', true, 'minutes / feet'],
+	['&Prime;',   '&#8243;', true, 'seconds / inches'],
+	['&sect;',    '&#167;',  true, 'section sign'],
+	['&para;',    '&#182;',  true, 'paragraph sign'],
+	['&szlig;',   '&#223;',  true, 'sharp s / ess-zed'],
+// quotations
+	['&lsaquo;',  '&#8249;', true, 'single left-pointing angle quotation mark'],
+	['&rsaquo;',  '&#8250;', true, 'single right-pointing angle quotation mark'],
+	['&laquo;',   '&#171;',  true, 'left pointing guillemet'],
+	['&raquo;',   '&#187;',  true, 'right pointing guillemet'],
+	['&lsquo;',   '&#8216;', true, 'left single quotation mark'],
+	['&rsquo;',   '&#8217;', true, 'right single quotation mark'],
+	['&ldquo;',   '&#8220;', true, 'left double quotation mark'],
+	['&rdquo;',   '&#8221;', true, 'right double quotation mark'],
+	['&sbquo;',   '&#8218;', true, 'single low-9 quotation mark'],
+	['&bdquo;',   '&#8222;', true, 'double low-9 quotation mark'],
+	['&lt;',      '&#60;',   true, 'less-than sign'],
+	['&gt;',      '&#62;',   true, 'greater-than sign'],
+	['&le;',      '&#8804;', true, 'less-than or equal to'],
+	['&ge;',      '&#8805;', true, 'greater-than or equal to'],
+	['&ndash;',   '&#8211;', true, 'en dash'],
+	['&mdash;',   '&#8212;', true, 'em dash'],
+	['&macr;',    '&#175;',  true, 'macron'],
+	['&oline;',   '&#8254;', true, 'overline'],
+	['&curren;',  '&#164;',  true, 'currency sign'],
+	['&brvbar;',  '&#166;',  true, 'broken bar'],
+	['&uml;',     '&#168;',  true, 'diaeresis'],
+	['&iexcl;',   '&#161;',  true, 'inverted exclamation mark'],
+	['&iquest;',  '&#191;',  true, 'turned question mark'],
+	['&circ;',    '&#710;',  true, 'circumflex accent'],
+	['&tilde;',   '&#732;',  true, 'small tilde'],
+	['&deg;',     '&#176;',  true, 'degree sign'],
+	['&minus;',   '&#8722;', true, 'minus sign'],
+	['&plusmn;',  '&#177;',  true, 'plus-minus sign'],
+	['&divide;',  '&#247;',  true, 'division sign'],
+	['&frasl;',   '&#8260;', true, 'fraction slash'],
+	['&times;',   '&#215;',  true, 'multiplication sign'],
+	['&sup1;',    '&#185;',  true, 'superscript one'],
+	['&sup2;',    '&#178;',  true, 'superscript two'],
+	['&sup3;',    '&#179;',  true, 'superscript three'],
+	['&frac14;',  '&#188;',  true, 'fraction one quarter'],
+	['&frac12;',  '&#189;',  true, 'fraction one half'],
+	['&frac34;',  '&#190;',  true, 'fraction three quarters'],
+// math / logical
+	['&fnof;',    '&#402;',  true, 'function / florin'],
+	['&int;',     '&#8747;', true, 'integral'],
+	['&sum;',     '&#8721;', true, 'n-ary sumation'],
+	['&infin;',   '&#8734;', true, 'infinity'],
+	['&radic;',   '&#8730;', true, 'square root'],
+	['&sim;',     '&#8764;', false,'similar to'],
+	['&cong;',    '&#8773;', false,'approximately equal to'],
+	['&asymp;',   '&#8776;', true, 'almost equal to'],
+	['&ne;',      '&#8800;', true, 'not equal to'],
+	['&equiv;',   '&#8801;', true, 'identical to'],
+	['&isin;',    '&#8712;', false,'element of'],
+	['&notin;',   '&#8713;', false,'not an element of'],
+	['&ni;',      '&#8715;', false,'contains as member'],
+	['&prod;',    '&#8719;', true, 'n-ary product'],
+	['&and;',     '&#8743;', false,'logical and'],
+	['&or;',      '&#8744;', false,'logical or'],
+	['&not;',     '&#172;',  true, 'not sign'],
+	['&cap;',     '&#8745;', true, 'intersection'],
+	['&cup;',     '&#8746;', false,'union'],
+	['&part;',    '&#8706;', true, 'partial differential'],
+	['&forall;',  '&#8704;', false,'for all'],
+	['&exist;',   '&#8707;', false,'there exists'],
+	['&empty;',   '&#8709;', false,'diameter'],
+	['&nabla;',   '&#8711;', false,'backward difference'],
+	['&lowast;',  '&#8727;', false,'asterisk operator'],
+	['&prop;',    '&#8733;', false,'proportional to'],
+	['&ang;',     '&#8736;', false,'angle'],
+// undefined
+	['&acute;',   '&#180;',  true, 'acute accent'],
+	['&cedil;',   '&#184;',  true, 'cedilla'],
+	['&ordf;',    '&#170;',  true, 'feminine ordinal indicator'],
+	['&ordm;',    '&#186;',  true, 'masculine ordinal indicator'],
+	['&dagger;',  '&#8224;', true, 'dagger'],
+	['&Dagger;',  '&#8225;', true, 'double dagger'],
+// alphabetical special chars
+	['&Agrave;',  '&#192;',  true, 'A - grave'],
+	['&Aacute;',  '&#193;',  true, 'A - acute'],
+	['&Acirc;',   '&#194;',  true, 'A - circumflex'],
+	['&Atilde;',  '&#195;',  true, 'A - tilde'],
+	['&Auml;',    '&#196;',  true, 'A - diaeresis'],
+	['&Aring;',   '&#197;',  true, 'A - ring above'],
+	['&AElig;',   '&#198;',  true, 'ligature AE'],
+	['&Ccedil;',  '&#199;',  true, 'C - cedilla'],
+	['&Egrave;',  '&#200;',  true, 'E - grave'],
+	['&Eacute;',  '&#201;',  true, 'E - acute'],
+	['&Ecirc;',   '&#202;',  true, 'E - circumflex'],
+	['&Euml;',    '&#203;',  true, 'E - diaeresis'],
+	['&Igrave;',  '&#204;',  true, 'I - grave'],
+	['&Iacute;',  '&#205;',  true, 'I - acute'],
+	['&Icirc;',   '&#206;',  true, 'I - circumflex'],
+	['&Iuml;',    '&#207;',  true, 'I - diaeresis'],
+	['&ETH;',     '&#208;',  true, 'ETH'],
+	['&Ntilde;',  '&#209;',  true, 'N - tilde'],
+	['&Ograve;',  '&#210;',  true, 'O - grave'],
+	['&Oacute;',  '&#211;',  true, 'O - acute'],
+	['&Ocirc;',   '&#212;',  true, 'O - circumflex'],
+	['&Otilde;',  '&#213;',  true, 'O - tilde'],
+	['&Ouml;',    '&#214;',  true, 'O - diaeresis'],
+	['&Oslash;',  '&#216;',  true, 'O - slash'],
+	['&OElig;',   '&#338;',  true, 'ligature OE'],
+	['&Scaron;',  '&#352;',  true, 'S - caron'],
+	['&Ugrave;',  '&#217;',  true, 'U - grave'],
+	['&Uacute;',  '&#218;',  true, 'U - acute'],
+	['&Ucirc;',   '&#219;',  true, 'U - circumflex'],
+	['&Uuml;',    '&#220;',  true, 'U - diaeresis'],
+	['&Yacute;',  '&#221;',  true, 'Y - acute'],
+	['&Yuml;',    '&#376;',  true, 'Y - diaeresis'],
+	['&THORN;',   '&#222;',  true, 'THORN'],
+	['&agrave;',  '&#224;',  true, 'a - grave'],
+	['&aacute;',  '&#225;',  true, 'a - acute'],
+	['&acirc;',   '&#226;',  true, 'a - circumflex'],
+	['&atilde;',  '&#227;',  true, 'a - tilde'],
+	['&auml;',    '&#228;',  true, 'a - diaeresis'],
+	['&aring;',   '&#229;',  true, 'a - ring above'],
+	['&aelig;',   '&#230;',  true, 'ligature ae'],
+	['&ccedil;',  '&#231;',  true, 'c - cedilla'],
+	['&egrave;',  '&#232;',  true, 'e - grave'],
+	['&eacute;',  '&#233;',  true, 'e - acute'],
+	['&ecirc;',   '&#234;',  true, 'e - circumflex'],
+	['&euml;',    '&#235;',  true, 'e - diaeresis'],
+	['&igrave;',  '&#236;',  true, 'i - grave'],
+	['&iacute;',  '&#237;',  true, 'i - acute'],
+	['&icirc;',   '&#238;',  true, 'i - circumflex'],
+	['&iuml;',    '&#239;',  true, 'i - diaeresis'],
+	['&eth;',     '&#240;',  true, 'eth'],
+	['&ntilde;',  '&#241;',  true, 'n - tilde'],
+	['&ograve;',  '&#242;',  true, 'o - grave'],
+	['&oacute;',  '&#243;',  true, 'o - acute'],
+	['&ocirc;',   '&#244;',  true, 'o - circumflex'],
+	['&otilde;',  '&#245;',  true, 'o - tilde'],
+	['&ouml;',    '&#246;',  true, 'o - diaeresis'],
+	['&oslash;',  '&#248;',  true, 'o slash'],
+	['&oelig;',   '&#339;',  true, 'ligature oe'],
+	['&scaron;',  '&#353;',  true, 's - caron'],
+	['&ugrave;',  '&#249;',  true, 'u - grave'],
+	['&uacute;',  '&#250;',  true, 'u - acute'],
+	['&ucirc;',   '&#251;',  true, 'u - circumflex'],
+	['&uuml;',    '&#252;',  true, 'u - diaeresis'],
+	['&yacute;',  '&#253;',  true, 'y - acute'],
+	['&thorn;',   '&#254;',  true, 'thorn'],
+	['&yuml;',    '&#255;',  true, 'y - diaeresis'],
+    ['&Alpha;',   '&#913;',  true, 'Alpha'],
+	['&Beta;',    '&#914;',  true, 'Beta'],
+	['&Gamma;',   '&#915;',  true, 'Gamma'],
+	['&Delta;',   '&#916;',  true, 'Delta'],
+	['&Epsilon;', '&#917;',  true, 'Epsilon'],
+	['&Zeta;',    '&#918;',  true, 'Zeta'],
+	['&Eta;',     '&#919;',  true, 'Eta'],
+	['&Theta;',   '&#920;',  true, 'Theta'],
+	['&Iota;',    '&#921;',  true, 'Iota'],
+	['&Kappa;',   '&#922;',  true, 'Kappa'],
+	['&Lambda;',  '&#923;',  true, 'Lambda'],
+	['&Mu;',      '&#924;',  true, 'Mu'],
+	['&Nu;',      '&#925;',  true, 'Nu'],
+	['&Xi;',      '&#926;',  true, 'Xi'],
+	['&Omicron;', '&#927;',  true, 'Omicron'],
+	['&Pi;',      '&#928;',  true, 'Pi'],
+	['&Rho;',     '&#929;',  true, 'Rho'],
+	['&Sigma;',   '&#931;',  true, 'Sigma'],
+	['&Tau;',     '&#932;',  true, 'Tau'],
+	['&Upsilon;', '&#933;',  true, 'Upsilon'],
+	['&Phi;',     '&#934;',  true, 'Phi'],
+	['&Chi;',     '&#935;',  true, 'Chi'],
+	['&Psi;',     '&#936;',  true, 'Psi'],
+	['&Omega;',   '&#937;',  true, 'Omega'],
+	['&alpha;',   '&#945;',  true, 'alpha'],
+	['&beta;',    '&#946;',  true, 'beta'],
+	['&gamma;',   '&#947;',  true, 'gamma'],
+	['&delta;',   '&#948;',  true, 'delta'],
+	['&epsilon;', '&#949;',  true, 'epsilon'],
+	['&zeta;',    '&#950;',  true, 'zeta'],
+	['&eta;',     '&#951;',  true, 'eta'],
+	['&theta;',   '&#952;',  true, 'theta'],
+	['&iota;',    '&#953;',  true, 'iota'],
+	['&kappa;',   '&#954;',  true, 'kappa'],
+	['&lambda;',  '&#955;',  true, 'lambda'],
+	['&mu;',      '&#956;',  true, 'mu'],
+	['&nu;',      '&#957;',  true, 'nu'],
+	['&xi;',      '&#958;',  true, 'xi'],
+	['&omicron;', '&#959;',  true, 'omicron'],
+	['&pi;',      '&#960;',  true, 'pi'],
+	['&rho;',     '&#961;',  true, 'rho'],
+	['&sigmaf;',  '&#962;',  true, 'final sigma'],
+	['&sigma;',   '&#963;',  true, 'sigma'],
+	['&tau;',     '&#964;',  true, 'tau'],
+	['&upsilon;', '&#965;',  true, 'upsilon'],
+	['&phi;',     '&#966;',  true, 'phi'],
+	['&chi;',     '&#967;',  true, 'chi'],
+	['&psi;',     '&#968;',  true, 'psi'],
+	['&omega;',   '&#969;',  true, 'omega'],
+// symbols
+	['&alefsym;', '&#8501;', false,'alef symbol'],
+	['&piv;',     '&#982;',  false,'pi symbol'],
+	['&real;',    '&#8476;', false,'real part symbol'],
+	['&thetasym;','&#977;',  false,'theta symbol'],
+	['&upsih;',   '&#978;',  false,'upsilon - hook symbol'],
+	['&weierp;',  '&#8472;', false,'Weierstrass p'],
+	['&image;',   '&#8465;', false,'imaginary part'],
+// arrows
+	['&larr;',    '&#8592;', true, 'leftwards arrow'],
+	['&uarr;',    '&#8593;', true, 'upwards arrow'],
+	['&rarr;',    '&#8594;', true, 'rightwards arrow'],
+	['&darr;',    '&#8595;', true, 'downwards arrow'],
+	['&harr;',    '&#8596;', true, 'left right arrow'],
+	['&crarr;',   '&#8629;', false,'carriage return'],
+	['&lArr;',    '&#8656;', false,'leftwards double arrow'],
+	['&uArr;',    '&#8657;', false,'upwards double arrow'],
+	['&rArr;',    '&#8658;', false,'rightwards double arrow'],
+	['&dArr;',    '&#8659;', false,'downwards double arrow'],
+	['&hArr;',    '&#8660;', false,'left right double arrow'],
+	['&there4;',  '&#8756;', false,'therefore'],
+	['&sub;',     '&#8834;', false,'subset of'],
+	['&sup;',     '&#8835;', false,'superset of'],
+	['&nsub;',    '&#8836;', false,'not a subset of'],
+	['&sube;',    '&#8838;', false,'subset of or equal to'],
+	['&supe;',    '&#8839;', false,'superset of or equal to'],
+	['&oplus;',   '&#8853;', false,'circled plus'],
+	['&otimes;',  '&#8855;', false,'circled times'],
+	['&perp;',    '&#8869;', false,'perpendicular'],
+	['&sdot;',    '&#8901;', false,'dot operator'],
+	['&lceil;',   '&#8968;', false,'left ceiling'],
+	['&rceil;',   '&#8969;', false,'right ceiling'],
+	['&lfloor;',  '&#8970;', false,'left floor'],
+	['&rfloor;',  '&#8971;', false,'right floor'],
+	['&lang;',    '&#9001;', false,'left-pointing angle bracket'],
+	['&rang;',    '&#9002;', false,'right-pointing angle bracket'],
+	['&loz;',     '&#9674;', true,'lozenge'],
+	['&spades;',  '&#9824;', false,'black spade suit'],
+	['&clubs;',   '&#9827;', true, 'black club suit'],
+	['&hearts;',  '&#9829;', true, 'black heart suit'],
+	['&diams;',   '&#9830;', true, 'black diamond suit'],
+	['&ensp;',    '&#8194;', false,'en space'],
+	['&emsp;',    '&#8195;', false,'em space'],
+	['&thinsp;',  '&#8201;', false,'thin space'],
+	['&zwnj;',    '&#8204;', false,'zero width non-joiner'],
+	['&zwj;',     '&#8205;', false,'zero width joiner'],
+	['&lrm;',     '&#8206;', false,'left-to-right mark'],
+	['&rlm;',     '&#8207;', false,'right-to-left mark'],
+	['&shy;',     '&#173;',  false,'soft hyphen']
+];
+
+tinyMCEPopup.onInit.add(function() {
+	tinyMCEPopup.dom.setHTML('charmapView', renderCharMapHTML());
+});
+
+function renderCharMapHTML() {
+	var charsPerRow = 20, tdWidth=20, tdHeight=20, i;
+	var html = '<table border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) + '"><tr height="' + tdHeight + '">';
+	var cols=-1;
+
+	for (i=0; i<charmap.length; i++) {
+		if (charmap[i][2]==true) {
+			cols++;
+			html += ''
+				+ '<td class="charmap">'
+				+ '<a onmouseover="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" onfocus="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" href="javascript:void(0)" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + '">'
+				+ charmap[i][1]
+				+ '</a></td>';
+			if ((cols+1) % charsPerRow == 0)
+				html += '</tr><tr height="' + tdHeight + '">';
+		}
+	 }
+
+	if (cols % charsPerRow > 0) {
+		var padd = charsPerRow - (cols % charsPerRow);
+		for (var i=0; i<padd-1; i++)
+			html += '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap">&nbsp;</td>';
+	}
+
+	html += '</tr></table>';
+
+	return html;
+}
+
+function insertChar(chr) {
+	tinyMCEPopup.execCommand('mceInsertContent', false, '&#' + chr + ';');
+
+	// Refocus in window
+	if (tinyMCEPopup.isWindow)
+		window.focus();
+
+	tinyMCEPopup.editor.focus();
+	tinyMCEPopup.close();
+}
+
+function previewChar(codeA, codeB, codeN) {
+	var elmA = document.getElementById('codeA');
+	var elmB = document.getElementById('codeB');
+	var elmV = document.getElementById('codeV');
+	var elmN = document.getElementById('codeN');
+
+	if (codeA=='#160;') {
+		elmV.innerHTML = '__';
+	} else {
+		elmV.innerHTML = '&' + codeA;
+	}
+
+	elmB.innerHTML = '&amp;' + codeA;
+	elmA.innerHTML = '&amp;' + codeB;
+	elmN.innerHTML = codeN;
+}
diff --git a/webapp/web/js/tiny_mce/themes/advanced/js/color_picker.js b/webapp/web/js/tiny_mce/themes/advanced/js/color_picker.js
index fd9700f22..c1a65db2c 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/js/color_picker.js
+++ b/webapp/web/js/tiny_mce/themes/advanced/js/color_picker.js
@@ -1,253 +1,253 @@
-tinyMCEPopup.requireLangPack();
-
-var detail = 50, strhex = "0123456789abcdef", i, isMouseDown = false, isMouseOver = false;
-
-var colors = [
-	"#000000","#000033","#000066","#000099","#0000cc","#0000ff","#330000","#330033",
-	"#330066","#330099","#3300cc","#3300ff","#660000","#660033","#660066","#660099",
-	"#6600cc","#6600ff","#990000","#990033","#990066","#990099","#9900cc","#9900ff",
-	"#cc0000","#cc0033","#cc0066","#cc0099","#cc00cc","#cc00ff","#ff0000","#ff0033",
-	"#ff0066","#ff0099","#ff00cc","#ff00ff","#003300","#003333","#003366","#003399",
-	"#0033cc","#0033ff","#333300","#333333","#333366","#333399","#3333cc","#3333ff",
-	"#663300","#663333","#663366","#663399","#6633cc","#6633ff","#993300","#993333",
-	"#993366","#993399","#9933cc","#9933ff","#cc3300","#cc3333","#cc3366","#cc3399",
-	"#cc33cc","#cc33ff","#ff3300","#ff3333","#ff3366","#ff3399","#ff33cc","#ff33ff",
-	"#006600","#006633","#006666","#006699","#0066cc","#0066ff","#336600","#336633",
-	"#336666","#336699","#3366cc","#3366ff","#666600","#666633","#666666","#666699",
-	"#6666cc","#6666ff","#996600","#996633","#996666","#996699","#9966cc","#9966ff",
-	"#cc6600","#cc6633","#cc6666","#cc6699","#cc66cc","#cc66ff","#ff6600","#ff6633",
-	"#ff6666","#ff6699","#ff66cc","#ff66ff","#009900","#009933","#009966","#009999",
-	"#0099cc","#0099ff","#339900","#339933","#339966","#339999","#3399cc","#3399ff",
-	"#669900","#669933","#669966","#669999","#6699cc","#6699ff","#999900","#999933",
-	"#999966","#999999","#9999cc","#9999ff","#cc9900","#cc9933","#cc9966","#cc9999",
-	"#cc99cc","#cc99ff","#ff9900","#ff9933","#ff9966","#ff9999","#ff99cc","#ff99ff",
-	"#00cc00","#00cc33","#00cc66","#00cc99","#00cccc","#00ccff","#33cc00","#33cc33",
-	"#33cc66","#33cc99","#33cccc","#33ccff","#66cc00","#66cc33","#66cc66","#66cc99",
-	"#66cccc","#66ccff","#99cc00","#99cc33","#99cc66","#99cc99","#99cccc","#99ccff",
-	"#cccc00","#cccc33","#cccc66","#cccc99","#cccccc","#ccccff","#ffcc00","#ffcc33",
-	"#ffcc66","#ffcc99","#ffcccc","#ffccff","#00ff00","#00ff33","#00ff66","#00ff99",
-	"#00ffcc","#00ffff","#33ff00","#33ff33","#33ff66","#33ff99","#33ffcc","#33ffff",
-	"#66ff00","#66ff33","#66ff66","#66ff99","#66ffcc","#66ffff","#99ff00","#99ff33",
-	"#99ff66","#99ff99","#99ffcc","#99ffff","#ccff00","#ccff33","#ccff66","#ccff99",
-	"#ccffcc","#ccffff","#ffff00","#ffff33","#ffff66","#ffff99","#ffffcc","#ffffff"
-];
-
-var named = {
-	'#F0F8FF':'AliceBlue','#FAEBD7':'AntiqueWhite','#00FFFF':'Aqua','#7FFFD4':'Aquamarine','#F0FFFF':'Azure','#F5F5DC':'Beige',
-	'#FFE4C4':'Bisque','#000000':'Black','#FFEBCD':'BlanchedAlmond','#0000FF':'Blue','#8A2BE2':'BlueViolet','#A52A2A':'Brown',
-	'#DEB887':'BurlyWood','#5F9EA0':'CadetBlue','#7FFF00':'Chartreuse','#D2691E':'Chocolate','#FF7F50':'Coral','#6495ED':'CornflowerBlue',
-	'#FFF8DC':'Cornsilk','#DC143C':'Crimson','#00FFFF':'Cyan','#00008B':'DarkBlue','#008B8B':'DarkCyan','#B8860B':'DarkGoldenRod',
-	'#A9A9A9':'DarkGray','#A9A9A9':'DarkGrey','#006400':'DarkGreen','#BDB76B':'DarkKhaki','#8B008B':'DarkMagenta','#556B2F':'DarkOliveGreen',
-	'#FF8C00':'Darkorange','#9932CC':'DarkOrchid','#8B0000':'DarkRed','#E9967A':'DarkSalmon','#8FBC8F':'DarkSeaGreen','#483D8B':'DarkSlateBlue',
-	'#2F4F4F':'DarkSlateGray','#2F4F4F':'DarkSlateGrey','#00CED1':'DarkTurquoise','#9400D3':'DarkViolet','#FF1493':'DeepPink','#00BFFF':'DeepSkyBlue',
-	'#696969':'DimGray','#696969':'DimGrey','#1E90FF':'DodgerBlue','#B22222':'FireBrick','#FFFAF0':'FloralWhite','#228B22':'ForestGreen',
-	'#FF00FF':'Fuchsia','#DCDCDC':'Gainsboro','#F8F8FF':'GhostWhite','#FFD700':'Gold','#DAA520':'GoldenRod','#808080':'Gray','#808080':'Grey',
-	'#008000':'Green','#ADFF2F':'GreenYellow','#F0FFF0':'HoneyDew','#FF69B4':'HotPink','#CD5C5C':'IndianRed','#4B0082':'Indigo','#FFFFF0':'Ivory',
-	'#F0E68C':'Khaki','#E6E6FA':'Lavender','#FFF0F5':'LavenderBlush','#7CFC00':'LawnGreen','#FFFACD':'LemonChiffon','#ADD8E6':'LightBlue',
-	'#F08080':'LightCoral','#E0FFFF':'LightCyan','#FAFAD2':'LightGoldenRodYellow','#D3D3D3':'LightGray','#D3D3D3':'LightGrey','#90EE90':'LightGreen',
-	'#FFB6C1':'LightPink','#FFA07A':'LightSalmon','#20B2AA':'LightSeaGreen','#87CEFA':'LightSkyBlue','#778899':'LightSlateGray','#778899':'LightSlateGrey',
-	'#B0C4DE':'LightSteelBlue','#FFFFE0':'LightYellow','#00FF00':'Lime','#32CD32':'LimeGreen','#FAF0E6':'Linen','#FF00FF':'Magenta','#800000':'Maroon',
-	'#66CDAA':'MediumAquaMarine','#0000CD':'MediumBlue','#BA55D3':'MediumOrchid','#9370D8':'MediumPurple','#3CB371':'MediumSeaGreen','#7B68EE':'MediumSlateBlue',
-	'#00FA9A':'MediumSpringGreen','#48D1CC':'MediumTurquoise','#C71585':'MediumVioletRed','#191970':'MidnightBlue','#F5FFFA':'MintCream','#FFE4E1':'MistyRose','#FFE4B5':'Moccasin',
-	'#FFDEAD':'NavajoWhite','#000080':'Navy','#FDF5E6':'OldLace','#808000':'Olive','#6B8E23':'OliveDrab','#FFA500':'Orange','#FF4500':'OrangeRed','#DA70D6':'Orchid',
-	'#EEE8AA':'PaleGoldenRod','#98FB98':'PaleGreen','#AFEEEE':'PaleTurquoise','#D87093':'PaleVioletRed','#FFEFD5':'PapayaWhip','#FFDAB9':'PeachPuff',
-	'#CD853F':'Peru','#FFC0CB':'Pink','#DDA0DD':'Plum','#B0E0E6':'PowderBlue','#800080':'Purple','#FF0000':'Red','#BC8F8F':'RosyBrown','#4169E1':'RoyalBlue',
-	'#8B4513':'SaddleBrown','#FA8072':'Salmon','#F4A460':'SandyBrown','#2E8B57':'SeaGreen','#FFF5EE':'SeaShell','#A0522D':'Sienna','#C0C0C0':'Silver',
-	'#87CEEB':'SkyBlue','#6A5ACD':'SlateBlue','#708090':'SlateGray','#708090':'SlateGrey','#FFFAFA':'Snow','#00FF7F':'SpringGreen',
-	'#4682B4':'SteelBlue','#D2B48C':'Tan','#008080':'Teal','#D8BFD8':'Thistle','#FF6347':'Tomato','#40E0D0':'Turquoise','#EE82EE':'Violet',
-	'#F5DEB3':'Wheat','#FFFFFF':'White','#F5F5F5':'WhiteSmoke','#FFFF00':'Yellow','#9ACD32':'YellowGreen'
-};
-
-function init() {
-	var inputColor = convertRGBToHex(tinyMCEPopup.getWindowArg('input_color'));
-
-	tinyMCEPopup.resizeToInnerSize();
-
-	generatePicker();
-
-	if (inputColor) {
-		changeFinalColor(inputColor);
-
-		col = convertHexToRGB(inputColor);
-
-		if (col)
-			updateLight(col.r, col.g, col.b);
-	}
-}
-
-function insertAction() {
-	var color = document.getElementById("color").value, f = tinyMCEPopup.getWindowArg('func');
-
-	tinyMCEPopup.restoreSelection();
-
-	if (f)
-		f(color);
-
-	tinyMCEPopup.close();
-}
-
-function showColor(color, name) {
-	if (name)
-		document.getElementById("colorname").innerHTML = name;
-
-	document.getElementById("preview").style.backgroundColor = color;
-	document.getElementById("color").value = color.toLowerCase();
-}
-
-function convertRGBToHex(col) {
-	var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");
-
-	if (!col)
-		return col;
-
-	var rgb = col.replace(re, "$1,$2,$3").split(',');
-	if (rgb.length == 3) {
-		r = parseInt(rgb[0]).toString(16);
-		g = parseInt(rgb[1]).toString(16);
-		b = parseInt(rgb[2]).toString(16);
-
-		r = r.length == 1 ? '0' + r : r;
-		g = g.length == 1 ? '0' + g : g;
-		b = b.length == 1 ? '0' + b : b;
-
-		return "#" + r + g + b;
-	}
-
-	return col;
-}
-
-function convertHexToRGB(col) {
-	if (col.indexOf('#') != -1) {
-		col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');
-
-		r = parseInt(col.substring(0, 2), 16);
-		g = parseInt(col.substring(2, 4), 16);
-		b = parseInt(col.substring(4, 6), 16);
-
-		return {r : r, g : g, b : b};
-	}
-
-	return null;
-}
-
-function generatePicker() {
-	var el = document.getElementById('light'), h = '', i;
-
-	for (i = 0; i < detail; i++){
-		h += '<div id="gs'+i+'" style="background-color:#000000; width:15px; height:3px; border-style:none; border-width:0px;"'
-		+ ' onclick="changeFinalColor(this.style.backgroundColor)"'
-		+ ' onmousedown="isMouseDown = true; return false;"'
-		+ ' onmouseup="isMouseDown = false;"'
-		+ ' onmousemove="if (isMouseDown && isMouseOver) changeFinalColor(this.style.backgroundColor); return false;"'
-		+ ' onmouseover="isMouseOver = true;"'
-		+ ' onmouseout="isMouseOver = false;"'
-		+ '></div>';
-	}
-
-	el.innerHTML = h;
-}
-
-function generateWebColors() {
-	var el = document.getElementById('webcolors'), h = '', i;
-
-	if (el.className == 'generated')
-		return;
-
-	h += '<table border="0" cellspacing="1" cellpadding="0">'
-		+ '<tr>';
-
-	for (i=0; i<colors.length; i++) {
-		h += '<td bgcolor="' + colors[i] + '" width="10" height="10">'
-			+ '<a href="javascript:insertAction();" onfocus="showColor(\'' + colors[i] +  '\');" onmouseover="showColor(\'' + colors[i] +  '\');" style="display:block;width:10px;height:10px;overflow:hidden;">'
-			+ '</a></td>';
-		if ((i+1) % 18 == 0)
-			h += '</tr><tr>';
-	}
-
-	h += '</table>';
-
-	el.innerHTML = h;
-	el.className = 'generated';
-}
-
-function generateNamedColors() {
-	var el = document.getElementById('namedcolors'), h = '', n, v, i = 0;
-
-	if (el.className == 'generated')
-		return;
-
-	for (n in named) {
-		v = named[n];
-		h += '<a href="javascript:insertAction();" onmouseover="showColor(\'' + n +  '\',\'' + v + '\');" style="background-color: ' + n + '"><!-- IE --></a>'
-	}
-
-	el.innerHTML = h;
-	el.className = 'generated';
-}
-
-function dechex(n) {
-	return strhex.charAt(Math.floor(n / 16)) + strhex.charAt(n % 16);
-}
-
-function computeColor(e) {
-	var x, y, partWidth, partDetail, imHeight, r, g, b, coef, i, finalCoef, finalR, finalG, finalB;
-
-	x = e.offsetX ? e.offsetX : (e.target ? e.clientX - e.target.x : 0);
-	y = e.offsetY ? e.offsetY : (e.target ? e.clientY - e.target.y : 0);
-
-	partWidth = document.getElementById('colors').width / 6;
-	partDetail = detail / 2;
-	imHeight = document.getElementById('colors').height;
-
-	r = (x >= 0)*(x < partWidth)*255 + (x >= partWidth)*(x < 2*partWidth)*(2*255 - x * 255 / partWidth) + (x >= 4*partWidth)*(x < 5*partWidth)*(-4*255 + x * 255 / partWidth) + (x >= 5*partWidth)*(x < 6*partWidth)*255;
-	g = (x >= 0)*(x < partWidth)*(x * 255 / partWidth) + (x >= partWidth)*(x < 3*partWidth)*255	+ (x >= 3*partWidth)*(x < 4*partWidth)*(4*255 - x * 255 / partWidth);
-	b = (x >= 2*partWidth)*(x < 3*partWidth)*(-2*255 + x * 255 / partWidth) + (x >= 3*partWidth)*(x < 5*partWidth)*255 + (x >= 5*partWidth)*(x < 6*partWidth)*(6*255 - x * 255 / partWidth);
-
-	coef = (imHeight - y) / imHeight;
-	r = 128 + (r - 128) * coef;
-	g = 128 + (g - 128) * coef;
-	b = 128 + (b - 128) * coef;
-
-	changeFinalColor('#' + dechex(r) + dechex(g) + dechex(b));
-	updateLight(r, g, b);
-}
-
-function updateLight(r, g, b) {
-	var i, partDetail = detail / 2, finalCoef, finalR, finalG, finalB, color;
-
-	for (i=0; i<detail; i++) {
-		if ((i>=0) && (i<partDetail)) {
-			finalCoef = i / partDetail;
-			finalR = dechex(255 - (255 - r) * finalCoef);
-			finalG = dechex(255 - (255 - g) * finalCoef);
-			finalB = dechex(255 - (255 - b) * finalCoef);
-		} else {
-			finalCoef = 2 - i / partDetail;
-			finalR = dechex(r * finalCoef);
-			finalG = dechex(g * finalCoef);
-			finalB = dechex(b * finalCoef);
-		}
-
-		color = finalR + finalG + finalB;
-
-		setCol('gs' + i, '#'+color);
-	}
-}
-
-function changeFinalColor(color) {
-	if (color.indexOf('#') == -1)
-		color = convertRGBToHex(color);
-
-	setCol('preview', color);
-	document.getElementById('color').value = color;
-}
-
-function setCol(e, c) {
-	try {
-		document.getElementById(e).style.backgroundColor = c;
-	} catch (ex) {
-		// Ignore IE warning
-	}
-}
-
-tinyMCEPopup.onInit.add(init);
+tinyMCEPopup.requireLangPack();
+
+var detail = 50, strhex = "0123456789abcdef", i, isMouseDown = false, isMouseOver = false;
+
+var colors = [
+	"#000000","#000033","#000066","#000099","#0000cc","#0000ff","#330000","#330033",
+	"#330066","#330099","#3300cc","#3300ff","#660000","#660033","#660066","#660099",
+	"#6600cc","#6600ff","#990000","#990033","#990066","#990099","#9900cc","#9900ff",
+	"#cc0000","#cc0033","#cc0066","#cc0099","#cc00cc","#cc00ff","#ff0000","#ff0033",
+	"#ff0066","#ff0099","#ff00cc","#ff00ff","#003300","#003333","#003366","#003399",
+	"#0033cc","#0033ff","#333300","#333333","#333366","#333399","#3333cc","#3333ff",
+	"#663300","#663333","#663366","#663399","#6633cc","#6633ff","#993300","#993333",
+	"#993366","#993399","#9933cc","#9933ff","#cc3300","#cc3333","#cc3366","#cc3399",
+	"#cc33cc","#cc33ff","#ff3300","#ff3333","#ff3366","#ff3399","#ff33cc","#ff33ff",
+	"#006600","#006633","#006666","#006699","#0066cc","#0066ff","#336600","#336633",
+	"#336666","#336699","#3366cc","#3366ff","#666600","#666633","#666666","#666699",
+	"#6666cc","#6666ff","#996600","#996633","#996666","#996699","#9966cc","#9966ff",
+	"#cc6600","#cc6633","#cc6666","#cc6699","#cc66cc","#cc66ff","#ff6600","#ff6633",
+	"#ff6666","#ff6699","#ff66cc","#ff66ff","#009900","#009933","#009966","#009999",
+	"#0099cc","#0099ff","#339900","#339933","#339966","#339999","#3399cc","#3399ff",
+	"#669900","#669933","#669966","#669999","#6699cc","#6699ff","#999900","#999933",
+	"#999966","#999999","#9999cc","#9999ff","#cc9900","#cc9933","#cc9966","#cc9999",
+	"#cc99cc","#cc99ff","#ff9900","#ff9933","#ff9966","#ff9999","#ff99cc","#ff99ff",
+	"#00cc00","#00cc33","#00cc66","#00cc99","#00cccc","#00ccff","#33cc00","#33cc33",
+	"#33cc66","#33cc99","#33cccc","#33ccff","#66cc00","#66cc33","#66cc66","#66cc99",
+	"#66cccc","#66ccff","#99cc00","#99cc33","#99cc66","#99cc99","#99cccc","#99ccff",
+	"#cccc00","#cccc33","#cccc66","#cccc99","#cccccc","#ccccff","#ffcc00","#ffcc33",
+	"#ffcc66","#ffcc99","#ffcccc","#ffccff","#00ff00","#00ff33","#00ff66","#00ff99",
+	"#00ffcc","#00ffff","#33ff00","#33ff33","#33ff66","#33ff99","#33ffcc","#33ffff",
+	"#66ff00","#66ff33","#66ff66","#66ff99","#66ffcc","#66ffff","#99ff00","#99ff33",
+	"#99ff66","#99ff99","#99ffcc","#99ffff","#ccff00","#ccff33","#ccff66","#ccff99",
+	"#ccffcc","#ccffff","#ffff00","#ffff33","#ffff66","#ffff99","#ffffcc","#ffffff"
+];
+
+var named = {
+	'#F0F8FF':'AliceBlue','#FAEBD7':'AntiqueWhite','#00FFFF':'Aqua','#7FFFD4':'Aquamarine','#F0FFFF':'Azure','#F5F5DC':'Beige',
+	'#FFE4C4':'Bisque','#000000':'Black','#FFEBCD':'BlanchedAlmond','#0000FF':'Blue','#8A2BE2':'BlueViolet','#A52A2A':'Brown',
+	'#DEB887':'BurlyWood','#5F9EA0':'CadetBlue','#7FFF00':'Chartreuse','#D2691E':'Chocolate','#FF7F50':'Coral','#6495ED':'CornflowerBlue',
+	'#FFF8DC':'Cornsilk','#DC143C':'Crimson','#00FFFF':'Cyan','#00008B':'DarkBlue','#008B8B':'DarkCyan','#B8860B':'DarkGoldenRod',
+	'#A9A9A9':'DarkGray','#A9A9A9':'DarkGrey','#006400':'DarkGreen','#BDB76B':'DarkKhaki','#8B008B':'DarkMagenta','#556B2F':'DarkOliveGreen',
+	'#FF8C00':'Darkorange','#9932CC':'DarkOrchid','#8B0000':'DarkRed','#E9967A':'DarkSalmon','#8FBC8F':'DarkSeaGreen','#483D8B':'DarkSlateBlue',
+	'#2F4F4F':'DarkSlateGray','#2F4F4F':'DarkSlateGrey','#00CED1':'DarkTurquoise','#9400D3':'DarkViolet','#FF1493':'DeepPink','#00BFFF':'DeepSkyBlue',
+	'#696969':'DimGray','#696969':'DimGrey','#1E90FF':'DodgerBlue','#B22222':'FireBrick','#FFFAF0':'FloralWhite','#228B22':'ForestGreen',
+	'#FF00FF':'Fuchsia','#DCDCDC':'Gainsboro','#F8F8FF':'GhostWhite','#FFD700':'Gold','#DAA520':'GoldenRod','#808080':'Gray','#808080':'Grey',
+	'#008000':'Green','#ADFF2F':'GreenYellow','#F0FFF0':'HoneyDew','#FF69B4':'HotPink','#CD5C5C':'IndianRed','#4B0082':'Indigo','#FFFFF0':'Ivory',
+	'#F0E68C':'Khaki','#E6E6FA':'Lavender','#FFF0F5':'LavenderBlush','#7CFC00':'LawnGreen','#FFFACD':'LemonChiffon','#ADD8E6':'LightBlue',
+	'#F08080':'LightCoral','#E0FFFF':'LightCyan','#FAFAD2':'LightGoldenRodYellow','#D3D3D3':'LightGray','#D3D3D3':'LightGrey','#90EE90':'LightGreen',
+	'#FFB6C1':'LightPink','#FFA07A':'LightSalmon','#20B2AA':'LightSeaGreen','#87CEFA':'LightSkyBlue','#778899':'LightSlateGray','#778899':'LightSlateGrey',
+	'#B0C4DE':'LightSteelBlue','#FFFFE0':'LightYellow','#00FF00':'Lime','#32CD32':'LimeGreen','#FAF0E6':'Linen','#FF00FF':'Magenta','#800000':'Maroon',
+	'#66CDAA':'MediumAquaMarine','#0000CD':'MediumBlue','#BA55D3':'MediumOrchid','#9370D8':'MediumPurple','#3CB371':'MediumSeaGreen','#7B68EE':'MediumSlateBlue',
+	'#00FA9A':'MediumSpringGreen','#48D1CC':'MediumTurquoise','#C71585':'MediumVioletRed','#191970':'MidnightBlue','#F5FFFA':'MintCream','#FFE4E1':'MistyRose','#FFE4B5':'Moccasin',
+	'#FFDEAD':'NavajoWhite','#000080':'Navy','#FDF5E6':'OldLace','#808000':'Olive','#6B8E23':'OliveDrab','#FFA500':'Orange','#FF4500':'OrangeRed','#DA70D6':'Orchid',
+	'#EEE8AA':'PaleGoldenRod','#98FB98':'PaleGreen','#AFEEEE':'PaleTurquoise','#D87093':'PaleVioletRed','#FFEFD5':'PapayaWhip','#FFDAB9':'PeachPuff',
+	'#CD853F':'Peru','#FFC0CB':'Pink','#DDA0DD':'Plum','#B0E0E6':'PowderBlue','#800080':'Purple','#FF0000':'Red','#BC8F8F':'RosyBrown','#4169E1':'RoyalBlue',
+	'#8B4513':'SaddleBrown','#FA8072':'Salmon','#F4A460':'SandyBrown','#2E8B57':'SeaGreen','#FFF5EE':'SeaShell','#A0522D':'Sienna','#C0C0C0':'Silver',
+	'#87CEEB':'SkyBlue','#6A5ACD':'SlateBlue','#708090':'SlateGray','#708090':'SlateGrey','#FFFAFA':'Snow','#00FF7F':'SpringGreen',
+	'#4682B4':'SteelBlue','#D2B48C':'Tan','#008080':'Teal','#D8BFD8':'Thistle','#FF6347':'Tomato','#40E0D0':'Turquoise','#EE82EE':'Violet',
+	'#F5DEB3':'Wheat','#FFFFFF':'White','#F5F5F5':'WhiteSmoke','#FFFF00':'Yellow','#9ACD32':'YellowGreen'
+};
+
+function init() {
+	var inputColor = convertRGBToHex(tinyMCEPopup.getWindowArg('input_color'));
+
+	tinyMCEPopup.resizeToInnerSize();
+
+	generatePicker();
+
+	if (inputColor) {
+		changeFinalColor(inputColor);
+
+		col = convertHexToRGB(inputColor);
+
+		if (col)
+			updateLight(col.r, col.g, col.b);
+	}
+}
+
+function insertAction() {
+	var color = document.getElementById("color").value, f = tinyMCEPopup.getWindowArg('func');
+
+	tinyMCEPopup.restoreSelection();
+
+	if (f)
+		f(color);
+
+	tinyMCEPopup.close();
+}
+
+function showColor(color, name) {
+	if (name)
+		document.getElementById("colorname").innerHTML = name;
+
+	document.getElementById("preview").style.backgroundColor = color;
+	document.getElementById("color").value = color.toLowerCase();
+}
+
+function convertRGBToHex(col) {
+	var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");
+
+	if (!col)
+		return col;
+
+	var rgb = col.replace(re, "$1,$2,$3").split(',');
+	if (rgb.length == 3) {
+		r = parseInt(rgb[0]).toString(16);
+		g = parseInt(rgb[1]).toString(16);
+		b = parseInt(rgb[2]).toString(16);
+
+		r = r.length == 1 ? '0' + r : r;
+		g = g.length == 1 ? '0' + g : g;
+		b = b.length == 1 ? '0' + b : b;
+
+		return "#" + r + g + b;
+	}
+
+	return col;
+}
+
+function convertHexToRGB(col) {
+	if (col.indexOf('#') != -1) {
+		col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');
+
+		r = parseInt(col.substring(0, 2), 16);
+		g = parseInt(col.substring(2, 4), 16);
+		b = parseInt(col.substring(4, 6), 16);
+
+		return {r : r, g : g, b : b};
+	}
+
+	return null;
+}
+
+function generatePicker() {
+	var el = document.getElementById('light'), h = '', i;
+
+	for (i = 0; i < detail; i++){
+		h += '<div id="gs'+i+'" style="background-color:#000000; width:15px; height:3px; border-style:none; border-width:0px;"'
+		+ ' onclick="changeFinalColor(this.style.backgroundColor)"'
+		+ ' onmousedown="isMouseDown = true; return false;"'
+		+ ' onmouseup="isMouseDown = false;"'
+		+ ' onmousemove="if (isMouseDown && isMouseOver) changeFinalColor(this.style.backgroundColor); return false;"'
+		+ ' onmouseover="isMouseOver = true;"'
+		+ ' onmouseout="isMouseOver = false;"'
+		+ '></div>';
+	}
+
+	el.innerHTML = h;
+}
+
+function generateWebColors() {
+	var el = document.getElementById('webcolors'), h = '', i;
+
+	if (el.className == 'generated')
+		return;
+
+	h += '<table border="0" cellspacing="1" cellpadding="0">'
+		+ '<tr>';
+
+	for (i=0; i<colors.length; i++) {
+		h += '<td bgcolor="' + colors[i] + '" width="10" height="10">'
+			+ '<a href="javascript:insertAction();" onfocus="showColor(\'' + colors[i] +  '\');" onmouseover="showColor(\'' + colors[i] +  '\');" style="display:block;width:10px;height:10px;overflow:hidden;">'
+			+ '</a></td>';
+		if ((i+1) % 18 == 0)
+			h += '</tr><tr>';
+	}
+
+	h += '</table>';
+
+	el.innerHTML = h;
+	el.className = 'generated';
+}
+
+function generateNamedColors() {
+	var el = document.getElementById('namedcolors'), h = '', n, v, i = 0;
+
+	if (el.className == 'generated')
+		return;
+
+	for (n in named) {
+		v = named[n];
+		h += '<a href="javascript:insertAction();" onmouseover="showColor(\'' + n +  '\',\'' + v + '\');" style="background-color: ' + n + '"><!-- IE --></a>'
+	}
+
+	el.innerHTML = h;
+	el.className = 'generated';
+}
+
+function dechex(n) {
+	return strhex.charAt(Math.floor(n / 16)) + strhex.charAt(n % 16);
+}
+
+function computeColor(e) {
+	var x, y, partWidth, partDetail, imHeight, r, g, b, coef, i, finalCoef, finalR, finalG, finalB;
+
+	x = e.offsetX ? e.offsetX : (e.target ? e.clientX - e.target.x : 0);
+	y = e.offsetY ? e.offsetY : (e.target ? e.clientY - e.target.y : 0);
+
+	partWidth = document.getElementById('colors').width / 6;
+	partDetail = detail / 2;
+	imHeight = document.getElementById('colors').height;
+
+	r = (x >= 0)*(x < partWidth)*255 + (x >= partWidth)*(x < 2*partWidth)*(2*255 - x * 255 / partWidth) + (x >= 4*partWidth)*(x < 5*partWidth)*(-4*255 + x * 255 / partWidth) + (x >= 5*partWidth)*(x < 6*partWidth)*255;
+	g = (x >= 0)*(x < partWidth)*(x * 255 / partWidth) + (x >= partWidth)*(x < 3*partWidth)*255	+ (x >= 3*partWidth)*(x < 4*partWidth)*(4*255 - x * 255 / partWidth);
+	b = (x >= 2*partWidth)*(x < 3*partWidth)*(-2*255 + x * 255 / partWidth) + (x >= 3*partWidth)*(x < 5*partWidth)*255 + (x >= 5*partWidth)*(x < 6*partWidth)*(6*255 - x * 255 / partWidth);
+
+	coef = (imHeight - y) / imHeight;
+	r = 128 + (r - 128) * coef;
+	g = 128 + (g - 128) * coef;
+	b = 128 + (b - 128) * coef;
+
+	changeFinalColor('#' + dechex(r) + dechex(g) + dechex(b));
+	updateLight(r, g, b);
+}
+
+function updateLight(r, g, b) {
+	var i, partDetail = detail / 2, finalCoef, finalR, finalG, finalB, color;
+
+	for (i=0; i<detail; i++) {
+		if ((i>=0) && (i<partDetail)) {
+			finalCoef = i / partDetail;
+			finalR = dechex(255 - (255 - r) * finalCoef);
+			finalG = dechex(255 - (255 - g) * finalCoef);
+			finalB = dechex(255 - (255 - b) * finalCoef);
+		} else {
+			finalCoef = 2 - i / partDetail;
+			finalR = dechex(r * finalCoef);
+			finalG = dechex(g * finalCoef);
+			finalB = dechex(b * finalCoef);
+		}
+
+		color = finalR + finalG + finalB;
+
+		setCol('gs' + i, '#'+color);
+	}
+}
+
+function changeFinalColor(color) {
+	if (color.indexOf('#') == -1)
+		color = convertRGBToHex(color);
+
+	setCol('preview', color);
+	document.getElementById('color').value = color;
+}
+
+function setCol(e, c) {
+	try {
+		document.getElementById(e).style.backgroundColor = c;
+	} catch (ex) {
+		// Ignore IE warning
+	}
+}
+
+tinyMCEPopup.onInit.add(init);
diff --git a/webapp/web/js/tiny_mce/themes/advanced/js/image.js b/webapp/web/js/tiny_mce/themes/advanced/js/image.js
index 4982ce0c8..7f07a86aa 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/js/image.js
+++ b/webapp/web/js/tiny_mce/themes/advanced/js/image.js
@@ -1,245 +1,245 @@
-var ImageDialog = {
-	preInit : function() {
-		var url;
-
-		tinyMCEPopup.requireLangPack();
-
-		if (url = tinyMCEPopup.getParam("external_image_list_url"))
-			document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
-	},
-
-	init : function() {
-		var f = document.forms[0], ed = tinyMCEPopup.editor;
-
-		// Setup browse button
-		document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image');
-		if (isVisible('srcbrowser'))
-			document.getElementById('src').style.width = '180px';
-
-		e = ed.selection.getNode();
-
-		this.fillFileList('image_list', 'tinyMCEImageList');
-
-		if (e.nodeName == 'IMG') {
-			f.src.value = ed.dom.getAttrib(e, 'src');
-			f.alt.value = ed.dom.getAttrib(e, 'alt');
-			f.border.value = this.getAttrib(e, 'border');
-			f.vspace.value = this.getAttrib(e, 'vspace');
-			f.hspace.value = this.getAttrib(e, 'hspace');
-			f.width.value = ed.dom.getAttrib(e, 'width');
-			f.height.value = ed.dom.getAttrib(e, 'height');
-			f.insert.value = ed.getLang('update');
-			this.styleVal = ed.dom.getAttrib(e, 'style');
-			selectByValue(f, 'image_list', f.src.value);
-			selectByValue(f, 'align', this.getAttrib(e, 'align'));
-			this.updateStyle();
-		}
-	},
-
-	fillFileList : function(id, l) {
-		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
-
-		l = window[l];
-
-		if (l && l.length > 0) {
-			lst.options[lst.options.length] = new Option('', '');
-
-			tinymce.each(l, function(o) {
-				lst.options[lst.options.length] = new Option(o[0], o[1]);
-			});
-		} else
-			dom.remove(dom.getParent(id, 'tr'));
-	},
-
-	update : function() {
-		var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, args = {}, el;
-
-		tinyMCEPopup.restoreSelection();
-
-		if (f.src.value === '') {
-			if (ed.selection.getNode().nodeName == 'IMG') {
-				ed.dom.remove(ed.selection.getNode());
-				ed.execCommand('mceRepaint');
-			}
-
-			tinyMCEPopup.close();
-			return;
-		}
-
-		if (!ed.settings.inline_styles) {
-			args = tinymce.extend(args, {
-				vspace : nl.vspace.value,
-				hspace : nl.hspace.value,
-				border : nl.border.value,
-				align : getSelectValue(f, 'align')
-			});
-		} else
-			args.style = this.styleVal;
-
-		tinymce.extend(args, {
-			src : f.src.value,
-			alt : f.alt.value,
-			width : f.width.value,
-			height : f.height.value
-		});
-
-		el = ed.selection.getNode();
-
-		if (el && el.nodeName == 'IMG') {
-			ed.dom.setAttribs(el, args);
-		} else {
-			ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});
-			ed.dom.setAttribs('__mce_tmp', args);
-			ed.dom.setAttrib('__mce_tmp', 'id', '');
-			ed.undoManager.add();
-		}
-
-		tinyMCEPopup.close();
-	},
-
-	updateStyle : function() {
-		var dom = tinyMCEPopup.dom, st, v, f = document.forms[0];
-
-		if (tinyMCEPopup.editor.settings.inline_styles) {
-			st = tinyMCEPopup.dom.parseStyle(this.styleVal);
-
-			// Handle align
-			v = getSelectValue(f, 'align');
-			if (v) {
-				if (v == 'left' || v == 'right') {
-					st['float'] = v;
-					delete st['vertical-align'];
-				} else {
-					st['vertical-align'] = v;
-					delete st['float'];
-				}
-			} else {
-				delete st['float'];
-				delete st['vertical-align'];
-			}
-
-			// Handle border
-			v = f.border.value;
-			if (v || v == '0') {
-				if (v == '0')
-					st['border'] = '0';
-				else
-					st['border'] = v + 'px solid black';
-			} else
-				delete st['border'];
-
-			// Handle hspace
-			v = f.hspace.value;
-			if (v) {
-				delete st['margin'];
-				st['margin-left'] = v + 'px';
-				st['margin-right'] = v + 'px';
-			} else {
-				delete st['margin-left'];
-				delete st['margin-right'];
-			}
-
-			// Handle vspace
-			v = f.vspace.value;
-			if (v) {
-				delete st['margin'];
-				st['margin-top'] = v + 'px';
-				st['margin-bottom'] = v + 'px';
-			} else {
-				delete st['margin-top'];
-				delete st['margin-bottom'];
-			}
-
-			// Merge
-			st = tinyMCEPopup.dom.parseStyle(dom.serializeStyle(st));
-			this.styleVal = dom.serializeStyle(st);
-		}
-	},
-
-	getAttrib : function(e, at) {
-		var ed = tinyMCEPopup.editor, dom = ed.dom, v, v2;
-
-		if (ed.settings.inline_styles) {
-			switch (at) {
-				case 'align':
-					if (v = dom.getStyle(e, 'float'))
-						return v;
-
-					if (v = dom.getStyle(e, 'vertical-align'))
-						return v;
-
-					break;
-
-				case 'hspace':
-					v = dom.getStyle(e, 'margin-left')
-					v2 = dom.getStyle(e, 'margin-right');
-					if (v && v == v2)
-						return parseInt(v.replace(/[^0-9]/g, ''));
-
-					break;
-
-				case 'vspace':
-					v = dom.getStyle(e, 'margin-top')
-					v2 = dom.getStyle(e, 'margin-bottom');
-					if (v && v == v2)
-						return parseInt(v.replace(/[^0-9]/g, ''));
-
-					break;
-
-				case 'border':
-					v = 0;
-
-					tinymce.each(['top', 'right', 'bottom', 'left'], function(sv) {
-						sv = dom.getStyle(e, 'border-' + sv + '-width');
-
-						// False or not the same as prev
-						if (!sv || (sv != v && v !== 0)) {
-							v = 0;
-							return false;
-						}
-
-						if (sv)
-							v = sv;
-					});
-
-					if (v)
-						return parseInt(v.replace(/[^0-9]/g, ''));
-
-					break;
-			}
-		}
-
-		if (v = dom.getAttrib(e, at))
-			return v;
-
-		return '';
-	},
-
-	resetImageData : function() {
-		var f = document.forms[0];
-
-		f.width.value = f.height.value = "";	
-	},
-
-	updateImageData : function() {
-		var f = document.forms[0], t = ImageDialog;
-
-		if (f.width.value == "")
-			f.width.value = t.preloadImg.width;
-
-		if (f.height.value == "")
-			f.height.value = t.preloadImg.height;
-	},
-
-	getImageData : function() {
-		var f = document.forms[0];
-
-		this.preloadImg = new Image();
-		this.preloadImg.onload = this.updateImageData;
-		this.preloadImg.onerror = this.resetImageData;
-		this.preloadImg.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.src.value);
-	}
-};
-
-ImageDialog.preInit();
-tinyMCEPopup.onInit.add(ImageDialog.init, ImageDialog);
+var ImageDialog = {
+	preInit : function() {
+		var url;
+
+		tinyMCEPopup.requireLangPack();
+
+		if (url = tinyMCEPopup.getParam("external_image_list_url"))
+			document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+	},
+
+	init : function() {
+		var f = document.forms[0], ed = tinyMCEPopup.editor;
+
+		// Setup browse button
+		document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image');
+		if (isVisible('srcbrowser'))
+			document.getElementById('src').style.width = '180px';
+
+		e = ed.selection.getNode();
+
+		this.fillFileList('image_list', 'tinyMCEImageList');
+
+		if (e.nodeName == 'IMG') {
+			f.src.value = ed.dom.getAttrib(e, 'src');
+			f.alt.value = ed.dom.getAttrib(e, 'alt');
+			f.border.value = this.getAttrib(e, 'border');
+			f.vspace.value = this.getAttrib(e, 'vspace');
+			f.hspace.value = this.getAttrib(e, 'hspace');
+			f.width.value = ed.dom.getAttrib(e, 'width');
+			f.height.value = ed.dom.getAttrib(e, 'height');
+			f.insert.value = ed.getLang('update');
+			this.styleVal = ed.dom.getAttrib(e, 'style');
+			selectByValue(f, 'image_list', f.src.value);
+			selectByValue(f, 'align', this.getAttrib(e, 'align'));
+			this.updateStyle();
+		}
+	},
+
+	fillFileList : function(id, l) {
+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
+
+		l = window[l];
+
+		if (l && l.length > 0) {
+			lst.options[lst.options.length] = new Option('', '');
+
+			tinymce.each(l, function(o) {
+				lst.options[lst.options.length] = new Option(o[0], o[1]);
+			});
+		} else
+			dom.remove(dom.getParent(id, 'tr'));
+	},
+
+	update : function() {
+		var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, args = {}, el;
+
+		tinyMCEPopup.restoreSelection();
+
+		if (f.src.value === '') {
+			if (ed.selection.getNode().nodeName == 'IMG') {
+				ed.dom.remove(ed.selection.getNode());
+				ed.execCommand('mceRepaint');
+			}
+
+			tinyMCEPopup.close();
+			return;
+		}
+
+		if (!ed.settings.inline_styles) {
+			args = tinymce.extend(args, {
+				vspace : nl.vspace.value,
+				hspace : nl.hspace.value,
+				border : nl.border.value,
+				align : getSelectValue(f, 'align')
+			});
+		} else
+			args.style = this.styleVal;
+
+		tinymce.extend(args, {
+			src : f.src.value,
+			alt : f.alt.value,
+			width : f.width.value,
+			height : f.height.value
+		});
+
+		el = ed.selection.getNode();
+
+		if (el && el.nodeName == 'IMG') {
+			ed.dom.setAttribs(el, args);
+		} else {
+			ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});
+			ed.dom.setAttribs('__mce_tmp', args);
+			ed.dom.setAttrib('__mce_tmp', 'id', '');
+			ed.undoManager.add();
+		}
+
+		tinyMCEPopup.close();
+	},
+
+	updateStyle : function() {
+		var dom = tinyMCEPopup.dom, st, v, f = document.forms[0];
+
+		if (tinyMCEPopup.editor.settings.inline_styles) {
+			st = tinyMCEPopup.dom.parseStyle(this.styleVal);
+
+			// Handle align
+			v = getSelectValue(f, 'align');
+			if (v) {
+				if (v == 'left' || v == 'right') {
+					st['float'] = v;
+					delete st['vertical-align'];
+				} else {
+					st['vertical-align'] = v;
+					delete st['float'];
+				}
+			} else {
+				delete st['float'];
+				delete st['vertical-align'];
+			}
+
+			// Handle border
+			v = f.border.value;
+			if (v || v == '0') {
+				if (v == '0')
+					st['border'] = '0';
+				else
+					st['border'] = v + 'px solid black';
+			} else
+				delete st['border'];
+
+			// Handle hspace
+			v = f.hspace.value;
+			if (v) {
+				delete st['margin'];
+				st['margin-left'] = v + 'px';
+				st['margin-right'] = v + 'px';
+			} else {
+				delete st['margin-left'];
+				delete st['margin-right'];
+			}
+
+			// Handle vspace
+			v = f.vspace.value;
+			if (v) {
+				delete st['margin'];
+				st['margin-top'] = v + 'px';
+				st['margin-bottom'] = v + 'px';
+			} else {
+				delete st['margin-top'];
+				delete st['margin-bottom'];
+			}
+
+			// Merge
+			st = tinyMCEPopup.dom.parseStyle(dom.serializeStyle(st));
+			this.styleVal = dom.serializeStyle(st);
+		}
+	},
+
+	getAttrib : function(e, at) {
+		var ed = tinyMCEPopup.editor, dom = ed.dom, v, v2;
+
+		if (ed.settings.inline_styles) {
+			switch (at) {
+				case 'align':
+					if (v = dom.getStyle(e, 'float'))
+						return v;
+
+					if (v = dom.getStyle(e, 'vertical-align'))
+						return v;
+
+					break;
+
+				case 'hspace':
+					v = dom.getStyle(e, 'margin-left')
+					v2 = dom.getStyle(e, 'margin-right');
+					if (v && v == v2)
+						return parseInt(v.replace(/[^0-9]/g, ''));
+
+					break;
+
+				case 'vspace':
+					v = dom.getStyle(e, 'margin-top')
+					v2 = dom.getStyle(e, 'margin-bottom');
+					if (v && v == v2)
+						return parseInt(v.replace(/[^0-9]/g, ''));
+
+					break;
+
+				case 'border':
+					v = 0;
+
+					tinymce.each(['top', 'right', 'bottom', 'left'], function(sv) {
+						sv = dom.getStyle(e, 'border-' + sv + '-width');
+
+						// False or not the same as prev
+						if (!sv || (sv != v && v !== 0)) {
+							v = 0;
+							return false;
+						}
+
+						if (sv)
+							v = sv;
+					});
+
+					if (v)
+						return parseInt(v.replace(/[^0-9]/g, ''));
+
+					break;
+			}
+		}
+
+		if (v = dom.getAttrib(e, at))
+			return v;
+
+		return '';
+	},
+
+	resetImageData : function() {
+		var f = document.forms[0];
+
+		f.width.value = f.height.value = "";	
+	},
+
+	updateImageData : function() {
+		var f = document.forms[0], t = ImageDialog;
+
+		if (f.width.value == "")
+			f.width.value = t.preloadImg.width;
+
+		if (f.height.value == "")
+			f.height.value = t.preloadImg.height;
+	},
+
+	getImageData : function() {
+		var f = document.forms[0];
+
+		this.preloadImg = new Image();
+		this.preloadImg.onload = this.updateImageData;
+		this.preloadImg.onerror = this.resetImageData;
+		this.preloadImg.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.src.value);
+	}
+};
+
+ImageDialog.preInit();
+tinyMCEPopup.onInit.add(ImageDialog.init, ImageDialog);
diff --git a/webapp/web/js/tiny_mce/themes/advanced/js/link.js b/webapp/web/js/tiny_mce/themes/advanced/js/link.js
index 2974878e1..c8cb642a9 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/js/link.js
+++ b/webapp/web/js/tiny_mce/themes/advanced/js/link.js
@@ -1,155 +1,155 @@
-tinyMCEPopup.requireLangPack();
-
-var LinkDialog = {
-	preInit : function() {
-		var url;
-
-		if (url = tinyMCEPopup.getParam("external_link_list_url"))
-			document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
-	},
-
-	init : function() {
-		var f = document.forms[0], ed = tinyMCEPopup.editor;
-
-		// Setup browse button
-		document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser', 'href', 'file', 'theme_advanced_link');
-		if (isVisible('hrefbrowser'))
-			document.getElementById('href').style.width = '180px';
-
-		this.fillClassList('class_list');
-		this.fillFileList('link_list', 'tinyMCELinkList');
-		this.fillTargetList('target_list');
-
-		if (e = ed.dom.getParent(ed.selection.getNode(), 'A')) {
-			f.href.value = ed.dom.getAttrib(e, 'href');
-			f.linktitle.value = ed.dom.getAttrib(e, 'title');
-			f.insert.value = ed.getLang('update');
-			selectByValue(f, 'link_list', f.href.value);
-			selectByValue(f, 'target_list', ed.dom.getAttrib(e, 'target'));
-			selectByValue(f, 'class_list', ed.dom.getAttrib(e, 'class'));
-		}
-	},
-
-	update : function() {
-		var f = document.forms[0], ed = tinyMCEPopup.editor, e, b;
-
-		tinyMCEPopup.restoreSelection();
-		e = ed.dom.getParent(ed.selection.getNode(), 'A');
-
-		// Remove element if there is no href
-		if (!f.href.value) {
-			if (e) {
-				tinyMCEPopup.execCommand("mceBeginUndoLevel");
-				b = ed.selection.getBookmark();
-				ed.dom.remove(e, 1);
-				ed.selection.moveToBookmark(b);
-				tinyMCEPopup.execCommand("mceEndUndoLevel");
-				tinyMCEPopup.close();
-				return;
-			}
-		}
-
-		tinyMCEPopup.execCommand("mceBeginUndoLevel");
-
-		// Create new anchor elements
-		if (e == null) {
-			tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});
-
-			tinymce.each(ed.dom.select("a"), function(n) {
-				if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') {
-					e = n;
-
-					ed.dom.setAttribs(e, {
-						href : f.href.value,
-						title : f.linktitle.value,
-						target : f.target_list ? f.target_list.options[f.target_list.selectedIndex].value : null,
-						'class' : f.class_list ? f.class_list.options[f.class_list.selectedIndex].value : null
-					});
-				}
-			});
-		} else {
-			ed.dom.setAttribs(e, {
-				href : f.href.value,
-				title : f.linktitle.value,
-				target : f.target_list ? f.target_list.options[f.target_list.selectedIndex].value : null,
-				'class' : f.class_list ? f.class_list.options[f.class_list.selectedIndex].value : null
-			});
-		}
-
-		// Don't move caret if selection was image
-		if (e.childNodes.length != 1 || e.firstChild.nodeName != 'IMG') {
-			ed.focus();
-			ed.selection.select(e);
-			ed.selection.collapse(0);
-			tinyMCEPopup.storeSelection();
-		}
-
-		tinyMCEPopup.execCommand("mceEndUndoLevel");
-		tinyMCEPopup.close();
-	},
-
-	checkPrefix : function(n) {
-		if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_email')))
-			n.value = 'mailto:' + n.value;
-
-		if (/^\s*www./i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_external')))
-			n.value = 'http://' + n.value;
-	},
-
-	fillFileList : function(id, l) {
-		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
-
-		l = window[l];
-
-		if (l && l.length > 0) {
-			lst.options[lst.options.length] = new Option('', '');
-
-			tinymce.each(l, function(o) {
-				lst.options[lst.options.length] = new Option(o[0], o[1]);
-			});
-		} else
-			dom.remove(dom.getParent(id, 'tr'));
-	},
-
-	fillClassList : function(id) {
-		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
-
-		if (v = tinyMCEPopup.getParam('theme_advanced_styles')) {
-			cl = [];
-
-			tinymce.each(v.split(';'), function(v) {
-				var p = v.split('=');
-
-				cl.push({'title' : p[0], 'class' : p[1]});
-			});
-		} else
-			cl = tinyMCEPopup.editor.dom.getClasses();
-
-		if (cl.length > 0) {
-			lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');
-
-			tinymce.each(cl, function(o) {
-				lst.options[lst.options.length] = new Option(o.title || o['class'], o['class']);
-			});
-		} else
-			dom.remove(dom.getParent(id, 'tr'));
-	},
-
-	fillTargetList : function(id) {
-		var dom = tinyMCEPopup.dom, lst = dom.get(id), v;
-
-		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');
-		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('advanced_dlg.link_target_same'), '_self');
-		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('advanced_dlg.link_target_blank'), '_blank');
-
-		if (v = tinyMCEPopup.getParam('theme_advanced_link_targets')) {
-			tinymce.each(v.split(','), function(v) {
-				v = v.split('=');
-				lst.options[lst.options.length] = new Option(v[0], v[1]);
-			});
-		}
-	}
-};
-
-LinkDialog.preInit();
-tinyMCEPopup.onInit.add(LinkDialog.init, LinkDialog);
+tinyMCEPopup.requireLangPack();
+
+var LinkDialog = {
+	preInit : function() {
+		var url;
+
+		if (url = tinyMCEPopup.getParam("external_link_list_url"))
+			document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');
+	},
+
+	init : function() {
+		var f = document.forms[0], ed = tinyMCEPopup.editor;
+
+		// Setup browse button
+		document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser', 'href', 'file', 'theme_advanced_link');
+		if (isVisible('hrefbrowser'))
+			document.getElementById('href').style.width = '180px';
+
+		this.fillClassList('class_list');
+		this.fillFileList('link_list', 'tinyMCELinkList');
+		this.fillTargetList('target_list');
+
+		if (e = ed.dom.getParent(ed.selection.getNode(), 'A')) {
+			f.href.value = ed.dom.getAttrib(e, 'href');
+			f.linktitle.value = ed.dom.getAttrib(e, 'title');
+			f.insert.value = ed.getLang('update');
+			selectByValue(f, 'link_list', f.href.value);
+			selectByValue(f, 'target_list', ed.dom.getAttrib(e, 'target'));
+			selectByValue(f, 'class_list', ed.dom.getAttrib(e, 'class'));
+		}
+	},
+
+	update : function() {
+		var f = document.forms[0], ed = tinyMCEPopup.editor, e, b;
+
+		tinyMCEPopup.restoreSelection();
+		e = ed.dom.getParent(ed.selection.getNode(), 'A');
+
+		// Remove element if there is no href
+		if (!f.href.value) {
+			if (e) {
+				tinyMCEPopup.execCommand("mceBeginUndoLevel");
+				b = ed.selection.getBookmark();
+				ed.dom.remove(e, 1);
+				ed.selection.moveToBookmark(b);
+				tinyMCEPopup.execCommand("mceEndUndoLevel");
+				tinyMCEPopup.close();
+				return;
+			}
+		}
+
+		tinyMCEPopup.execCommand("mceBeginUndoLevel");
+
+		// Create new anchor elements
+		if (e == null) {
+			tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});
+
+			tinymce.each(ed.dom.select("a"), function(n) {
+				if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') {
+					e = n;
+
+					ed.dom.setAttribs(e, {
+						href : f.href.value,
+						title : f.linktitle.value,
+						target : f.target_list ? f.target_list.options[f.target_list.selectedIndex].value : null,
+						'class' : f.class_list ? f.class_list.options[f.class_list.selectedIndex].value : null
+					});
+				}
+			});
+		} else {
+			ed.dom.setAttribs(e, {
+				href : f.href.value,
+				title : f.linktitle.value,
+				target : f.target_list ? f.target_list.options[f.target_list.selectedIndex].value : null,
+				'class' : f.class_list ? f.class_list.options[f.class_list.selectedIndex].value : null
+			});
+		}
+
+		// Don't move caret if selection was image
+		if (e.childNodes.length != 1 || e.firstChild.nodeName != 'IMG') {
+			ed.focus();
+			ed.selection.select(e);
+			ed.selection.collapse(0);
+			tinyMCEPopup.storeSelection();
+		}
+
+		tinyMCEPopup.execCommand("mceEndUndoLevel");
+		tinyMCEPopup.close();
+	},
+
+	checkPrefix : function(n) {
+		if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_email')))
+			n.value = 'mailto:' + n.value;
+
+		if (/^\s*www./i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_external')))
+			n.value = 'http://' + n.value;
+	},
+
+	fillFileList : function(id, l) {
+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
+
+		l = window[l];
+
+		if (l && l.length > 0) {
+			lst.options[lst.options.length] = new Option('', '');
+
+			tinymce.each(l, function(o) {
+				lst.options[lst.options.length] = new Option(o[0], o[1]);
+			});
+		} else
+			dom.remove(dom.getParent(id, 'tr'));
+	},
+
+	fillClassList : function(id) {
+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;
+
+		if (v = tinyMCEPopup.getParam('theme_advanced_styles')) {
+			cl = [];
+
+			tinymce.each(v.split(';'), function(v) {
+				var p = v.split('=');
+
+				cl.push({'title' : p[0], 'class' : p[1]});
+			});
+		} else
+			cl = tinyMCEPopup.editor.dom.getClasses();
+
+		if (cl.length > 0) {
+			lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');
+
+			tinymce.each(cl, function(o) {
+				lst.options[lst.options.length] = new Option(o.title || o['class'], o['class']);
+			});
+		} else
+			dom.remove(dom.getParent(id, 'tr'));
+	},
+
+	fillTargetList : function(id) {
+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v;
+
+		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');
+		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('advanced_dlg.link_target_same'), '_self');
+		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('advanced_dlg.link_target_blank'), '_blank');
+
+		if (v = tinyMCEPopup.getParam('theme_advanced_link_targets')) {
+			tinymce.each(v.split(','), function(v) {
+				v = v.split('=');
+				lst.options[lst.options.length] = new Option(v[0], v[1]);
+			});
+		}
+	}
+};
+
+LinkDialog.preInit();
+tinyMCEPopup.onInit.add(LinkDialog.init, LinkDialog);
diff --git a/webapp/web/js/tiny_mce/themes/advanced/js/source_editor.js b/webapp/web/js/tiny_mce/themes/advanced/js/source_editor.js
index af2231cad..a6235a381 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/js/source_editor.js
+++ b/webapp/web/js/tiny_mce/themes/advanced/js/source_editor.js
@@ -1,62 +1,62 @@
-tinyMCEPopup.requireLangPack();
-tinyMCEPopup.onInit.add(onLoadInit);
-
-function saveContent() {
-	tinyMCEPopup.editor.setContent(document.getElementById('htmlSource').value);
-	tinyMCEPopup.close();
-}
-
-function onLoadInit() {
-	tinyMCEPopup.resizeToInnerSize();
-
-	// Remove Gecko spellchecking
-	if (tinymce.isGecko)
-		document.body.spellcheck = tinyMCEPopup.editor.getParam("gecko_spellcheck");
-
-	document.getElementById('htmlSource').value = tinyMCEPopup.editor.getContent();
-
-	if (tinyMCEPopup.editor.getParam("theme_advanced_source_editor_wrap", true)) {
-		setWrap('soft');
-		document.getElementById('wraped').checked = true;
-	}
-
-	resizeInputs();
-}
-
-function setWrap(val) {
-	var v, n, s = document.getElementById('htmlSource');
-
-	s.wrap = val;
-
-	if (!tinymce.isIE) {
-		v = s.value;
-		n = s.cloneNode(false);
-		n.setAttribute("wrap", val);
-		s.parentNode.replaceChild(n, s);
-		n.value = v;
-	}
-}
-
-function toggleWordWrap(elm) {
-	if (elm.checked)
-		setWrap('soft');
-	else
-		setWrap('off');
-}
-
-var wHeight=0, wWidth=0, owHeight=0, owWidth=0;
-
-function resizeInputs() {
-	var el = document.getElementById('htmlSource');
-
-	if (!tinymce.isIE) {
-		 wHeight = self.innerHeight - 65;
-		 wWidth = self.innerWidth - 16;
-	} else {
-		 wHeight = document.body.clientHeight - 70;
-		 wWidth = document.body.clientWidth - 16;
-	}
-
-	el.style.height = Math.abs(wHeight) + 'px';
-	el.style.width  = Math.abs(wWidth) + 'px';
-}
+tinyMCEPopup.requireLangPack();
+tinyMCEPopup.onInit.add(onLoadInit);
+
+function saveContent() {
+	tinyMCEPopup.editor.setContent(document.getElementById('htmlSource').value);
+	tinyMCEPopup.close();
+}
+
+function onLoadInit() {
+	tinyMCEPopup.resizeToInnerSize();
+
+	// Remove Gecko spellchecking
+	if (tinymce.isGecko)
+		document.body.spellcheck = tinyMCEPopup.editor.getParam("gecko_spellcheck");
+
+	document.getElementById('htmlSource').value = tinyMCEPopup.editor.getContent();
+
+	if (tinyMCEPopup.editor.getParam("theme_advanced_source_editor_wrap", true)) {
+		setWrap('soft');
+		document.getElementById('wraped').checked = true;
+	}
+
+	resizeInputs();
+}
+
+function setWrap(val) {
+	var v, n, s = document.getElementById('htmlSource');
+
+	s.wrap = val;
+
+	if (!tinymce.isIE) {
+		v = s.value;
+		n = s.cloneNode(false);
+		n.setAttribute("wrap", val);
+		s.parentNode.replaceChild(n, s);
+		n.value = v;
+	}
+}
+
+function toggleWordWrap(elm) {
+	if (elm.checked)
+		setWrap('soft');
+	else
+		setWrap('off');
+}
+
+var wHeight=0, wWidth=0, owHeight=0, owWidth=0;
+
+function resizeInputs() {
+	var el = document.getElementById('htmlSource');
+
+	if (!tinymce.isIE) {
+		 wHeight = self.innerHeight - 65;
+		 wWidth = self.innerWidth - 16;
+	} else {
+		 wHeight = document.body.clientHeight - 70;
+		 wWidth = document.body.clientWidth - 16;
+	}
+
+	el.style.height = Math.abs(wHeight) + 'px';
+	el.style.width  = Math.abs(wWidth) + 'px';
+}
diff --git a/webapp/web/js/tiny_mce/themes/advanced/langs/en.js b/webapp/web/js/tiny_mce/themes/advanced/langs/en.js
index 69694b1f9..52989e393 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/langs/en.js
+++ b/webapp/web/js/tiny_mce/themes/advanced/langs/en.js
@@ -1,62 +1,62 @@
-tinyMCE.addI18n('en.advanced',{
-style_select:"Styles",
-font_size:"Font size",
-fontdefault:"Font family",
-block:"Format",
-paragraph:"Paragraph",
-div:"Div",
-address:"Address",
-pre:"Preformatted",
-h1:"Heading 1",
-h2:"Heading 2",
-h3:"Heading 3",
-h4:"Heading 4",
-h5:"Heading 5",
-h6:"Heading 6",
-blockquote:"Blockquote",
-code:"Code",
-samp:"Code sample",
-dt:"Definition term ",
-dd:"Definition description",
-bold_desc:"Bold (Ctrl+B)",
-italic_desc:"Italic (Ctrl+I)",
-underline_desc:"Underline (Ctrl+U)",
-striketrough_desc:"Strikethrough",
-justifyleft_desc:"Align left",
-justifycenter_desc:"Align center",
-justifyright_desc:"Align right",
-justifyfull_desc:"Align full",
-bullist_desc:"Unordered list",
-numlist_desc:"Ordered list",
-outdent_desc:"Outdent",
-indent_desc:"Indent",
-undo_desc:"Undo (Ctrl+Z)",
-redo_desc:"Redo (Ctrl+Y)",
-link_desc:"Insert/edit link",
-unlink_desc:"Unlink",
-image_desc:"Insert/edit image",
-cleanup_desc:"Cleanup messy code",
-code_desc:"Edit HTML Source",
-sub_desc:"Subscript",
-sup_desc:"Superscript",
-hr_desc:"Insert horizontal ruler",
-removeformat_desc:"Remove formatting",
-custom1_desc:"Your custom description here",
-forecolor_desc:"Select text color",
-backcolor_desc:"Select background color",
-charmap_desc:"Insert custom character",
-visualaid_desc:"Toggle guidelines/invisible elements",
-anchor_desc:"Insert/edit anchor",
-cut_desc:"Cut",
-copy_desc:"Copy",
-paste_desc:"Paste",
-image_props_desc:"Image properties",
-newdocument_desc:"New document",
-help_desc:"Help",
-blockquote_desc:"Blockquote",
-clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\r\nDo you want more information about this issue?",
-path:"Path",
-newdocument:"Are you sure you want clear all contents?",
-toolbar_focus:"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",
-more_colors:"More colors"
+tinyMCE.addI18n('en.advanced',{
+style_select:"Styles",
+font_size:"Font size",
+fontdefault:"Font family",
+block:"Format",
+paragraph:"Paragraph",
+div:"Div",
+address:"Address",
+pre:"Preformatted",
+h1:"Heading 1",
+h2:"Heading 2",
+h3:"Heading 3",
+h4:"Heading 4",
+h5:"Heading 5",
+h6:"Heading 6",
+blockquote:"Blockquote",
+code:"Code",
+samp:"Code sample",
+dt:"Definition term ",
+dd:"Definition description",
+bold_desc:"Bold (Ctrl+B)",
+italic_desc:"Italic (Ctrl+I)",
+underline_desc:"Underline (Ctrl+U)",
+striketrough_desc:"Strikethrough",
+justifyleft_desc:"Align left",
+justifycenter_desc:"Align center",
+justifyright_desc:"Align right",
+justifyfull_desc:"Align full",
+bullist_desc:"Unordered list",
+numlist_desc:"Ordered list",
+outdent_desc:"Outdent",
+indent_desc:"Indent",
+undo_desc:"Undo (Ctrl+Z)",
+redo_desc:"Redo (Ctrl+Y)",
+link_desc:"Insert/edit link",
+unlink_desc:"Unlink",
+image_desc:"Insert/edit image",
+cleanup_desc:"Cleanup messy code",
+code_desc:"Edit HTML Source",
+sub_desc:"Subscript",
+sup_desc:"Superscript",
+hr_desc:"Insert horizontal ruler",
+removeformat_desc:"Remove formatting",
+custom1_desc:"Your custom description here",
+forecolor_desc:"Select text color",
+backcolor_desc:"Select background color",
+charmap_desc:"Insert custom character",
+visualaid_desc:"Toggle guidelines/invisible elements",
+anchor_desc:"Insert/edit anchor",
+cut_desc:"Cut",
+copy_desc:"Copy",
+paste_desc:"Paste",
+image_props_desc:"Image properties",
+newdocument_desc:"New document",
+help_desc:"Help",
+blockquote_desc:"Blockquote",
+clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\r\nDo you want more information about this issue?",
+path:"Path",
+newdocument:"Are you sure you want clear all contents?",
+toolbar_focus:"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",
+more_colors:"More colors"
 });
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/themes/advanced/langs/en_dlg.js b/webapp/web/js/tiny_mce/themes/advanced/langs/en_dlg.js
index 9d124d7db..80e49419c 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/langs/en_dlg.js
+++ b/webapp/web/js/tiny_mce/themes/advanced/langs/en_dlg.js
@@ -1,51 +1,51 @@
-tinyMCE.addI18n('en.advanced_dlg',{
-about_title:"About TinyMCE",
-about_general:"About",
-about_help:"Help",
-about_license:"License",
-about_plugins:"Plugins",
-about_plugin:"Plugin",
-about_author:"Author",
-about_version:"Version",
-about_loaded:"Loaded plugins",
-anchor_title:"Insert/edit anchor",
-anchor_name:"Anchor name",
-code_title:"HTML Source Editor",
-code_wordwrap:"Word wrap",
-colorpicker_title:"Select a color",
-colorpicker_picker_tab:"Picker",
-colorpicker_picker_title:"Color picker",
-colorpicker_palette_tab:"Palette",
-colorpicker_palette_title:"Palette colors",
-colorpicker_named_tab:"Named",
-colorpicker_named_title:"Named colors",
-colorpicker_color:"Color:",
-colorpicker_name:"Name:",
-charmap_title:"Select custom character",
-image_title:"Insert/edit image",
-image_src:"Image URL",
-image_alt:"Image description",
-image_list:"Image list",
-image_border:"Border",
-image_dimensions:"Dimensions",
-image_vspace:"Vertical space",
-image_hspace:"Horizontal space",
-image_align:"Alignment",
-image_align_baseline:"Baseline",
-image_align_top:"Top",
-image_align_middle:"Middle",
-image_align_bottom:"Bottom",
-image_align_texttop:"Text top",
-image_align_textbottom:"Text bottom",
-image_align_left:"Left",
-image_align_right:"Right",
-link_title:"Insert/edit link",
-link_url:"Link URL",
-link_target:"Target",
-link_target_same:"Open link in the same window",
-link_target_blank:"Open link in a new window",
-link_titlefield:"Title",
-link_is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?",
-link_is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?",
-link_list:"Link list"
+tinyMCE.addI18n('en.advanced_dlg',{
+about_title:"About TinyMCE",
+about_general:"About",
+about_help:"Help",
+about_license:"License",
+about_plugins:"Plugins",
+about_plugin:"Plugin",
+about_author:"Author",
+about_version:"Version",
+about_loaded:"Loaded plugins",
+anchor_title:"Insert/edit anchor",
+anchor_name:"Anchor name",
+code_title:"HTML Source Editor",
+code_wordwrap:"Word wrap",
+colorpicker_title:"Select a color",
+colorpicker_picker_tab:"Picker",
+colorpicker_picker_title:"Color picker",
+colorpicker_palette_tab:"Palette",
+colorpicker_palette_title:"Palette colors",
+colorpicker_named_tab:"Named",
+colorpicker_named_title:"Named colors",
+colorpicker_color:"Color:",
+colorpicker_name:"Name:",
+charmap_title:"Select custom character",
+image_title:"Insert/edit image",
+image_src:"Image URL",
+image_alt:"Image description",
+image_list:"Image list",
+image_border:"Border",
+image_dimensions:"Dimensions",
+image_vspace:"Vertical space",
+image_hspace:"Horizontal space",
+image_align:"Alignment",
+image_align_baseline:"Baseline",
+image_align_top:"Top",
+image_align_middle:"Middle",
+image_align_bottom:"Bottom",
+image_align_texttop:"Text top",
+image_align_textbottom:"Text bottom",
+image_align_left:"Left",
+image_align_right:"Right",
+link_title:"Insert/edit link",
+link_url:"Link URL",
+link_target:"Target",
+link_target_same:"Open link in the same window",
+link_target_blank:"Open link in a new window",
+link_titlefield:"Title",
+link_is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?",
+link_is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?",
+link_list:"Link list"
 });
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/themes/advanced/link.htm b/webapp/web/js/tiny_mce/themes/advanced/link.htm
index 286cc9247..b647eed4f 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/link.htm
+++ b/webapp/web/js/tiny_mce/themes/advanced/link.htm
@@ -1,64 +1,64 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>{#advanced_dlg.link_title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="../../utils/mctabs.js"></script>
-	<script type="text/javascript" src="../../utils/form_utils.js"></script>
-	<script type="text/javascript" src="../../utils/validate.js"></script>
-	<script type="text/javascript" src="js/link.js"></script>
-	<base target="_self" />
-</head>
-<body id="link" style="display: none">
-<form onsubmit="LinkDialog.update();return false;" action="#">
-	<div class="tabs">
-		<ul>
-			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.link_title}</a></span></li>
-		</ul>
-	</div>
-
-	<div class="panel_wrapper">
-		<div id="general_panel" class="panel current">
-
-		<table border="0" cellpadding="4" cellspacing="0">
-          <tr>
-            <td nowrap="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 id="hrefbrowsercontainer">&nbsp;</td>
-				  </tr> 
-				</table></td>
-          </tr>
-		  <tr>
-			<td><label for="link_list">{#advanced_dlg.link_list}</label></td>
-			<td><select id="link_list" name="link_list" onchange="document.getElementById('href').value=this.options[this.selectedIndex].value;"></select></td>
-		  </tr>
-		<tr>
-			<td><label id="targetlistlabel" for="targetlist">{#advanced_dlg.link_target}</label></td>
-			<td><select id="target_list" name="target_list"></select></td>
-		</tr>
-          <tr>
-            <td nowrap="nowrap"><label for="linktitle">{#advanced_dlg.link_titlefield}</label></td>
-            <td><input id="linktitle" name="linktitle" type="text" value="" style="width: 200px" /></td>
-          </tr>
-			<tr>
-				<td><label for="class_list">{#class_name}</label></td>
-				<td><select id="class_list" name="class_list"></select></td>
-			</tr>
-        </table>
-		</div>
-	</div>
-
-	<div class="mceActionPanel">
-		<div style="float: left">
-			<input type="submit" id="insert" name="insert" value="{#insert}" />
-		</div>
-
-		<div style="float: right">
-			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
-		</div>
-	</div>
-</form>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#advanced_dlg.link_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="../../utils/validate.js"></script>
+	<script type="text/javascript" src="js/link.js"></script>
+	<base target="_self" />
+</head>
+<body id="link" style="display: none">
+<form onsubmit="LinkDialog.update();return false;" action="#">
+	<div class="tabs">
+		<ul>
+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.link_title}</a></span></li>
+		</ul>
+	</div>
+
+	<div class="panel_wrapper">
+		<div id="general_panel" class="panel current">
+
+		<table border="0" cellpadding="4" cellspacing="0">
+          <tr>
+            <td nowrap="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 id="hrefbrowsercontainer">&nbsp;</td>
+				  </tr> 
+				</table></td>
+          </tr>
+		  <tr>
+			<td><label for="link_list">{#advanced_dlg.link_list}</label></td>
+			<td><select id="link_list" name="link_list" onchange="document.getElementById('href').value=this.options[this.selectedIndex].value;"></select></td>
+		  </tr>
+		<tr>
+			<td><label id="targetlistlabel" for="targetlist">{#advanced_dlg.link_target}</label></td>
+			<td><select id="target_list" name="target_list"></select></td>
+		</tr>
+          <tr>
+            <td nowrap="nowrap"><label for="linktitle">{#advanced_dlg.link_titlefield}</label></td>
+            <td><input id="linktitle" name="linktitle" type="text" value="" style="width: 200px" /></td>
+          </tr>
+			<tr>
+				<td><label for="class_list">{#class_name}</label></td>
+				<td><select id="class_list" name="class_list"></select></td>
+			</tr>
+        </table>
+		</div>
+	</div>
+
+	<div class="mceActionPanel">
+		<div style="float: left">
+			<input type="submit" id="insert" name="insert" value="{#insert}" />
+		</div>
+
+		<div style="float: right">
+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+		</div>
+	</div>
+</form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/themes/advanced/skins/default/content.css b/webapp/web/js/tiny_mce/themes/advanced/skins/default/content.css
index cafa95225..6fecb1923 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/skins/default/content.css
+++ b/webapp/web/js/tiny_mce/themes/advanced/skins/default/content.css
@@ -1,32 +1,32 @@
-body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:8px;}
-body {background:#FFF;}
-body.mceForceColors {background:#FFF; color:#000;}
-h1 {font-size: 2em}
-h2 {font-size: 1.5em}
-h3 {font-size: 1.17em}
-h4 {font-size: 1em}
-h5 {font-size: .83em}
-h6 {font-size: .75em}
-.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}
-a.mceItemAnchor {width:12px; line-height:6px; overflow:hidden; padding-left:12px; background:url(img/items.gif) no-repeat bottom left;}
-img.mceItemAnchor {width:12px; height:12px; background:url(img/items.gif) no-repeat;}
-img {border:0;}
-table {cursor:default}
-table td, table th {cursor:text}
-ins {border-bottom:1px solid green; text-decoration: none; color:green}
-del {color:red; text-decoration:line-through}
-cite {border-bottom:1px dashed blue}
-acronym {border-bottom:1px dotted #CCC; cursor:help}
-abbr, html\:abbr {border-bottom:1px dashed #CCC; cursor:help}
-
-/* IE */
-* html body {
-scrollbar-3dlight-color:#F0F0EE;
-scrollbar-arrow-color:#676662;
-scrollbar-base-color:#F0F0EE;
-scrollbar-darkshadow-color:#DDD;
-scrollbar-face-color:#E0E0DD;
-scrollbar-highlight-color:#F0F0EE;
-scrollbar-shadow-color:#F0F0EE;
-scrollbar-track-color:#F5F5F5;
-}
+body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:8px;}
+body {background:#FFF;}
+body.mceForceColors {background:#FFF; color:#000;}
+h1 {font-size: 2em}
+h2 {font-size: 1.5em}
+h3 {font-size: 1.17em}
+h4 {font-size: 1em}
+h5 {font-size: .83em}
+h6 {font-size: .75em}
+.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}
+a.mceItemAnchor {width:12px; line-height:6px; overflow:hidden; padding-left:12px; background:url(img/items.gif) no-repeat bottom left;}
+img.mceItemAnchor {width:12px; height:12px; background:url(img/items.gif) no-repeat;}
+img {border:0;}
+table {cursor:default}
+table td, table th {cursor:text}
+ins {border-bottom:1px solid green; text-decoration: none; color:green}
+del {color:red; text-decoration:line-through}
+cite {border-bottom:1px dashed blue}
+acronym {border-bottom:1px dotted #CCC; cursor:help}
+abbr, html\:abbr {border-bottom:1px dashed #CCC; cursor:help}
+
+/* IE */
+* html body {
+scrollbar-3dlight-color:#F0F0EE;
+scrollbar-arrow-color:#676662;
+scrollbar-base-color:#F0F0EE;
+scrollbar-darkshadow-color:#DDD;
+scrollbar-face-color:#E0E0DD;
+scrollbar-highlight-color:#F0F0EE;
+scrollbar-shadow-color:#F0F0EE;
+scrollbar-track-color:#F5F5F5;
+}
diff --git a/webapp/web/js/tiny_mce/themes/advanced/skins/default/dialog.css b/webapp/web/js/tiny_mce/themes/advanced/skins/default/dialog.css
index c944a60ba..497dda30c 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/skins/default/dialog.css
+++ b/webapp/web/js/tiny_mce/themes/advanced/skins/default/dialog.css
@@ -1,114 +1,114 @@
-/* Generic */
-body {
-font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;
-scrollbar-3dlight-color:#F0F0EE;
-scrollbar-arrow-color:#676662;
-scrollbar-base-color:#F0F0EE;
-scrollbar-darkshadow-color:#DDDDDD;
-scrollbar-face-color:#E0E0DD;
-scrollbar-highlight-color:#F0F0EE;
-scrollbar-shadow-color:#F0F0EE;
-scrollbar-track-color:#F5F5F5;
-background:#F0F0EE;
-padding:0;
-margin:8px 8px 0 8px;
-}
-
-html {background:#F0F0EE;}
-td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
-textarea {resize:none;outline:none;}
-a:link, a:visited {color:black;}
-a:hover {color:#2B6FB6;}
-
-/* Forms */
-fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;}
-legend {color:#2B6FB6; font-weight:bold;}
-label.msg {display:none;}
-label.invalid {color:#EE0000; display:inline;}
-input.invalid {border:1px solid #EE0000;}
-input {background:#FFF; border:1px solid #CCC;}
-input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
-input, select, textarea {border:1px solid #808080;}
-input.radio {border:1px none #000000; background:transparent; vertical-align:middle;}
-input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;}
-.input_noborder {border:0;}
-
-/* Buttons */
-#insert, #cancel, input.button, .updateButton {
-border:0; margin:0; padding:0;
-font-weight:bold;
-width:94px; height:26px;
-background:url(img/buttons.png) 0 -26px;
-cursor:pointer;
-padding-bottom:2px;
-}
-
-#insert {background:url(img/buttons.png) 0 -52px;}
-#cancel {background:url(img/buttons.png) 0 0;}
-
-/* Browse */
-a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;}
-.mceOldBoxModel a.browse span {width:22px; height:20px;}
-a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;}
-a.browse span.disabled {border:1px solid white; -moz-opacity:0.3; opacity:0.3; filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);}
-a.browse:hover span.disabled {border:1px solid white; background-color:transparent;}
-a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;}
-.mceOldBoxModel a.pickcolor span {width:21px; height:17px;}
-a.pickcolor:hover span {background-color:#B2BBD0;}
-a.pickcolor:hover span.disabled {}
-
-/* Charmap */
-table.charmap {border:1px solid #AAA; text-align:center}
-td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;}
-#charmap a {display:block; color:#000; text-decoration:none; border:0}
-#charmap a:hover {background:#CCC;color:#2B6FB6}
-#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center}
-#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center}
-
-/* Source */
-.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;}
-.mceActionPanel {margin-top:5px;}
-
-/* Tabs classes */
-.tabs {width:100%; height:18px; line-height:normal; background:url(img/tabs.gif) repeat-x 0 -72px;}
-.tabs ul {margin:0; padding:0; list-style:none;}
-.tabs li {float:left; background:url(img/tabs.gif) no-repeat 0 0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block;}
-.tabs li.current {background:url(img/tabs.gif) no-repeat 0 -18px; margin-right:2px;}
-.tabs span {float:left; display:block; background:url(img/tabs.gif) no-repeat right -36px; padding:0px 10px 0 0;}
-.tabs .current span {background:url(img/tabs.gif) no-repeat right -54px;}
-.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;}
-.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;}
-
-/* Panels */
-.panel_wrapper div.panel {display:none;}
-.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;}
-.panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;}
-
-/* Columns */
-.column {float:left;}
-.properties {width:100%;}
-.properties .column1 {}
-.properties .column2 {text-align:left;}
-
-/* Titles */
-h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;}
-h3 {font-size:14px;}
-.title {font-size:12px; font-weight:bold; color:#2B6FB6;}
-
-/* Dialog specific */
-#link .panel_wrapper, #link div.current {height:125px;}
-#image .panel_wrapper, #image div.current {height:200px;}
-#plugintable thead {font-weight:bold; background:#DDD;}
-#plugintable, #about #plugintable td {border:1px solid #919B9C;}
-#plugintable {width:96%; margin-top:10px;}
-#pluginscontainer {height:290px; overflow:auto;}
-#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;}
-#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}
-#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}
-#colorpicker #light div {overflow:hidden;}
-#colorpicker #previewblock {float:right; padding-left:10px; height:20px;}
-#colorpicker .panel_wrapper div.current {height:175px;}
-#colorpicker #namedcolors {width:150px;}
-#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
-#colorpicker #colornamecontainer {margin-top:5px;}
+/* Generic */
+body {
+font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;
+scrollbar-3dlight-color:#F0F0EE;
+scrollbar-arrow-color:#676662;
+scrollbar-base-color:#F0F0EE;
+scrollbar-darkshadow-color:#DDDDDD;
+scrollbar-face-color:#E0E0DD;
+scrollbar-highlight-color:#F0F0EE;
+scrollbar-shadow-color:#F0F0EE;
+scrollbar-track-color:#F5F5F5;
+background:#F0F0EE;
+padding:0;
+margin:8px 8px 0 8px;
+}
+
+html {background:#F0F0EE;}
+td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
+textarea {resize:none;outline:none;}
+a:link, a:visited {color:black;}
+a:hover {color:#2B6FB6;}
+
+/* Forms */
+fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;}
+legend {color:#2B6FB6; font-weight:bold;}
+label.msg {display:none;}
+label.invalid {color:#EE0000; display:inline;}
+input.invalid {border:1px solid #EE0000;}
+input {background:#FFF; border:1px solid #CCC;}
+input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
+input, select, textarea {border:1px solid #808080;}
+input.radio {border:1px none #000000; background:transparent; vertical-align:middle;}
+input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;}
+.input_noborder {border:0;}
+
+/* Buttons */
+#insert, #cancel, input.button, .updateButton {
+border:0; margin:0; padding:0;
+font-weight:bold;
+width:94px; height:26px;
+background:url(img/buttons.png) 0 -26px;
+cursor:pointer;
+padding-bottom:2px;
+}
+
+#insert {background:url(img/buttons.png) 0 -52px;}
+#cancel {background:url(img/buttons.png) 0 0;}
+
+/* Browse */
+a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;}
+.mceOldBoxModel a.browse span {width:22px; height:20px;}
+a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;}
+a.browse span.disabled {border:1px solid white; -moz-opacity:0.3; opacity:0.3; filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);}
+a.browse:hover span.disabled {border:1px solid white; background-color:transparent;}
+a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;}
+.mceOldBoxModel a.pickcolor span {width:21px; height:17px;}
+a.pickcolor:hover span {background-color:#B2BBD0;}
+a.pickcolor:hover span.disabled {}
+
+/* Charmap */
+table.charmap {border:1px solid #AAA; text-align:center}
+td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;}
+#charmap a {display:block; color:#000; text-decoration:none; border:0}
+#charmap a:hover {background:#CCC;color:#2B6FB6}
+#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center}
+#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center}
+
+/* Source */
+.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;}
+.mceActionPanel {margin-top:5px;}
+
+/* Tabs classes */
+.tabs {width:100%; height:18px; line-height:normal; background:url(img/tabs.gif) repeat-x 0 -72px;}
+.tabs ul {margin:0; padding:0; list-style:none;}
+.tabs li {float:left; background:url(img/tabs.gif) no-repeat 0 0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block;}
+.tabs li.current {background:url(img/tabs.gif) no-repeat 0 -18px; margin-right:2px;}
+.tabs span {float:left; display:block; background:url(img/tabs.gif) no-repeat right -36px; padding:0px 10px 0 0;}
+.tabs .current span {background:url(img/tabs.gif) no-repeat right -54px;}
+.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;}
+.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;}
+
+/* Panels */
+.panel_wrapper div.panel {display:none;}
+.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;}
+.panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;}
+
+/* Columns */
+.column {float:left;}
+.properties {width:100%;}
+.properties .column1 {}
+.properties .column2 {text-align:left;}
+
+/* Titles */
+h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;}
+h3 {font-size:14px;}
+.title {font-size:12px; font-weight:bold; color:#2B6FB6;}
+
+/* Dialog specific */
+#link .panel_wrapper, #link div.current {height:125px;}
+#image .panel_wrapper, #image div.current {height:200px;}
+#plugintable thead {font-weight:bold; background:#DDD;}
+#plugintable, #about #plugintable td {border:1px solid #919B9C;}
+#plugintable {width:96%; margin-top:10px;}
+#pluginscontainer {height:290px; overflow:auto;}
+#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;}
+#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}
+#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}
+#colorpicker #light div {overflow:hidden;}
+#colorpicker #previewblock {float:right; padding-left:10px; height:20px;}
+#colorpicker .panel_wrapper div.current {height:175px;}
+#colorpicker #namedcolors {width:150px;}
+#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
+#colorpicker #colornamecontainer {margin-top:5px;}
 #colorpicker #picker_panel fieldset {margin:auto;width:325px;}
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/themes/advanced/skins/default/ui.css b/webapp/web/js/tiny_mce/themes/advanced/skins/default/ui.css
index 7e202a71a..ba8d30a5b 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/skins/default/ui.css
+++ b/webapp/web/js/tiny_mce/themes/advanced/skins/default/ui.css
@@ -1,215 +1,215 @@
-/* Reset */
-.defaultSkin table, .defaultSkin tbody, .defaultSkin a, .defaultSkin img, .defaultSkin tr, .defaultSkin div, .defaultSkin td, .defaultSkin iframe, .defaultSkin span, .defaultSkin *, .defaultSkin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left}
-.defaultSkin a:hover, .defaultSkin a:link, .defaultSkin a:visited, .defaultSkin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000}
-.defaultSkin table td {vertical-align:middle}
-
-/* Containers */
-.defaultSkin table {background:#F0F0EE}
-.defaultSkin iframe {display:block; background:#FFF}
-.defaultSkin .mceToolbar {height:26px}
-.defaultSkin .mceLeft {text-align:left}
-.defaultSkin .mceRight {text-align:right}
-
-/* External */
-.defaultSkin .mceExternalToolbar {position:absolute; border:1px solid #CCC; border-bottom:0; display:none;}
-.defaultSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}
-.defaultSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0}
-
-/* Layout */
-.defaultSkin table.mceLayout {border:0; border-left:1px solid #CCC; border-right:1px solid #CCC}
-.defaultSkin table.mceLayout tr.mceFirst td {border-top:1px solid #CCC}
-.defaultSkin table.mceLayout tr.mceLast td {border-bottom:1px solid #CCC}
-.defaultSkin table.mceToolbar, .defaultSkin tr.mceFirst .mceToolbar tr td, .defaultSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;}
-.defaultSkin td.mceToolbar {padding-top:1px; vertical-align:top}
-.defaultSkin .mceIframeContainer {border-top:1px solid #CCC; border-bottom:1px solid #CCC}
-.defaultSkin .mceStatusbar {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px}
-.defaultSkin .mceStatusbar div {float:left; margin:2px}
-.defaultSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize}
-.defaultSkin .mceStatusbar a:hover {text-decoration:underline}
-.defaultSkin table.mceToolbar {margin-left:3px}
-.defaultSkin span.mceIcon, .defaultSkin img.mceIcon {display:block; width:20px; height:20px}
-.defaultSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}
-.defaultSkin td.mceCenter {text-align:center;}
-.defaultSkin td.mceCenter table {margin:0 auto; text-align:left;}
-.defaultSkin td.mceRight table {margin:0 0 0 auto;}
-
-/* Button */
-.defaultSkin .mceButton {display:block; border:1px solid #F0F0EE; width:20px; height:20px; margin-right:1px}
-.defaultSkin a.mceButtonEnabled:hover {border:1px solid #0A246A; background-color:#B2BBD0}
-.defaultSkin a.mceButtonActive, .defaultSkin a.mceButtonSelected {border:1px solid #0A246A; background-color:#C2CBE0}
-.defaultSkin .mceButtonDisabled .mceIcon {opacity:0.3; filter:alpha(opacity=30)}
-.defaultSkin .mceButtonLabeled {width:auto}
-.defaultSkin .mceButtonLabeled span.mceIcon {float:left}
-.defaultSkin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px; font-family:Tahoma,Verdana,Arial,Helvetica}
-.defaultSkin .mceButtonDisabled .mceButtonLabel {color:#888}
-
-/* Separator */
-.defaultSkin .mceSeparator {display:block; background:url(../../img/icons.gif) -180px 0; width:2px; height:20px; margin:2px 2px 0 4px}
-
-/* ListBox */
-.defaultSkin .mceListBox {direction:ltr}
-.defaultSkin .mceListBox, .defaultSkin .mceListBox a {display:block}
-.defaultSkin .mceListBox .mceText {padding-left:4px; width:70px; text-align:left; border:1px solid #CCC; border-right:0; background:#FFF; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}
-.defaultSkin .mceListBox .mceOpen {width:9px; height:20px; background:url(../../img/icons.gif) -741px 0; margin-right:2px; border:1px solid #CCC;}
-.defaultSkin table.mceListBoxEnabled:hover .mceText, .defaultSkin .mceListBoxHover .mceText, .defaultSkin .mceListBoxSelected .mceText {border:1px solid #A2ABC0; border-right:0; background:#FFF}
-.defaultSkin table.mceListBoxEnabled:hover .mceOpen, .defaultSkin .mceListBoxHover .mceOpen, .defaultSkin .mceListBoxSelected .mceOpen {background-color:#FFF; border:1px solid #A2ABC0}
-.defaultSkin .mceListBoxDisabled a.mceText {color:gray; background-color:transparent;}
-.defaultSkin .mceListBoxMenu {overflow:auto; overflow-x:hidden}
-.defaultSkin .mceOldBoxModel .mceListBox .mceText {height:22px}
-.defaultSkin .mceOldBoxModel .mceListBox .mceOpen {width:11px; height:22px;}
-.defaultSkin select.mceNativeListBox {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:7pt; background:#F0F0EE; border:1px solid gray; margin-right:2px;}
-
-/* SplitButton */
-.defaultSkin .mceSplitButton {width:32px; height:20px; direction:ltr}
-.defaultSkin .mceSplitButton a, .defaultSkin .mceSplitButton span {height:20px; display:block}
-.defaultSkin .mceSplitButton a.mceAction {width:20px; border:1px solid #F0F0EE; border-right:0;}
-.defaultSkin .mceSplitButton span.mceAction {width:20px; background:url(../../img/icons.gif) 20px 20px;}
-.defaultSkin .mceSplitButton a.mceOpen {width:9px; border:1px solid #F0F0EE;}
-.defaultSkin .mceSplitButton span.mceOpen {width:9px; background:url(../../img/icons.gif) -741px 0;}
-.defaultSkin table.mceSplitButtonEnabled:hover a.mceAction, .defaultSkin .mceSplitButtonHover a.mceAction, .defaultSkin .mceSplitButtonSelected a.mceAction {border:1px solid #0A246A; border-right:0; background-color:#B2BBD0}
-.defaultSkin table.mceSplitButtonEnabled:hover a.mceOpen, .defaultSkin .mceSplitButtonHover a.mceOpen, .defaultSkin .mceSplitButtonSelected a.mceOpen {border:1px solid #0A246A;}
-.defaultSkin table.mceSplitButtonEnabled:hover span.mceOpen, .defaultSkin .mceSplitButtonHover span.mceOpen, .defaultSkin .mceSplitButtonSelected span.mceOpen {background-color:#B2BBD0}
-.defaultSkin .mceSplitButtonDisabled .mceAction, .defaultSkin .mceSplitButtonDisabled span.mceOpen {opacity:0.3; filter:alpha(opacity=30)}
-.defaultSkin .mceSplitButtonActive a.mceAction {border:1px solid #0A246A; background-color:#C2CBE0}
-.defaultSkin .mceSplitButtonActive a.mceOpen {border-left:0;}
-
-/* ColorSplitButton */
-.defaultSkin div.mceColorSplitMenu table {background:#FFF; border:1px solid gray}
-.defaultSkin .mceColorSplitMenu td {padding:2px}
-.defaultSkin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden; border:1px solid #808080}
-.defaultSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}
-.defaultSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF}
-.defaultSkin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid #0A246A; background-color:#B6BDD2}
-.defaultSkin a.mceMoreColors:hover {border:1px solid #0A246A}
-.defaultSkin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; background:#9a9b9a}
-.defaultSkin .mce_forecolor span.mceAction, .defaultSkin .mce_backcolor span.mceAction {overflow:hidden; height:16px}
-
-/* Menu */
-.defaultSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #D4D0C8}
-.defaultSkin .mceNoIcons span.mceIcon {width:0;}
-.defaultSkin .mceNoIcons a .mceText {padding-left:10px}
-.defaultSkin .mceMenu table {background:#FFF}
-.defaultSkin .mceMenu a, .defaultSkin .mceMenu span, .defaultSkin .mceMenu {display:block}
-.defaultSkin .mceMenu td {height:20px}
-.defaultSkin .mceMenu a {position:relative;padding:3px 0 4px 0}
-.defaultSkin .mceMenu .mceText {position:relative; display:block; font-family:Tahoma,Verdana,Arial,Helvetica; color:#000; cursor:default; margin:0; padding:0 25px 0 25px; display:block}
-.defaultSkin .mceMenu span.mceText, .defaultSkin .mceMenu .mcePreview {font-size:11px}
-.defaultSkin .mceMenu pre.mceText {font-family:Monospace}
-.defaultSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;}
-.defaultSkin .mceMenu .mceMenuItemEnabled a:hover, .defaultSkin .mceMenu .mceMenuItemActive {background-color:#dbecf3}
-.defaultSkin td.mceMenuItemSeparator {background:#DDD; height:1px}
-.defaultSkin .mceMenuItemTitle a {border:0; background:#EEE; border-bottom:1px solid #DDD}
-.defaultSkin .mceMenuItemTitle span.mceText {color:#000; font-weight:bold; padding-left:4px}
-.defaultSkin .mceMenuItemDisabled .mceText {color:#888}
-.defaultSkin .mceMenuItemSelected .mceIcon {background:url(img/menu_check.gif)}
-.defaultSkin .mceNoIcons .mceMenuItemSelected a {background:url(img/menu_arrow.gif) no-repeat -6px center}
-.defaultSkin .mceMenu span.mceMenuLine {display:none}
-.defaultSkin .mceMenuItemSub a {background:url(img/menu_arrow.gif) no-repeat top right;}
-
-/* Progress,Resize */
-.defaultSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; filter:alpha(opacity=50); background:#FFF}
-.defaultSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
-.defaultSkin .mcePlaceHolder {border:1px dotted gray}
-
-/* Formats */
-.defaultSkin .mce_formatPreview a {font-size:10px}
-.defaultSkin .mce_p span.mceText {}
-.defaultSkin .mce_address span.mceText {font-style:italic}
-.defaultSkin .mce_pre span.mceText {font-family:monospace}
-.defaultSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}
-.defaultSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}
-.defaultSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}
-.defaultSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}
-.defaultSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}
-.defaultSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}
-
-/* Theme */
-.defaultSkin span.mce_bold {background-position:0 0}
-.defaultSkin span.mce_italic {background-position:-60px 0}
-.defaultSkin span.mce_underline {background-position:-140px 0}
-.defaultSkin span.mce_strikethrough {background-position:-120px 0}
-.defaultSkin span.mce_undo {background-position:-160px 0}
-.defaultSkin span.mce_redo {background-position:-100px 0}
-.defaultSkin span.mce_cleanup {background-position:-40px 0}
-.defaultSkin span.mce_bullist {background-position:-20px 0}
-.defaultSkin span.mce_numlist {background-position:-80px 0}
-.defaultSkin span.mce_justifyleft {background-position:-460px 0}
-.defaultSkin span.mce_justifyright {background-position:-480px 0}
-.defaultSkin span.mce_justifycenter {background-position:-420px 0}
-.defaultSkin span.mce_justifyfull {background-position:-440px 0}
-.defaultSkin span.mce_anchor {background-position:-200px 0}
-.defaultSkin span.mce_indent {background-position:-400px 0}
-.defaultSkin span.mce_outdent {background-position:-540px 0}
-.defaultSkin span.mce_link {background-position:-500px 0}
-.defaultSkin span.mce_unlink {background-position:-640px 0}
-.defaultSkin span.mce_sub {background-position:-600px 0}
-.defaultSkin span.mce_sup {background-position:-620px 0}
-.defaultSkin span.mce_removeformat {background-position:-580px 0}
-.defaultSkin span.mce_newdocument {background-position:-520px 0}
-.defaultSkin span.mce_image {background-position:-380px 0}
-.defaultSkin span.mce_help {background-position:-340px 0}
-.defaultSkin span.mce_code {background-position:-260px 0}
-.defaultSkin span.mce_hr {background-position:-360px 0}
-.defaultSkin span.mce_visualaid {background-position:-660px 0}
-.defaultSkin span.mce_charmap {background-position:-240px 0}
-.defaultSkin span.mce_paste {background-position:-560px 0}
-.defaultSkin span.mce_copy {background-position:-700px 0}
-.defaultSkin span.mce_cut {background-position:-680px 0}
-.defaultSkin span.mce_blockquote {background-position:-220px 0}
-.defaultSkin .mce_forecolor span.mceAction {background-position:-720px 0}
-.defaultSkin .mce_backcolor span.mceAction {background-position:-760px 0}
-.defaultSkin span.mce_forecolorpicker {background-position:-720px 0}
-.defaultSkin span.mce_backcolorpicker {background-position:-760px 0}
-
-/* Plugins */
-.defaultSkin span.mce_advhr {background-position:-0px -20px}
-.defaultSkin span.mce_ltr {background-position:-20px -20px}
-.defaultSkin span.mce_rtl {background-position:-40px -20px}
-.defaultSkin span.mce_emotions {background-position:-60px -20px}
-.defaultSkin span.mce_fullpage {background-position:-80px -20px}
-.defaultSkin span.mce_fullscreen {background-position:-100px -20px}
-.defaultSkin span.mce_iespell {background-position:-120px -20px}
-.defaultSkin span.mce_insertdate {background-position:-140px -20px}
-.defaultSkin span.mce_inserttime {background-position:-160px -20px}
-.defaultSkin span.mce_absolute {background-position:-180px -20px}
-.defaultSkin span.mce_backward {background-position:-200px -20px}
-.defaultSkin span.mce_forward {background-position:-220px -20px}
-.defaultSkin span.mce_insert_layer {background-position:-240px -20px}
-.defaultSkin span.mce_insertlayer {background-position:-260px -20px}
-.defaultSkin span.mce_movebackward {background-position:-280px -20px}
-.defaultSkin span.mce_moveforward {background-position:-300px -20px}
-.defaultSkin span.mce_media {background-position:-320px -20px}
-.defaultSkin span.mce_nonbreaking {background-position:-340px -20px}
-.defaultSkin span.mce_pastetext {background-position:-360px -20px}
-.defaultSkin span.mce_pasteword {background-position:-380px -20px}
-.defaultSkin span.mce_selectall {background-position:-400px -20px}
-.defaultSkin span.mce_preview {background-position:-420px -20px}
-.defaultSkin span.mce_print {background-position:-440px -20px}
-.defaultSkin span.mce_cancel {background-position:-460px -20px}
-.defaultSkin span.mce_save {background-position:-480px -20px}
-.defaultSkin span.mce_replace {background-position:-500px -20px}
-.defaultSkin span.mce_search {background-position:-520px -20px}
-.defaultSkin span.mce_styleprops {background-position:-560px -20px}
-.defaultSkin span.mce_table {background-position:-580px -20px}
-.defaultSkin span.mce_cell_props {background-position:-600px -20px}
-.defaultSkin span.mce_delete_table {background-position:-620px -20px}
-.defaultSkin span.mce_delete_col {background-position:-640px -20px}
-.defaultSkin span.mce_delete_row {background-position:-660px -20px}
-.defaultSkin span.mce_col_after {background-position:-680px -20px}
-.defaultSkin span.mce_col_before {background-position:-700px -20px}
-.defaultSkin span.mce_row_after {background-position:-720px -20px}
-.defaultSkin span.mce_row_before {background-position:-740px -20px}
-.defaultSkin span.mce_merge_cells {background-position:-760px -20px}
-.defaultSkin span.mce_table_props {background-position:-980px -20px}
-.defaultSkin span.mce_row_props {background-position:-780px -20px}
-.defaultSkin span.mce_split_cells {background-position:-800px -20px}
-.defaultSkin span.mce_template {background-position:-820px -20px}
-.defaultSkin span.mce_visualchars {background-position:-840px -20px}
-.defaultSkin span.mce_abbr {background-position:-860px -20px}
-.defaultSkin span.mce_acronym {background-position:-880px -20px}
-.defaultSkin span.mce_attribs {background-position:-900px -20px}
-.defaultSkin span.mce_cite {background-position:-920px -20px}
-.defaultSkin span.mce_del {background-position:-940px -20px}
-.defaultSkin span.mce_ins {background-position:-960px -20px}
-.defaultSkin span.mce_pagebreak {background-position:0 -40px}
-.defaultSkin .mce_spellchecker span.mceAction {background-position:-540px -20px}
+/* Reset */
+.defaultSkin table, .defaultSkin tbody, .defaultSkin a, .defaultSkin img, .defaultSkin tr, .defaultSkin div, .defaultSkin td, .defaultSkin iframe, .defaultSkin span, .defaultSkin *, .defaultSkin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left}
+.defaultSkin a:hover, .defaultSkin a:link, .defaultSkin a:visited, .defaultSkin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000}
+.defaultSkin table td {vertical-align:middle}
+
+/* Containers */
+.defaultSkin table {background:#F0F0EE}
+.defaultSkin iframe {display:block; background:#FFF}
+.defaultSkin .mceToolbar {height:26px}
+.defaultSkin .mceLeft {text-align:left}
+.defaultSkin .mceRight {text-align:right}
+
+/* External */
+.defaultSkin .mceExternalToolbar {position:absolute; border:1px solid #CCC; border-bottom:0; display:none;}
+.defaultSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}
+.defaultSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0}
+
+/* Layout */
+.defaultSkin table.mceLayout {border:0; border-left:1px solid #CCC; border-right:1px solid #CCC}
+.defaultSkin table.mceLayout tr.mceFirst td {border-top:1px solid #CCC}
+.defaultSkin table.mceLayout tr.mceLast td {border-bottom:1px solid #CCC}
+.defaultSkin table.mceToolbar, .defaultSkin tr.mceFirst .mceToolbar tr td, .defaultSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;}
+.defaultSkin td.mceToolbar {padding-top:1px; vertical-align:top}
+.defaultSkin .mceIframeContainer {border-top:1px solid #CCC; border-bottom:1px solid #CCC}
+.defaultSkin .mceStatusbar {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px}
+.defaultSkin .mceStatusbar div {float:left; margin:2px}
+.defaultSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize}
+.defaultSkin .mceStatusbar a:hover {text-decoration:underline}
+.defaultSkin table.mceToolbar {margin-left:3px}
+.defaultSkin span.mceIcon, .defaultSkin img.mceIcon {display:block; width:20px; height:20px}
+.defaultSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}
+.defaultSkin td.mceCenter {text-align:center;}
+.defaultSkin td.mceCenter table {margin:0 auto; text-align:left;}
+.defaultSkin td.mceRight table {margin:0 0 0 auto;}
+
+/* Button */
+.defaultSkin .mceButton {display:block; border:1px solid #F0F0EE; width:20px; height:20px; margin-right:1px}
+.defaultSkin a.mceButtonEnabled:hover {border:1px solid #0A246A; background-color:#B2BBD0}
+.defaultSkin a.mceButtonActive, .defaultSkin a.mceButtonSelected {border:1px solid #0A246A; background-color:#C2CBE0}
+.defaultSkin .mceButtonDisabled .mceIcon {opacity:0.3; filter:alpha(opacity=30)}
+.defaultSkin .mceButtonLabeled {width:auto}
+.defaultSkin .mceButtonLabeled span.mceIcon {float:left}
+.defaultSkin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px; font-family:Tahoma,Verdana,Arial,Helvetica}
+.defaultSkin .mceButtonDisabled .mceButtonLabel {color:#888}
+
+/* Separator */
+.defaultSkin .mceSeparator {display:block; background:url(../../img/icons.gif) -180px 0; width:2px; height:20px; margin:2px 2px 0 4px}
+
+/* ListBox */
+.defaultSkin .mceListBox {direction:ltr}
+.defaultSkin .mceListBox, .defaultSkin .mceListBox a {display:block}
+.defaultSkin .mceListBox .mceText {padding-left:4px; width:70px; text-align:left; border:1px solid #CCC; border-right:0; background:#FFF; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}
+.defaultSkin .mceListBox .mceOpen {width:9px; height:20px; background:url(../../img/icons.gif) -741px 0; margin-right:2px; border:1px solid #CCC;}
+.defaultSkin table.mceListBoxEnabled:hover .mceText, .defaultSkin .mceListBoxHover .mceText, .defaultSkin .mceListBoxSelected .mceText {border:1px solid #A2ABC0; border-right:0; background:#FFF}
+.defaultSkin table.mceListBoxEnabled:hover .mceOpen, .defaultSkin .mceListBoxHover .mceOpen, .defaultSkin .mceListBoxSelected .mceOpen {background-color:#FFF; border:1px solid #A2ABC0}
+.defaultSkin .mceListBoxDisabled a.mceText {color:gray; background-color:transparent;}
+.defaultSkin .mceListBoxMenu {overflow:auto; overflow-x:hidden}
+.defaultSkin .mceOldBoxModel .mceListBox .mceText {height:22px}
+.defaultSkin .mceOldBoxModel .mceListBox .mceOpen {width:11px; height:22px;}
+.defaultSkin select.mceNativeListBox {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:7pt; background:#F0F0EE; border:1px solid gray; margin-right:2px;}
+
+/* SplitButton */
+.defaultSkin .mceSplitButton {width:32px; height:20px; direction:ltr}
+.defaultSkin .mceSplitButton a, .defaultSkin .mceSplitButton span {height:20px; display:block}
+.defaultSkin .mceSplitButton a.mceAction {width:20px; border:1px solid #F0F0EE; border-right:0;}
+.defaultSkin .mceSplitButton span.mceAction {width:20px; background:url(../../img/icons.gif) 20px 20px;}
+.defaultSkin .mceSplitButton a.mceOpen {width:9px; border:1px solid #F0F0EE;}
+.defaultSkin .mceSplitButton span.mceOpen {width:9px; background:url(../../img/icons.gif) -741px 0;}
+.defaultSkin table.mceSplitButtonEnabled:hover a.mceAction, .defaultSkin .mceSplitButtonHover a.mceAction, .defaultSkin .mceSplitButtonSelected a.mceAction {border:1px solid #0A246A; border-right:0; background-color:#B2BBD0}
+.defaultSkin table.mceSplitButtonEnabled:hover a.mceOpen, .defaultSkin .mceSplitButtonHover a.mceOpen, .defaultSkin .mceSplitButtonSelected a.mceOpen {border:1px solid #0A246A;}
+.defaultSkin table.mceSplitButtonEnabled:hover span.mceOpen, .defaultSkin .mceSplitButtonHover span.mceOpen, .defaultSkin .mceSplitButtonSelected span.mceOpen {background-color:#B2BBD0}
+.defaultSkin .mceSplitButtonDisabled .mceAction, .defaultSkin .mceSplitButtonDisabled span.mceOpen {opacity:0.3; filter:alpha(opacity=30)}
+.defaultSkin .mceSplitButtonActive a.mceAction {border:1px solid #0A246A; background-color:#C2CBE0}
+.defaultSkin .mceSplitButtonActive a.mceOpen {border-left:0;}
+
+/* ColorSplitButton */
+.defaultSkin div.mceColorSplitMenu table {background:#FFF; border:1px solid gray}
+.defaultSkin .mceColorSplitMenu td {padding:2px}
+.defaultSkin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden; border:1px solid #808080}
+.defaultSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}
+.defaultSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF}
+.defaultSkin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid #0A246A; background-color:#B6BDD2}
+.defaultSkin a.mceMoreColors:hover {border:1px solid #0A246A}
+.defaultSkin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; background:#9a9b9a}
+.defaultSkin .mce_forecolor span.mceAction, .defaultSkin .mce_backcolor span.mceAction {overflow:hidden; height:16px}
+
+/* Menu */
+.defaultSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #D4D0C8}
+.defaultSkin .mceNoIcons span.mceIcon {width:0;}
+.defaultSkin .mceNoIcons a .mceText {padding-left:10px}
+.defaultSkin .mceMenu table {background:#FFF}
+.defaultSkin .mceMenu a, .defaultSkin .mceMenu span, .defaultSkin .mceMenu {display:block}
+.defaultSkin .mceMenu td {height:20px}
+.defaultSkin .mceMenu a {position:relative;padding:3px 0 4px 0}
+.defaultSkin .mceMenu .mceText {position:relative; display:block; font-family:Tahoma,Verdana,Arial,Helvetica; color:#000; cursor:default; margin:0; padding:0 25px 0 25px; display:block}
+.defaultSkin .mceMenu span.mceText, .defaultSkin .mceMenu .mcePreview {font-size:11px}
+.defaultSkin .mceMenu pre.mceText {font-family:Monospace}
+.defaultSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;}
+.defaultSkin .mceMenu .mceMenuItemEnabled a:hover, .defaultSkin .mceMenu .mceMenuItemActive {background-color:#dbecf3}
+.defaultSkin td.mceMenuItemSeparator {background:#DDD; height:1px}
+.defaultSkin .mceMenuItemTitle a {border:0; background:#EEE; border-bottom:1px solid #DDD}
+.defaultSkin .mceMenuItemTitle span.mceText {color:#000; font-weight:bold; padding-left:4px}
+.defaultSkin .mceMenuItemDisabled .mceText {color:#888}
+.defaultSkin .mceMenuItemSelected .mceIcon {background:url(img/menu_check.gif)}
+.defaultSkin .mceNoIcons .mceMenuItemSelected a {background:url(img/menu_arrow.gif) no-repeat -6px center}
+.defaultSkin .mceMenu span.mceMenuLine {display:none}
+.defaultSkin .mceMenuItemSub a {background:url(img/menu_arrow.gif) no-repeat top right;}
+
+/* Progress,Resize */
+.defaultSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; filter:alpha(opacity=50); background:#FFF}
+.defaultSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
+.defaultSkin .mcePlaceHolder {border:1px dotted gray}
+
+/* Formats */
+.defaultSkin .mce_formatPreview a {font-size:10px}
+.defaultSkin .mce_p span.mceText {}
+.defaultSkin .mce_address span.mceText {font-style:italic}
+.defaultSkin .mce_pre span.mceText {font-family:monospace}
+.defaultSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}
+.defaultSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}
+.defaultSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}
+.defaultSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}
+.defaultSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}
+.defaultSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}
+
+/* Theme */
+.defaultSkin span.mce_bold {background-position:0 0}
+.defaultSkin span.mce_italic {background-position:-60px 0}
+.defaultSkin span.mce_underline {background-position:-140px 0}
+.defaultSkin span.mce_strikethrough {background-position:-120px 0}
+.defaultSkin span.mce_undo {background-position:-160px 0}
+.defaultSkin span.mce_redo {background-position:-100px 0}
+.defaultSkin span.mce_cleanup {background-position:-40px 0}
+.defaultSkin span.mce_bullist {background-position:-20px 0}
+.defaultSkin span.mce_numlist {background-position:-80px 0}
+.defaultSkin span.mce_justifyleft {background-position:-460px 0}
+.defaultSkin span.mce_justifyright {background-position:-480px 0}
+.defaultSkin span.mce_justifycenter {background-position:-420px 0}
+.defaultSkin span.mce_justifyfull {background-position:-440px 0}
+.defaultSkin span.mce_anchor {background-position:-200px 0}
+.defaultSkin span.mce_indent {background-position:-400px 0}
+.defaultSkin span.mce_outdent {background-position:-540px 0}
+.defaultSkin span.mce_link {background-position:-500px 0}
+.defaultSkin span.mce_unlink {background-position:-640px 0}
+.defaultSkin span.mce_sub {background-position:-600px 0}
+.defaultSkin span.mce_sup {background-position:-620px 0}
+.defaultSkin span.mce_removeformat {background-position:-580px 0}
+.defaultSkin span.mce_newdocument {background-position:-520px 0}
+.defaultSkin span.mce_image {background-position:-380px 0}
+.defaultSkin span.mce_help {background-position:-340px 0}
+.defaultSkin span.mce_code {background-position:-260px 0}
+.defaultSkin span.mce_hr {background-position:-360px 0}
+.defaultSkin span.mce_visualaid {background-position:-660px 0}
+.defaultSkin span.mce_charmap {background-position:-240px 0}
+.defaultSkin span.mce_paste {background-position:-560px 0}
+.defaultSkin span.mce_copy {background-position:-700px 0}
+.defaultSkin span.mce_cut {background-position:-680px 0}
+.defaultSkin span.mce_blockquote {background-position:-220px 0}
+.defaultSkin .mce_forecolor span.mceAction {background-position:-720px 0}
+.defaultSkin .mce_backcolor span.mceAction {background-position:-760px 0}
+.defaultSkin span.mce_forecolorpicker {background-position:-720px 0}
+.defaultSkin span.mce_backcolorpicker {background-position:-760px 0}
+
+/* Plugins */
+.defaultSkin span.mce_advhr {background-position:-0px -20px}
+.defaultSkin span.mce_ltr {background-position:-20px -20px}
+.defaultSkin span.mce_rtl {background-position:-40px -20px}
+.defaultSkin span.mce_emotions {background-position:-60px -20px}
+.defaultSkin span.mce_fullpage {background-position:-80px -20px}
+.defaultSkin span.mce_fullscreen {background-position:-100px -20px}
+.defaultSkin span.mce_iespell {background-position:-120px -20px}
+.defaultSkin span.mce_insertdate {background-position:-140px -20px}
+.defaultSkin span.mce_inserttime {background-position:-160px -20px}
+.defaultSkin span.mce_absolute {background-position:-180px -20px}
+.defaultSkin span.mce_backward {background-position:-200px -20px}
+.defaultSkin span.mce_forward {background-position:-220px -20px}
+.defaultSkin span.mce_insert_layer {background-position:-240px -20px}
+.defaultSkin span.mce_insertlayer {background-position:-260px -20px}
+.defaultSkin span.mce_movebackward {background-position:-280px -20px}
+.defaultSkin span.mce_moveforward {background-position:-300px -20px}
+.defaultSkin span.mce_media {background-position:-320px -20px}
+.defaultSkin span.mce_nonbreaking {background-position:-340px -20px}
+.defaultSkin span.mce_pastetext {background-position:-360px -20px}
+.defaultSkin span.mce_pasteword {background-position:-380px -20px}
+.defaultSkin span.mce_selectall {background-position:-400px -20px}
+.defaultSkin span.mce_preview {background-position:-420px -20px}
+.defaultSkin span.mce_print {background-position:-440px -20px}
+.defaultSkin span.mce_cancel {background-position:-460px -20px}
+.defaultSkin span.mce_save {background-position:-480px -20px}
+.defaultSkin span.mce_replace {background-position:-500px -20px}
+.defaultSkin span.mce_search {background-position:-520px -20px}
+.defaultSkin span.mce_styleprops {background-position:-560px -20px}
+.defaultSkin span.mce_table {background-position:-580px -20px}
+.defaultSkin span.mce_cell_props {background-position:-600px -20px}
+.defaultSkin span.mce_delete_table {background-position:-620px -20px}
+.defaultSkin span.mce_delete_col {background-position:-640px -20px}
+.defaultSkin span.mce_delete_row {background-position:-660px -20px}
+.defaultSkin span.mce_col_after {background-position:-680px -20px}
+.defaultSkin span.mce_col_before {background-position:-700px -20px}
+.defaultSkin span.mce_row_after {background-position:-720px -20px}
+.defaultSkin span.mce_row_before {background-position:-740px -20px}
+.defaultSkin span.mce_merge_cells {background-position:-760px -20px}
+.defaultSkin span.mce_table_props {background-position:-980px -20px}
+.defaultSkin span.mce_row_props {background-position:-780px -20px}
+.defaultSkin span.mce_split_cells {background-position:-800px -20px}
+.defaultSkin span.mce_template {background-position:-820px -20px}
+.defaultSkin span.mce_visualchars {background-position:-840px -20px}
+.defaultSkin span.mce_abbr {background-position:-860px -20px}
+.defaultSkin span.mce_acronym {background-position:-880px -20px}
+.defaultSkin span.mce_attribs {background-position:-900px -20px}
+.defaultSkin span.mce_cite {background-position:-920px -20px}
+.defaultSkin span.mce_del {background-position:-940px -20px}
+.defaultSkin span.mce_ins {background-position:-960px -20px}
+.defaultSkin span.mce_pagebreak {background-position:0 -40px}
+.defaultSkin .mce_spellchecker span.mceAction {background-position:-540px -20px}
diff --git a/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/content.css b/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/content.css
index b8431d169..a40493175 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/content.css
+++ b/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/content.css
@@ -1,32 +1,32 @@
-body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;}
-body {background:#FFF;}
-body.mceForceColors {background:#FFF; color:#000;}
-h1 {font-size: 2em}
-h2 {font-size: 1.5em}
-h3 {font-size: 1.17em}
-h4 {font-size: 1em}
-h5 {font-size: .83em}
-h6 {font-size: .75em}
-.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}
-a.mceItemAnchor {width:12px; line-height:6px; overflow:hidden; padding-left:12px; background:url(../default/img/items.gif) no-repeat bottom left;}
-img.mceItemAnchor {width:12px; height:12px; background:url(../default/img/items.gif) no-repeat;}
-img {border:0;}
-table {cursor:default}
-table td, table th {cursor:text}
-ins {border-bottom:1px solid green; text-decoration: none; color:green}
-del {color:red; text-decoration:line-through}
-cite {border-bottom:1px dashed blue}
-acronym {border-bottom:1px dotted #CCC; cursor:help}
-abbr, html\:abbr {border-bottom:1px dashed #CCC; cursor:help}
-
-/* IE */
-* html body {
-scrollbar-3dlight-color:#F0F0EE;
-scrollbar-arrow-color:#676662;
-scrollbar-base-color:#F0F0EE;
-scrollbar-darkshadow-color:#DDD;
-scrollbar-face-color:#E0E0DD;
-scrollbar-highlight-color:#F0F0EE;
-scrollbar-shadow-color:#F0F0EE;
-scrollbar-track-color:#F5F5F5;
-}
+body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;}
+body {background:#FFF;}
+body.mceForceColors {background:#FFF; color:#000;}
+h1 {font-size: 2em}
+h2 {font-size: 1.5em}
+h3 {font-size: 1.17em}
+h4 {font-size: 1em}
+h5 {font-size: .83em}
+h6 {font-size: .75em}
+.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}
+a.mceItemAnchor {width:12px; line-height:6px; overflow:hidden; padding-left:12px; background:url(../default/img/items.gif) no-repeat bottom left;}
+img.mceItemAnchor {width:12px; height:12px; background:url(../default/img/items.gif) no-repeat;}
+img {border:0;}
+table {cursor:default}
+table td, table th {cursor:text}
+ins {border-bottom:1px solid green; text-decoration: none; color:green}
+del {color:red; text-decoration:line-through}
+cite {border-bottom:1px dashed blue}
+acronym {border-bottom:1px dotted #CCC; cursor:help}
+abbr, html\:abbr {border-bottom:1px dashed #CCC; cursor:help}
+
+/* IE */
+* html body {
+scrollbar-3dlight-color:#F0F0EE;
+scrollbar-arrow-color:#676662;
+scrollbar-base-color:#F0F0EE;
+scrollbar-darkshadow-color:#DDD;
+scrollbar-face-color:#E0E0DD;
+scrollbar-highlight-color:#F0F0EE;
+scrollbar-shadow-color:#F0F0EE;
+scrollbar-track-color:#F5F5F5;
+}
diff --git a/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/dialog.css b/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/dialog.css
index e36042e64..e630fa7c4 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/dialog.css
+++ b/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/dialog.css
@@ -1,113 +1,113 @@
-/* Generic */
-body {
-font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;
-scrollbar-3dlight-color:#F0F0EE;
-scrollbar-arrow-color:#676662;
-scrollbar-base-color:#F0F0EE;
-scrollbar-darkshadow-color:#DDDDDD;
-scrollbar-face-color:#E0E0DD;
-scrollbar-highlight-color:#F0F0EE;
-scrollbar-shadow-color:#F0F0EE;
-scrollbar-track-color:#F5F5F5;
-background:#F0F0EE;
-padding:0;
-margin:8px 8px 0 8px;
-}
-
-html {background:#F0F0EE;}
-td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
-textarea {resize:none;outline:none;}
-a:link, a:visited {color:black;}
-a:hover {color:#2B6FB6;}
-
-/* Forms */
-fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;}
-legend {color:#2B6FB6; font-weight:bold;}
-label.msg {display:none;}
-label.invalid {color:#EE0000; display:inline;}
-input.invalid {border:1px solid #EE0000;}
-input {background:#FFF; border:1px solid #CCC;}
-input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
-input, select, textarea {border:1px solid #808080;}
-input.radio {border:1px none #000000; background:transparent; vertical-align:middle;}
-input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;}
-.input_noborder {border:0;}
-
-/* Buttons */
-#insert, #cancel, input.button, .updateButton {
-border:0; margin:0; padding:0;
-font-weight:bold;
-width:94px; height:26px;
-background:url(../default/img/buttons.png) 0 -26px;
-cursor:pointer;
-padding-bottom:2px;
-}
-
-#insert {background:url(../default/img/buttons.png) 0 -52px;}
-#cancel {background:url(../default/img/buttons.png) 0 0;}
-
-/* Browse */
-a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;}
-.mceOldBoxModel a.browse span {width:22px; height:20px;}
-a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;}
-a.browse span.disabled {border:1px solid white; -moz-opacity:0.3; opacity:0.3; filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);}
-a.browse:hover span.disabled {border:1px solid white; background-color:transparent;}
-a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;}
-.mceOldBoxModel a.pickcolor span {width:21px; height:17px;}
-a.pickcolor:hover span {background-color:#B2BBD0;}
-a.pickcolor:hover span.disabled {}
-
-/* Charmap */
-table.charmap {border:1px solid #AAA; text-align:center}
-td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;}
-#charmap a {display:block; color:#000; text-decoration:none; border:0}
-#charmap a:hover {background:#CCC;color:#2B6FB6}
-#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center}
-#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center}
-
-/* Source */
-.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;}
-.mceActionPanel {margin-top:5px;}
-
-/* Tabs classes */
-.tabs {width:100%; height:18px; line-height:normal; background:url(../default/img/tabs.gif) repeat-x 0 -72px;}
-.tabs ul {margin:0; padding:0; list-style:none;}
-.tabs li {float:left; background:url(../default/img/tabs.gif) no-repeat 0 0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block;}
-.tabs li.current {background:url(../default/img/tabs.gif) no-repeat 0 -18px; margin-right:2px;}
-.tabs span {float:left; display:block; background:url(../default/img/tabs.gif) no-repeat right -36px; padding:0px 10px 0 0;}
-.tabs .current span {background:url(../default/img/tabs.gif) no-repeat right -54px;}
-.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;}
-.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;}
-
-/* Panels */
-.panel_wrapper div.panel {display:none;}
-.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;}
-.panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;}
-
-/* Columns */
-.column {float:left;}
-.properties {width:100%;}
-.properties .column1 {}
-.properties .column2 {text-align:left;}
-
-/* Titles */
-h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;}
-h3 {font-size:14px;}
-.title {font-size:12px; font-weight:bold; color:#2B6FB6;}
-
-/* Dialog specific */
-#link .panel_wrapper, #link div.current {height:125px;}
-#image .panel_wrapper, #image div.current {height:200px;}
-#plugintable thead {font-weight:bold; background:#DDD;}
-#plugintable, #about #plugintable td {border:1px solid #919B9C;}
-#plugintable {width:96%; margin-top:10px;}
-#pluginscontainer {height:290px; overflow:auto;}
-#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;}
-#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}
-#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}
-#colorpicker #light div {overflow:hidden;}
-#colorpicker #previewblock {float:right; padding-left:10px; height:20px;}
-#colorpicker .panel_wrapper div.current {height:175px;}
-#colorpicker #namedcolors {width:150px;}
-#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
-#colorpicker #colornamecontainer {margin-top:5px;}
+/* Generic */
+body {
+font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;
+scrollbar-3dlight-color:#F0F0EE;
+scrollbar-arrow-color:#676662;
+scrollbar-base-color:#F0F0EE;
+scrollbar-darkshadow-color:#DDDDDD;
+scrollbar-face-color:#E0E0DD;
+scrollbar-highlight-color:#F0F0EE;
+scrollbar-shadow-color:#F0F0EE;
+scrollbar-track-color:#F5F5F5;
+background:#F0F0EE;
+padding:0;
+margin:8px 8px 0 8px;
+}
+
+html {background:#F0F0EE;}
+td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
+textarea {resize:none;outline:none;}
+a:link, a:visited {color:black;}
+a:hover {color:#2B6FB6;}
+
+/* Forms */
+fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;}
+legend {color:#2B6FB6; font-weight:bold;}
+label.msg {display:none;}
+label.invalid {color:#EE0000; display:inline;}
+input.invalid {border:1px solid #EE0000;}
+input {background:#FFF; border:1px solid #CCC;}
+input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
+input, select, textarea {border:1px solid #808080;}
+input.radio {border:1px none #000000; background:transparent; vertical-align:middle;}
+input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;}
+.input_noborder {border:0;}
+
+/* Buttons */
+#insert, #cancel, input.button, .updateButton {
+border:0; margin:0; padding:0;
+font-weight:bold;
+width:94px; height:26px;
+background:url(../default/img/buttons.png) 0 -26px;
+cursor:pointer;
+padding-bottom:2px;
+}
+
+#insert {background:url(../default/img/buttons.png) 0 -52px;}
+#cancel {background:url(../default/img/buttons.png) 0 0;}
+
+/* Browse */
+a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;}
+.mceOldBoxModel a.browse span {width:22px; height:20px;}
+a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;}
+a.browse span.disabled {border:1px solid white; -moz-opacity:0.3; opacity:0.3; filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);}
+a.browse:hover span.disabled {border:1px solid white; background-color:transparent;}
+a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;}
+.mceOldBoxModel a.pickcolor span {width:21px; height:17px;}
+a.pickcolor:hover span {background-color:#B2BBD0;}
+a.pickcolor:hover span.disabled {}
+
+/* Charmap */
+table.charmap {border:1px solid #AAA; text-align:center}
+td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;}
+#charmap a {display:block; color:#000; text-decoration:none; border:0}
+#charmap a:hover {background:#CCC;color:#2B6FB6}
+#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center}
+#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center}
+
+/* Source */
+.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;}
+.mceActionPanel {margin-top:5px;}
+
+/* Tabs classes */
+.tabs {width:100%; height:18px; line-height:normal; background:url(../default/img/tabs.gif) repeat-x 0 -72px;}
+.tabs ul {margin:0; padding:0; list-style:none;}
+.tabs li {float:left; background:url(../default/img/tabs.gif) no-repeat 0 0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block;}
+.tabs li.current {background:url(../default/img/tabs.gif) no-repeat 0 -18px; margin-right:2px;}
+.tabs span {float:left; display:block; background:url(../default/img/tabs.gif) no-repeat right -36px; padding:0px 10px 0 0;}
+.tabs .current span {background:url(../default/img/tabs.gif) no-repeat right -54px;}
+.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;}
+.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;}
+
+/* Panels */
+.panel_wrapper div.panel {display:none;}
+.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;}
+.panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;}
+
+/* Columns */
+.column {float:left;}
+.properties {width:100%;}
+.properties .column1 {}
+.properties .column2 {text-align:left;}
+
+/* Titles */
+h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;}
+h3 {font-size:14px;}
+.title {font-size:12px; font-weight:bold; color:#2B6FB6;}
+
+/* Dialog specific */
+#link .panel_wrapper, #link div.current {height:125px;}
+#image .panel_wrapper, #image div.current {height:200px;}
+#plugintable thead {font-weight:bold; background:#DDD;}
+#plugintable, #about #plugintable td {border:1px solid #919B9C;}
+#plugintable {width:96%; margin-top:10px;}
+#pluginscontainer {height:290px; overflow:auto;}
+#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;}
+#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}
+#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}
+#colorpicker #light div {overflow:hidden;}
+#colorpicker #previewblock {float:right; padding-left:10px; height:20px;}
+#colorpicker .panel_wrapper div.current {height:175px;}
+#colorpicker #namedcolors {width:150px;}
+#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}
+#colorpicker #colornamecontainer {margin-top:5px;}
diff --git a/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/ui.css b/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/ui.css
index 0da56e911..8363da1d4 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/ui.css
+++ b/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/ui.css
@@ -1,215 +1,215 @@
-/* Reset */
-.o2k7Skin table, .o2k7Skin tbody, .o2k7Skin a, .o2k7Skin img, .o2k7Skin tr, .o2k7Skin div, .o2k7Skin td, .o2k7Skin iframe, .o2k7Skin span, .o2k7Skin *, .o2k7Skin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left}
-.o2k7Skin a:hover, .o2k7Skin a:link, .o2k7Skin a:visited, .o2k7Skin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000}
-.o2k7Skin table td {vertical-align:middle}
-
-/* Containers */
-.o2k7Skin table {background:#E5EFFD}
-.o2k7Skin iframe {display:block; background:#FFF}
-.o2k7Skin .mceToolbar {height:26px}
-
-/* External */
-.o2k7Skin .mceExternalToolbar {position:absolute; border:1px solid #ABC6DD; border-bottom:0; display:none}
-.o2k7Skin .mceExternalToolbar td.mceToolbar {padding-right:13px;}
-.o2k7Skin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0}
-
-/* Layout */
-.o2k7Skin table.mceLayout {border:0; border-left:1px solid #ABC6DD; border-right:1px solid #ABC6DD}
-.o2k7Skin table.mceLayout tr.mceFirst td {border-top:1px solid #ABC6DD}
-.o2k7Skin table.mceLayout tr.mceLast td {border-bottom:1px solid #ABC6DD}
-.o2k7Skin table.mceToolbar, .o2k7Skin tr.mceFirst .mceToolbar tr td, .o2k7Skin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0}
-.o2k7Skin .mceIframeContainer {border-top:1px solid #ABC6DD; border-bottom:1px solid #ABC6DD}
-.o2k7Skin .mceStatusbar {display:block; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; height:20px}
-.o2k7Skin .mceStatusbar div {float:left; padding:2px}
-.o2k7Skin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize}
-.o2k7Skin .mceStatusbar a:hover {text-decoration:underline}
-.o2k7Skin table.mceToolbar {margin-left:3px}
-.o2k7Skin .mceToolbar .mceToolbarStart span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px; margin-left:3px;}
-.o2k7Skin .mceToolbar td.mceFirst span {margin:0}
-.o2k7Skin .mceToolbar .mceToolbarEnd span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px}
-.o2k7Skin .mceToolbar .mceToolbarEndListBox span, .o2k7Skin .mceToolbar .mceToolbarStartListBox span {display:none}
-.o2k7Skin span.mceIcon, .o2k7Skin img.mceIcon {display:block; width:20px; height:20px}
-.o2k7Skin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}
-.o2k7Skin td.mceCenter {text-align:center;}
-.o2k7Skin td.mceCenter table {margin:0 auto; text-align:left;}
-.o2k7Skin td.mceRight table {margin:0 0 0 auto;}
-
-/* Button */
-.o2k7Skin .mceButton {display:block; background:url(img/button_bg.png); width:22px; height:22px}
-.o2k7Skin a.mceButton span, .o2k7Skin a.mceButton img {margin-left:1px}
-.o2k7Skin .mceOldBoxModel a.mceButton span, .o2k7Skin .mceOldBoxModel a.mceButton img {margin:0 0 0 1px}
-.o2k7Skin a.mceButtonEnabled:hover {background-color:#B2BBD0; background-position:0 -22px}
-.o2k7Skin a.mceButtonActive, .o2k7Skin a.mceButtonSelected {background-position:0 -44px}
-.o2k7Skin .mceButtonDisabled .mceIcon {opacity:0.3; filter:alpha(opacity=30)}
-.o2k7Skin .mceButtonLabeled {width:auto}
-.o2k7Skin .mceButtonLabeled span.mceIcon {float:left}
-.o2k7Skin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px; font-family:Tahoma,Verdana,Arial,Helvetica}
-.o2k7Skin .mceButtonDisabled .mceButtonLabel {color:#888}
-
-/* Separator */
-.o2k7Skin .mceSeparator {display:block; background:url(img/button_bg.png) -22px 0; width:5px; height:22px}
-
-/* ListBox */
-.o2k7Skin .mceListBox {margin-left:3px}
-.o2k7Skin .mceListBox, .o2k7Skin .mceListBox a {display:block}
-.o2k7Skin .mceListBox .mceText {padding-left:4px; text-align:left; width:70px; border:1px solid #b3c7e1; border-right:0; background:#eaf2fb; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}
-.o2k7Skin .mceListBox .mceOpen {width:14px; height:22px; background:url(img/button_bg.png) -66px 0}
-.o2k7Skin table.mceListBoxEnabled:hover .mceText, .o2k7Skin .mceListBoxHover .mceText, .o2k7Skin .mceListBoxSelected .mceText {background:#FFF}
-.o2k7Skin table.mceListBoxEnabled:hover .mceOpen, .o2k7Skin .mceListBoxHover .mceOpen, .o2k7Skin .mceListBoxSelected .mceOpen {background-position:-66px -22px}
-.o2k7Skin .mceListBoxDisabled .mceText {color:gray}
-.o2k7Skin .mceListBoxMenu {overflow:auto; overflow-x:hidden}
-.o2k7Skin .mceOldBoxModel .mceListBox .mceText {height:22px}
-.o2k7Skin select.mceListBox {font-family:Tahoma,Verdana,Arial,Helvetica; font-size:12px; border:1px solid #b3c7e1; background:#FFF;}
-
-/* SplitButton */
-.o2k7Skin .mceSplitButton, .o2k7Skin .mceSplitButton a, .o2k7Skin .mceSplitButton span {display:block; height:22px}
-.o2k7Skin .mceSplitButton {background:url(img/button_bg.png)}
-.o2k7Skin .mceSplitButton a.mceAction {width:22px}
-.o2k7Skin .mceSplitButton span.mceAction {width:22px; background:url(../../img/icons.gif) 20px 20px}
-.o2k7Skin .mceSplitButton a.mceOpen {width:10px}
-.o2k7Skin .mceSplitButton span.mceOpen {width:10px; background:url(img/button_bg.png) -44px 0}
-.o2k7Skin table.mceSplitButtonEnabled:hover a.mceAction, .o2k7Skin .mceSplitButtonHover a.mceAction, .o2k7Skin .mceSplitButtonSelected {background:url(img/button_bg.png) 0 -22px}
-.o2k7Skin table.mceSplitButtonEnabled:hover span.mceOpen, .o2k7Skin .mceSplitButtonHover span.mceOpen, .o2k7Skin .mceSplitButtonSelected span.mceOpen {background-position:-44px -44px}
-.o2k7Skin .mceSplitButtonDisabled .mceAction {opacity:0.3; filter:alpha(opacity=30)}
-.o2k7Skin .mceSplitButtonActive {background-position:0 -44px}
-
-/* ColorSplitButton */
-.o2k7Skin div.mceColorSplitMenu table {background:#FFF; border:1px solid gray}
-.o2k7Skin .mceColorSplitMenu td {padding:2px}
-.o2k7Skin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden; border:1px solid #808080}
-.o2k7Skin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}
-.o2k7Skin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF}
-.o2k7Skin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid #0A246A; background-color:#B6BDD2}
-.o2k7Skin a.mceMoreColors:hover {border:1px solid #0A246A}
-.o2k7Skin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; background:#9a9b9a;overflow:hidden}
-.o2k7Skin .mce_forecolor span.mceAction, .o2k7Skin .mce_backcolor span.mceAction {height:15px;overflow:hidden}
-
-/* Menu */
-.o2k7Skin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #ABC6DD}
-.o2k7Skin .mceNoIcons span.mceIcon {width:0;}
-.o2k7Skin .mceNoIcons a .mceText {padding-left:10px}
-.o2k7Skin .mceMenu table {background:#FFF}
-.o2k7Skin .mceMenu a, .o2k7Skin .mceMenu span, .o2k7Skin .mceMenu {display:block}
-.o2k7Skin .mceMenu td {height:20px}
-.o2k7Skin .mceMenu a {position:relative;padding:3px 0 4px 0}
-.o2k7Skin .mceMenu .mceText {position:relative; display:block; font-family:Tahoma,Verdana,Arial,Helvetica; color:#000; cursor:default; margin:0; padding:0 25px 0 25px; display:block}
-.o2k7Skin .mceMenu span.mceText, .o2k7Skin .mceMenu .mcePreview {font-size:11px}
-.o2k7Skin .mceMenu pre.mceText {font-family:Monospace}
-.o2k7Skin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;}
-.o2k7Skin .mceMenu .mceMenuItemEnabled a:hover, .o2k7Skin .mceMenu .mceMenuItemActive {background-color:#dbecf3}
-.o2k7Skin td.mceMenuItemSeparator {background:#DDD; height:1px}
-.o2k7Skin .mceMenuItemTitle a {border:0; background:#E5EFFD; border-bottom:1px solid #ABC6DD}
-.o2k7Skin .mceMenuItemTitle span.mceText {color:#000; font-weight:bold; padding-left:4px}
-.o2k7Skin .mceMenuItemDisabled .mceText {color:#888}
-.o2k7Skin .mceMenuItemSelected .mceIcon {background:url(../default/img/menu_check.gif)}
-.o2k7Skin .mceNoIcons .mceMenuItemSelected a {background:url(../default/img/menu_arrow.gif) no-repeat -6px center}
-.o2k7Skin .mceMenu span.mceMenuLine {display:none}
-.o2k7Skin .mceMenuItemSub a {background:url(../default/img/menu_arrow.gif) no-repeat top right;}
-
-/* Progress,Resize */
-.o2k7Skin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; filter:alpha(opacity=50); background:#FFF}
-.o2k7Skin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
-.o2k7Skin .mcePlaceHolder {border:1px dotted gray}
-
-/* Formats */
-.o2k7Skin .mce_formatPreview a {font-size:10px}
-.o2k7Skin .mce_p span.mceText {}
-.o2k7Skin .mce_address span.mceText {font-style:italic}
-.o2k7Skin .mce_pre span.mceText {font-family:monospace}
-.o2k7Skin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}
-.o2k7Skin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}
-.o2k7Skin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}
-.o2k7Skin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}
-.o2k7Skin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}
-.o2k7Skin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}
-
-/* Theme */
-.o2k7Skin span.mce_bold {background-position:0 0}
-.o2k7Skin span.mce_italic {background-position:-60px 0}
-.o2k7Skin span.mce_underline {background-position:-140px 0}
-.o2k7Skin span.mce_strikethrough {background-position:-120px 0}
-.o2k7Skin span.mce_undo {background-position:-160px 0}
-.o2k7Skin span.mce_redo {background-position:-100px 0}
-.o2k7Skin span.mce_cleanup {background-position:-40px 0}
-.o2k7Skin span.mce_bullist {background-position:-20px 0}
-.o2k7Skin span.mce_numlist {background-position:-80px 0}
-.o2k7Skin span.mce_justifyleft {background-position:-460px 0}
-.o2k7Skin span.mce_justifyright {background-position:-480px 0}
-.o2k7Skin span.mce_justifycenter {background-position:-420px 0}
-.o2k7Skin span.mce_justifyfull {background-position:-440px 0}
-.o2k7Skin span.mce_anchor {background-position:-200px 0}
-.o2k7Skin span.mce_indent {background-position:-400px 0}
-.o2k7Skin span.mce_outdent {background-position:-540px 0}
-.o2k7Skin span.mce_link {background-position:-500px 0}
-.o2k7Skin span.mce_unlink {background-position:-640px 0}
-.o2k7Skin span.mce_sub {background-position:-600px 0}
-.o2k7Skin span.mce_sup {background-position:-620px 0}
-.o2k7Skin span.mce_removeformat {background-position:-580px 0}
-.o2k7Skin span.mce_newdocument {background-position:-520px 0}
-.o2k7Skin span.mce_image {background-position:-380px 0}
-.o2k7Skin span.mce_help {background-position:-340px 0}
-.o2k7Skin span.mce_code {background-position:-260px 0}
-.o2k7Skin span.mce_hr {background-position:-360px 0}
-.o2k7Skin span.mce_visualaid {background-position:-660px 0}
-.o2k7Skin span.mce_charmap {background-position:-240px 0}
-.o2k7Skin span.mce_paste {background-position:-560px 0}
-.o2k7Skin span.mce_copy {background-position:-700px 0}
-.o2k7Skin span.mce_cut {background-position:-680px 0}
-.o2k7Skin span.mce_blockquote {background-position:-220px 0}
-.o2k7Skin .mce_forecolor span.mceAction {background-position:-720px 0}
-.o2k7Skin .mce_backcolor span.mceAction {background-position:-760px 0}
-.o2k7Skin span.mce_forecolorpicker {background-position:-720px 0}
-.o2k7Skin span.mce_backcolorpicker {background-position:-760px 0}
-
-/* Plugins */
-.o2k7Skin span.mce_advhr {background-position:-0px -20px}
-.o2k7Skin span.mce_ltr {background-position:-20px -20px}
-.o2k7Skin span.mce_rtl {background-position:-40px -20px}
-.o2k7Skin span.mce_emotions {background-position:-60px -20px}
-.o2k7Skin span.mce_fullpage {background-position:-80px -20px}
-.o2k7Skin span.mce_fullscreen {background-position:-100px -20px}
-.o2k7Skin span.mce_iespell {background-position:-120px -20px}
-.o2k7Skin span.mce_insertdate {background-position:-140px -20px}
-.o2k7Skin span.mce_inserttime {background-position:-160px -20px}
-.o2k7Skin span.mce_absolute {background-position:-180px -20px}
-.o2k7Skin span.mce_backward {background-position:-200px -20px}
-.o2k7Skin span.mce_forward {background-position:-220px -20px}
-.o2k7Skin span.mce_insert_layer {background-position:-240px -20px}
-.o2k7Skin span.mce_insertlayer {background-position:-260px -20px}
-.o2k7Skin span.mce_movebackward {background-position:-280px -20px}
-.o2k7Skin span.mce_moveforward {background-position:-300px -20px}
-.o2k7Skin span.mce_media {background-position:-320px -20px}
-.o2k7Skin span.mce_nonbreaking {background-position:-340px -20px}
-.o2k7Skin span.mce_pastetext {background-position:-360px -20px}
-.o2k7Skin span.mce_pasteword {background-position:-380px -20px}
-.o2k7Skin span.mce_selectall {background-position:-400px -20px}
-.o2k7Skin span.mce_preview {background-position:-420px -20px}
-.o2k7Skin span.mce_print {background-position:-440px -20px}
-.o2k7Skin span.mce_cancel {background-position:-460px -20px}
-.o2k7Skin span.mce_save {background-position:-480px -20px}
-.o2k7Skin span.mce_replace {background-position:-500px -20px}
-.o2k7Skin span.mce_search {background-position:-520px -20px}
-.o2k7Skin span.mce_styleprops {background-position:-560px -20px}
-.o2k7Skin span.mce_table {background-position:-580px -20px}
-.o2k7Skin span.mce_cell_props {background-position:-600px -20px}
-.o2k7Skin span.mce_delete_table {background-position:-620px -20px}
-.o2k7Skin span.mce_delete_col {background-position:-640px -20px}
-.o2k7Skin span.mce_delete_row {background-position:-660px -20px}
-.o2k7Skin span.mce_col_after {background-position:-680px -20px}
-.o2k7Skin span.mce_col_before {background-position:-700px -20px}
-.o2k7Skin span.mce_row_after {background-position:-720px -20px}
-.o2k7Skin span.mce_row_before {background-position:-740px -20px}
-.o2k7Skin span.mce_merge_cells {background-position:-760px -20px}
-.o2k7Skin span.mce_table_props {background-position:-980px -20px}
-.o2k7Skin span.mce_row_props {background-position:-780px -20px}
-.o2k7Skin span.mce_split_cells {background-position:-800px -20px}
-.o2k7Skin span.mce_template {background-position:-820px -20px}
-.o2k7Skin span.mce_visualchars {background-position:-840px -20px}
-.o2k7Skin span.mce_abbr {background-position:-860px -20px}
-.o2k7Skin span.mce_acronym {background-position:-880px -20px}
-.o2k7Skin span.mce_attribs {background-position:-900px -20px}
-.o2k7Skin span.mce_cite {background-position:-920px -20px}
-.o2k7Skin span.mce_del {background-position:-940px -20px}
-.o2k7Skin span.mce_ins {background-position:-960px -20px}
-.o2k7Skin span.mce_pagebreak {background-position:0 -40px}
-.o2k7Skin .mce_spellchecker span.mceAction {background-position:-540px -20px}
+/* Reset */
+.o2k7Skin table, .o2k7Skin tbody, .o2k7Skin a, .o2k7Skin img, .o2k7Skin tr, .o2k7Skin div, .o2k7Skin td, .o2k7Skin iframe, .o2k7Skin span, .o2k7Skin *, .o2k7Skin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left}
+.o2k7Skin a:hover, .o2k7Skin a:link, .o2k7Skin a:visited, .o2k7Skin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000}
+.o2k7Skin table td {vertical-align:middle}
+
+/* Containers */
+.o2k7Skin table {background:#E5EFFD}
+.o2k7Skin iframe {display:block; background:#FFF}
+.o2k7Skin .mceToolbar {height:26px}
+
+/* External */
+.o2k7Skin .mceExternalToolbar {position:absolute; border:1px solid #ABC6DD; border-bottom:0; display:none}
+.o2k7Skin .mceExternalToolbar td.mceToolbar {padding-right:13px;}
+.o2k7Skin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0}
+
+/* Layout */
+.o2k7Skin table.mceLayout {border:0; border-left:1px solid #ABC6DD; border-right:1px solid #ABC6DD}
+.o2k7Skin table.mceLayout tr.mceFirst td {border-top:1px solid #ABC6DD}
+.o2k7Skin table.mceLayout tr.mceLast td {border-bottom:1px solid #ABC6DD}
+.o2k7Skin table.mceToolbar, .o2k7Skin tr.mceFirst .mceToolbar tr td, .o2k7Skin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0}
+.o2k7Skin .mceIframeContainer {border-top:1px solid #ABC6DD; border-bottom:1px solid #ABC6DD}
+.o2k7Skin .mceStatusbar {display:block; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; height:20px}
+.o2k7Skin .mceStatusbar div {float:left; padding:2px}
+.o2k7Skin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize}
+.o2k7Skin .mceStatusbar a:hover {text-decoration:underline}
+.o2k7Skin table.mceToolbar {margin-left:3px}
+.o2k7Skin .mceToolbar .mceToolbarStart span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px; margin-left:3px;}
+.o2k7Skin .mceToolbar td.mceFirst span {margin:0}
+.o2k7Skin .mceToolbar .mceToolbarEnd span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px}
+.o2k7Skin .mceToolbar .mceToolbarEndListBox span, .o2k7Skin .mceToolbar .mceToolbarStartListBox span {display:none}
+.o2k7Skin span.mceIcon, .o2k7Skin img.mceIcon {display:block; width:20px; height:20px}
+.o2k7Skin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}
+.o2k7Skin td.mceCenter {text-align:center;}
+.o2k7Skin td.mceCenter table {margin:0 auto; text-align:left;}
+.o2k7Skin td.mceRight table {margin:0 0 0 auto;}
+
+/* Button */
+.o2k7Skin .mceButton {display:block; background:url(img/button_bg.png); width:22px; height:22px}
+.o2k7Skin a.mceButton span, .o2k7Skin a.mceButton img {margin-left:1px}
+.o2k7Skin .mceOldBoxModel a.mceButton span, .o2k7Skin .mceOldBoxModel a.mceButton img {margin:0 0 0 1px}
+.o2k7Skin a.mceButtonEnabled:hover {background-color:#B2BBD0; background-position:0 -22px}
+.o2k7Skin a.mceButtonActive, .o2k7Skin a.mceButtonSelected {background-position:0 -44px}
+.o2k7Skin .mceButtonDisabled .mceIcon {opacity:0.3; filter:alpha(opacity=30)}
+.o2k7Skin .mceButtonLabeled {width:auto}
+.o2k7Skin .mceButtonLabeled span.mceIcon {float:left}
+.o2k7Skin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px; font-family:Tahoma,Verdana,Arial,Helvetica}
+.o2k7Skin .mceButtonDisabled .mceButtonLabel {color:#888}
+
+/* Separator */
+.o2k7Skin .mceSeparator {display:block; background:url(img/button_bg.png) -22px 0; width:5px; height:22px}
+
+/* ListBox */
+.o2k7Skin .mceListBox {margin-left:3px}
+.o2k7Skin .mceListBox, .o2k7Skin .mceListBox a {display:block}
+.o2k7Skin .mceListBox .mceText {padding-left:4px; text-align:left; width:70px; border:1px solid #b3c7e1; border-right:0; background:#eaf2fb; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}
+.o2k7Skin .mceListBox .mceOpen {width:14px; height:22px; background:url(img/button_bg.png) -66px 0}
+.o2k7Skin table.mceListBoxEnabled:hover .mceText, .o2k7Skin .mceListBoxHover .mceText, .o2k7Skin .mceListBoxSelected .mceText {background:#FFF}
+.o2k7Skin table.mceListBoxEnabled:hover .mceOpen, .o2k7Skin .mceListBoxHover .mceOpen, .o2k7Skin .mceListBoxSelected .mceOpen {background-position:-66px -22px}
+.o2k7Skin .mceListBoxDisabled .mceText {color:gray}
+.o2k7Skin .mceListBoxMenu {overflow:auto; overflow-x:hidden}
+.o2k7Skin .mceOldBoxModel .mceListBox .mceText {height:22px}
+.o2k7Skin select.mceListBox {font-family:Tahoma,Verdana,Arial,Helvetica; font-size:12px; border:1px solid #b3c7e1; background:#FFF;}
+
+/* SplitButton */
+.o2k7Skin .mceSplitButton, .o2k7Skin .mceSplitButton a, .o2k7Skin .mceSplitButton span {display:block; height:22px}
+.o2k7Skin .mceSplitButton {background:url(img/button_bg.png)}
+.o2k7Skin .mceSplitButton a.mceAction {width:22px}
+.o2k7Skin .mceSplitButton span.mceAction {width:22px; background:url(../../img/icons.gif) 20px 20px}
+.o2k7Skin .mceSplitButton a.mceOpen {width:10px}
+.o2k7Skin .mceSplitButton span.mceOpen {width:10px; background:url(img/button_bg.png) -44px 0}
+.o2k7Skin table.mceSplitButtonEnabled:hover a.mceAction, .o2k7Skin .mceSplitButtonHover a.mceAction, .o2k7Skin .mceSplitButtonSelected {background:url(img/button_bg.png) 0 -22px}
+.o2k7Skin table.mceSplitButtonEnabled:hover span.mceOpen, .o2k7Skin .mceSplitButtonHover span.mceOpen, .o2k7Skin .mceSplitButtonSelected span.mceOpen {background-position:-44px -44px}
+.o2k7Skin .mceSplitButtonDisabled .mceAction {opacity:0.3; filter:alpha(opacity=30)}
+.o2k7Skin .mceSplitButtonActive {background-position:0 -44px}
+
+/* ColorSplitButton */
+.o2k7Skin div.mceColorSplitMenu table {background:#FFF; border:1px solid gray}
+.o2k7Skin .mceColorSplitMenu td {padding:2px}
+.o2k7Skin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden; border:1px solid #808080}
+.o2k7Skin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}
+.o2k7Skin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF}
+.o2k7Skin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid #0A246A; background-color:#B6BDD2}
+.o2k7Skin a.mceMoreColors:hover {border:1px solid #0A246A}
+.o2k7Skin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; background:#9a9b9a;overflow:hidden}
+.o2k7Skin .mce_forecolor span.mceAction, .o2k7Skin .mce_backcolor span.mceAction {height:15px;overflow:hidden}
+
+/* Menu */
+.o2k7Skin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #ABC6DD}
+.o2k7Skin .mceNoIcons span.mceIcon {width:0;}
+.o2k7Skin .mceNoIcons a .mceText {padding-left:10px}
+.o2k7Skin .mceMenu table {background:#FFF}
+.o2k7Skin .mceMenu a, .o2k7Skin .mceMenu span, .o2k7Skin .mceMenu {display:block}
+.o2k7Skin .mceMenu td {height:20px}
+.o2k7Skin .mceMenu a {position:relative;padding:3px 0 4px 0}
+.o2k7Skin .mceMenu .mceText {position:relative; display:block; font-family:Tahoma,Verdana,Arial,Helvetica; color:#000; cursor:default; margin:0; padding:0 25px 0 25px; display:block}
+.o2k7Skin .mceMenu span.mceText, .o2k7Skin .mceMenu .mcePreview {font-size:11px}
+.o2k7Skin .mceMenu pre.mceText {font-family:Monospace}
+.o2k7Skin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;}
+.o2k7Skin .mceMenu .mceMenuItemEnabled a:hover, .o2k7Skin .mceMenu .mceMenuItemActive {background-color:#dbecf3}
+.o2k7Skin td.mceMenuItemSeparator {background:#DDD; height:1px}
+.o2k7Skin .mceMenuItemTitle a {border:0; background:#E5EFFD; border-bottom:1px solid #ABC6DD}
+.o2k7Skin .mceMenuItemTitle span.mceText {color:#000; font-weight:bold; padding-left:4px}
+.o2k7Skin .mceMenuItemDisabled .mceText {color:#888}
+.o2k7Skin .mceMenuItemSelected .mceIcon {background:url(../default/img/menu_check.gif)}
+.o2k7Skin .mceNoIcons .mceMenuItemSelected a {background:url(../default/img/menu_arrow.gif) no-repeat -6px center}
+.o2k7Skin .mceMenu span.mceMenuLine {display:none}
+.o2k7Skin .mceMenuItemSub a {background:url(../default/img/menu_arrow.gif) no-repeat top right;}
+
+/* Progress,Resize */
+.o2k7Skin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; filter:alpha(opacity=50); background:#FFF}
+.o2k7Skin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
+.o2k7Skin .mcePlaceHolder {border:1px dotted gray}
+
+/* Formats */
+.o2k7Skin .mce_formatPreview a {font-size:10px}
+.o2k7Skin .mce_p span.mceText {}
+.o2k7Skin .mce_address span.mceText {font-style:italic}
+.o2k7Skin .mce_pre span.mceText {font-family:monospace}
+.o2k7Skin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}
+.o2k7Skin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}
+.o2k7Skin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}
+.o2k7Skin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}
+.o2k7Skin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}
+.o2k7Skin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}
+
+/* Theme */
+.o2k7Skin span.mce_bold {background-position:0 0}
+.o2k7Skin span.mce_italic {background-position:-60px 0}
+.o2k7Skin span.mce_underline {background-position:-140px 0}
+.o2k7Skin span.mce_strikethrough {background-position:-120px 0}
+.o2k7Skin span.mce_undo {background-position:-160px 0}
+.o2k7Skin span.mce_redo {background-position:-100px 0}
+.o2k7Skin span.mce_cleanup {background-position:-40px 0}
+.o2k7Skin span.mce_bullist {background-position:-20px 0}
+.o2k7Skin span.mce_numlist {background-position:-80px 0}
+.o2k7Skin span.mce_justifyleft {background-position:-460px 0}
+.o2k7Skin span.mce_justifyright {background-position:-480px 0}
+.o2k7Skin span.mce_justifycenter {background-position:-420px 0}
+.o2k7Skin span.mce_justifyfull {background-position:-440px 0}
+.o2k7Skin span.mce_anchor {background-position:-200px 0}
+.o2k7Skin span.mce_indent {background-position:-400px 0}
+.o2k7Skin span.mce_outdent {background-position:-540px 0}
+.o2k7Skin span.mce_link {background-position:-500px 0}
+.o2k7Skin span.mce_unlink {background-position:-640px 0}
+.o2k7Skin span.mce_sub {background-position:-600px 0}
+.o2k7Skin span.mce_sup {background-position:-620px 0}
+.o2k7Skin span.mce_removeformat {background-position:-580px 0}
+.o2k7Skin span.mce_newdocument {background-position:-520px 0}
+.o2k7Skin span.mce_image {background-position:-380px 0}
+.o2k7Skin span.mce_help {background-position:-340px 0}
+.o2k7Skin span.mce_code {background-position:-260px 0}
+.o2k7Skin span.mce_hr {background-position:-360px 0}
+.o2k7Skin span.mce_visualaid {background-position:-660px 0}
+.o2k7Skin span.mce_charmap {background-position:-240px 0}
+.o2k7Skin span.mce_paste {background-position:-560px 0}
+.o2k7Skin span.mce_copy {background-position:-700px 0}
+.o2k7Skin span.mce_cut {background-position:-680px 0}
+.o2k7Skin span.mce_blockquote {background-position:-220px 0}
+.o2k7Skin .mce_forecolor span.mceAction {background-position:-720px 0}
+.o2k7Skin .mce_backcolor span.mceAction {background-position:-760px 0}
+.o2k7Skin span.mce_forecolorpicker {background-position:-720px 0}
+.o2k7Skin span.mce_backcolorpicker {background-position:-760px 0}
+
+/* Plugins */
+.o2k7Skin span.mce_advhr {background-position:-0px -20px}
+.o2k7Skin span.mce_ltr {background-position:-20px -20px}
+.o2k7Skin span.mce_rtl {background-position:-40px -20px}
+.o2k7Skin span.mce_emotions {background-position:-60px -20px}
+.o2k7Skin span.mce_fullpage {background-position:-80px -20px}
+.o2k7Skin span.mce_fullscreen {background-position:-100px -20px}
+.o2k7Skin span.mce_iespell {background-position:-120px -20px}
+.o2k7Skin span.mce_insertdate {background-position:-140px -20px}
+.o2k7Skin span.mce_inserttime {background-position:-160px -20px}
+.o2k7Skin span.mce_absolute {background-position:-180px -20px}
+.o2k7Skin span.mce_backward {background-position:-200px -20px}
+.o2k7Skin span.mce_forward {background-position:-220px -20px}
+.o2k7Skin span.mce_insert_layer {background-position:-240px -20px}
+.o2k7Skin span.mce_insertlayer {background-position:-260px -20px}
+.o2k7Skin span.mce_movebackward {background-position:-280px -20px}
+.o2k7Skin span.mce_moveforward {background-position:-300px -20px}
+.o2k7Skin span.mce_media {background-position:-320px -20px}
+.o2k7Skin span.mce_nonbreaking {background-position:-340px -20px}
+.o2k7Skin span.mce_pastetext {background-position:-360px -20px}
+.o2k7Skin span.mce_pasteword {background-position:-380px -20px}
+.o2k7Skin span.mce_selectall {background-position:-400px -20px}
+.o2k7Skin span.mce_preview {background-position:-420px -20px}
+.o2k7Skin span.mce_print {background-position:-440px -20px}
+.o2k7Skin span.mce_cancel {background-position:-460px -20px}
+.o2k7Skin span.mce_save {background-position:-480px -20px}
+.o2k7Skin span.mce_replace {background-position:-500px -20px}
+.o2k7Skin span.mce_search {background-position:-520px -20px}
+.o2k7Skin span.mce_styleprops {background-position:-560px -20px}
+.o2k7Skin span.mce_table {background-position:-580px -20px}
+.o2k7Skin span.mce_cell_props {background-position:-600px -20px}
+.o2k7Skin span.mce_delete_table {background-position:-620px -20px}
+.o2k7Skin span.mce_delete_col {background-position:-640px -20px}
+.o2k7Skin span.mce_delete_row {background-position:-660px -20px}
+.o2k7Skin span.mce_col_after {background-position:-680px -20px}
+.o2k7Skin span.mce_col_before {background-position:-700px -20px}
+.o2k7Skin span.mce_row_after {background-position:-720px -20px}
+.o2k7Skin span.mce_row_before {background-position:-740px -20px}
+.o2k7Skin span.mce_merge_cells {background-position:-760px -20px}
+.o2k7Skin span.mce_table_props {background-position:-980px -20px}
+.o2k7Skin span.mce_row_props {background-position:-780px -20px}
+.o2k7Skin span.mce_split_cells {background-position:-800px -20px}
+.o2k7Skin span.mce_template {background-position:-820px -20px}
+.o2k7Skin span.mce_visualchars {background-position:-840px -20px}
+.o2k7Skin span.mce_abbr {background-position:-860px -20px}
+.o2k7Skin span.mce_acronym {background-position:-880px -20px}
+.o2k7Skin span.mce_attribs {background-position:-900px -20px}
+.o2k7Skin span.mce_cite {background-position:-920px -20px}
+.o2k7Skin span.mce_del {background-position:-940px -20px}
+.o2k7Skin span.mce_ins {background-position:-960px -20px}
+.o2k7Skin span.mce_pagebreak {background-position:0 -40px}
+.o2k7Skin .mce_spellchecker span.mceAction {background-position:-540px -20px}
diff --git a/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/ui_black.css b/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
index a42a727ab..caa7dbbb2 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
+++ b/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/ui_black.css
@@ -1,8 +1,8 @@
-/* Black */
-.o2k7SkinBlack .mceToolbar .mceToolbarStart span, .o2k7SkinBlack .mceToolbar .mceToolbarEnd span, .o2k7SkinBlack .mceButton, .o2k7SkinBlack .mceSplitButton, .o2k7SkinBlack .mceSeparator, .o2k7SkinBlack .mceSplitButton span.mceOpen, .o2k7SkinBlack .mceListBox .mceOpen {background-image:url(img/button_bg_black.png)}
-.o2k7SkinBlack table, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack .mceMenuItemTitle span.mceText, .o2k7SkinBlack .mceStatusbar div, .o2k7SkinBlack .mceStatusbar span, .o2k7SkinBlack .mceStatusbar a {background:#535353; color:#FFF}
-.o2k7SkinBlack table.mceListBoxEnabled .mceText, o2k7SkinBlack .mceListBox .mceText {background:#FFF; border:1px solid #CBCFD4; border-bottom-color:#989FA9; border-right:0}
-.o2k7SkinBlack table.mceListBoxEnabled:hover .mceText, .o2k7Skin .mceListBoxHover .mceText, .o2k7Skin .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, .o2k7Skin .mceSplitButtonHover a.mceAction, .o2k7Skin .mceSplitButtonSelected {background-image:url(img/button_bg_black.png)}
+/* Black */
+.o2k7SkinBlack .mceToolbar .mceToolbarStart span, .o2k7SkinBlack .mceToolbar .mceToolbarEnd span, .o2k7SkinBlack .mceButton, .o2k7SkinBlack .mceSplitButton, .o2k7SkinBlack .mceSeparator, .o2k7SkinBlack .mceSplitButton span.mceOpen, .o2k7SkinBlack .mceListBox .mceOpen {background-image:url(img/button_bg_black.png)}
+.o2k7SkinBlack table, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack .mceMenuItemTitle span.mceText, .o2k7SkinBlack .mceStatusbar div, .o2k7SkinBlack .mceStatusbar span, .o2k7SkinBlack .mceStatusbar a {background:#535353; color:#FFF}
+.o2k7SkinBlack table.mceListBoxEnabled .mceText, o2k7SkinBlack .mceListBox .mceText {background:#FFF; border:1px solid #CBCFD4; border-bottom-color:#989FA9; border-right:0}
+.o2k7SkinBlack table.mceListBoxEnabled:hover .mceText, .o2k7Skin .mceListBoxHover .mceText, .o2k7Skin .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, .o2k7Skin .mceSplitButtonHover a.mceAction, .o2k7Skin .mceSplitButtonSelected {background-image:url(img/button_bg_black.png)}
 .o2k7SkinBlack .mceMenu .mceMenuItemEnabled a:hover, .o2k7Skin .mceMenu .mceMenuItemActive {background-color:#FFE7A1}
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css b/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
index 548b1b852..bf3c47971 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
+++ b/webapp/web/js/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css
@@ -1,5 +1,5 @@
-/* Silver */
-.o2k7SkinSilver .mceToolbar .mceToolbarStart span, .o2k7SkinSilver .mceButton, .o2k7SkinSilver .mceSplitButton, .o2k7SkinSilver .mceSeparator, .o2k7SkinSilver .mceSplitButton span.mceOpen, .o2k7SkinSilver .mceListBox .mceOpen {background-image:url(img/button_bg_silver.png)}
-.o2k7SkinSilver table, .o2k7SkinSilver .mceMenuItemTitle a {background:#eee}
-.o2k7SkinSilver .mceListBox .mceText {background:#FFF}
-.o2k7SkinSilver .mceExternalToolbar, .o2k7SkinSilver .mceListBox .mceText, .o2k7SkinSilver div.mceMenu, .o2k7SkinSilver table.mceLayout, .o2k7SkinSilver .mceMenuItemTitle a, .o2k7SkinSilver table.mceLayout tr.mceFirst td, .o2k7SkinSilver table.mceLayout, .o2k7SkinSilver .mceMenuItemTitle a, .o2k7SkinSilver table.mceLayout tr.mceLast td, .o2k7SkinSilver .mceIframeContainer {border-color: #bbb}
+/* Silver */
+.o2k7SkinSilver .mceToolbar .mceToolbarStart span, .o2k7SkinSilver .mceButton, .o2k7SkinSilver .mceSplitButton, .o2k7SkinSilver .mceSeparator, .o2k7SkinSilver .mceSplitButton span.mceOpen, .o2k7SkinSilver .mceListBox .mceOpen {background-image:url(img/button_bg_silver.png)}
+.o2k7SkinSilver table, .o2k7SkinSilver .mceMenuItemTitle a {background:#eee}
+.o2k7SkinSilver .mceListBox .mceText {background:#FFF}
+.o2k7SkinSilver .mceExternalToolbar, .o2k7SkinSilver .mceListBox .mceText, .o2k7SkinSilver div.mceMenu, .o2k7SkinSilver table.mceLayout, .o2k7SkinSilver .mceMenuItemTitle a, .o2k7SkinSilver table.mceLayout tr.mceFirst td, .o2k7SkinSilver table.mceLayout, .o2k7SkinSilver .mceMenuItemTitle a, .o2k7SkinSilver table.mceLayout tr.mceLast td, .o2k7SkinSilver .mceIframeContainer {border-color: #bbb}
diff --git a/webapp/web/js/tiny_mce/themes/advanced/source_editor.htm b/webapp/web/js/tiny_mce/themes/advanced/source_editor.htm
index 119a913c9..5f047dcb1 100755
--- a/webapp/web/js/tiny_mce/themes/advanced/source_editor.htm
+++ b/webapp/web/js/tiny_mce/themes/advanced/source_editor.htm
@@ -1,32 +1,32 @@
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-	<title>{#advanced_dlg.code_title}</title>
-	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
-	<script type="text/javascript" src="js/source_editor.js"></script>
-	<base target="_self" />
-</head>
-<body onresize="resizeInputs();" style="display:none; overflow:hidden;">
-	<form name="source" onsubmit="saveContent();return false;" action="#">
-		<div style="float: left" class="title">{#advanced_dlg.code_title}</div>
-
-		<div id="wrapline" style="float: right">
-			<input type="checkbox" name="wraped" id="wraped" onclick="toggleWordWrap(this);" class="wordWrapCode" /><label for="wraped">{#advanced_dlg.code_wordwrap}</label>
-		</div>
-
-		<br style="clear: both" />
-
-		<textarea name="htmlSource" id="htmlSource" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,monospace; font-size: 12px;" dir="ltr" wrap="off" class="mceFocus"></textarea>
-
-		<div class="mceActionPanel">
-			<div style="float: left">
-				<input type="submit" name="insert" value="{#update}" id="insert" />
-			</div>
-
-			<div style="float: right">
-				<input type="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
-			</div>
-		</div>
-	</form>
-</body>
-</html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title>{#advanced_dlg.code_title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="js/source_editor.js"></script>
+	<base target="_self" />
+</head>
+<body onresize="resizeInputs();" style="display:none; overflow:hidden;">
+	<form name="source" onsubmit="saveContent();return false;" action="#">
+		<div style="float: left" class="title">{#advanced_dlg.code_title}</div>
+
+		<div id="wrapline" style="float: right">
+			<input type="checkbox" name="wraped" id="wraped" onclick="toggleWordWrap(this);" class="wordWrapCode" /><label for="wraped">{#advanced_dlg.code_wordwrap}</label>
+		</div>
+
+		<br style="clear: both" />
+
+		<textarea name="htmlSource" id="htmlSource" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,monospace; font-size: 12px;" dir="ltr" wrap="off" class="mceFocus"></textarea>
+
+		<div class="mceActionPanel">
+			<div style="float: left">
+				<input type="submit" name="insert" value="{#update}" id="insert" />
+			</div>
+
+			<div style="float: right">
+				<input type="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />
+			</div>
+		</div>
+	</form>
+</body>
+</html>
diff --git a/webapp/web/js/tiny_mce/themes/simple/editor_template_src.js b/webapp/web/js/tiny_mce/themes/simple/editor_template_src.js
index adc4492ab..4873a0cd5 100755
--- a/webapp/web/js/tiny_mce/themes/simple/editor_template_src.js
+++ b/webapp/web/js/tiny_mce/themes/simple/editor_template_src.js
@@ -1,85 +1,85 @@
-/**
- * $Id: editor_template_src.js 752 2008-03-27 21:51:25Z spocke $
- *
- * This file is meant to showcase how to create a simple theme. The advanced
- * theme is more suitable for production use.
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-(function() {
-	var DOM = tinymce.DOM;
-
-	// Tell it to load theme specific language pack(s)
-	tinymce.ThemeManager.requireLangPack('simple');
-
-	tinymce.create('tinymce.themes.SimpleTheme', {
-		init : function(ed, url) {
-			var t = this, states = ['Bold', 'Italic', 'Underline', 'Strikethrough', 'InsertUnorderedList', 'InsertOrderedList'], s = ed.settings;
-
-			t.editor = ed;
-
-			ed.onInit.add(function() {
-				ed.onNodeChange.add(function(ed, cm) {
-					tinymce.each(states, function(c) {
-						cm.get(c.toLowerCase()).setActive(ed.queryCommandState(c));
-					});
-				});
-
-				ed.dom.loadCSS(url + "/skins/" + s.skin + "/content.css");
-			});
-
-			DOM.loadCSS((s.editor_css ? ed.baseURI.toAbsolute(s.editor_css) : '') || url + "/skins/" + s.skin + "/ui.css");
-		},
-
-		renderUI : function(o) {
-			var t = this, n = o.targetNode, ic, tb, ed = t.editor, cf = ed.controlManager, sc;
-
-			n = DOM.insertAfter(DOM.create('span', {id : ed.id + '_container', 'class' : 'mceEditor ' + ed.settings.skin + 'SimpleSkin'}), n);
-			n = sc = DOM.add(n, 'table', {cellPadding : 0, cellSpacing : 0, 'class' : 'mceLayout'});
-			n = tb = DOM.add(n, 'tbody');
-
-			// Create iframe container
-			n = DOM.add(tb, 'tr');
-			n = ic = DOM.add(DOM.add(n, 'td'), 'div', {'class' : 'mceIframeContainer'});
-
-			// Create toolbar container
-			n = DOM.add(DOM.add(tb, 'tr', {'class' : 'last'}), 'td', {'class' : 'mceToolbar mceLast', align : 'center'});
-
-			// Create toolbar
-			tb = t.toolbar = cf.createToolbar("tools1");
-			tb.add(cf.createButton('bold', {title : 'simple.bold_desc', cmd : 'Bold'}));
-			tb.add(cf.createButton('italic', {title : 'simple.italic_desc', cmd : 'Italic'}));
-			tb.add(cf.createButton('underline', {title : 'simple.underline_desc', cmd : 'Underline'}));
-			tb.add(cf.createButton('strikethrough', {title : 'simple.striketrough_desc', cmd : 'Strikethrough'}));
-			tb.add(cf.createSeparator());
-			tb.add(cf.createButton('undo', {title : 'simple.undo_desc', cmd : 'Undo'}));
-			tb.add(cf.createButton('redo', {title : 'simple.redo_desc', cmd : 'Redo'}));
-			tb.add(cf.createSeparator());
-			tb.add(cf.createButton('cleanup', {title : 'simple.cleanup_desc', cmd : 'mceCleanup'}));
-			tb.add(cf.createSeparator());
-			tb.add(cf.createButton('insertunorderedlist', {title : 'simple.bullist_desc', cmd : 'InsertUnorderedList'}));
-			tb.add(cf.createButton('insertorderedlist', {title : 'simple.numlist_desc', cmd : 'InsertOrderedList'}));
-			tb.renderTo(n);
-
-			return {
-				iframeContainer : ic,
-				editorContainer : ed.id + '_container',
-				sizeContainer : sc,
-				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);
+/**
+ * $Id: editor_template_src.js 752 2008-03-27 21:51:25Z spocke $
+ *
+ * This file is meant to showcase how to create a simple theme. The advanced
+ * theme is more suitable for production use.
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+(function() {
+	var DOM = tinymce.DOM;
+
+	// Tell it to load theme specific language pack(s)
+	tinymce.ThemeManager.requireLangPack('simple');
+
+	tinymce.create('tinymce.themes.SimpleTheme', {
+		init : function(ed, url) {
+			var t = this, states = ['Bold', 'Italic', 'Underline', 'Strikethrough', 'InsertUnorderedList', 'InsertOrderedList'], s = ed.settings;
+
+			t.editor = ed;
+
+			ed.onInit.add(function() {
+				ed.onNodeChange.add(function(ed, cm) {
+					tinymce.each(states, function(c) {
+						cm.get(c.toLowerCase()).setActive(ed.queryCommandState(c));
+					});
+				});
+
+				ed.dom.loadCSS(url + "/skins/" + s.skin + "/content.css");
+			});
+
+			DOM.loadCSS((s.editor_css ? ed.baseURI.toAbsolute(s.editor_css) : '') || url + "/skins/" + s.skin + "/ui.css");
+		},
+
+		renderUI : function(o) {
+			var t = this, n = o.targetNode, ic, tb, ed = t.editor, cf = ed.controlManager, sc;
+
+			n = DOM.insertAfter(DOM.create('span', {id : ed.id + '_container', 'class' : 'mceEditor ' + ed.settings.skin + 'SimpleSkin'}), n);
+			n = sc = DOM.add(n, 'table', {cellPadding : 0, cellSpacing : 0, 'class' : 'mceLayout'});
+			n = tb = DOM.add(n, 'tbody');
+
+			// Create iframe container
+			n = DOM.add(tb, 'tr');
+			n = ic = DOM.add(DOM.add(n, 'td'), 'div', {'class' : 'mceIframeContainer'});
+
+			// Create toolbar container
+			n = DOM.add(DOM.add(tb, 'tr', {'class' : 'last'}), 'td', {'class' : 'mceToolbar mceLast', align : 'center'});
+
+			// Create toolbar
+			tb = t.toolbar = cf.createToolbar("tools1");
+			tb.add(cf.createButton('bold', {title : 'simple.bold_desc', cmd : 'Bold'}));
+			tb.add(cf.createButton('italic', {title : 'simple.italic_desc', cmd : 'Italic'}));
+			tb.add(cf.createButton('underline', {title : 'simple.underline_desc', cmd : 'Underline'}));
+			tb.add(cf.createButton('strikethrough', {title : 'simple.striketrough_desc', cmd : 'Strikethrough'}));
+			tb.add(cf.createSeparator());
+			tb.add(cf.createButton('undo', {title : 'simple.undo_desc', cmd : 'Undo'}));
+			tb.add(cf.createButton('redo', {title : 'simple.redo_desc', cmd : 'Redo'}));
+			tb.add(cf.createSeparator());
+			tb.add(cf.createButton('cleanup', {title : 'simple.cleanup_desc', cmd : 'mceCleanup'}));
+			tb.add(cf.createSeparator());
+			tb.add(cf.createButton('insertunorderedlist', {title : 'simple.bullist_desc', cmd : 'InsertUnorderedList'}));
+			tb.add(cf.createButton('insertorderedlist', {title : 'simple.numlist_desc', cmd : 'InsertOrderedList'}));
+			tb.renderTo(n);
+
+			return {
+				iframeContainer : ic,
+				editorContainer : ed.id + '_container',
+				sizeContainer : sc,
+				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
diff --git a/webapp/web/js/tiny_mce/themes/simple/langs/en.js b/webapp/web/js/tiny_mce/themes/simple/langs/en.js
index 9f08f102f..6f095311d 100755
--- a/webapp/web/js/tiny_mce/themes/simple/langs/en.js
+++ b/webapp/web/js/tiny_mce/themes/simple/langs/en.js
@@ -1,11 +1,11 @@
-tinyMCE.addI18n('en.simple',{
-bold_desc:"Bold (Ctrl+B)",
-italic_desc:"Italic (Ctrl+I)",
-underline_desc:"Underline (Ctrl+U)",
-striketrough_desc:"Strikethrough",
-bullist_desc:"Unordered list",
-numlist_desc:"Ordered list",
-undo_desc:"Undo (Ctrl+Z)",
-redo_desc:"Redo (Ctrl+Y)",
-cleanup_desc:"Cleanup messy code"
+tinyMCE.addI18n('en.simple',{
+bold_desc:"Bold (Ctrl+B)",
+italic_desc:"Italic (Ctrl+I)",
+underline_desc:"Underline (Ctrl+U)",
+striketrough_desc:"Strikethrough",
+bullist_desc:"Unordered list",
+numlist_desc:"Ordered list",
+undo_desc:"Undo (Ctrl+Z)",
+redo_desc:"Redo (Ctrl+Y)",
+cleanup_desc:"Cleanup messy code"
 });
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/themes/simple/skins/default/content.css b/webapp/web/js/tiny_mce/themes/simple/skins/default/content.css
index 2506c807c..783b170f7 100755
--- a/webapp/web/js/tiny_mce/themes/simple/skins/default/content.css
+++ b/webapp/web/js/tiny_mce/themes/simple/skins/default/content.css
@@ -1,25 +1,25 @@
-body, td, pre {
-	font-family: Verdana, Arial, Helvetica, sans-serif;
-	font-size: 10px;
-}
-
-body {
-	background-color: #FFFFFF;
-}
-
-.mceVisualAid {
-	border: 1px dashed #BBBBBB;
-}
-
-/* MSIE specific */
-
-* html body {
-	scrollbar-3dlight-color: #F0F0EE;
-	scrollbar-arrow-color: #676662;
-	scrollbar-base-color: #F0F0EE;
-	scrollbar-darkshadow-color: #DDDDDD;
-	scrollbar-face-color: #E0E0DD;
-	scrollbar-highlight-color: #F0F0EE;
-	scrollbar-shadow-color: #F0F0EE;
-	scrollbar-track-color: #F5F5F5;	
-}
+body, td, pre {
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 10px;
+}
+
+body {
+	background-color: #FFFFFF;
+}
+
+.mceVisualAid {
+	border: 1px dashed #BBBBBB;
+}
+
+/* MSIE specific */
+
+* html body {
+	scrollbar-3dlight-color: #F0F0EE;
+	scrollbar-arrow-color: #676662;
+	scrollbar-base-color: #F0F0EE;
+	scrollbar-darkshadow-color: #DDDDDD;
+	scrollbar-face-color: #E0E0DD;
+	scrollbar-highlight-color: #F0F0EE;
+	scrollbar-shadow-color: #F0F0EE;
+	scrollbar-track-color: #F5F5F5;	
+}
diff --git a/webapp/web/js/tiny_mce/themes/simple/skins/default/ui.css b/webapp/web/js/tiny_mce/themes/simple/skins/default/ui.css
index 1cf64b8dc..d92ba408a 100755
--- a/webapp/web/js/tiny_mce/themes/simple/skins/default/ui.css
+++ b/webapp/web/js/tiny_mce/themes/simple/skins/default/ui.css
@@ -1,32 +1,32 @@
-/* Reset */
-.defaultSimpleSkin table, .defaultSimpleSkin tbody, .defaultSimpleSkin a, .defaultSimpleSkin img, .defaultSimpleSkin tr, .defaultSimpleSkin div, .defaultSimpleSkin td, .defaultSimpleSkin iframe, .defaultSimpleSkin span, .defaultSimpleSkin * {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000}
-
-/* Containers */
-.defaultSimpleSkin {position:relative}
-.defaultSimpleSkin table.mceLayout {background:#F0F0EE; border:1px solid #CCC;}
-.defaultSimpleSkin iframe {display:block; background:#FFF; border-bottom:1px solid #CCC;}
-.defaultSimpleSkin .mceToolbar {height:24px;}
-
-/* Layout */
-.defaultSimpleSkin span.mceIcon, .defaultSimpleSkin img.mceIcon {display:block; width:20px; height:20px}
-.defaultSimpleSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}
-
-/* Button */
-.defaultSimpleSkin .mceButton {display:block; border:1px solid #F0F0EE; width:20px; height:20px}
-.defaultSimpleSkin a.mceButtonEnabled:hover {border:1px solid #0A246A; background-color:#B2BBD0}
-.defaultSimpleSkin a.mceButtonActive {border:1px solid #0A246A; background-color:#C2CBE0}
-.defaultSimpleSkin .mceButtonDisabled span {opacity:0.3; filter:alpha(opacity=30)}
-
-/* Separator */
-.defaultSimpleSkin .mceSeparator {display:block; background:url(../../img/icons.gif) -180px 0; width:2px; height:20px; margin:0 2px 0 4px}
-
-/* Theme */
-.defaultSimpleSkin span.mce_bold {background-position:0 0}
-.defaultSimpleSkin span.mce_italic {background-position:-60px 0}
-.defaultSimpleSkin span.mce_underline {background-position:-140px 0}
-.defaultSimpleSkin span.mce_strikethrough {background-position:-120px 0}
-.defaultSimpleSkin span.mce_undo {background-position:-160px 0}
-.defaultSimpleSkin span.mce_redo {background-position:-100px 0}
-.defaultSimpleSkin span.mce_cleanup {background-position:-40px 0}
-.defaultSimpleSkin span.mce_insertunorderedlist {background-position:-20px 0}
-.defaultSimpleSkin span.mce_insertorderedlist {background-position:-80px 0}
+/* Reset */
+.defaultSimpleSkin table, .defaultSimpleSkin tbody, .defaultSimpleSkin a, .defaultSimpleSkin img, .defaultSimpleSkin tr, .defaultSimpleSkin div, .defaultSimpleSkin td, .defaultSimpleSkin iframe, .defaultSimpleSkin span, .defaultSimpleSkin * {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000}
+
+/* Containers */
+.defaultSimpleSkin {position:relative}
+.defaultSimpleSkin table.mceLayout {background:#F0F0EE; border:1px solid #CCC;}
+.defaultSimpleSkin iframe {display:block; background:#FFF; border-bottom:1px solid #CCC;}
+.defaultSimpleSkin .mceToolbar {height:24px;}
+
+/* Layout */
+.defaultSimpleSkin span.mceIcon, .defaultSimpleSkin img.mceIcon {display:block; width:20px; height:20px}
+.defaultSimpleSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}
+
+/* Button */
+.defaultSimpleSkin .mceButton {display:block; border:1px solid #F0F0EE; width:20px; height:20px}
+.defaultSimpleSkin a.mceButtonEnabled:hover {border:1px solid #0A246A; background-color:#B2BBD0}
+.defaultSimpleSkin a.mceButtonActive {border:1px solid #0A246A; background-color:#C2CBE0}
+.defaultSimpleSkin .mceButtonDisabled span {opacity:0.3; filter:alpha(opacity=30)}
+
+/* Separator */
+.defaultSimpleSkin .mceSeparator {display:block; background:url(../../img/icons.gif) -180px 0; width:2px; height:20px; margin:0 2px 0 4px}
+
+/* Theme */
+.defaultSimpleSkin span.mce_bold {background-position:0 0}
+.defaultSimpleSkin span.mce_italic {background-position:-60px 0}
+.defaultSimpleSkin span.mce_underline {background-position:-140px 0}
+.defaultSimpleSkin span.mce_strikethrough {background-position:-120px 0}
+.defaultSimpleSkin span.mce_undo {background-position:-160px 0}
+.defaultSimpleSkin span.mce_redo {background-position:-100px 0}
+.defaultSimpleSkin span.mce_cleanup {background-position:-40px 0}
+.defaultSimpleSkin span.mce_insertunorderedlist {background-position:-20px 0}
+.defaultSimpleSkin span.mce_insertorderedlist {background-position:-80px 0}
diff --git a/webapp/web/js/tiny_mce/themes/simple/skins/o2k7/content.css b/webapp/web/js/tiny_mce/themes/simple/skins/o2k7/content.css
index 595809fa6..e10558f9d 100755
--- a/webapp/web/js/tiny_mce/themes/simple/skins/o2k7/content.css
+++ b/webapp/web/js/tiny_mce/themes/simple/skins/o2k7/content.css
@@ -1,17 +1,17 @@
-body, td, pre {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
-
-body {background: #FFF;}
-.mceVisualAid {border: 1px dashed #BBB;}
-
-/* IE */
-
-* html body {
-scrollbar-3dlight-color: #F0F0EE;
-scrollbar-arrow-color: #676662;
-scrollbar-base-color: #F0F0EE;
-scrollbar-darkshadow-color: #DDDDDD;
-scrollbar-face-color: #E0E0DD;
-scrollbar-highlight-color: #F0F0EE;
-scrollbar-shadow-color: #F0F0EE;
-scrollbar-track-color: #F5F5F5;	
-}
+body, td, pre {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}
+
+body {background: #FFF;}
+.mceVisualAid {border: 1px dashed #BBB;}
+
+/* IE */
+
+* html body {
+scrollbar-3dlight-color: #F0F0EE;
+scrollbar-arrow-color: #676662;
+scrollbar-base-color: #F0F0EE;
+scrollbar-darkshadow-color: #DDDDDD;
+scrollbar-face-color: #E0E0DD;
+scrollbar-highlight-color: #F0F0EE;
+scrollbar-shadow-color: #F0F0EE;
+scrollbar-track-color: #F5F5F5;	
+}
diff --git a/webapp/web/js/tiny_mce/themes/simple/skins/o2k7/ui.css b/webapp/web/js/tiny_mce/themes/simple/skins/o2k7/ui.css
index bfae96e2d..21c0d19cd 100755
--- a/webapp/web/js/tiny_mce/themes/simple/skins/o2k7/ui.css
+++ b/webapp/web/js/tiny_mce/themes/simple/skins/o2k7/ui.css
@@ -1,35 +1,35 @@
-/* Reset */
-.o2k7SimpleSkin table, .o2k7SimpleSkin tbody, .o2k7SimpleSkin a, .o2k7SimpleSkin img, .o2k7SimpleSkin tr, .o2k7SimpleSkin div, .o2k7SimpleSkin td, .o2k7SimpleSkin iframe, .o2k7SimpleSkin span, .o2k7SimpleSkin * {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000}
-
-/* Containers */
-.o2k7SimpleSkin {position:relative}
-.o2k7SimpleSkin table.mceLayout {background:#E5EFFD; border:1px solid #ABC6DD;}
-.o2k7SimpleSkin iframe {display:block; background:#FFF; border-bottom:1px solid #ABC6DD;}
-.o2k7SimpleSkin .mceToolbar {height:26px;}
-
-/* Layout */
-.o2k7SimpleSkin .mceToolbar .mceToolbarStart span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px; }
-.o2k7SimpleSkin .mceToolbar .mceToolbarEnd span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px}
-.o2k7SimpleSkin span.mceIcon, .o2k7SimpleSkin img.mceIcon {display:block; width:20px; height:20px}
-.o2k7SimpleSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}
-
-/* Button */
-.o2k7SimpleSkin .mceButton {display:block; background:url(img/button_bg.png); width:22px; height:22px}
-.o2k7SimpleSkin a.mceButton span, .o2k7SimpleSkin a.mceButton img {margin:1px 0 0 1px}
-.o2k7SimpleSkin a.mceButtonEnabled:hover {background-color:#B2BBD0; background-position:0 -22px}
-.o2k7SimpleSkin a.mceButtonActive {background-position:0 -44px}
-.o2k7SimpleSkin .mceButtonDisabled span {opacity:0.3; filter:alpha(opacity=30)}
-
-/* Separator */
-.o2k7SimpleSkin .mceSeparator {display:block; background:url(img/button_bg.png) -22px 0; width:5px; height:22px}
-
-/* Theme */
-.o2k7SimpleSkin span.mce_bold {background-position:0 0}
-.o2k7SimpleSkin span.mce_italic {background-position:-60px 0}
-.o2k7SimpleSkin span.mce_underline {background-position:-140px 0}
-.o2k7SimpleSkin span.mce_strikethrough {background-position:-120px 0}
-.o2k7SimpleSkin span.mce_undo {background-position:-160px 0}
-.o2k7SimpleSkin span.mce_redo {background-position:-100px 0}
-.o2k7SimpleSkin span.mce_cleanup {background-position:-40px 0}
-.o2k7SimpleSkin span.mce_insertunorderedlist {background-position:-20px 0}
-.o2k7SimpleSkin span.mce_insertorderedlist {background-position:-80px 0}
+/* Reset */
+.o2k7SimpleSkin table, .o2k7SimpleSkin tbody, .o2k7SimpleSkin a, .o2k7SimpleSkin img, .o2k7SimpleSkin tr, .o2k7SimpleSkin div, .o2k7SimpleSkin td, .o2k7SimpleSkin iframe, .o2k7SimpleSkin span, .o2k7SimpleSkin * {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000}
+
+/* Containers */
+.o2k7SimpleSkin {position:relative}
+.o2k7SimpleSkin table.mceLayout {background:#E5EFFD; border:1px solid #ABC6DD;}
+.o2k7SimpleSkin iframe {display:block; background:#FFF; border-bottom:1px solid #ABC6DD;}
+.o2k7SimpleSkin .mceToolbar {height:26px;}
+
+/* Layout */
+.o2k7SimpleSkin .mceToolbar .mceToolbarStart span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px; }
+.o2k7SimpleSkin .mceToolbar .mceToolbarEnd span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px}
+.o2k7SimpleSkin span.mceIcon, .o2k7SimpleSkin img.mceIcon {display:block; width:20px; height:20px}
+.o2k7SimpleSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}
+
+/* Button */
+.o2k7SimpleSkin .mceButton {display:block; background:url(img/button_bg.png); width:22px; height:22px}
+.o2k7SimpleSkin a.mceButton span, .o2k7SimpleSkin a.mceButton img {margin:1px 0 0 1px}
+.o2k7SimpleSkin a.mceButtonEnabled:hover {background-color:#B2BBD0; background-position:0 -22px}
+.o2k7SimpleSkin a.mceButtonActive {background-position:0 -44px}
+.o2k7SimpleSkin .mceButtonDisabled span {opacity:0.3; filter:alpha(opacity=30)}
+
+/* Separator */
+.o2k7SimpleSkin .mceSeparator {display:block; background:url(img/button_bg.png) -22px 0; width:5px; height:22px}
+
+/* Theme */
+.o2k7SimpleSkin span.mce_bold {background-position:0 0}
+.o2k7SimpleSkin span.mce_italic {background-position:-60px 0}
+.o2k7SimpleSkin span.mce_underline {background-position:-140px 0}
+.o2k7SimpleSkin span.mce_strikethrough {background-position:-120px 0}
+.o2k7SimpleSkin span.mce_undo {background-position:-160px 0}
+.o2k7SimpleSkin span.mce_redo {background-position:-100px 0}
+.o2k7SimpleSkin span.mce_cleanup {background-position:-40px 0}
+.o2k7SimpleSkin span.mce_insertunorderedlist {background-position:-20px 0}
+.o2k7SimpleSkin span.mce_insertorderedlist {background-position:-80px 0}
diff --git a/webapp/web/js/tiny_mce/tiny_mce_popup.js b/webapp/web/js/tiny_mce/tiny_mce_popup.js
index eac381781..704500999 100755
--- a/webapp/web/js/tiny_mce/tiny_mce_popup.js
+++ b/webapp/web/js/tiny_mce/tiny_mce_popup.js
@@ -1,284 +1,284 @@
-// Some global instances
-var tinymce = null, tinyMCEPopup, tinyMCE;
-
-tinyMCEPopup = {
-	init : function() {
-		var t = this, w, ti, li, q, i, it;
-
-		li = ('' + document.location.search).replace(/^\?/, '').split('&');
-		q = {};
-		for (i=0; i<li.length; i++) {
-			it = li[i].split('=');
-			q[unescape(it[0])] = unescape(it[1]);
-		}
-
-		if (q.mce_rdomain)
-			document.domain = q.mce_rdomain;
-
-		// Find window & API
-		w = t.getWin();
-		tinymce = w.tinymce;
-		tinyMCE = w.tinyMCE;
-		t.editor = tinymce.EditorManager.activeEditor;
-		t.params = t.editor.windowManager.params;
-		t.features = t.editor.windowManager.features;
-
-		// Setup local DOM
-		t.dom = t.editor.windowManager.createInstance('tinymce.dom.DOMUtils', document);
-		t.dom.loadCSS(t.features.popup_css || t.editor.settings.popup_css);
-
-		// Setup on init listeners
-		t.listeners = [];
-		t.onInit = {
-			add : function(f, s) {
-				t.listeners.push({func : f, scope : s});
-			}
-		};
-
-		t.isWindow = !t.getWindowArg('mce_inline');
-		t.id = t.getWindowArg('mce_window_id');
-		t.editor.windowManager.onOpen.dispatch(t.editor.windowManager, window);
-	},
-
-	getWin : function() {
-		return window.dialogArguments || opener || parent || top;
-	},
-
-	getWindowArg : function(n, dv) {
-		var v = this.params[n];
-
-		return tinymce.is(v) ? v : dv;
-	},
-
-	getParam : function(n, dv) {
-		return this.editor.getParam(n, dv);
-	},
-
-	getLang : function(n, dv) {
-		return this.editor.getLang(n, dv);
-	},
-
-	execCommand : function(cmd, ui, val, a) {
-		a = a || {};
-		a.skip_focus = 1;
-
-		this.restoreSelection();
-		return this.editor.execCommand(cmd, ui, val, a);
-	},
-
-	resizeToInnerSize : function() {
-		var t = this, n, b = document.body, vp = t.dom.getViewPort(window), dw, dh;
-
-		dw = t.getWindowArg('mce_width') - vp.w;
-		dh = t.getWindowArg('mce_height') - vp.h;
-
-		if (t.isWindow)
-			window.resizeBy(dw, dh);
-		else
-			t.editor.windowManager.resizeBy(dw, dh, t.id);
-	},
-
-	executeOnLoad : function(s) {
-		this.onInit.add(function() {
-			eval(s);
-		});
-	},
-
-	storeSelection : function() {
-		this.editor.windowManager.bookmark = tinyMCEPopup.editor.selection.getBookmark('simple');
-	},
-
-	restoreSelection : function() {
-		var t = tinyMCEPopup;
-
-		if (!t.isWindow && tinymce.isIE)
-			t.editor.selection.moveToBookmark(t.editor.windowManager.bookmark);
-	},
-
-	requireLangPack : function() {
-		var u = this.getWindowArg('plugin_url') || this.getWindowArg('theme_url');
-
-		if (u && this.editor.settings.language) {
-			u += '/langs/' + this.editor.settings.language + '_dlg.js';
-
-			if (!tinymce.ScriptLoader.isDone(u)) {
-				document.write('<script type="text/javascript" src="' + tinymce._addVer(u) + '"></script>');
-				tinymce.ScriptLoader.markDone(u);
-			}
-		}
-	},
-
-	pickColor : function(e, element_id) {
-		this.execCommand('mceColorPicker', true, {
-			color : document.getElementById(element_id).value,
-			func : function(c) {
-				document.getElementById(element_id).value = c;
-
-				try {
-					document.getElementById(element_id).onchange();
-				} catch (ex) {
-					// Try fire event, ignore errors
-				}
-			}
-		});
-	},
-
-	openBrowser : function(element_id, type, option) {
-		tinyMCEPopup.restoreSelection();
-		this.editor.execCallback('file_browser_callback', element_id, document.getElementById(element_id).value, type, window);
-	},
-
-	confirm : function(t, cb, s) {
-		this.editor.windowManager.confirm(t, cb, s, window);
-	},
-
-	alert : function(tx, cb, s) {
-		this.editor.windowManager.alert(tx, cb, s, window);
-	},
-
-	close : function() {
-		var t = this;
-
-		// To avoid domain relaxing issue in Opera
-		function close() {
-			t.editor.windowManager.close(window);
-			tinymce = tinyMCE = t.editor = t.params = t.dom = t.dom.doc = null; // Cleanup
-		};
-
-		if (tinymce.isOpera)
-			t.getWin().setTimeout(close, 0);
-		else
-			close();
-	},
-
-	// Internal functions	
-
-	_restoreSelection : function() {
-		var e = window.event.srcElement;
-
-		if (e.nodeName == 'INPUT' && (e.type == 'submit' || e.type == 'button'))
-			tinyMCEPopup.restoreSelection();
-	},
-
-/*	_restoreSelection : function() {
-		var e = window.event.srcElement;
-
-		// If user focus a non text input or textarea
-		if ((e.nodeName != 'INPUT' && e.nodeName != 'TEXTAREA') || e.type != 'text')
-			tinyMCEPopup.restoreSelection();
-	},*/
-
-	_onDOMLoaded : function() {
-		var t = this, ti = document.title, bm, h;
-
-		// Translate page
-		h = document.body.innerHTML;
-
-		// Replace a=x with a="x" in IE
-		if (tinymce.isIE)
-			h = h.replace(/ (value|title|alt)=([^"][^\s>]+)/gi, ' $1="$2"')
-
-		document.dir = t.editor.getParam('directionality','');
-		document.body.innerHTML = t.editor.translate(h);
-		document.title = ti = t.editor.translate(ti);
-		document.body.style.display = '';
-
-		// Restore selection in IE when focus is placed on a non textarea or input element of the type text
-		if (tinymce.isIE)
-			document.attachEvent('onmouseup', tinyMCEPopup._restoreSelection);
-
-		t.restoreSelection();
-		t.resizeToInnerSize();
-
-		// Set inline title
-		if (!t.isWindow)
-			t.editor.windowManager.setTitle(window, ti);
-		else
-			window.focus();
-
-		if (!tinymce.isIE && !t.isWindow) {
-			tinymce.dom.Event._add(document, 'focus', function() {
-				t.editor.windowManager.focus(t.id)
-			});
-		}
-
-		// Patch for accessibility
-		tinymce.each(t.dom.select('select'), function(e) {
-			e.onkeydown = tinyMCEPopup._accessHandler;
-		});
-
-		// Call onInit
-		// Init must be called before focus so the selection won't get lost by the focus call
-		tinymce.each(t.listeners, function(o) {
-			o.func.call(o.scope, t.editor);
-		});
-
-		// Move focus to window
-		if (t.getWindowArg('mce_auto_focus', true)) {
-			window.focus();
-
-			// Focus element with mceFocus class
-			tinymce.each(document.forms, function(f) {
-				tinymce.each(f.elements, function(e) {
-					if (t.dom.hasClass(e, 'mceFocus') && !e.disabled) {
-						e.focus();
-						return false; // Break loop
-					}
-				});
-			});
-		}
-
-		document.onkeyup = tinyMCEPopup._closeWinKeyHandler;
-	},
-
-	_accessHandler : function(e) {
-		e = e || window.event;
-
-		if (e.keyCode == 13 || e.keyCode == 32) {
-			e = e.target || e.srcElement;
-
-			if (e.onchange)
-				e.onchange();
-
-			return tinymce.dom.Event.cancel(e);
-		}
-	},
-
-	_closeWinKeyHandler : function(e) {
-		e = e || window.event;
-
-		if (e.keyCode == 27)
-			tinyMCEPopup.close();
-	},
-
-	_wait : function() {
-		var t = this, ti;
-
-		if (tinymce.isIE && document.location.protocol != 'https:') {
-			// Fake DOMContentLoaded on IE
-			document.write('<script id=__ie_onload defer src=\'javascript:""\';><\/script>');
-			document.getElementById("__ie_onload").onreadystatechange = function() {
-				if (this.readyState == "complete") {
-					t._onDOMLoaded();
-					document.getElementById("__ie_onload").onreadystatechange = null; // Prevent leak
-				}
-			};
-		} else {
-			if (tinymce.isIE || tinymce.isWebKit) {
-				ti = setInterval(function() {
-					if (/loaded|complete/.test(document.readyState)) {
-						clearInterval(ti);
-						t._onDOMLoaded();
-					}
-				}, 10);
-			} else {
-				window.addEventListener('DOMContentLoaded', function() {
-					t._onDOMLoaded();
-				}, false);
-			}
-		}
-	}
-};
-
-tinyMCEPopup.init();
-tinyMCEPopup._wait(); // Wait for DOM Content Loaded
+// Some global instances
+var tinymce = null, tinyMCEPopup, tinyMCE;
+
+tinyMCEPopup = {
+	init : function() {
+		var t = this, w, ti, li, q, i, it;
+
+		li = ('' + document.location.search).replace(/^\?/, '').split('&');
+		q = {};
+		for (i=0; i<li.length; i++) {
+			it = li[i].split('=');
+			q[unescape(it[0])] = unescape(it[1]);
+		}
+
+		if (q.mce_rdomain)
+			document.domain = q.mce_rdomain;
+
+		// Find window & API
+		w = t.getWin();
+		tinymce = w.tinymce;
+		tinyMCE = w.tinyMCE;
+		t.editor = tinymce.EditorManager.activeEditor;
+		t.params = t.editor.windowManager.params;
+		t.features = t.editor.windowManager.features;
+
+		// Setup local DOM
+		t.dom = t.editor.windowManager.createInstance('tinymce.dom.DOMUtils', document);
+		t.dom.loadCSS(t.features.popup_css || t.editor.settings.popup_css);
+
+		// Setup on init listeners
+		t.listeners = [];
+		t.onInit = {
+			add : function(f, s) {
+				t.listeners.push({func : f, scope : s});
+			}
+		};
+
+		t.isWindow = !t.getWindowArg('mce_inline');
+		t.id = t.getWindowArg('mce_window_id');
+		t.editor.windowManager.onOpen.dispatch(t.editor.windowManager, window);
+	},
+
+	getWin : function() {
+		return window.dialogArguments || opener || parent || top;
+	},
+
+	getWindowArg : function(n, dv) {
+		var v = this.params[n];
+
+		return tinymce.is(v) ? v : dv;
+	},
+
+	getParam : function(n, dv) {
+		return this.editor.getParam(n, dv);
+	},
+
+	getLang : function(n, dv) {
+		return this.editor.getLang(n, dv);
+	},
+
+	execCommand : function(cmd, ui, val, a) {
+		a = a || {};
+		a.skip_focus = 1;
+
+		this.restoreSelection();
+		return this.editor.execCommand(cmd, ui, val, a);
+	},
+
+	resizeToInnerSize : function() {
+		var t = this, n, b = document.body, vp = t.dom.getViewPort(window), dw, dh;
+
+		dw = t.getWindowArg('mce_width') - vp.w;
+		dh = t.getWindowArg('mce_height') - vp.h;
+
+		if (t.isWindow)
+			window.resizeBy(dw, dh);
+		else
+			t.editor.windowManager.resizeBy(dw, dh, t.id);
+	},
+
+	executeOnLoad : function(s) {
+		this.onInit.add(function() {
+			eval(s);
+		});
+	},
+
+	storeSelection : function() {
+		this.editor.windowManager.bookmark = tinyMCEPopup.editor.selection.getBookmark('simple');
+	},
+
+	restoreSelection : function() {
+		var t = tinyMCEPopup;
+
+		if (!t.isWindow && tinymce.isIE)
+			t.editor.selection.moveToBookmark(t.editor.windowManager.bookmark);
+	},
+
+	requireLangPack : function() {
+		var u = this.getWindowArg('plugin_url') || this.getWindowArg('theme_url');
+
+		if (u && this.editor.settings.language) {
+			u += '/langs/' + this.editor.settings.language + '_dlg.js';
+
+			if (!tinymce.ScriptLoader.isDone(u)) {
+				document.write('<script type="text/javascript" src="' + tinymce._addVer(u) + '"></script>');
+				tinymce.ScriptLoader.markDone(u);
+			}
+		}
+	},
+
+	pickColor : function(e, element_id) {
+		this.execCommand('mceColorPicker', true, {
+			color : document.getElementById(element_id).value,
+			func : function(c) {
+				document.getElementById(element_id).value = c;
+
+				try {
+					document.getElementById(element_id).onchange();
+				} catch (ex) {
+					// Try fire event, ignore errors
+				}
+			}
+		});
+	},
+
+	openBrowser : function(element_id, type, option) {
+		tinyMCEPopup.restoreSelection();
+		this.editor.execCallback('file_browser_callback', element_id, document.getElementById(element_id).value, type, window);
+	},
+
+	confirm : function(t, cb, s) {
+		this.editor.windowManager.confirm(t, cb, s, window);
+	},
+
+	alert : function(tx, cb, s) {
+		this.editor.windowManager.alert(tx, cb, s, window);
+	},
+
+	close : function() {
+		var t = this;
+
+		// To avoid domain relaxing issue in Opera
+		function close() {
+			t.editor.windowManager.close(window);
+			tinymce = tinyMCE = t.editor = t.params = t.dom = t.dom.doc = null; // Cleanup
+		};
+
+		if (tinymce.isOpera)
+			t.getWin().setTimeout(close, 0);
+		else
+			close();
+	},
+
+	// Internal functions	
+
+	_restoreSelection : function() {
+		var e = window.event.srcElement;
+
+		if (e.nodeName == 'INPUT' && (e.type == 'submit' || e.type == 'button'))
+			tinyMCEPopup.restoreSelection();
+	},
+
+/*	_restoreSelection : function() {
+		var e = window.event.srcElement;
+
+		// If user focus a non text input or textarea
+		if ((e.nodeName != 'INPUT' && e.nodeName != 'TEXTAREA') || e.type != 'text')
+			tinyMCEPopup.restoreSelection();
+	},*/
+
+	_onDOMLoaded : function() {
+		var t = this, ti = document.title, bm, h;
+
+		// Translate page
+		h = document.body.innerHTML;
+
+		// Replace a=x with a="x" in IE
+		if (tinymce.isIE)
+			h = h.replace(/ (value|title|alt)=([^"][^\s>]+)/gi, ' $1="$2"')
+
+		document.dir = t.editor.getParam('directionality','');
+		document.body.innerHTML = t.editor.translate(h);
+		document.title = ti = t.editor.translate(ti);
+		document.body.style.display = '';
+
+		// Restore selection in IE when focus is placed on a non textarea or input element of the type text
+		if (tinymce.isIE)
+			document.attachEvent('onmouseup', tinyMCEPopup._restoreSelection);
+
+		t.restoreSelection();
+		t.resizeToInnerSize();
+
+		// Set inline title
+		if (!t.isWindow)
+			t.editor.windowManager.setTitle(window, ti);
+		else
+			window.focus();
+
+		if (!tinymce.isIE && !t.isWindow) {
+			tinymce.dom.Event._add(document, 'focus', function() {
+				t.editor.windowManager.focus(t.id)
+			});
+		}
+
+		// Patch for accessibility
+		tinymce.each(t.dom.select('select'), function(e) {
+			e.onkeydown = tinyMCEPopup._accessHandler;
+		});
+
+		// Call onInit
+		// Init must be called before focus so the selection won't get lost by the focus call
+		tinymce.each(t.listeners, function(o) {
+			o.func.call(o.scope, t.editor);
+		});
+
+		// Move focus to window
+		if (t.getWindowArg('mce_auto_focus', true)) {
+			window.focus();
+
+			// Focus element with mceFocus class
+			tinymce.each(document.forms, function(f) {
+				tinymce.each(f.elements, function(e) {
+					if (t.dom.hasClass(e, 'mceFocus') && !e.disabled) {
+						e.focus();
+						return false; // Break loop
+					}
+				});
+			});
+		}
+
+		document.onkeyup = tinyMCEPopup._closeWinKeyHandler;
+	},
+
+	_accessHandler : function(e) {
+		e = e || window.event;
+
+		if (e.keyCode == 13 || e.keyCode == 32) {
+			e = e.target || e.srcElement;
+
+			if (e.onchange)
+				e.onchange();
+
+			return tinymce.dom.Event.cancel(e);
+		}
+	},
+
+	_closeWinKeyHandler : function(e) {
+		e = e || window.event;
+
+		if (e.keyCode == 27)
+			tinyMCEPopup.close();
+	},
+
+	_wait : function() {
+		var t = this, ti;
+
+		if (tinymce.isIE && document.location.protocol != 'https:') {
+			// Fake DOMContentLoaded on IE
+			document.write('<script id=__ie_onload defer src=\'javascript:""\';><\/script>');
+			document.getElementById("__ie_onload").onreadystatechange = function() {
+				if (this.readyState == "complete") {
+					t._onDOMLoaded();
+					document.getElementById("__ie_onload").onreadystatechange = null; // Prevent leak
+				}
+			};
+		} else {
+			if (tinymce.isIE || tinymce.isWebKit) {
+				ti = setInterval(function() {
+					if (/loaded|complete/.test(document.readyState)) {
+						clearInterval(ti);
+						t._onDOMLoaded();
+					}
+				}, 10);
+			} else {
+				window.addEventListener('DOMContentLoaded', function() {
+					t._onDOMLoaded();
+				}, false);
+			}
+		}
+	}
+};
+
+tinyMCEPopup.init();
+tinyMCEPopup._wait(); // Wait for DOM Content Loaded
diff --git a/webapp/web/js/tiny_mce/tiny_mce_src.js b/webapp/web/js/tiny_mce/tiny_mce_src.js
index d1a9b1f71..abd88e3a3 100755
--- a/webapp/web/js/tiny_mce/tiny_mce_src.js
+++ b/webapp/web/js/tiny_mce/tiny_mce_src.js
@@ -1,10728 +1,10728 @@
-
-/* file:jscripts/tiny_mce/classes/tinymce.js */
-
-var tinymce = {
-	majorVersion : '3',
-	minorVersion : '1.1',
-	releaseDate : '2008-08-18',
-
-	_init : function() {
-		var t = this, d = document, w = window, na = navigator, ua = na.userAgent, i, nl, n, base, p, v;
-
-		// Browser checks
-		t.isOpera = w.opera && opera.buildNumber;
-		t.isWebKit = /WebKit/.test(ua);
-		t.isOldWebKit = t.isWebKit && !w.getSelection().getRangeAt;
-		t.isIE = !t.isWebKit && !t.isOpera && (/MSIE/gi).test(ua) && (/Explorer/gi).test(na.appName);
-		t.isIE6 = t.isIE && /MSIE [56]/.test(ua);
-		t.isGecko = !t.isWebKit && /Gecko/.test(ua);
-		t.isMac = ua.indexOf('Mac') != -1;
-
-		// TinyMCE .NET webcontrol might be setting the values for TinyMCE
-		if (w.tinyMCEPreInit) {
-			t.suffix = tinyMCEPreInit.suffix;
-			t.baseURL = tinyMCEPreInit.base;
-			t.query = tinyMCEPreInit.query;
-			return;
-		}
-
-		// Get suffix and base
-		t.suffix = '';
-
-		// If base element found, add that infront of baseURL
-		nl = d.getElementsByTagName('base');
-		for (i=0; i<nl.length; i++) {
-			if (v = nl[i].href) {
-				// Host only value like http://site.com or http://site.com:8008
-				if (/^https?:\/\/[^\/]+$/.test(v))
-					v += '/';
-
-				base = v ? v.match(/.*\//)[0] : ''; // Get only directory
-			}
-		}
-
-		function getBase(n) {
-			if (n.src && /tiny_mce(|_dev|_src|_gzip|_jquery|_prototype).js/.test(n.src)) {
-				if (/_(src|dev)\.js/g.test(n.src))
-					t.suffix = '_src';
-
-				if ((p = n.src.indexOf('?')) != -1)
-					t.query = n.src.substring(p + 1);
-
-				t.baseURL = n.src.substring(0, n.src.lastIndexOf('/'));
-
-				// If path to script is relative and a base href was found add that one infront
-				if (base && t.baseURL.indexOf('://') == -1)
-					t.baseURL = base + t.baseURL;
-
-				return t.baseURL;
-			}
-
-			return null;
-		};
-
-		// Check document
-		nl = d.getElementsByTagName('script');
-		for (i=0; i<nl.length; i++) {
-			if (getBase(nl[i]))
-				return;
-		}
-
-		// Check head
-		n = d.getElementsByTagName('head')[0];
-		if (n) {
-			nl = n.getElementsByTagName('script');
-			for (i=0; i<nl.length; i++) {
-				if (getBase(nl[i]))
-					return;
-			}
-		}
-
-		return;
-	},
-
-	is : function(o, t) {
-		var n = typeof(o);
-
-		if (!t)
-			return n != 'undefined';
-
-		if (t == 'array' && (o instanceof Array))
-			return true;
-
-		return n == t;
-	},
-
-	// #if !jquery
-
-	each : function(o, cb, s) {
-		var n, l;
-
-		if (!o)
-			return 0;
-
-		s = s || o;
-
-		if (typeof(o.length) != 'undefined') {
-			// Indexed arrays, needed for Safari
-			for (n=0, l = o.length; n<l; n++) {
-				if (cb.call(s, o[n], n, o) === false)
-					return 0;
-			}
-		} else {
-			// Hashtables
-			for (n in o) {
-				if (o.hasOwnProperty(n)) {
-					if (cb.call(s, o[n], n, o) === false)
-						return 0;
-				}
-			}
-		}
-
-		return 1;
-	},
-
-	map : function(a, f) {
-		var o = [];
-
-		tinymce.each(a, function(v) {
-			o.push(f(v));
-		});
-
-		return o;
-	},
-
-	grep : function(a, f) {
-		var o = [];
-
-		tinymce.each(a, function(v) {
-			if (!f || f(v))
-				o.push(v);
-		});
-
-		return o;
-	},
-
-	inArray : function(a, v) {
-		var i, l;
-
-		if (a) {
-			for (i = 0, l = a.length; i < l; i++) {
-				if (a[i] === v)
-					return i;
-			}
-		}
-
-		return -1;
-	},
-
-	extend : function(o, e) {
-		var i, a = arguments;
-
-		for (i=1; i<a.length; i++) {
-			e = a[i];
-
-			tinymce.each(e, function(v, n) {
-				if (typeof(v) !== 'undefined')
-					o[n] = v;
-			});
-		}
-
-		return o;
-	},
-
-	trim : function(s) {
-		return (s ? '' + s : '').replace(/^\s*|\s*$/g, '');
-	},
-
-	// #endif
-
-	create : function(s, p) {
-		var t = this, sp, ns, cn, scn, c, de = 0;
-
-		// Parse : <prefix> <class>:<super class>
-		s = /^((static) )?([\w.]+)(:([\w.]+))?/.exec(s);
-		cn = s[3].match(/(^|\.)(\w+)$/i)[2]; // Class name
-
-		// Create namespace for new class
-		ns = t.createNS(s[3].replace(/\.\w+$/, ''));
-
-		// Class already exists
-		if (ns[cn])
-			return;
-
-		// Make pure static class
-		if (s[2] == 'static') {
-			ns[cn] = p;
-
-			if (this.onCreate)
-				this.onCreate(s[2], s[3], ns[cn]);
-
-			return;
-		}
-
-		// Create default constructor
-		if (!p[cn]) {
-			p[cn] = function() {};
-			de = 1;
-		}
-
-		// Add constructor and methods
-		ns[cn] = p[cn];
-		t.extend(ns[cn].prototype, p);
-
-		// Extend
-		if (s[5]) {
-			sp = t.resolve(s[5]).prototype;
-			scn = s[5].match(/\.(\w+)$/i)[1]; // Class name
-
-			// Extend constructor
-			c = ns[cn];
-			if (de) {
-				// Add passthrough constructor
-				ns[cn] = function() {
-					return sp[scn].apply(this, arguments);
-				};
-			} else {
-				// Add inherit constructor
-				ns[cn] = function() {
-					this.parent = sp[scn];
-					return c.apply(this, arguments);
-				};
-			}
-			ns[cn].prototype[cn] = ns[cn];
-
-			// Add super methods
-			t.each(sp, function(f, n) {
-				ns[cn].prototype[n] = sp[n];
-			});
-
-			// Add overridden methods
-			t.each(p, function(f, n) {
-				// Extend methods if needed
-				if (sp[n]) {
-					ns[cn].prototype[n] = function() {
-						this.parent = sp[n];
-						return f.apply(this, arguments);
-					};
-				} else {
-					if (n != cn)
-						ns[cn].prototype[n] = f;
-				}
-			});
-		}
-
-		// Add static methods
-		t.each(p['static'], function(f, n) {
-			ns[cn][n] = f;
-		});
-
-		if (this.onCreate)
-			this.onCreate(s[2], s[3], ns[cn].prototype);
-	},
-
-	walk : function(o, f, n, s) {
-		s = s || this;
-
-		if (o) {
-			if (n)
-				o = o[n];
-
-			tinymce.each(o, function(o, i) {
-				if (f.call(s, o, i, n) === false)
-					return false;
-
-				tinymce.walk(o, f, n, s);
-			});
-		}
-	},
-
-	createNS : function(n, o) {
-		var i, v;
-
-		o = o || window;
-
-		n = n.split('.');
-		for (i=0; i<n.length; i++) {
-			v = n[i];
-
-			if (!o[v])
-				o[v] = {};
-
-			o = o[v];
-		}
-
-		return o;
-	},
-
-	resolve : function(n, o) {
-		var i, l;
-
-		o = o || window;
-
-		n = n.split('.');
-		for (i=0, l = n.length; i<l; i++) {
-			o = o[n[i]];
-
-			if (!o)
-				break;
-		}
-
-		return o;
-	},
-
-	addUnload : function(f, s) {
-		var t = this, w = window;
-
-		f = {func : f, scope : s || this};
-
-		if (!t.unloads) {
-			function unload() {
-				var li = t.unloads, o, n;
-
-				if (li) {
-					// Call unload handlers
-					for (n in li) {
-						o = li[n];
-
-						if (o && o.func)
-							o.func.call(o.scope, 1); // Send in one arg to distinct unload and user destroy
-					}
-
-					// Detach unload function
-					if (w.detachEvent) {
-						w.detachEvent('onbeforeunload', fakeUnload);
-						w.detachEvent('onunload', unload);
-					} else if (w.removeEventListener)
-						w.removeEventListener('unload', unload, false);
-
-					// Destroy references
-					t.unloads = o = li = w = unload = null;
-
-					// Run garbarge collector on IE
-					if (window.CollectGarbage)
-						window.CollectGarbage();
-				}
-			};
-
-			function fakeUnload() {
-				var d = document;
-
-				// Is there things still loading, then do some magic
-				if (d.readyState == 'interactive') {
-					function stop() {
-						// Prevent memory leak
-						d.detachEvent('onstop', stop);
-
-						// Call unload handler
-						unload();
-
-						d = null;
-					};
-
-					// Fire unload when the currently loading page is stopped
-					d.attachEvent('onstop', stop);
-
-					// Remove onstop listener after a while to prevent the unload function
-					// to execute if the user presses cancel in an onbeforeunload
-					// confirm dialog and then presses the browser stop button
-					window.setTimeout(function() {
-						d.detachEvent('onstop', stop);
-					}, 0);
-				}
-			};
-
-			// Attach unload handler
-			if (w.attachEvent) {
-				w.attachEvent('onunload', unload);
-				w.attachEvent('onbeforeunload', fakeUnload);
-			} else if (w.addEventListener)
-				w.addEventListener('unload', unload, false);
-
-			// Setup initial unload handler array
-			t.unloads = [f];
-		} else
-			t.unloads.push(f);
-
-		return f;
-	},
-
-	removeUnload : function(f) {
-		var u = this.unloads, r = null;
-
-		tinymce.each(u, function(o, i) {
-			if (o && o.func == f) {
-				u.splice(i, 1);
-				r = f;
-				return false;
-			}
-		});
-
-		return r;
-	},
-
-	explode : function(s, d) {
-		return s ? tinymce.map(s.split(d || ','), tinymce.trim) : s;
-	},
-
-	_addVer : function(u) {
-		var v;
-
-		if (!this.query)
-			return u;
-
-		v = (u.indexOf('?') == -1 ? '?' : '&') + this.query;
-
-		if (u.indexOf('#') == -1)
-			return u + v;
-
-		return u.replace('#', v + '#');
-	}
-
-	};
-
-// Required for GZip AJAX loading
-window.tinymce = tinymce;
-
-// Initialize the API
-tinymce._init();
-
-/* file:jscripts/tiny_mce/classes/adapter/jquery/adapter.js */
-
-
-/* file:jscripts/tiny_mce/classes/adapter/prototype/adapter.js */
-
-
-/* file:jscripts/tiny_mce/classes/util/Dispatcher.js */
-
-tinymce.create('tinymce.util.Dispatcher', {
-	scope : null,
-	listeners : null,
-
-	Dispatcher : function(s) {
-		this.scope = s || this;
-		this.listeners = [];
-	},
-
-	add : function(cb, s) {
-		this.listeners.push({cb : cb, scope : s || this.scope});
-
-		return cb;
-	},
-
-	addToTop : function(cb, s) {
-		this.listeners.unshift({cb : cb, scope : s || this.scope});
-
-		return cb;
-	},
-
-	remove : function(cb) {
-		var l = this.listeners, o = null;
-
-		tinymce.each(l, function(c, i) {
-			if (cb == c.cb) {
-				o = cb;
-				l.splice(i, 1);
-				return false;
-			}
-		});
-
-		return o;
-	},
-
-	dispatch : function() {
-		var s, a = arguments, i, li = this.listeners, c;
-
-		// Needs to be a real loop since the listener count might change while looping
-		// And this is also more efficient
-		for (i = 0; i<li.length; i++) {
-			c = li[i];
-			s = c.cb.apply(c.scope, a);
-
-			if (s === false)
-				break;
-		}
-
-		return s;
-	}
-
-	});
-
-/* file:jscripts/tiny_mce/classes/util/URI.js */
-
-(function() {
-	var each = tinymce.each;
-
-	tinymce.create('tinymce.util.URI', {
-		URI : function(u, s) {
-			var t = this, o, a, b;
-
-			// Default settings
-			s = t.settings = s || {};
-
-			// Strange app protocol or local anchor
-			if (/^(mailto|news|javascript|about):/i.test(u) || /^\s*#/.test(u)) {
-				t.source = u;
-				return;
-			}
-
-			// Absolute path with no host, fake host and protocol
-			if (u.indexOf('/') === 0 && u.indexOf('//') !== 0)
-				u = (s.base_uri ? s.base_uri.protocol || 'http' : 'http') + '://mce_host' + u;
-
-			// Relative path
-			if (u.indexOf('://') === -1 && u.indexOf('//') !== 0)
-				u = (s.base_uri.protocol || 'http') + '://mce_host' + t.toAbsPath(s.base_uri.path, u);
-
-			// Parse URL (Credits goes to Steave, http://blog.stevenlevithan.com/archives/parseuri)
-			u = u.replace(/@@/g, '(mce_at)'); // Zope 3 workaround, they use @@something
-			u = /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(u);
-			each(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"], function(v, i) {
-				var s = u[i];
-
-				// Zope 3 workaround, they use @@something
-				if (s)
-					s = s.replace(/\(mce_at\)/g, '@@');
-
-				t[v] = s;
-			});
-
-			if (b = s.base_uri) {
-				if (!t.protocol)
-					t.protocol = b.protocol;
-
-				if (!t.userInfo)
-					t.userInfo = b.userInfo;
-
-				if (!t.port && t.host == 'mce_host')
-					t.port = b.port;
-
-				if (!t.host || t.host == 'mce_host')
-					t.host = b.host;
-
-				t.source = '';
-			}
-
-			//t.path = t.path || '/';
-		},
-
-		setPath : function(p) {
-			var t = this;
-
-			p = /^(.*?)\/?(\w+)?$/.exec(p);
-
-			// Update path parts
-			t.path = p[0];
-			t.directory = p[1];
-			t.file = p[2];
-
-			// Rebuild source
-			t.source = '';
-			t.getURI();
-		},
-
-		toRelative : function(u) {
-			var t = this, o;
-
-			u = new tinymce.util.URI(u, {base_uri : t});
-
-			// Not on same domain/port or protocol
-			if ((u.host != 'mce_host' && t.host != u.host && u.host) || t.port != u.port || t.protocol != u.protocol)
-				return u.getURI();
-
-			o = t.toRelPath(t.path, u.path);
-
-			// Add query
-			if (u.query)
-				o += '?' + u.query;
-
-			// Add anchor
-			if (u.anchor)
-				o += '#' + u.anchor;
-
-			return o;
-		},
-	
-		toAbsolute : function(u, nh) {
-			var u = new tinymce.util.URI(u, {base_uri : this});
-
-			return u.getURI(this.host == u.host ? nh : 0);
-		},
-
-		toRelPath : function(base, path) {
-			var items, bp = 0, out = '', i;
-
-			// Split the paths
-			base = base.substring(0, base.lastIndexOf('/'));
-			base = base.split('/');
-			items = path.split('/');
-
-			if (base.length >= items.length) {
-				for (i = 0; i < base.length; i++) {
-					if (i >= items.length || base[i] != items[i]) {
-						bp = i + 1;
-						break;
-					}
-				}
-			}
-
-			if (base.length < items.length) {
-				for (i = 0; i < items.length; i++) {
-					if (i >= base.length || base[i] != items[i]) {
-						bp = i + 1;
-						break;
-					}
-				}
-			}
-
-			if (bp == 1)
-				return path;
-
-			for (i = 0; i < base.length - (bp - 1); i++)
-				out += "../";
-
-			for (i = bp - 1; i < items.length; i++) {
-				if (i != bp - 1)
-					out += "/" + items[i];
-				else
-					out += items[i];
-			}
-
-			return out;
-		},
-
-		toAbsPath : function(base, path) {
-			var i, nb = 0, o = [];
-
-			// Split paths
-			base = base.split('/');
-			path = path.split('/');
-
-			// Remove empty chunks
-			each(base, function(k) {
-				if (k)
-					o.push(k);
-			});
-
-			base = o;
-
-			// Merge relURLParts chunks
-			for (i = path.length - 1, o = []; i >= 0; i--) {
-				// Ignore empty or .
-				if (path[i].length == 0 || path[i] == ".")
-					continue;
-
-				// Is parent
-				if (path[i] == '..') {
-					nb++;
-					continue;
-				}
-
-				// Move up
-				if (nb > 0) {
-					nb--;
-					continue;
-				}
-
-				o.push(path[i]);
-			}
-
-			i = base.length - nb;
-
-			// If /a/b/c or /
-			if (i <= 0)
-				return '/' + o.reverse().join('/');
-
-			return '/' + base.slice(0, i).join('/') + '/' + o.reverse().join('/');
-		},
-
-		getURI : function(nh) {
-			var s, t = this;
-
-			// Rebuild source
-			if (!t.source || nh) {
-				s = '';
-
-				if (!nh) {
-					if (t.protocol)
-						s += t.protocol + '://';
-
-					if (t.userInfo)
-						s += t.userInfo + '@';
-
-					if (t.host)
-						s += t.host;
-
-					if (t.port)
-						s += ':' + t.port;
-				}
-
-				if (t.path)
-					s += t.path;
-
-				if (t.query)
-					s += '?' + t.query;
-
-				if (t.anchor)
-					s += '#' + t.anchor;
-
-				t.source = s;
-			}
-
-			return t.source;
-		}
-
-		});
-})();
-
-/* file:jscripts/tiny_mce/classes/util/Cookie.js */
-
-(function() {
-	var each = tinymce.each;
-
-	tinymce.create('static tinymce.util.Cookie', {
-		getHash : function(n) {
-			var v = this.get(n), h;
-
-			if (v) {
-				each(v.split('&'), function(v) {
-					v = v.split('=');
-					h = h || {};
-					h[unescape(v[0])] = unescape(v[1]);
-				});
-			}
-
-			return h;
-		},
-
-		setHash : function(n, v, e, p, d, s) {
-			var o = '';
-
-			each(v, function(v, k) {
-				o += (!o ? '' : '&') + escape(k) + '=' + escape(v);
-			});
-
-			this.set(n, o, e, p, d, s);
-		},
-
-		get : function(n) {
-			var c = document.cookie, e, p = n + "=", b;
-
-			// Strict mode
-			if (!c)
-				return;
-
-			b = c.indexOf("; " + p);
-
-			if (b == -1) {
-				b = c.indexOf(p);
-
-				if (b != 0)
-					return null;
-			} else
-				b += 2;
-
-			e = c.indexOf(";", b);
-
-			if (e == -1)
-				e = c.length;
-
-			return unescape(c.substring(b + p.length, e));
-		},
-
-		set : function(n, v, e, p, d, s) {
-			document.cookie = n + "=" + escape(v) +
-				((e) ? "; expires=" + e.toGMTString() : "") +
-				((p) ? "; path=" + escape(p) : "") +
-				((d) ? "; domain=" + d : "") +
-				((s) ? "; secure" : "");
-		},
-
-		remove : function(n, p) {
-			var d = new Date();
-
-			d.setTime(d.getTime() - 1000);
-
-			this.set(n, '', d, p, d);
-		}
-
-		});
-})();
-
-/* file:jscripts/tiny_mce/classes/util/JSON.js */
-
-tinymce.create('static tinymce.util.JSON', {
-	serialize : function(o) {
-		var i, v, s = tinymce.util.JSON.serialize, t;
-
-		if (o == null)
-			return 'null';
-
-		t = typeof o;
-
-		if (t == 'string') {
-			v = '\bb\tt\nn\ff\rr\""\'\'\\\\';
-
-			return '"' + o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'])/g, function(a, b) {
-				i = v.indexOf(b);
-
-				if (i + 1)
-					return '\\' + v.charAt(i + 1);
-
-				a = b.charCodeAt().toString(16);
-
-				return '\\u' + '0000'.substring(a.length) + a;
-			}) + '"';
-		}
-
-		if (t == 'object') {
-			if (o instanceof Array) {
-					for (i=0, v = '['; i<o.length; i++)
-						v += (i > 0 ? ',' : '') + s(o[i]);
-
-					return v + ']';
-				}
-
-				v = '{';
-
-				for (i in o)
-					v += typeof o[i] != 'function' ? (v.length > 1 ? ',"' : '"') + i + '":' + s(o[i]) : '';
-
-				return v + '}';
-		}
-
-		return '' + o;
-	},
-
-	parse : function(s) {
-		try {
-			return eval('(' + s + ')');
-		} catch (ex) {
-			// Ignore
-		}
-	}
-
-	});
-
-/* file:jscripts/tiny_mce/classes/util/XHR.js */
-
-tinymce.create('static tinymce.util.XHR', {
-	send : function(o) {
-		var x, t, w = window, c = 0;
-
-		// Default settings
-		o.scope = o.scope || this;
-		o.success_scope = o.success_scope || o.scope;
-		o.error_scope = o.error_scope || o.scope;
-		o.async = o.async === false ? false : true;
-		o.data = o.data || '';
-
-		function get(s) {
-			x = 0;
-
-			try {
-				x = new ActiveXObject(s);
-			} catch (ex) {
-			}
-
-			return x;
-		};
-
-		x = w.XMLHttpRequest ? new XMLHttpRequest() : get('Microsoft.XMLHTTP') || get('Msxml2.XMLHTTP');
-
-		if (x) {
-			if (x.overrideMimeType)
-				x.overrideMimeType(o.content_type);
-
-			x.open(o.type || (o.data ? 'POST' : 'GET'), o.url, o.async);
-
-			if (o.content_type)
-				x.setRequestHeader('Content-Type', o.content_type);
-
-			x.send(o.data);
-
-			function ready() {
-				if (!o.async || x.readyState == 4 || c++ > 10000) {
-					if (o.success && c < 10000 && x.status == 200)
-						o.success.call(o.success_scope, '' + x.responseText, x, o);
-					else if (o.error)
-						o.error.call(o.error_scope, c > 10000 ? 'TIMED_OUT' : 'GENERAL', x, o);
-
-					x = null;
-				} else
-					w.setTimeout(ready, 10);
-			};
-
-			// Syncronous request
-			if (!o.async)
-				return ready();
-
-			// Wait for response, onReadyStateChange can not be used since it leaks memory in IE
-			t = w.setTimeout(ready, 10);
-		}
-
-		}
-});
-
-/* file:jscripts/tiny_mce/classes/util/JSONRequest.js */
-
-(function() {
-	var extend = tinymce.extend, JSON = tinymce.util.JSON, XHR = tinymce.util.XHR;
-
-	tinymce.create('tinymce.util.JSONRequest', {
-		JSONRequest : function(s) {
-			this.settings = extend({
-			}, s);
-			this.count = 0;
-		},
-
-		send : function(o) {
-			var ecb = o.error, scb = o.success;
-
-			o = extend(this.settings, o);
-
-			o.success = function(c, x) {
-				c = JSON.parse(c);
-
-				if (typeof(c) == 'undefined') {
-					c = {
-						error : 'JSON Parse error.'
-					};
-				}
-
-				if (c.error)
-					ecb.call(o.error_scope || o.scope, c.error, x);
-				else
-					scb.call(o.success_scope || o.scope, c.result);
-			};
-
-			o.error = function(ty, x) {
-				ecb.call(o.error_scope || o.scope, ty, x);
-			};
-
-			o.data = JSON.serialize({
-				id : o.id || 'c' + (this.count++),
-				method : o.method,
-				params : o.params
-			});
-
-			// JSON content type for Ruby on rails. Bug: #1883287
-			o.content_type = 'application/json';
-
-			XHR.send(o);
-		},
-
-		'static' : {
-			sendRPC : function(o) {
-				return new tinymce.util.JSONRequest().send(o);
-			}
-		}
-
-		});
-}());
-/* file:jscripts/tiny_mce/classes/dom/DOMUtils.js */
-
-(function() {
-	// Shorten names
-	var each = tinymce.each, is = tinymce.is;
-	var isWebKit = tinymce.isWebKit, isIE = tinymce.isIE;
-
-	tinymce.create('tinymce.dom.DOMUtils', {
-		doc : null,
-		root : null,
-		files : null,
-		listeners : {},
-		pixelStyles : /^(top|left|bottom|right|width|height|borderWidth)$/,
-		cache : {},
-		idPattern : /^#[\w]+$/,
-		elmPattern : /^[\w_*]+$/,
-		elmClassPattern : /^([\w_]*)\.([\w_]+)$/,
-		props : {
-			"for" : "htmlFor",
-			"class" : "className",
-			className : "className",
-			checked : "checked",
-			disabled : "disabled",
-			maxlength : "maxLength",
-			readonly : "readOnly",
-			selected : "selected",
-			value : "value"
-		},
-
-		DOMUtils : function(d, s) {
-			var t = this;
-
-			t.doc = d;
-			t.win = window;
-			t.files = {};
-			t.cssFlicker = false;
-			t.counter = 0;
-			t.boxModel = !tinymce.isIE || d.compatMode == "CSS1Compat"; 
-			t.stdMode = d.documentMode === 8;
-
-			this.settings = s = tinymce.extend({
-				keep_values : false,
-				hex_colors : 1,
-				process_html : 1
-			}, s);
-
-			// Fix IE6SP2 flicker and check it failed for pre SP2
-			if (tinymce.isIE6) {
-				try {
-					d.execCommand('BackgroundImageCache', false, true);
-				} catch (e) {
-					t.cssFlicker = true;
-				}
-			}
-
-			tinymce.addUnload(t.destroy, t);
-		},
-
-		getRoot : function() {
-			var t = this, s = t.settings;
-
-			return (s && t.get(s.root_element)) || t.doc.body;
-		},
-
-		getViewPort : function(w) {
-			var d, b;
-
-			w = !w ? this.win : w;
-			d = w.document;
-			b = this.boxModel ? d.documentElement : d.body;
-
-			// Returns viewport size excluding scrollbars
-			return {
-				x : w.pageXOffset || b.scrollLeft,
-				y : w.pageYOffset || b.scrollTop,
-				w : w.innerWidth || b.clientWidth,
-				h : w.innerHeight || b.clientHeight
-			};
-		},
-
-		getRect : function(e) {
-			var p, t = this, sr;
-
-			e = t.get(e);
-			p = t.getPos(e);
-			sr = t.getSize(e);
-
-			return {
-				x : p.x,
-				y : p.y,
-				w : sr.w,
-				h : sr.h
-			};
-		},
-
-		getSize : function(e) {
-			var t = this, w, h;
-
-			e = t.get(e);
-			w = t.getStyle(e, 'width');
-			h = t.getStyle(e, 'height');
-
-			// Non pixel value, then force offset/clientWidth
-			if (w.indexOf('px') === -1)
-				w = 0;
-
-			// Non pixel value, then force offset/clientWidth
-			if (h.indexOf('px') === -1)
-				h = 0;
-
-			return {
-				w : parseInt(w) || e.offsetWidth || e.clientWidth,
-				h : parseInt(h) || e.offsetHeight || e.clientHeight
-			};
-		},
-
-		getParent : function(n, f, r) {
-			var na, se = this.settings;
-
-			n = this.get(n);
-
-			if (se.strict_root)
-				r = r || this.getRoot();
-
-			// Wrap node name as func
-			if (is(f, 'string')) {
-				na = f.toUpperCase();
-
-				f = function(n) {
-					var s = false;
-
-					// Any element
-					if (n.nodeType == 1 && na === '*') {
-						s = true;
-						return false;
-					}
-
-					each(na.split(','), function(v) {
-						if (n.nodeType == 1 && ((se.strict && n.nodeName.toUpperCase() == v) || n.nodeName.toUpperCase() == v)) {
-							s = true;
-							return false; // Break loop
-						}
-					});
-
-					return s;
-				};
-			}
-
-			while (n) {
-				if (n == r)
-					return null;
-
-				if (f(n))
-					return n;
-
-				n = n.parentNode;
-			}
-
-			return null;
-		},
-
-		get : function(e) {
-			var n;
-
-			if (e && this.doc && typeof(e) == 'string') {
-				n = e;
-				e = this.doc.getElementById(e);
-
-				// IE and Opera returns meta elements when they match the specified input ID, but getElementsByName seems to do the trick
-				if (e && e.id !== n)
-					return this.doc.getElementsByName(n)[1];
-			}
-
-			return e;
-		},
-
-		// #if !jquery
-
-		select : function(pa, s) {
-			var t = this, cs, c, pl, o = [], x, i, l, n;
-
-			s = t.get(s) || t.doc;
-
-			// Look for native support and use that if it's found
-			if (s.querySelectorAll) {
-				// Element scope then use temp id
-				// We need to do this to be compatible with other implementations
-				// See bug report: http://bugs.webkit.org/show_bug.cgi?id=17461
-				if (s != t.doc) {
-					i = s.id;
-					s.id = '_mc_tmp';
-					pa = '#_mc_tmp ' + pa;
-				}
-
-				// Select elements
-				l = tinymce.grep(s.querySelectorAll(pa));
-
-				// Restore old id
-				s.id = i;
-
-				return l;
-			}
-
-			if (t.settings.strict) {
-				function get(s, n) {
-					return s.getElementsByTagName(n.toLowerCase());
-				};
-			} else {
-				function get(s, n) {
-					return s.getElementsByTagName(n);
-				};
-			}
-
-			// Simple element pattern. For example: "p" or "*"
-			if (t.elmPattern.test(pa)) {
-				x = get(s, pa);
-
-				for (i = 0, l = x.length; i<l; i++)
-					o.push(x[i]);
-
-				return o;
-			}
-
-			// Simple class pattern. For example: "p.class" or ".class"
-			if (t.elmClassPattern.test(pa)) {
-				pl = t.elmClassPattern.exec(pa);
-				x = get(s, pl[1] || '*');
-				c = ' ' + pl[2] + ' ';
-
-				for (i = 0, l = x.length; i<l; i++) {
-					n = x[i];
-
-					if (n.className && (' ' + n.className + ' ').indexOf(c) !== -1)
-						o.push(n);
-				}
-
-				return o;
-			}
-
-			function collect(n) {
-				if (!n.mce_save) {
-					n.mce_save = 1;
-					o.push(n);
-				}
-			};
-
-			function collectIE(n) {
-				if (!n.getAttribute('mce_save')) {
-					n.setAttribute('mce_save', '1');
-					o.push(n);
-				}
-			};
-
-			function find(n, f, r) {
-				var i, l, nl = get(r, n);
-
-				for (i = 0, l = nl.length; i < l; i++)
-					f(nl[i]);
-			};
-
-			each(pa.split(','), function(v, i) {
-				v = tinymce.trim(v);
-
-				// Simple element pattern, most common in TinyMCE
-				if (t.elmPattern.test(v)) {
-					each(get(s, v), function(n) {
-						collect(n);
-					});
-
-					return;
-				}
-
-				// Simple element pattern with class, fairly common in TinyMCE
-				if (t.elmClassPattern.test(v)) {
-					x = t.elmClassPattern.exec(v);
-
-					each(get(s, x[1]), function(n) {
-						if (t.hasClass(n, x[2]))
-							collect(n);
-					});
-
-					return;
-				}
-
-				if (!(cs = t.cache[pa])) {
-					cs = 'x=(function(cf, s) {';
-					pl = v.split(' ');
-
-					each(pl, function(v) {
-						var p = /^([\w\\*]+)?(?:#([\w\\]+))?(?:\.([\w\\\.]+))?(?:\[\@([\w\\]+)([\^\$\*!]?=)([\w\\]+)\])?(?:\:([\w\\]+))?/i.exec(v);
-
-						// Find elements
-						p[1] = p[1] || '*';
-						cs += 'find("' + p[1] + '", function(n) {';
-
-						// Check id
-						if (p[2])
-							cs += 'if (n.id !== "' + p[2] + '") return;';
-
-						// Check classes
-						if (p[3]) {
-							cs += 'var c = " " + n.className + " ";';
-							cs += 'if (';
-							c = '';
-							each(p[3].split('.'), function(v) {
-								if (v)
-									c += (c ? '||' : '') + 'c.indexOf(" ' + v + ' ") === -1';
-							});
-							cs += c + ') return;';
-						}
-					});
-
-					cs += 'cf(n);';
-
-					for (i = pl.length - 1; i >= 0; i--)
-						cs += '}, ' + (i ? 'n' : 's') + ');';
-
-					cs += '})';
-
-					// Compile CSS pattern function
-					t.cache[pa] = cs = eval(cs);
-				}
-
-				// Run selector function
-				cs(isIE ? collectIE : collect, s);
-			});
-
-			// Cleanup
-			each(o, function(n) {
-				if (isIE)
-					n.removeAttribute('mce_save');
-				else
-					delete n.mce_save;
-			});
-
-			return o;
-		},
-
-		// #endif
-
-		add : function(p, n, a, h, c) {
-			var t = this;
-
-			return this.run(p, function(p) {
-				var e, k;
-
-				e = is(n, 'string') ? t.doc.createElement(n) : n;
-
-				if (a) {
-					for (k in a) {
-						if (a.hasOwnProperty(k) && !is(a[k], 'object'))
-							t.setAttrib(e, k, '' + a[k]);
-					}
-
-					if (a.style && !is(a.style, 'string')) {
-						each(a.style, function(v, n) {
-							t.setStyle(e, n, v);
-						});
-					}
-				}
-
-				if (h) {
-					if (h.nodeType)
-						e.appendChild(h);
-					else
-						t.setHTML(e, h);
-				}
-
-				return !c ? p.appendChild(e) : e;
-			});
-		},
-
-		create : function(n, a, h) {
-			return this.add(this.doc.createElement(n), n, a, h, 1);
-		},
-
-		createHTML : function(n, a, h) {
-			var o = '', t = this, k;
-
-			o += '<' + n;
-
-			for (k in a) {
-				if (a.hasOwnProperty(k))
-					o += ' ' + k + '="' + t.encode(a[k]) + '"';
-			}
-
-			if (tinymce.is(h))
-				return o + '>' + h + '</' + n + '>';
-
-			return o + ' />';
-		},
-
-		remove : function(n, k) {
-			return this.run(n, function(n) {
-				var p, g;
-
-				p = n.parentNode;
-
-				if (!p)
-					return null;
-
-				if (k) {
-					each (n.childNodes, function(c) {
-						p.insertBefore(c.cloneNode(true), n);
-					});
-				}
-
-				// Fix IE psuedo leak
-		/*		if (isIE) {
-					p = n.cloneNode(true);
-					n.outerHTML = '';
-
-					return p;
-				}*/
-
-				return p.removeChild(n);
-			});
-		},
-
-		// #if !jquery
-
-		setStyle : function(n, na, v) {
-			var t = this;
-
-			return t.run(n, function(e) {
-				var s, i;
-
-				s = e.style;
-
-				// Camelcase it, if needed
-				na = na.replace(/-(\D)/g, function(a, b){
-					return b.toUpperCase();
-				});
-
-				// Default px suffix on these
-				if (t.pixelStyles.test(na) && (tinymce.is(v, 'number') || /^[\-0-9\.]+$/.test(v)))
-					v += 'px';
-
-				switch (na) {
-					case 'opacity':
-						// IE specific opacity
-						if (isIE) {
-							s.filter = v === '' ? '' : "alpha(opacity=" + (v * 100) + ")";
-
-							if (!n.currentStyle || !n.currentStyle.hasLayout)
-								s.display = 'inline-block';
-						}
-
-						// Fix for older browsers
-						s[na] = s['-moz-opacity'] = s['-khtml-opacity'] = v || '';
-						break;
-
-					case 'float':
-						isIE ? s.styleFloat = v : s.cssFloat = v;
-						break;
-					
-					default:
-						s[na] = v || '';
-				}
-
-				// Force update of the style data
-				if (t.settings.update_styles)
-					t.setAttrib(e, 'mce_style');
-			});
-		},
-
-		getStyle : function(n, na, c) {
-			n = this.get(n);
-
-			if (!n)
-				return false;
-
-			// Gecko
-			if (this.doc.defaultView && c) {
-				// Remove camelcase
-				na = na.replace(/[A-Z]/g, function(a){
-					return '-' + a;
-				});
-
-				try {
-					return this.doc.defaultView.getComputedStyle(n, null).getPropertyValue(na);
-				} catch (ex) {
-					// Old safari might fail
-					return null;
-				}
-			}
-
-			// Camelcase it, if needed
-			na = na.replace(/-(\D)/g, function(a, b){
-				return b.toUpperCase();
-			});
-
-			if (na == 'float')
-				na = isIE ? 'styleFloat' : 'cssFloat';
-
-			// IE & Opera
-			if (n.currentStyle && c)
-				return n.currentStyle[na];
-
-			return n.style[na];
-		},
-
-		setStyles : function(e, o) {
-			var t = this, s = t.settings, ol;
-
-			ol = s.update_styles;
-			s.update_styles = 0;
-
-			each(o, function(v, n) {
-				t.setStyle(e, n, v);
-			});
-
-			// Update style info
-			s.update_styles = ol;
-			if (s.update_styles)
-				t.setAttrib(e, s.cssText);
-		},
-
-		setAttrib : function(e, n, v) {
-			var t = this;
-
-			// Whats the point
-			if (!e || !n)
-				return;
-
-			// Strict XML mode
-			if (t.settings.strict)
-				n = n.toLowerCase();
-
-			return this.run(e, function(e) {
-				var s = t.settings;
-
-				switch (n) {
-					case "style":
-						// No mce_style for elements with these since they might get resized by the user
-						if (s.keep_values) {
-							if (v && !t._isRes(v))
-								e.setAttribute('mce_style', v, 2);
-							else
-								e.removeAttribute('mce_style', 2);
-						}
-
-						e.style.cssText = v;
-						break;
-
-					case "class":
-						e.className = v || ''; // Fix IE null bug
-						break;
-
-					case "src":
-					case "href":
-						if (s.keep_values) {
-							if (s.url_converter)
-								v = s.url_converter.call(s.url_converter_scope || t, v, n, e);
-
-							t.setAttrib(e, 'mce_' + n, v, 2);
-						}
-
-						break;
-					
-					case "shape":
-						e.setAttribute('mce_style', v);
-						break;
-				}
-
-				if (is(v) && v !== null && v.length !== 0)
-					e.setAttribute(n, '' + v, 2);
-				else
-					e.removeAttribute(n, 2);
-			});
-		},
-
-		setAttribs : function(e, o) {
-			var t = this;
-
-			return this.run(e, function(e) {
-				each(o, function(v, n) {
-					t.setAttrib(e, n, v);
-				});
-			});
-		},
-
-		// #endif
-
-		getAttrib : function(e, n, dv) {
-			var v, t = this;
-
-			e = t.get(e);
-
-			if (!e || e.nodeType !== 1)
-				return false;
-
-			if (!is(dv))
-				dv = '';
-
-			// Try the mce variant for these
-			if (/^(src|href|style|coords|shape)$/.test(n)) {
-				v = e.getAttribute("mce_" + n);
-
-				if (v)
-					return v;
-			}
-
-			if (isIE && t.props[n]) {
-				v = e[t.props[n]];
-				v = v && v.nodeValue ? v.nodeValue : v;
-			}
-
-			if (!v)
-				v = e.getAttribute(n, 2);
-
-			if (n === 'style') {
-				v = v || e.style.cssText;
-
-				if (v) {
-					v = t.serializeStyle(t.parseStyle(v));
-
-					if (t.settings.keep_values && !t._isRes(v))
-						e.setAttribute('mce_style', v);
-				}
-			}
-
-			// Remove Apple and WebKit stuff
-			if (isWebKit && n === "class" && v)
-				v = v.replace(/(apple|webkit)\-[a-z\-]+/gi, '');
-
-			// Handle IE issues
-			if (isIE) {
-				switch (n) {
-					case 'rowspan':
-					case 'colspan':
-						// IE returns 1 as default value
-						if (v === 1)
-							v = '';
-
-						break;
-
-					case 'size':
-						// IE returns +0 as default value for size
-						if (v === '+0' || v === 20)
-							v = '';
-
-						break;
-
-					case 'width':
-					case 'height':
-					case 'vspace':
-						if (v === 0)
-							v = '';
-
-						break;
-
-					case 'hspace':
-						// IE returns -1 as default value
-						if (v === -1)
-							v = '';
-
-						break;
-
-					case 'maxlength':
-					case 'tabindex':
-						// IE returns default value
-						if (v === 32768 || v === 2147483647)
-							v = '';
-
-						break;
-
-					case 'compact':
-					case 'noshade':
-						if (v === 65535)
-							return n;
-
-						return dv;
-
-					case 'shape':
-						v = v.toLowerCase();
-						break;
-
-					default:
-						// IE has odd anonymous function for event attributes
-						if (n.indexOf('on') === 0 && v)
-							v = ('' + v).replace(/^function\s+anonymous\(\)\s+\{\s+(.*)\s+\}$/, '$1');
-				}
-			}
-
-			return (v !== undefined && v !== null && v !== '') ? '' + v : dv;
-		},
-
-		getPos : function(n) {
-			var t = this, x = 0, y = 0, e, d = t.doc, r;
-
-			n = t.get(n);
-
-			// Use getBoundingClientRect on IE, Opera has it but it's not perfect
-			if (n && isIE) {
-				n = n.getBoundingClientRect();
-				e = t.boxModel ? d.documentElement : d.body;
-				x = t.getStyle(t.select('html')[0], 'borderWidth'); // Remove border
-				x = (x == 'medium' || t.boxModel && !t.isIE6) && 2 || x;
-				n.top += t.win.self != t.win.top ? 2 : 0; // IE adds some strange extra cord if used in a frameset
-
-				return {x : n.left + e.scrollLeft - x, y : n.top + e.scrollTop - x};
-			}
-
-			r = n;
-			while (r) {
-				x += r.offsetLeft || 0;
-				y += r.offsetTop || 0;
-				r = r.offsetParent;
-			}
-
-			r = n;
-			while (r) {
-				// Opera 9.25 bug fix, fixed in 9.50
-				if (!/^table-row|inline.*/i.test(t.getStyle(r, "display", 1))) {
-					x -= r.scrollLeft || 0;
-					y -= r.scrollTop || 0;
-				}
-
-				r = r.parentNode;
-
-				if (r == d.body)
-					break;
-			}
-
-			return {x : x, y : y};
-		},
-
-		parseStyle : function(st) {
-			var t = this, s = t.settings, o = {};
-
-			if (!st)
-				return o;
-
-			function compress(p, s, ot) {
-				var t, r, b, l;
-
-				// Get values and check it it needs compressing
-				t = o[p + '-top' + s];
-				if (!t)
-					return;
-
-				r = o[p + '-right' + s];
-				if (t != r)
-					return;
-
-				b = o[p + '-bottom' + s];
-				if (r != b)
-					return;
-
-				l = o[p + '-left' + s];
-				if (b != l)
-					return;
-
-				// Compress
-				o[ot] = l;
-				delete o[p + '-top' + s];
-				delete o[p + '-right' + s];
-				delete o[p + '-bottom' + s];
-				delete o[p + '-left' + s];
-			};
-
-			function compress2(ta, a, b, c) {
-				var t;
-
-				t = o[a];
-				if (!t)
-					return;
-
-				t = o[b];
-				if (!t)
-					return;
-
-				t = o[c];
-				if (!t)
-					return;
-
-				// Compress
-				o[ta] = o[a] + ' ' + o[b] + ' ' + o[c];
-				delete o[a];
-				delete o[b];
-				delete o[c];
-			};
-
-			st = st.replace(/&(#?[a-z0-9]+);/g, '&$1_MCE_SEMI_'); // Protect entities
-
-			each(st.split(';'), function(v) {
-				var sv, ur = [];
-
-				if (v) {
-					v = v.replace(/_MCE_SEMI_/g, ';'); // Restore entities
-					v = v.replace(/url\([^\)]+\)/g, function(v) {ur.push(v);return 'url(' + ur.length + ')';});
-					v = v.split(':');
-					sv = tinymce.trim(v[1]);
-					sv = sv.replace(/url\(([^\)]+)\)/g, function(a, b) {return ur[parseInt(b) - 1];});
-
-					sv = sv.replace(/rgb\([^\)]+\)/g, function(v) {
-						return t.toHex(v);
-					});
-
-					if (s.url_converter) {
-						sv = sv.replace(/url\([\'\"]?([^\)\'\"]+)[\'\"]?\)/g, function(x, c) {
-							return 'url(' + s.url_converter.call(s.url_converter_scope || t, t.decode(c), 'style', null) + ')';
-						});
-					}
-
-					o[tinymce.trim(v[0]).toLowerCase()] = sv;
-				}
-			});
-
-			compress("border", "", "border");
-			compress("border", "-width", "border-width");
-			compress("border", "-color", "border-color");
-			compress("border", "-style", "border-style");
-			compress("padding", "", "padding");
-			compress("margin", "", "margin");
-			compress2('border', 'border-width', 'border-style', 'border-color');
-
-			if (isIE) {
-				// Remove pointless border
-				if (o.border == 'medium none')
-					o.border = '';
-			}
-
-			return o;
-		},
-
-		serializeStyle : function(o) {
-			var s = '';
-
-			each(o, function(v, k) {
-				if (k && v) {
-					if (tinymce.isGecko && k.indexOf('-moz-') === 0)
-						return;
-
-					switch (k) {
-						case 'color':
-						case 'background-color':
-							v = v.toLowerCase();
-							break;
-					}
-
-					s += (s ? ' ' : '') + k + ': ' + v + ';';
-				}
-			});
-
-			return s;
-		},
-
-		loadCSS : function(u) {
-			var t = this, d = t.doc;
-
-			if (!u)
-				u = '';
-
-			each(u.split(','), function(u) {
-				if (t.files[u])
-					return;
-
-				t.files[u] = true;
-				t.add(t.select('head')[0], 'link', {rel : 'stylesheet', href : tinymce._addVer(u)});
-			});
-		},
-
-		// #if !jquery
-
-		addClass : function(e, c) {
-			return this.run(e, function(e) {
-				var o;
-
-				if (!c)
-					return 0;
-
-				if (this.hasClass(e, c))
-					return e.className;
-
-				o = this.removeClass(e, c);
-
-				return e.className = (o != '' ? (o + ' ') : '') + c;
-			});
-		},
-
-		removeClass : function(e, c) {
-			var t = this, re;
-
-			return t.run(e, function(e) {
-				var v;
-
-				if (t.hasClass(e, c)) {
-					if (!re)
-						re = new RegExp("(^|\\s+)" + c + "(\\s+|$)", "g");
-
-					v = e.className.replace(re, ' ');
-
-					return e.className = tinymce.trim(v != ' ' ? v : '');
-				}
-
-				return e.className;
-			});
-		},
-
-		hasClass : function(n, c) {
-			n = this.get(n);
-
-			if (!n || !c)
-				return false;
-
-			return (' ' + n.className + ' ').indexOf(' ' + c + ' ') !== -1;
-		},
-
-		show : function(e) {
-			return this.setStyle(e, 'display', 'block');
-		},
-
-		hide : function(e) {
-			return this.setStyle(e, 'display', 'none');
-		},
-
-		isHidden : function(e) {
-			e = this.get(e);
-
-			return e.style.display == 'none' || this.getStyle(e, 'display') == 'none';
-		},
-
-		// #endif
-
-		uniqueId : function(p) {
-			return (!p ? 'mce_' : p) + (this.counter++);
-		},
-
-		setHTML : function(e, h) {
-			var t = this;
-
-			return this.run(e, function(e) {
-				var x, i, nl, n, p, x;
-
-				h = t.processHTML(h);
-
-				if (isIE) {
-					function set() {
-						try {
-							// IE will remove comments from the beginning
-							// unless you padd the contents with something
-							e.innerHTML = '<br />' + h;
-							e.removeChild(e.firstChild);
-						} catch (ex) {
-							// IE sometimes produces an unknown runtime error on innerHTML if it's an block element within a block element for example a div inside a p
-							// This seems to fix this problem
-
-							// Remove all child nodes
-							while (e.firstChild)
-								e.firstChild.removeNode();
-
-							// Create new div with HTML contents and a BR infront to keep comments
-							x = t.create('div');
-							x.innerHTML = '<br />' + h;
-
-							// Add all children from div to target
-							each (x.childNodes, function(n, i) {
-								// Skip br element
-								if (i)
-									e.appendChild(n);
-							});
-						}
-					};
-
-					// IE has a serious bug when it comes to paragraphs it can produce an invalid
-					// DOM tree if contents like this <p><ul><li>Item 1</li></ul></p> is inserted
-					// It seems to be that IE doesn't like a root block element placed inside another root block element
-					if (t.settings.fix_ie_paragraphs)
-						h = h.replace(/<p><\/p>|<p([^>]+)><\/p>|<p[^\/+]\/>/gi, '<p$1 mce_keep="true">&nbsp;</p>');
-
-					set();
-
-					if (t.settings.fix_ie_paragraphs) {
-						// Check for odd paragraphs this is a sign of a broken DOM
-						nl = e.getElementsByTagName("p");
-						for (i = nl.length - 1, x = 0; i >= 0; i--) {
-							n = nl[i];
-
-							if (!n.hasChildNodes()) {
-								if (!n.mce_keep) {
-									x = 1; // Is broken
-									break;
-								}
-
-								n.removeAttribute('mce_keep');
-							}
-						}
-					}
-
-					// Time to fix the madness IE left us
-					if (x) {
-						// So if we replace the p elements with divs and mark them and then replace them back to paragraphs
-						// after we use innerHTML we can fix the DOM tree
-						h = h.replace(/<p([^>]+)>|<p>/g, '<div$1 mce_tmp="1">');
-						h = h.replace(/<\/p>/g, '</div>');
-
-						// Set the new HTML with DIVs
-						set();
-
-						// Replace all DIV elements with he mce_tmp attibute back to paragraphs
-						// This is needed since IE has a annoying bug see above for details
-						// This is a slow process but it has to be done. :(
-						if (t.settings.fix_ie_paragraphs) {
-							nl = e.getElementsByTagName("DIV");
-							for (i = nl.length - 1; i >= 0; i--) {
-								n = nl[i];
-
-								// Is it a temp div
-								if (n.mce_tmp) {
-									// Create new paragraph
-									p = t.doc.createElement('p');
-
-									// Copy all attributes
-									n.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi, function(a, b) {
-										var v;
-
-										if (b !== 'mce_tmp') {
-											v = n.getAttribute(b);
-
-											if (!v && b === 'class')
-												v = n.className;
-
-											p.setAttribute(b, v);
-										}
-									});
-
-									// Append all children to new paragraph
-									for (x = 0; x<n.childNodes.length; x++)
-										p.appendChild(n.childNodes[x].cloneNode(true));
-
-									// Replace div with new paragraph
-									n.swapNode(p);
-								}
-							}
-						}
-					}
-				} else
-					e.innerHTML = h;
-
-				return h;
-			});
-		},
-
-		processHTML : function(h) {
-			var t = this, s = t.settings;
-
-			if (!s.process_html)
-				return h;
-
-			// Convert strong and em to b and i in FF since it can't handle them
-			if (tinymce.isGecko) {
-				h = h.replace(/<(\/?)strong>|<strong( [^>]+)>/gi, '<$1b$2>');
-				h = h.replace(/<(\/?)em>|<em( [^>]+)>/gi, '<$1i$2>');
-			} else if (isIE)
-				h = h.replace(/&apos;/g, '&#39;'); // IE can't handle apos
-
-			// Fix some issues
-			h = h.replace(/<a( )([^>]+)\/>|<a\/>/gi, '<a$1$2></a>'); // Force open
-
-			// Store away src and href in mce_src and mce_href since browsers mess them up
-			if (s.keep_values) {
-				h = h.replace(/<!\[CDATA\[([\s\S]+)\]\]>/g, '<!--[CDATA[$1]]-->');
-
-				// Wrap scripts and styles in comments for serialization purposes
-				if (/<script|style/.test(h)) {
-					function trim(s) {
-						// Remove prefix and suffix code for element
-						s = s.replace(/^[\r\n]*|[\r\n]*$/g, '');
-						s = s.replace(/^\s*(\/\/\s*<!--|\/\/\s*<\[CDATA\[|<!--|<\[CDATA\[)[\r\n]*/g, '');
-						s = s.replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->)\s*$/g, '');
-
-						return s;
-					};
-
-					// Preserve script elements
-					h = h.replace(/<script([^>]+|)>([\s\S]*?)<\/script>/g, function(v, a, b) {
-						// Remove prefix and suffix code for script element
-						b = trim(b);
-
-						// Force type attribute
-						if (!a)
-							a = ' type="text/javascript"';
-
-						// Wrap contents in a comment
-						if (b)
-							b = '<!--\n' + b + '\n// -->';
-
-						// Output fake element
-						return '<mce:script' + a + '>' + b + '</mce:script>';
-					});
-
-					// Preserve style elements
-					h = h.replace(/<style([^>]+|)>([\s\S]*?)<\/style>/g, function(v, a, b) {
-						b = trim(b);
-						return '<mce:style' + a + '><!--\n' + b + '\n--></mce:style><style' + a + ' mce_bogus="1">' + b + '</style>';
-					});
-				}
-
-				// Process all tags with src, href or style
-				h = h.replace(/<([\w:]+) [^>]*(src|href|style|shape|coords)[^>]*>/gi, function(a, n) {
-					function handle(m, b, c) {
-						var u = c;
-
-						// Tag already got a mce_ version
-						if (a.indexOf('mce_' + b) != -1)
-							return m;
-
-						if (b == 'style') {
-							// Why did I need this one?
-							//if (isIE)
-							//	u = t.serializeStyle(t.parseStyle(u));
-
-							// No mce_style for elements with these since they might get resized by the user
-							if (t._isRes(c))
-								return m;
-
-							if (s.hex_colors) {
-								u = u.replace(/rgb\([^\)]+\)/g, function(v) {
-									return t.toHex(v);
-								});
-							}
-
-							if (s.url_converter) {
-								u = u.replace(/url\([\'\"]?([^\)\'\"]+)\)/g, function(x, c) {
-									return 'url(' + t.encode(s.url_converter.call(s.url_converter_scope || t, t.decode(c), b, n)) + ')';
-								});
-							}
-						} else if (b != 'coords' && b != 'shape') {
-							if (s.url_converter)
-								u = t.encode(s.url_converter.call(s.url_converter_scope || t, t.decode(c), b, n));
-						}
-
-						return ' ' + b + '="' + c + '" mce_' + b + '="' + u + '"';
-					};
-
-					a = a.replace(/ (src|href|style|coords|shape)=[\"]([^\"]+)[\"]/gi, handle); // W3C
-					a = a.replace(/ (src|href|style|coords|shape)=[\']([^\']+)[\']/gi, handle); // W3C
-
-					return a.replace(/ (src|href|style|coords|shape)=([^\s\"\'>]+)/gi, handle); // IE
-				});
-			}
-
-			return h;
-		},
-
-		getOuterHTML : function(e) {
-			var d;
-
-			e = this.get(e);
-
-			if (!e)
-				return null;
-
-			if (isIE)
-				return e.outerHTML;
-
-			d = (e.ownerDocument || this.doc).createElement("body");
-			d.appendChild(e.cloneNode(true));
-
-			return d.innerHTML;
-		},
-
-		setOuterHTML : function(e, h, d) {
-			var t = this;
-
-			return this.run(e, function(e) {
-				var n, tp;
-
-				e = t.get(e);
-				d = d || e.ownerDocument || t.doc;
-
-				if (isIE && e.nodeType == 1)
-					e.outerHTML = h;
-				else {
-					tp = d.createElement("body");
-					tp.innerHTML = h;
-
-					n = tp.lastChild;
-					while (n) {
-						t.insertAfter(n.cloneNode(true), e);
-						n = n.previousSibling;
-					}
-
-					t.remove(e);
-				}
-			});
-		},
-
-		decode : function(s) {
-			var e;
-
-			// Look for entities to decode
-			if (/&[^;]+;/.test(s)) {
-				// Decode the entities using a div element not super efficient but less code
-				e = this.doc.createElement("div");
-				e.innerHTML = s;
-
-				return !e.firstChild ? s : e.firstChild.nodeValue;
-			}
-
-			return s;
-		},
-
-		encode : function(s) {
-			return s ? ('' + s).replace(/[<>&\"]/g, function (c, b) {
-				switch (c) {
-					case '&':
-						return '&amp;';
-
-					case '"':
-						return '&quot;';
-
-					case '<':
-						return '&lt;';
-
-					case '>':
-						return '&gt;';
-				}
-
-				return c;
-			}) : s;
-		},
-
-		// #if !jquery
-
-		insertAfter : function(n, r) {
-			var t = this;
-
-			r = t.get(r);
-
-			return this.run(n, function(n) {
-				var p, ns;
-
-				p = r.parentNode;
-				ns = r.nextSibling;
-
-				if (ns)
-					p.insertBefore(n, ns);
-				else
-					p.appendChild(n);
-
-				return n;
-			});
-		},
-
-		// #endif
-
-		isBlock : function(n) {
-			if (n.nodeType && n.nodeType !== 1)
-				return false;
-
-			n = n.nodeName || n;
-
-			return /^(H[1-6]|HR|P|DIV|ADDRESS|PRE|FORM|TABLE|LI|OL|UL|TD|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|NOFRAMES|MENU|ISINDEX|SAMP)$/.test(n);
-		},
-
-		// #if !jquery
-
-		replace : function(n, o, k) {
-			if (is(o, 'array'))
-				n = n.cloneNode(true);
-
-			return this.run(o, function(o) {
-				if (k) {
-					each(o.childNodes, function(c) {
-						n.appendChild(c.cloneNode(true));
-					});
-				}
-
-				// Fix IE psuedo leak for elements since replacing elements if fairly common
-				// Will break parentNode for some unknown reason
-	/*			if (isIE && o.nodeType === 1) {
-					o.parentNode.insertBefore(n, o);
-					o.outerHTML = '';
-					return n;
-				}*/
-
-				return o.parentNode.replaceChild(n, o);
-			});
-		},
-
-		// #endif
-
-		toHex : function(s) {
-			var c = /^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(s);
-
-			function hex(s) {
-				s = parseInt(s).toString(16);
-
-				return s.length > 1 ? s : '0' + s; // 0 -> 00
-			};
-
-			if (c) {
-				s = '#' + hex(c[1]) + hex(c[2]) + hex(c[3]);
-
-				return s;
-			}
-
-			return s;
-		},
-
-		getClasses : function() {
-			var t = this, cl = [], i, lo = {}, f = t.settings.class_filter, ov;
-
-			if (t.classes)
-				return t.classes;
-
-			function addClasses(s) {
-				// IE style imports
-				each(s.imports, function(r) {
-					addClasses(r);
-				});
-
-				each(s.cssRules || s.rules, function(r) {
-					// Real type or fake it on IE
-					switch (r.type || 1) {
-						// Rule
-						case 1:
-							if (r.selectorText) {
-								each(r.selectorText.split(','), function(v) {
-									v = v.replace(/^\s*|\s*$|^\s\./g, "");
-
-									// Is internal or it doesn't contain a class
-									if (/\.mce/.test(v) || !/\.[\w\-]+$/.test(v))
-										return;
-
-									// Remove everything but class name
-									ov = v;
-									v = v.replace(/.*\.([a-z0-9_\-]+).*/i, '$1');
-
-									// Filter classes
-									if (f && !(v = f(v, ov)))
-										return;
-
-									if (!lo[v]) {
-										cl.push({'class' : v});
-										lo[v] = 1;
-									}
-								});
-							}
-							break;
-
-						// Import
-						case 3:
-							addClasses(r.styleSheet);
-							break;
-					}
-				});
-			};
-
-			try {
-				each(t.doc.styleSheets, addClasses);
-			} catch (ex) {
-				// Ignore
-			}
-
-			if (cl.length > 0)
-				t.classes = cl;
-
-			return cl;
-		},
-
-		run : function(e, f, s) {
-			var t = this, o;
-
-			if (t.doc && typeof(e) === 'string')
-				e = t.doc.getElementById(e);
-
-			if (!e)
-				return false;
-
-			s = s || this;
-			if (!e.nodeType && (e.length || e.length === 0)) {
-				o = [];
-
-				each(e, function(e, i) {
-					if (e) {
-						if (typeof(e) == 'string')
-							e = t.doc.getElementById(e);
-
-						o.push(f.call(s, e, i));
-					}
-				});
-
-				return o;
-			}
-
-			return f.call(s, e);
-		},
-
-		getAttribs : function(n) {
-			var o;
-
-			n = this.get(n);
-
-			if (!n)
-				return [];
-
-			if (isIE) {
-				o = [];
-
-				// Object will throw exception in IE
-				if (n.nodeName == 'OBJECT')
-					return n.attributes;
-
-				// It's crazy that this is faster in IE but it's because it returns all attributes all the time
-				n.cloneNode(false).outerHTML.replace(/([a-z0-9\:\-_]+)=/gi, function(a, b) {
-					o.push({specified : 1, nodeName : b});
-				});
-
-				return o;
-			}
-
-			return n.attributes;
-		},
-
-		destroy : function(s) {
-			var t = this;
-
-			t.win = t.doc = t.root = null;
-
-			// Manual destroy then remove unload handler
-			if (!s)
-				tinymce.removeUnload(t.destroy);
-		},
-
-		_isRes : function(c) {
-			// Is live resizble element
-			return /^(top|left|bottom|right|width|height)/i.test(c) || /;\s*(top|left|bottom|right|width|height)/i.test(c);
-		}
-
-		/*
-		walk : function(n, f, s) {
-			var d = this.doc, w;
-
-			if (d.createTreeWalker) {
-				w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);
-
-				while ((n = w.nextNode()) != null)
-					f.call(s || this, n);
-			} else
-				tinymce.walk(n, f, 'childNodes', s);
-		}
-		*/
-
-		/*
-		toRGB : function(s) {
-			var c = /^\s*?#([0-9A-F]{2})([0-9A-F]{1,2})([0-9A-F]{2})?\s*?$/.exec(s);
-
-			if (c) {
-				// #FFF -> #FFFFFF
-				if (!is(c[3]))
-					c[3] = c[2] = c[1];
-
-				return "rgb(" + parseInt(c[1], 16) + "," + parseInt(c[2], 16) + "," + parseInt(c[3], 16) + ")";
-			}
-
-			return s;
-		}
-		*/
-
-		});
-
-	// Setup page DOM
-	tinymce.DOM = new tinymce.dom.DOMUtils(document, {process_html : 0});
-})();
-
-/* file:jscripts/tiny_mce/classes/dom/Event.js */
-
-(function() {
-	// Shorten names
-	var each = tinymce.each, DOM = tinymce.DOM, isIE = tinymce.isIE, isWebKit = tinymce.isWebKit, Event;
-
-	tinymce.create('static tinymce.dom.Event', {
-		inits : [],
-		events : [],
-
-		// #if !jquery
-
-		add : function(o, n, f, s) {
-			var cb, t = this, el = t.events, r;
-
-			// Handle array
-			if (o && o instanceof Array) {
-				r = [];
-
-				each(o, function(o) {
-					o = DOM.get(o);
-					r.push(t.add(o, n, f, s));
-				});
-
-				return r;
-			}
-
-			o = DOM.get(o);
-
-			if (!o)
-				return;
-
-			// Setup event callback
-			cb = function(e) {
-				e = e || window.event;
-
-				// Patch in target in IE it's W3C valid
-				if (e && !e.target && isIE)
-					e.target = e.srcElement;
-
-				if (!s)
-					return f(e);
-
-				return f.call(s, e);
-			};
-
-			if (n == 'unload') {
-				tinymce.unloads.unshift({func : cb});
-				return cb;
-			}
-
-			if (n == 'init') {
-				if (t.domLoaded)
-					cb();
-				else
-					t.inits.push(cb);
-
-				return cb;
-			}
-
-			// Store away listener reference
-			el.push({
-				obj : o,
-				name : n,
-				func : f,
-				cfunc : cb,
-				scope : s
-			});
-
-			t._add(o, n, cb);
-
-			return f;
-		},
-
-		remove : function(o, n, f) {
-			var t = this, a = t.events, s = false, r;
-
-			// Handle array
-			if (o && o instanceof Array) {
-				r = [];
-
-				each(o, function(o) {
-					o = DOM.get(o);
-					r.push(t.remove(o, n, f));
-				});
-
-				return r;
-			}
-
-			o = DOM.get(o);
-
-			each(a, function(e, i) {
-				if (e.obj == o && e.name == n && (!f || (e.func == f || e.cfunc == f))) {
-					a.splice(i, 1);
-					t._remove(o, n, e.cfunc);
-					s = true;
-					return false;
-				}
-			});
-
-			return s;
-		},
-
-		clear : function(o) {
-			var t = this, a = t.events, i, e;
-
-			if (o) {
-				o = DOM.get(o);
-
-				for (i = a.length - 1; i >= 0; i--) {
-					e = a[i];
-
-					if (e.obj === o) {
-						t._remove(e.obj, e.name, e.cfunc);
-						e.obj = e.cfunc = null;
-						a.splice(i, 1);
-					}
-				}
-			}
-		},
-
-		// #endif
-
-		cancel : function(e) {
-			if (!e)
-				return false;
-
-			this.stop(e);
-			return this.prevent(e);
-		},
-
-		stop : function(e) {
-			if (e.stopPropagation)
-				e.stopPropagation();
-			else
-				e.cancelBubble = true;
-
-			return false;
-		},
-
-		prevent : function(e) {
-			if (e.preventDefault)
-				e.preventDefault();
-			else
-				e.returnValue = false;
-
-			return false;
-		},
-
-		_unload : function() {
-			var t = Event;
-
-			each(t.events, function(e, i) {
-				t._remove(e.obj, e.name, e.cfunc);
-				e.obj = e.cfunc = null;
-			});
-
-			t.events = [];
-			t = null;
-		},
-
-		_add : function(o, n, f) {
-			if (o.attachEvent)
-				o.attachEvent('on' + n, f);
-			else if (o.addEventListener)
-				o.addEventListener(n, f, false);
-			else
-				o['on' + n] = f;
-		},
-
-		_remove : function(o, n, f) {
-			if (o) {
-				try {
-					if (o.detachEvent)
-						o.detachEvent('on' + n, f);
-					else if (o.removeEventListener)
-						o.removeEventListener(n, f, false);
-					else
-						o['on' + n] = null;
-				} catch (ex) {
-					// Might fail with permission denined on IE so we just ignore that
-				}
-			}
-		},
-
-		_pageInit : function() {
-			var e = Event;
-
-			e._remove(window, 'DOMContentLoaded', e._pageInit);
-			e.domLoaded = true;
-
-			each(e.inits, function(c) {
-				c();
-			});
-
-			e.inits = [];
-		},
-
-		_wait : function() {
-			var t;
-
-			// No need since the document is already loaded
-			if (window.tinyMCE_GZ && tinyMCE_GZ.loaded) {
-				Event.domLoaded = 1;
-				return;
-			}
-
-			if (isIE && document.location.protocol != 'https:') {
-				// Fake DOMContentLoaded on IE
-				document.write('<script id=__ie_onload defer src=\'javascript:""\';><\/script>');
-				DOM.get("__ie_onload").onreadystatechange = function() {
-					if (this.readyState == "complete") {
-						Event._pageInit();
-						DOM.get("__ie_onload").onreadystatechange = null; // Prevent leak
-					}
-				};
-			} else {
-				Event._add(window, 'DOMContentLoaded', Event._pageInit, Event);
-
-				if (isIE || isWebKit) {
-					t = setInterval(function() {
-						if (/loaded|complete/.test(document.readyState)) {
-							clearInterval(t);
-							Event._pageInit();
-						}
-					}, 10);
-				}
-			}
-		}
-
-		});
-
-	// Shorten name
-	Event = tinymce.dom.Event;
-
-	// Dispatch DOM content loaded event for IE and Safari
-	Event._wait();
-	tinymce.addUnload(Event._unload);
-})();
-
-/* file:jscripts/tiny_mce/classes/dom/Element.js */
-
-(function() {
-	var each = tinymce.each;
-
-	tinymce.create('tinymce.dom.Element', {
-		Element : function(id, s) {
-			var t = this, dom, el;
-
-			s = s || {};
-			t.id = id;
-			t.dom = dom = s.dom || tinymce.DOM;
-			t.settings = s;
-
-			// Only IE leaks DOM references, this is a lot faster
-			if (!tinymce.isIE)
-				el = t.dom.get(t.id);
-
-			each([
-				'getPos',
-				'getRect',
-				'getParent',
-				'add',
-				'setStyle',
-				'getStyle',
-				'setStyles',
-				'setAttrib',
-				'setAttribs',
-				'getAttrib',
-				'addClass',
-				'removeClass',
-				'hasClass',
-				'getOuterHTML',
-				'setOuterHTML',
-				'remove',
-				'show',
-				'hide',
-				'isHidden',
-				'setHTML',
-				'get'
-			], function(k) {
-				t[k] = function() {
-					var a = arguments, o;
-
-					// Opera fails
-					if (tinymce.isOpera) {
-						a = [id];
-
-						each(arguments, function(v) {
-							a.push(v);
-						});
-					} else
-						Array.prototype.unshift.call(a, el || id);
-
-					o = dom[k].apply(dom, a);
-					t.update(k);
-
-					return o;
-				};
-			});
-		},
-
-		on : function(n, f, s) {
-			return tinymce.dom.Event.add(this.id, n, f, s);
-		},
-
-		getXY : function() {
-			return {
-				x : parseInt(this.getStyle('left')),
-				y : parseInt(this.getStyle('top'))
-			};
-		},
-
-		getSize : function() {
-			var n = this.dom.get(this.id);
-
-			return {
-				w : parseInt(this.getStyle('width') || n.clientWidth),
-				h : parseInt(this.getStyle('height') || n.clientHeight)
-			};
-		},
-
-		moveTo : function(x, y) {
-			this.setStyles({left : x, top : y});
-		},
-
-		moveBy : function(x, y) {
-			var p = this.getXY();
-
-			this.moveTo(p.x + x, p.y + y);
-		},
-
-		resizeTo : function(w, h) {
-			this.setStyles({width : w, height : h});
-		},
-
-		resizeBy : function(w, h) {
-			var s = this.getSize();
-
-			this.resizeTo(s.w + w, s.h + h);
-		},
-
-		update : function(k) {
-			var t = this, b, dom = t.dom;
-
-			if (tinymce.isIE6 && t.settings.blocker) {
-				k = k || '';
-
-				// Ignore getters
-				if (k.indexOf('get') === 0 || k.indexOf('has') === 0 || k.indexOf('is') === 0)
-					return;
-
-				// Remove blocker on remove
-				if (k == 'remove') {
-					dom.remove(t.blocker);
-					return;
-				}
-
-				if (!t.blocker) {
-					t.blocker = dom.uniqueId();
-					b = dom.add(t.settings.container || dom.getRoot(), 'iframe', {id : t.blocker, style : 'position:absolute;', frameBorder : 0, src : 'javascript:""'});
-					dom.setStyle(b, 'opacity', 0);
-				} else
-					b = dom.get(t.blocker);
-
-				dom.setStyle(b, 'left', t.getStyle('left', 1));
-				dom.setStyle(b, 'top', t.getStyle('top', 1));
-				dom.setStyle(b, 'width', t.getStyle('width', 1));
-				dom.setStyle(b, 'height', t.getStyle('height', 1));
-				dom.setStyle(b, 'display', t.getStyle('display', 1));
-				dom.setStyle(b, 'zIndex', parseInt(t.getStyle('zIndex', 1) || 0) - 1);
-			}
-		}
-
-		});
-})();
-
-/* file:jscripts/tiny_mce/classes/dom/Selection.js */
-
-(function() {
-	function trimNl(s) {
-		return s.replace(/[\n\r]+/g, '');
-	};
-
-	// Shorten names
-	var is = tinymce.is, isIE = tinymce.isIE, each = tinymce.each;
-
-	tinymce.create('tinymce.dom.Selection', {
-		Selection : function(dom, win, serializer) {
-			var t = this;
-
-			t.dom = dom;
-			t.win = win;
-			t.serializer = serializer;
-
-			// Prevent leaks
-			tinymce.addUnload(t.destroy, t);
-		},
-
-		getContent : function(s) {
-			var t = this, r = t.getRng(), e = t.dom.create("body"), se = t.getSel(), wb, wa, n;
-
-			s = s || {};
-			wb = wa = '';
-			s.get = true;
-			s.format = s.format || 'html';
-
-			if (s.format == 'text')
-				return t.isCollapsed() ? '' : (r.text || (se.toString ? se.toString() : ''));
-
-			if (r.cloneContents) {
-				n = r.cloneContents();
-
-				if (n)
-					e.appendChild(n);
-			} else if (is(r.item) || is(r.htmlText))
-				e.innerHTML = r.item ? r.item(0).outerHTML : r.htmlText;
-			else
-				e.innerHTML = r.toString();
-
-			// Keep whitespace before and after
-			if (/^\s/.test(e.innerHTML))
-				wb = ' ';
-
-			if (/\s+$/.test(e.innerHTML))
-				wa = ' ';
-
-			s.getInner = true;
-
-			return t.isCollapsed() ? '' : wb + t.serializer.serialize(e, s) + wa;
-		},
-
-		setContent : function(h, s) {
-			var t = this, r = t.getRng(), c, d = t.win.document;
-
-			s = s || {format : 'html'};
-			s.set = true;
-			h = t.dom.processHTML(h);
-
-			if (r.insertNode) {
-				// Make caret marker since insertNode places the caret in the beginning of text after insert
-				h += '<span id="__caret">_</span>';
-
-				// Delete and insert new node
-				r.deleteContents();
-				r.insertNode(t.getRng().createContextualFragment(h));
-
-				// Move to caret marker
-				c = t.dom.get('__caret');
-
-				// Make sure we wrap it compleatly, Opera fails with a simple select call
-				r = d.createRange();
-				r.setStartBefore(c);
-				r.setEndAfter(c);
-				t.setRng(r);
-
-				// Delete the marker, and hopefully the caret gets placed in the right location
-				d.execCommand('Delete', false, null);
-
-				// In case it's still there
-				t.dom.remove('__caret');
-			} else {
-				if (r.item) {
-					// Delete content and get caret text selection
-					d.execCommand('Delete', false, null);
-					r = t.getRng();
-				}
-
-				r.pasteHTML(h);
-			}
-		},
-
-		getStart : function() {
-			var t = this, r = t.getRng(), e;
-
-			if (isIE) {
-				if (r.item)
-					return r.item(0);
-
-				r = r.duplicate();
-				r.collapse(1);
-				e = r.parentElement();
-
-				if (e && e.nodeName == 'BODY')
-					return e.firstChild;
-
-				return e;
-			} else {
-				e = r.startContainer;
-
-				if (e.nodeName == 'BODY')
-					return e.firstChild;
-
-				return t.dom.getParent(e, function(n) {return n.nodeType == 1;});
-			}
-		},
-
-		getEnd : function() {
-			var t = this, r = t.getRng(), e;
-
-			if (isIE) {
-				if (r.item)
-					return r.item(0);
-
-				r = r.duplicate();
-				r.collapse(0);
-				e = r.parentElement();
-
-				if (e && e.nodeName == 'BODY')
-					return e.lastChild;
-
-				return e;
-			} else {
-				e = r.endContainer;
-
-				if (e.nodeName == 'BODY')
-					return e.lastChild;
-
-				return t.dom.getParent(e, function(n) {return n.nodeType == 1;});
-			}
-		},
-
-		getBookmark : function(si) {
-			var t = this, r = t.getRng(), tr, sx, sy, vp = t.dom.getViewPort(t.win), e, sp, bp, le, c = -0xFFFFFF, s, ro = t.dom.getRoot(), wb = 0, wa = 0, nv;
-			sx = vp.x;
-			sy = vp.y;
-
-			// Simple bookmark fast but not as persistent
-			if (si == 'simple')
-				return {rng : r, scrollX : sx, scrollY : sy};
-
-			// Handle IE
-			if (isIE) {
-				// Control selection
-				if (r.item) {
-					e = r.item(0);
-
-					each(t.dom.select(e.nodeName), function(n, i) {
-						if (e == n) {
-							sp = i;
-							return false;
-						}
-					});
-
-					return {
-						tag : e.nodeName,
-						index : sp,
-						scrollX : sx,
-						scrollY : sy
-					};
-				}
-
-				// Text selection
-				tr = t.dom.doc.body.createTextRange();
-				tr.moveToElementText(ro);
-				tr.collapse(true);
-				bp = Math.abs(tr.move('character', c));
-
-				tr = r.duplicate();
-				tr.collapse(true);
-				sp = Math.abs(tr.move('character', c));
-
-				tr = r.duplicate();
-				tr.collapse(false);
-				le = Math.abs(tr.move('character', c)) - sp;
-
-				return {
-					start : sp - bp,
-					length : le,
-					scrollX : sx,
-					scrollY : sy
-				};
-			}
-
-			// Handle W3C
-			e = t.getNode();
-			s = t.getSel();
-
-			if (!s)
-				return null;
-
-			// Image selection
-			if (e && e.nodeName == 'IMG') {
-				return {
-					scrollX : sx,
-					scrollY : sy
-				};
-			}
-
-			// Text selection
-
-			function getPos(r, sn, en) {
-				var w = t.dom.doc.createTreeWalker(r, NodeFilter.SHOW_TEXT, null, false), n, p = 0, d = {};
-
-				while ((n = w.nextNode()) != null) {
-					if (n == sn)
-						d.start = p;
-
-					if (n == en) {
-						d.end = p;
-						return d;
-					}
-
-					p += trimNl(n.nodeValue || '').length;
-				}
-
-				return null;
-			};
-
-			// Caret or selection
-			if (s.anchorNode == s.focusNode && s.anchorOffset == s.focusOffset) {
-				e = getPos(ro, s.anchorNode, s.focusNode);
-
-				if (!e)
-					return {scrollX : sx, scrollY : sy};
-
-				// Count whitespace before
-				trimNl(s.anchorNode.nodeValue || '').replace(/^\s+/, function(a) {wb = a.length;});
-
-				return {
-					start : Math.max(e.start + s.anchorOffset - wb, 0),
-					end : Math.max(e.end + s.focusOffset - wb, 0),
-					scrollX : sx,
-					scrollY : sy,
-					beg : s.anchorOffset - wb == 0
-				};
-			} else {
-				e = getPos(ro, r.startContainer, r.endContainer);
-
-				// Count whitespace before start and end container
-				//(r.startContainer.nodeValue || '').replace(/^\s+/, function(a) {wb = a.length;});
-				//(r.endContainer.nodeValue || '').replace(/^\s+/, function(a) {wa = a.length;});
-
-				if (!e)
-					return {scrollX : sx, scrollY : sy};
-
-				return {
-					start : Math.max(e.start + r.startOffset - wb, 0),
-					end : Math.max(e.end + r.endOffset - wa, 0),
-					scrollX : sx,
-					scrollY : sy,
-					beg : r.startOffset - wb == 0
-				};
-			}
-		},
-
-		moveToBookmark : function(b) {
-			var t = this, r = t.getRng(), s = t.getSel(), ro = t.dom.getRoot(), sd, nvl, nv;
-
-			function getPos(r, sp, ep) {
-				var w = t.dom.doc.createTreeWalker(r, NodeFilter.SHOW_TEXT, null, false), n, p = 0, d = {}, o, v, wa, wb;
-
-				while ((n = w.nextNode()) != null) {
-					wa = wb = 0;
-
-					nv = n.nodeValue || '';
-					//nv.replace(/^\s+[^\s]/, function(a) {wb = a.length - 1;});
-					//nv.replace(/[^\s]\s+$/, function(a) {wa = a.length - 1;});
-
-					nvl = trimNl(nv).length;
-					p += nvl;
-
-					if (p >= sp && !d.startNode) {
-						o = sp - (p - nvl);
-
-						// Fix for odd quirk in FF
-						if (b.beg && o >= nvl)
-							continue;
-
-						d.startNode = n;
-						d.startOffset = o + wb;
-					}
-
-					if (p >= ep) {
-						d.endNode = n;
-						d.endOffset = ep - (p - nvl) + wb;
-						return d;
-					}
-				}
-
-				return null;
-			};
-
-			if (!b)
-				return false;
-
-			t.win.scrollTo(b.scrollX, b.scrollY);
-
-			// Handle explorer
-			if (isIE) {
-				// Handle simple
-				if (r = b.rng) {
-					try {
-						r.select();
-					} catch (ex) {
-						// Ignore
-					}
-
-					return true;
-				}
-
-				t.win.focus();
-
-				// Handle control bookmark
-				if (b.tag) {
-					r = ro.createControlRange();
-
-					each(t.dom.select(b.tag), function(n, i) {
-						if (i == b.index)
-							r.addElement(n);
-					});
-				} else {
-					// Try/catch needed since this operation breaks when TinyMCE is placed in hidden divs/tabs
-					try {
-						// Incorrect bookmark
-						if (b.start < 0)
-							return true;
-
-						r = s.createRange();
-						r.moveToElementText(ro);
-						r.collapse(true);
-						r.moveStart('character', b.start);
-						r.moveEnd('character', b.length);
-					} catch (ex2) {
-						return true;
-					}
-				}
-
-				try {
-					r.select();
-				} catch (ex) {
-					// Needed for some odd IE bug #1843306
-				}
-
-				return true;
-			}
-
-			// Handle W3C
-			if (!s)
-				return false;
-
-			// Handle simple
-			if (b.rng) {
-				s.removeAllRanges();
-				s.addRange(b.rng);
-			} else {
-				if (is(b.start) && is(b.end)) {
-					try {
-						sd = getPos(ro, b.start, b.end);
-
-						if (sd) {
-							r = t.dom.doc.createRange();
-							r.setStart(sd.startNode, sd.startOffset);
-							r.setEnd(sd.endNode, sd.endOffset);
-							s.removeAllRanges();
-							s.addRange(r);
-						}
-
-						if (!tinymce.isOpera)
-							t.win.focus();
-					} catch (ex) {
-						// Ignore
-					}
-				}
-			}
-		},
-
-		select : function(n, c) {
-			var t = this, r = t.getRng(), s = t.getSel(), b, fn, ln, d = t.win.document;
-
-			function first(n) {
-				return n ? d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false).nextNode() : null;
-			};
-
-			function last(n) {
-				var c, o, w;
-
-				if (!n)
-					return null;
-
-				w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);
-				while (c = w.nextNode())
-					o = c;
-
-				return o;
-			};
-
-			if (isIE) {
-				try {
-					b = d.body;
-
-					if (/^(IMG|TABLE)$/.test(n.nodeName)) {
-						r = b.createControlRange();
-						r.addElement(n);
-					} else {
-						r = b.createTextRange();
-						r.moveToElementText(n);
-					}
-
-					r.select();
-				} catch (ex) {
-					// Throws illigal agrument in IE some times
-				}
-			} else {
-				if (c) {
-					fn = first(n);
-					ln = last(n);
-
-					if (fn && ln) {
-						//console.debug(fn, ln);
-						r = d.createRange();
-						r.setStart(fn, 0);
-						r.setEnd(ln, ln.nodeValue.length);
-					} else
-						r.selectNode(n);
-				} else
-					r.selectNode(n);
-
-				t.setRng(r);
-			}
-
-			return n;
-		},
-
-		isCollapsed : function() {
-			var t = this, r = t.getRng(), s = t.getSel();
-
-			if (!r || r.item)
-				return false;
-
-			return !s || r.boundingWidth == 0 || r.collapsed;
-		},
-
-		collapse : function(b) {
-			var t = this, r = t.getRng(), n;
-
-			// Control range on IE
-			if (r.item) {
-				n = r.item(0);
-				r = this.win.document.body.createTextRange();
-				r.moveToElementText(n);
-			}
-
-			r.collapse(!!b);
-			t.setRng(r);
-		},
-
-		getSel : function() {
-			var t = this, w = this.win;
-
-			return w.getSelection ? w.getSelection() : w.document.selection;
-		},
-
-		getRng : function() {
-			var t = this, s = t.getSel(), r;
-
-			try {
-				if (s)
-					r = s.rangeCount > 0 ? s.getRangeAt(0) : (s.createRange ? s.createRange() : t.win.document.createRange());
-			} catch (ex) {
-				// IE throws unspecified error here if TinyMCE is placed in a frame/iframe
-			}
-
-			// No range found then create an empty one
-			// This can occur when the editor is placed in a hidden container element on Gecko
-			// Or on IE when there was an exception
-			if (!r)
-				r = isIE ? t.win.document.body.createTextRange() : t.win.document.createRange();
-
-			return r;
-		},
-
-		setRng : function(r) {
-			var s;
-
-			if (!isIE) {
-				s = this.getSel();
-
-				if (s) {
-					s.removeAllRanges();
-					s.addRange(r);
-				}
-			} else {
-				try {
-					r.select();
-				} catch (ex) {
-					// Needed for some odd IE bug #1843306
-				}
-			}
-		},
-
-		setNode : function(n) {
-			var t = this;
-
-			t.setContent(t.dom.getOuterHTML(n));
-
-			return n;
-		},
-
-		getNode : function() {
-			var t = this, r = t.getRng(), s = t.getSel(), e;
-
-			if (!isIE) {
-				// Range maybe lost after the editor is made visible again
-				if (!r)
-					return t.dom.getRoot();
-
-				e = r.commonAncestorContainer;
-
-				// Handle selection a image or other control like element such as anchors
-				if (!r.collapsed) {
-					// If the anchor node is a element instead of a text node then return this element
-					if (tinymce.isWebKit && s.anchorNode && s.anchorNode.nodeType == 1) 
-						return s.anchorNode.childNodes[s.anchorOffset]; 
-
-					if (r.startContainer == r.endContainer) {
-						if (r.startOffset - r.endOffset < 2) {
-							if (r.startContainer.hasChildNodes())
-								e = r.startContainer.childNodes[r.startOffset];
-						}
-					}
-				}
-
-				return t.dom.getParent(e, function(n) {
-					return n.nodeType == 1;
-				});
-			}
-
-			return r.item ? r.item(0) : r.parentElement();
-		},
-
-		destroy : function(s) {
-			var t = this;
-
-			t.win = null;
-
-			// Manual destroy then remove unload handler
-			if (!s)
-				tinymce.removeUnload(t.destroy);
-		}
-
-		});
-})();
-
-/* file:jscripts/tiny_mce/classes/dom/XMLWriter.js */
-
-(function() {
-	tinymce.create('tinymce.dom.XMLWriter', {
-		node : null,
-
-		XMLWriter : function(s) {
-			// Get XML document
-			function getXML() {
-				var i = document.implementation;
-
-				if (!i || !i.createDocument) {
-					// Try IE objects
-					try {return new ActiveXObject('MSXML2.DOMDocument');} catch (ex) {}
-					try {return new ActiveXObject('Microsoft.XmlDom');} catch (ex) {}
-				} else
-					return i.createDocument('', '', null);
-			};
-
-			this.doc = getXML();
-			
-			// Since Opera and WebKit doesn't escape > into &gt; we need to do it our self to normalize the output for all browsers
-			this.valid = tinymce.isOpera || tinymce.isWebKit;
-
-			this.reset();
-		},
-
-		reset : function() {
-			var t = this, d = t.doc;
-
-			if (d.firstChild)
-				d.removeChild(d.firstChild);
-
-			t.node = d.appendChild(d.createElement("html"));
-		},
-
-		writeStartElement : function(n) {
-			var t = this;
-
-			t.node = t.node.appendChild(t.doc.createElement(n));
-		},
-
-		writeAttribute : function(n, v) {
-			if (this.valid)
-				v = v.replace(/>/g, '%MCGT%');
-
-			this.node.setAttribute(n, v);
-		},
-
-		writeEndElement : function() {
-			this.node = this.node.parentNode;
-		},
-
-		writeFullEndElement : function() {
-			var t = this, n = t.node;
-
-			n.appendChild(t.doc.createTextNode(""));
-			t.node = n.parentNode;
-		},
-
-		writeText : function(v) {
-			if (this.valid)
-				v = v.replace(/>/g, '%MCGT%');
-
-			this.node.appendChild(this.doc.createTextNode(v));
-		},
-
-		writeCDATA : function(v) {
-			this.node.appendChild(this.doc.createCDATA(v));
-		},
-
-		writeComment : function(v) {
-			this.node.appendChild(this.doc.createComment(v.replace(/\-\-/g, ' ')));
-		},
-
-		getContent : function() {
-			var h;
-
-			h = this.doc.xml || new XMLSerializer().serializeToString(this.doc);
-			h = h.replace(/<\?[^?]+\?>|<html>|<\/html>|<html\/>|<!DOCTYPE[^>]+>/g, '');
-			h = h.replace(/ ?\/>/g, ' />');
-
-			if (this.valid)
-				h = h.replace(/\%MCGT%/g, '&gt;');
-
-			return h;
-		}
-
-		});
-})();
-
-/* file:jscripts/tiny_mce/classes/dom/StringWriter.js */
-
-(function() {
-	tinymce.create('tinymce.dom.StringWriter', {
-		str : null,
-		tags : null,
-		count : 0,
-		settings : null,
-		indent : null,
-
-		StringWriter : function(s) {
-			this.settings = tinymce.extend({
-				indent_char : ' ',
-				indentation : 1
-			}, s);
-
-			this.reset();
-		},
-
-		reset : function() {
-			this.indent = '';
-			this.str = "";
-			this.tags = [];
-			this.count = 0;
-		},
-
-		writeStartElement : function(n) {
-			this._writeAttributesEnd();
-			this.writeRaw('<' + n);
-			this.tags.push(n);
-			this.inAttr = true;
-			this.count++;
-			this.elementCount = this.count;
-		},
-
-		writeAttribute : function(n, v) {
-			var t = this;
-
-			t.writeRaw(" " + t.encode(n) + '="' + t.encode(v) + '"');
-		},
-
-		writeEndElement : function() {
-			var n;
-
-			if (this.tags.length > 0) {
-				n = this.tags.pop();
-
-				if (this._writeAttributesEnd(1))
-					this.writeRaw('</' + n + '>');
-
-				if (this.settings.indentation > 0)
-					this.writeRaw('\n');
-			}
-		},
-
-		writeFullEndElement : function() {
-			if (this.tags.length > 0) {
-				this._writeAttributesEnd();
-				this.writeRaw('</' + this.tags.pop() + '>');
-
-				if (this.settings.indentation > 0)
-					this.writeRaw('\n');
-			}
-		},
-
-		writeText : function(v) {
-			this._writeAttributesEnd();
-			this.writeRaw(this.encode(v));
-			this.count++;
-		},
-
-		writeCDATA : function(v) {
-			this._writeAttributesEnd();
-			this.writeRaw('<![CDATA[' + v + ']]>');
-			this.count++;
-		},
-
-		writeComment : function(v) {
-			this._writeAttributesEnd();
-			this.writeRaw('<!-- ' + v + '-->');
-			this.count++;
-		},
-
-		writeRaw : function(v) {
-			this.str += v;
-		},
-
-		encode : function(s) {
-			return s.replace(/[<>&"]/g, function(v) {
-				switch (v) {
-					case '<':
-						return '&lt;';
-
-					case '>':
-						return '&gt;';
-
-					case '&':
-						return '&amp;';
-
-					case '"':
-						return '&quot;';
-				}
-
-				return v;
-			});
-		},
-
-		getContent : function() {
-			return this.str;
-		},
-
-		_writeAttributesEnd : function(s) {
-			if (!this.inAttr)
-				return;
-
-			this.inAttr = false;
-
-			if (s && this.elementCount == this.count) {
-				this.writeRaw(' />');
-				return false;
-			}
-
-			this.writeRaw('>');
-
-			return true;
-		}
-
-		});
-})();
-
-/* file:jscripts/tiny_mce/classes/dom/Serializer.js */
-
-(function() {
-	// Shorten names
-	var extend = tinymce.extend, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher, isIE = tinymce.isIE, isGecko = tinymce.isGecko;
-
-	// Returns only attribites that have values not all attributes in IE
-	function getIEAtts(n) {
-		var o = [];
-
-		// Object will throw exception in IE
-		if (n.nodeName == 'OBJECT')
-			return n.attributes;
-
-		n.cloneNode(false).outerHTML.replace(/([a-z0-9\:\-_]+)=/gi, function(a, b) {
-			o.push({specified : 1, nodeName : b});
-		});
-
-		return o;
-	};
-
-	function wildcardToRE(s) {
-		return s.replace(/([?+*])/g, '.$1');
-	};
-
-	tinymce.create('tinymce.dom.Serializer', {
-		Serializer : function(s) {
-			var t = this;
-
-			t.key = 0;
-			t.onPreProcess = new Dispatcher(t);
-			t.onPostProcess = new Dispatcher(t);
-
-			if (tinymce.relaxedDomain && tinymce.isGecko) {
-				// Gecko has a bug where we can't create a new XML document if domain relaxing is used
-				t.writer = new tinymce.dom.StringWriter();
-			} else {
-				try {
-					t.writer = new tinymce.dom.XMLWriter();
-				} catch (ex) {
-					// IE might throw exception if ActiveX is disabled so we then switch to the slightly slower StringWriter
-					t.writer = new tinymce.dom.StringWriter();
-				}
-			}
-
-			// Default settings
-			t.settings = s = extend({
-				dom : tinymce.DOM,
-				valid_nodes : 0,
-				node_filter : 0,
-				attr_filter : 0,
-				invalid_attrs : /^(mce_|_moz_)/,
-				closed : /(br|hr|input|meta|img|link|param)/,
-				entity_encoding : 'named',
-				entities : '160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro',
-				valid_elements : '*[*]',
-				extended_valid_elements : 0,
-				valid_child_elements : 0,
-				invalid_elements : 0,
-				fix_table_elements : 0,
-				fix_list_elements : true,
-				fix_content_duplication : true,
-				convert_fonts_to_spans : false,
-				font_size_classes : 0,
-				font_size_style_values : 0,
-				apply_source_formatting : 0,
-				indent_mode : 'simple',
-				indent_char : '\t',
-				indent_levels : 1,
-				remove_linebreaks : 1,
-				remove_redundant_brs : 1
-			}, s);
-
-			t.dom = s.dom;
-
-			if (s.remove_redundant_brs) {
-				t.onPostProcess.add(function(se, o) {
-					// Remove BR elements at end of list elements since they get rendered in IE
-					o.content = o.content.replace(/<br \/>(\s*<\/li>)/g, '$1');
-				});
-			}
-
-			if (s.fix_list_elements) {
-				t.onPreProcess.add(function(se, o) {
-					var nl, x, a = ['ol', 'ul'], i, n, p, r = /^(OL|UL)$/, np;
-
-					function prevNode(e, n) {
-						var a = n.split(','), i;
-
-						while ((e = e.previousSibling) != null) {
-							for (i=0; i<a.length; i++) {
-								if (e.nodeName == a[i])
-									return e;
-							}
-						}
-
-						return null;
-					};
-
-					for (x=0; x<a.length; x++) {
-						nl = t.dom.select(a[x], o.node);
-
-						for (i=0; i<nl.length; i++) {
-							n = nl[i];
-							p = n.parentNode;
-
-							if (r.test(p.nodeName)) {
-								np = prevNode(n, 'LI');
-
-								if (!np) {
-									np = t.dom.create('li');
-									np.innerHTML = '&nbsp;';
-									np.appendChild(n);
-									p.insertBefore(np, p.firstChild);
-								} else
-									np.appendChild(n);
-							}
-						}
-					}
-				});
-			}
-
-			if (s.fix_table_elements) {
-				t.onPreProcess.add(function(se, o) {
-					each(t.dom.select('table', o.node), function(e) {
-						var pa = t.dom.getParent(e, 'H1,H2,H3,H4,H5,H6,P'), pa2, n, tm, pl = [], i, ns;
-
-						if (pa) {
-							pa2 = pa.cloneNode(false);
-
-							pl.push(e);
-							for (n = e; n = n.parentNode;) {
-								pl.push(n);
-
-								if (n == pa)
-									break;
-							}
-
-							tm = pa2;
-							for (i = pl.length - 1; i >= 0; i--) {
-								if (i == pl.length - 1) {
-									while (ns = pl[i - 1].nextSibling)
-										tm.appendChild(ns.parentNode.removeChild(ns));
-								} else {
-									n = pl[i].cloneNode(false);
-
-									if (i != 0) {
-										while (ns = pl[i - 1].nextSibling)
-											n.appendChild(ns.parentNode.removeChild(ns));
-									}
-
-									tm = tm.appendChild(n);
-								}
-							}
-
-							e = t.dom.insertAfter(e.parentNode.removeChild(e), pa);
-							t.dom.insertAfter(e, pa);
-							t.dom.insertAfter(pa2, e);
-						}
-					});
-				});
-			}
-		},
-
-		setEntities : function(s) {
-			var t = this, a, i, l = {}, re = '', v;
-
-			// No need to setup more than once
-			if (t.entityLookup)
-				return;
-
-			// Build regex and lookup array
-			a = s.split(',');
-			for (i = 0; i < a.length; i += 2) {
-				v = a[i];
-
-				// Don't add default &amp; &quot; etc.
-				if (v == 34 || v == 38 || v == 60 || v == 62)
-					continue;
-
-				l[String.fromCharCode(a[i])] = a[i + 1];
-
-				v = parseInt(a[i]).toString(16);
-				re += '\\u' + '0000'.substring(v.length) + v;
-			}
-
-			if (!re) {
-				t.settings.entity_encoding = 'raw';
-				return;
-			}
-
-			t.entitiesRE = new RegExp('[' + re + ']', 'g');
-			t.entityLookup = l;
-		},
-
-		setValidChildRules : function(s) {
-			this.childRules = null;
-			this.addValidChildRules(s);
-		},
-
-		addValidChildRules : function(s) {
-			var t = this, inst, intr, bloc;
-
-			if (!s)
-				return;
-
-			inst = 'A|BR|SPAN|BDO|MAP|OBJECT|IMG|TT|I|B|BIG|SMALL|EM|STRONG|DFN|CODE|Q|SAMP|KBD|VAR|CITE|ABBR|ACRONYM|SUB|SUP|#text|#comment';
-			intr = 'A|BR|SPAN|BDO|OBJECT|APPLET|IMG|MAP|IFRAME|TT|I|B|U|S|STRIKE|BIG|SMALL|FONT|BASEFONT|EM|STRONG|DFN|CODE|Q|SAMP|KBD|VAR|CITE|ABBR|ACRONYM|SUB|SUP|INPUT|SELECT|TEXTAREA|LABEL|BUTTON|#text|#comment';
-			bloc = 'H[1-6]|P|DIV|ADDRESS|PRE|FORM|TABLE|LI|OL|UL|TD|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|FORM|NOSCRIPT|NOFRAMES|MENU|ISINDEX|SAMP';
-
-			each(s.split(','), function(s) {
-				var p = s.split(/\[|\]/), re;
-
-				s = '';
-				each(p[1].split('|'), function(v) {
-					if (s)
-						s += '|';
-
-					switch (v) {
-						case '%itrans':
-							v = intr;
-							break;
-
-						case '%itrans_na':
-							v = intr.substring(2);
-							break;
-
-						case '%istrict':
-							v = inst;
-							break;
-
-						case '%istrict_na':
-							v = inst.substring(2);
-							break;
-
-						case '%btrans':
-							v = bloc;
-							break;
-
-						case '%bstrict':
-							v = bloc;
-							break;
-					}
-
-					s += v;
-				});
-				re = new RegExp('^(' + s.toLowerCase() + ')$', 'i');
-
-				each(p[0].split('/'), function(s) {
-					t.childRules = t.childRules || {};
-					t.childRules[s] = re;
-				});
-			});
-
-			// Build regex
-			s = '';
-			each(t.childRules, function(v, k) {
-				if (s)
-					s += '|';
-
-				s += k;
-			});
-
-			t.parentElementsRE = new RegExp('^(' + s.toLowerCase() + ')$', 'i');
-
-			/*console.debug(t.parentElementsRE.toString());
-			each(t.childRules, function(v) {
-				console.debug(v.toString());
-			});*/
-		},
-
-		setRules : function(s) {
-			var t = this;
-
-			t._setup();
-			t.rules = {};
-			t.wildRules = [];
-			t.validElements = {};
-
-			return t.addRules(s);
-		},
-
-		addRules : function(s) {
-			var t = this, dr;
-
-			if (!s)
-				return;
-
-			t._setup();
-
-			each(s.split(','), function(s) {
-				var p = s.split(/\[|\]/), tn = p[0].split('/'), ra, at, wat, va = [];
-
-				// Extend with default rules
-				if (dr)
-					at = tinymce.extend([], dr.attribs);
-
-				// Parse attributes
-				if (p.length > 1) {
-					each(p[1].split('|'), function(s) {
-						var ar = {}, i;
-
-						at = at || [];
-
-						// Parse attribute rule
-						s = s.replace(/::/g, '~');
-						s = /^([!\-])?([\w*.?~_\-]+|)([=:<])?(.+)?$/.exec(s);
-						s[2] = s[2].replace(/~/g, ':');
-
-						// Add required attributes
-						if (s[1] == '!') {
-							ra = ra || [];
-							ra.push(s[2]);
-						}
-
-						// Remove inherited attributes
-						if (s[1] == '-') {
-							for (i = 0; i <at.length; i++) {
-								if (at[i].name == s[2]) {
-									at.splice(i, 1);
-									return;
-								}
-							}
-						}
-
-						switch (s[3]) {
-							// Add default attrib values
-							case '=':
-								ar.defaultVal = s[4] || '';
-								break;
-
-							// Add forced attrib values
-							case ':':
-								ar.forcedVal = s[4];
-								break;
-
-							// Add validation values
-							case '<':
-								ar.validVals = s[4].split('?');
-								break;
-						}
-
-						if (/[*.?]/.test(s[2])) {
-							wat = wat || [];
-							ar.nameRE = new RegExp('^' + wildcardToRE(s[2]) + '$');
-							wat.push(ar);
-						} else {
-							ar.name = s[2];
-							at.push(ar);
-						}
-
-						va.push(s[2]);
-					});
-				}
-
-				// Handle element names
-				each(tn, function(s, i) {
-					var pr = s.charAt(0), x = 1, ru = {};
-
-					// Extend with default rule data
-					if (dr) {
-						if (dr.noEmpty)
-							ru.noEmpty = dr.noEmpty;
-
-						if (dr.fullEnd)
-							ru.fullEnd = dr.fullEnd;
-
-						if (dr.padd)
-							ru.padd = dr.padd;
-					}
-
-					// Handle prefixes
-					switch (pr) {
-						case '-':
-							ru.noEmpty = true;
-							break;
-
-						case '+':
-							ru.fullEnd = true;
-							break;
-
-						case '#':
-							ru.padd = true;
-							break;
-
-						default:
-							x = 0;
-					}
-
-					tn[i] = s = s.substring(x);
-					t.validElements[s] = 1;
-
-					// Add element name or element regex
-					if (/[*.?]/.test(tn[0])) {
-						ru.nameRE = new RegExp('^' + wildcardToRE(tn[0]) + '$');
-						t.wildRules = t.wildRules || {};
-						t.wildRules.push(ru);
-					} else {
-						ru.name = tn[0];
-
-						// Store away default rule
-						if (tn[0] == '@')
-							dr = ru;
-
-						t.rules[s] = ru;
-					}
-
-					ru.attribs = at;
-
-					if (ra)
-						ru.requiredAttribs = ra;
-
-					if (wat) {
-						// Build valid attributes regexp
-						s = '';
-						each(va, function(v) {
-							if (s)
-								s += '|';
-
-							s += '(' + wildcardToRE(v) + ')';
-						});
-						ru.validAttribsRE = new RegExp('^' + s.toLowerCase() + '$');
-						ru.wildAttribs = wat;
-					}
-				});
-			});
-
-			// Build valid elements regexp
-			s = '';
-			each(t.validElements, function(v, k) {
-				if (s)
-					s += '|';
-
-				if (k != '@')
-					s += k;
-			});
-			t.validElementsRE = new RegExp('^(' + wildcardToRE(s.toLowerCase()) + ')$');
-
-			//console.debug(t.validElementsRE.toString());
-			//console.dir(t.rules);
-			//console.dir(t.wildRules);
-		},
-
-		findRule : function(n) {
-			var t = this, rl = t.rules, i, r;
-
-			t._setup();
-
-			// Exact match
-			r = rl[n];
-			if (r)
-				return r;
-
-			// Try wildcards
-			rl = t.wildRules;
-			for (i = 0; i < rl.length; i++) {
-				if (rl[i].nameRE.test(n))
-					return rl[i];
-			}
-
-			return null;
-		},
-
-		findAttribRule : function(ru, n) {
-			var i, wa = ru.wildAttribs;
-
-			for (i = 0; i < wa.length; i++) {
-				if (wa[i].nameRE.test(n))
-					return wa[i];
-			}
-
-			return null;
-		},
-
-		serialize : function(n, o) {
-			var h, t = this;
-
-			t._setup();
-			o = o || {};
-			o.format = o.format || 'html';
-			t.processObj = o;
-			n = n.cloneNode(true);
-			t.key = '' + (parseInt(t.key) + 1);
-
-			// Pre process
-			if (!o.no_events) {
-				o.node = n;
-				t.onPreProcess.dispatch(t, o);
-			}
-
-			// Serialize HTML DOM into a string
-			t.writer.reset();
-			t._serializeNode(n, o.getInner);
-
-			// Post process
-			o.content = t.writer.getContent();
-
-			if (!o.no_events)
-				t.onPostProcess.dispatch(t, o);
-
-			t._postProcess(o);
-			o.node = null;
-
-			return tinymce.trim(o.content);
-		},
-
-		// Internal functions
-
-		_postProcess : function(o) {
-			var t = this, s = t.settings, h = o.content, sc = [], p;
-
-			if (o.format == 'html') {
-				// Protect some elements
-				p = t._protect({
-					content : h,
-					patterns : [
-						{pattern : /(<script[^>]*>)(.*?)(<\/script>)/g},
-						{pattern : /(<style[^>]*>)(.*?)(<\/style>)/g},
-						{pattern : /(<pre[^>]*>)(.*?)(<\/pre>)/g, encode : 1},
-						{pattern : /(<!--\[CDATA\[)(.*?)(\]\]-->)/g}
-					]
-				});
-
-				h = p.content;
-
-				// Entity encode
-				if (s.entity_encoding !== 'raw')
-					h = t._encode(h);
-
-				// Use BR instead of &nbsp; padded P elements inside editor and use <p>&nbsp;</p> outside editor
-/*				if (o.set)
-					h = h.replace(/<p>\s+(&nbsp;|&#160;|\u00a0|<br \/>)\s+<\/p>/g, '<p><br /></p>');
-				else
-					h = h.replace(/<p>\s+(&nbsp;|&#160;|\u00a0|<br \/>)\s+<\/p>/g, '<p>$1</p>');*/
-
-				// Since Gecko and Safari keeps whitespace in the DOM we need to
-				// remove it inorder to match other browsers. But I think Gecko and Safari is right.
-				// This process is only done when getting contents out from the editor.
-				if (!o.set) {
-					// We need to replace paragraph whitespace with an nbsp before indentation to keep the \u00a0 char
-					h = h.replace(/<p>\s+<\/p>|<p([^>]+)>\s+<\/p>/g, s.entity_encoding == 'numeric' ? '<p$1>&#160;</p>' : '<p$1>&nbsp;</p>');
-
-					if (s.remove_linebreaks) {
-						h = h.replace(/\r?\n|\r/g, ' ');
-						h = h.replace(/(<[^>]+>)\s+/g, '$1 ');
-						h = h.replace(/\s+(<\/[^>]+>)/g, ' $1');
-						h = h.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object) ([^>]+)>\s+/g, '<$1 $2>'); // Trim block start
-						h = h.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>\s+/g, '<$1>'); // Trim block start
-						h = h.replace(/\s+<\/(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>/g, '</$1>'); // Trim block end
-					}
-
-					// Simple indentation
-					if (s.apply_source_formatting && s.indent_mode == 'simple') {
-						// Add line breaks before and after block elements
-						h = h.replace(/<(\/?)(ul|hr|table|meta|link|tbody|tr|object|body|head|html|map)(|[^>]+)>\s*/g, '\n<$1$2$3>\n');
-						h = h.replace(/\s*<(p|h[1-6]|blockquote|div|title|style|pre|script|td|li|area)(|[^>]+)>/g, '\n<$1$2>');
-						h = h.replace(/<\/(p|h[1-6]|blockquote|div|title|style|pre|script|td|li)>\s*/g, '</$1>\n');
-						h = h.replace(/\n\n/g, '\n');
-					}
-				}
-
-				h = t._unprotect(h, p);
-
-				// Restore CDATA sections
-				h = h.replace(/<!--\[CDATA\[([\s\S]+)\]\]-->/g, '<![CDATA[$1]]>');
-
-				// Restore the \u00a0 character if raw mode is enabled
-				if (s.entity_encoding == 'raw')
-					h = h.replace(/<p>&nbsp;<\/p>|<p([^>]+)>&nbsp;<\/p>/g, '<p$1>\u00a0</p>');
-			}
-
-			o.content = h;
-		},
-
-		_serializeNode : function(n, inn) {
-			var t = this, s = t.settings, w = t.writer, hc, el, cn, i, l, a, at, no, v, nn, ru, ar, iv;
-
-			if (!s.node_filter || s.node_filter(n)) {
-				switch (n.nodeType) {
-					case 1: // Element
-						if (n.hasAttribute ? n.hasAttribute('mce_bogus') : n.getAttribute('mce_bogus'))
-							return;
-
-						iv = false;
-						hc = n.hasChildNodes();
-						nn = n.getAttribute('mce_name') || n.nodeName.toLowerCase();
-
-						// Add correct prefix on IE
-						if (isIE) {
-							if (n.scopeName !== 'HTML' && n.scopeName !== 'html')
-								nn = n.scopeName + ':' + nn;
-						}
-
-						// Remove mce prefix on IE needed for the abbr element
-						if (nn.indexOf('mce:') === 0)
-							nn = nn.substring(4);
-
-						// Check if valid
-						if (!t.validElementsRE.test(nn) || (t.invalidElementsRE && t.invalidElementsRE.test(nn)) || inn) {
-							iv = true;
-							break;
-						}
-
-						if (isIE) {
-							// Fix IE content duplication (DOM can have multiple copies of the same node)
-							if (s.fix_content_duplication) {
-								if (n.mce_serialized == t.key)
-									return;
-
-								n.mce_serialized = t.key;
-							}
-
-							// IE sometimes adds a / infront of the node name
-							if (nn.charAt(0) == '/')
-								nn = nn.substring(1);
-						} else if (isGecko) {
-							// Ignore br elements
-							if (n.nodeName === 'BR' && n.getAttribute('type') == '_moz')
-								return;
-						}
-
-						// Check if valid child
-						if (t.childRules) {
-							if (t.parentElementsRE.test(t.elementName)) {
-								if (!t.childRules[t.elementName].test(nn)) {
-									iv = true;
-									break;
-								}
-							}
-
-							t.elementName = nn;
-						}
-
-						ru = t.findRule(nn);
-						nn = ru.name || nn;
-
-						// Skip empty nodes or empty node name in IE
-						if ((!hc && ru.noEmpty) || (isIE && !nn)) {
-							iv = true;
-							break;
-						}
-
-						// Check required
-						if (ru.requiredAttribs) {
-							a = ru.requiredAttribs;
-
-							for (i = a.length - 1; i >= 0; i--) {
-								if (this.dom.getAttrib(n, a[i]) !== '')
-									break;
-							}
-
-							// None of the required was there
-							if (i == -1) {
-								iv = true;
-								break;
-							}
-						}
-
-						w.writeStartElement(nn);
-
-						// Add ordered attributes
-						if (ru.attribs) {
-							for (i=0, at = ru.attribs, l = at.length; i<l; i++) {
-								a = at[i];
-								v = t._getAttrib(n, a);
-
-								if (v !== null)
-									w.writeAttribute(a.name, v);
-							}
-						}
-
-						// Add wild attributes
-						if (ru.validAttribsRE) {
-							at = isIE ? getIEAtts(n) : n.attributes;
-							for (i=at.length-1; i>-1; i--) {
-								no = at[i];
-
-								if (no.specified) {
-									a = no.nodeName.toLowerCase();
-
-									if (s.invalid_attrs.test(a) || !ru.validAttribsRE.test(a))
-										continue;
-
-									ar = t.findAttribRule(ru, a);
-									v = t._getAttrib(n, ar, a);
-
-									if (v !== null)
-										w.writeAttribute(a, v);
-								}
-							}
-						}
-
-						// Padd empty nodes with a &nbsp;
-						if (!hc && ru.padd)
-							w.writeText('\u00a0');
-
-						break;
-
-					case 3: // Text
-						// Check if valid child
-						if (t.childRules && t.parentElementsRE.test(t.elementName)) {
-							if (!t.childRules[t.elementName].test(n.nodeName))
-								return;
-						}
-
-						return w.writeText(n.nodeValue);
-
-					case 4: // CDATA
-						return w.writeCDATA(n.nodeValue);
-
-					case 8: // Comment
-						return w.writeComment(n.nodeValue);
-				}
-			} else if (n.nodeType == 1)
-				hc = n.hasChildNodes();
-
-			if (hc) {
-				cn = n.firstChild;
-
-				while (cn) {
-					t._serializeNode(cn);
-					t.elementName = nn;
-					cn = cn.nextSibling;
-				}
-			}
-
-			// Write element end
-			if (!iv) {
-				if (hc || !s.closed.test(nn))
-					w.writeFullEndElement();
-				else
-					w.writeEndElement();
-			}
-		},
-
-		_protect : function(o) {
-			var t = this;
-
-			o.items = o.items || [];
-
-			function enc(s) {
-				return s.replace(/[\r\n\\]/g, function(c) {
-					if (c === '\n')
-						return '\\n';
-					else if (c === '\\')
-						return '\\\\';
-
-					return '\\r';
-				});
-			};
-
-			function dec(s) {
-				return s.replace(/\\[\\rn]/g, function(c) {
-					if (c === '\\n')
-						return '\n';
-					else if (c === '\\\\')
-						return '\\';
-
-					return '\r';
-				});
-			};
-
-			each(o.patterns, function(p) {
-				o.content = dec(enc(o.content).replace(p.pattern, function(x, a, b, c) {
-					b = dec(b);
-
-					if (p.encode)
-						b = t._encode(b);
-
-					o.items.push(b);
-					return a + '<!--mce:' + (o.items.length - 1) + '-->' + c;
-				}));
-			});
-
-			return o;
-		},
-
-		_unprotect : function(h, o) {
-			h = h.replace(/\<!--mce:([0-9]+)--\>/g, function(a, b) {
-				return o.items[parseInt(b)];
-			});
-
-			o.items = [];
-
-			return h;
-		},
-
-		_encode : function(h) {
-			var t = this, s = t.settings, l;
-
-			// Entity encode
-			if (s.entity_encoding !== 'raw') {
-				if (s.entity_encoding.indexOf('named') != -1) {
-					t.setEntities(s.entities);
-					l = t.entityLookup;
-
-					h = h.replace(t.entitiesRE, function(a) {
-						var v;
-
-						if (v = l[a])
-							a = '&' + v + ';';
-
-						return a;
-					});
-				}
-
-				if (s.entity_encoding.indexOf('numeric') != -1) {
-					h = h.replace(/[\u007E-\uFFFF]/g, function(a) {
-						return '&#' + a.charCodeAt(0) + ';';
-					});
-				}
-			}
-
-			return h;
-		},
-
-		_setup : function() {
-			var t = this, s = this.settings;
-
-			if (t.done)
-				return;
-
-			t.done = 1;
-
-			t.setRules(s.valid_elements);
-			t.addRules(s.extended_valid_elements);
-			t.addValidChildRules(s.valid_child_elements);
-
-			if (s.invalid_elements)
-				t.invalidElementsRE = new RegExp('^(' + wildcardToRE(s.invalid_elements.replace(/,/g, '|').toLowerCase()) + ')$');
-
-			if (s.attrib_value_filter)
-				t.attribValueFilter = s.attribValueFilter;
-		},
-
-		_getAttrib : function(n, a, na) {
-			var i, v;
-
-			na = na || a.name;
-
-			if (a.forcedVal && (v = a.forcedVal)) {
-				if (v === '{$uid}')
-					return this.dom.uniqueId();
-
-				return v;
-			}
-
-			v = this.dom.getAttrib(n, na);
-
-			switch (na) {
-				case 'rowspan':
-				case 'colspan':
-					// Whats the point? Remove usless attribute value
-					if (v == '1')
-						v = '';
-
-					break;
-			}
-
-			if (this.attribValueFilter)
-				v = this.attribValueFilter(na, v, n);
-
-			if (a.validVals) {
-				for (i = a.validVals.length - 1; i >= 0; i--) {
-					if (v == a.validVals[i])
-						break;
-				}
-
-				if (i == -1)
-					return null;
-			}
-
-			if (v === '' && typeof(a.defaultVal) != 'undefined') {
-				v = a.defaultVal;
-
-				if (v === '{$uid}')
-					return this.dom.uniqueId();
-
-				return v;
-			} else {
-				// Remove internal mceItemXX classes when content is extracted from editor
-				if (na == 'class' && this.processObj.get)
-					v = v.replace(/\s?mceItem\w+\s?/g, '');
-			}
-
-			if (v === '')
-				return null;
-
-
-			return v;
-		}
-
-		});
-})();
-
-/* file:jscripts/tiny_mce/classes/dom/ScriptLoader.js */
-
-(function() {
-	var each = tinymce.each;
-
-	tinymce.create('tinymce.dom.ScriptLoader', {
-		ScriptLoader : function(s) {
-			this.settings = s || {};
-			this.queue = [];
-			this.lookup = {};
-		},
-
-		isDone : function(u) {
-			return this.lookup[u] ? this.lookup[u].state == 2 : 0;
-		},
-
-		markDone : function(u) {
-			this.lookup[u] = {state : 2, url : u};
-		},
-
-		add : function(u, cb, s, pr) {
-			var t = this, lo = t.lookup, o;
-
-			if (o = lo[u]) {
-				// Is loaded fire callback
-				if (cb && o.state == 2)
-					cb.call(s || this);
-
-				return o;
-			}
-
-			o = {state : 0, url : u, func : cb, scope : s || this};
-
-			if (pr)
-				t.queue.unshift(o);
-			else
-				t.queue.push(o);
-
-			lo[u] = o;
-
-			return o;
-		},
-
-		load : function(u, cb, s) {
-			var t = this, o;
-
-			if (o = t.lookup[u]) {
-				// Is loaded fire callback
-				if (cb && o.state == 2)
-					cb.call(s || t);
-
-				return o;
-			}
-
-			function loadScript(u) {
-				if (tinymce.dom.Event.domLoaded || t.settings.strict_mode) {
-					tinymce.util.XHR.send({
-						url : tinymce._addVer(u),
-						error : t.settings.error,
-						async : false,
-						success : function(co) {
-							t.eval(co);
-						}
-					});
-				} else
-					document.write('<script type="text/javascript" src="' + tinymce._addVer(u) + '"></script>');
-			};
-
-			if (!tinymce.is(u, 'string')) {
-				each(u, function(u) {
-					loadScript(u);
-				});
-
-				if (cb)
-					cb.call(s || t);
-			} else {
-				loadScript(u);
-
-				if (cb)
-					cb.call(s || t);
-			}
-		},
-
-		loadQueue : function(cb, s) {
-			var t = this;
-
-			if (!t.queueLoading) {
-				t.queueLoading = 1;
-				t.queueCallbacks = [];
-
-				t.loadScripts(t.queue, function() {
-					t.queueLoading = 0;
-
-					if (cb)
-						cb.call(s || t);
-
-					each(t.queueCallbacks, function(o) {
-						o.func.call(o.scope);
-					});
-				});
-			} else if (cb)
-				t.queueCallbacks.push({func : cb, scope : s || t});
-		},
-
-		eval : function(co) {
-			var w = window;
-
-			// Evaluate script
-			if (!w.execScript) {
-				try {
-					eval.call(w, co);
-				} catch (ex) {
-					eval(co, w); // Firefox 3.0a8
-				}
-			} else
-				w.execScript(co); // IE
-		},
-
-		loadScripts : function(sc, cb, s) {
-			var t = this, lo = t.lookup;
-
-			function done(o) {
-				o.state = 2; // Has been loaded
-
-				// Run callback
-				if (o.func)
-					o.func.call(o.scope || t);
-			};
-
-			function allDone() {
-				var l;
-
-				// Check if all files are loaded
-				l = sc.length;
-				each(sc, function(o) {
-					o = lo[o.url];
-
-					if (o.state === 2) {// It has finished loading
-						done(o);
-						l--;
-					} else
-						load(o);
-				});
-
-				// They are all loaded
-				if (l === 0 && cb) {
-					cb.call(s || t);
-					cb = 0;
-				}
-			};
-
-			function load(o) {
-				if (o.state > 0)
-					return;
-
-				o.state = 1; // Is loading
-
-				tinymce.util.XHR.send({
-					url : o.url,
-					error : t.settings.error,
-					success : function(co) {
-						t.eval(co);
-						done(o);
-						allDone();
-					}
-				});
-			};
-
-			each(sc, function(o) {
-				var u = o.url;
-
-				// Add to queue if needed
-				if (!lo[u]) {
-					lo[u] = o;
-					t.queue.push(o);
-				} else
-					o = lo[u];
-
-				// Is already loading or has been loaded
-				if (o.state > 0)
-					return;
-
-				if (!tinymce.dom.Event.domLoaded && !t.settings.strict_mode) {
-					var ix, ol = '';
-
-					// Add onload events
-					if (cb || o.func) {
-						o.state = 1; // Is loading
-
-						ix = tinymce.dom.ScriptLoader._addOnLoad(function() {
-							done(o);
-							allDone();
-						});
-
-						if (tinymce.isIE)
-							ol = ' onreadystatechange="';
-						else
-							ol = ' onload="';
-
-						ol += 'tinymce.dom.ScriptLoader._onLoad(this,\'' + u + '\',' + ix + ');"';
-					}
-
-					document.write('<script type="text/javascript" src="' + tinymce._addVer(u) + '"' + ol + '></script>');
-
-					if (!o.func)
-						done(o);
-				} else
-					load(o);
-			});
-
-			allDone();
-		},
-
-		// Static methods
-		'static' : {
-			_addOnLoad : function(f) {
-				var t = this;
-
-				t._funcs = t._funcs || [];
-				t._funcs.push(f);
-
-				return t._funcs.length - 1;
-			},
-
-			_onLoad : function(e, u, ix) {
-				if (!tinymce.isIE || e.readyState == 'complete')
-					this._funcs[ix].call(this);
-			}
-		}
-
-		});
-
-	// Global script loader
-	tinymce.ScriptLoader = new tinymce.dom.ScriptLoader();
-})();
-
-/* file:jscripts/tiny_mce/classes/ui/Control.js */
-
-(function() {
-	// Shorten class names
-	var DOM = tinymce.DOM, is = tinymce.is;
-
-	tinymce.create('tinymce.ui.Control', {
-		Control : function(id, s) {
-			this.id = id;
-			this.settings = s = s || {};
-			this.rendered = false;
-			this.onRender = new tinymce.util.Dispatcher(this);
-			this.classPrefix = '';
-			this.scope = s.scope || this;
-			this.disabled = 0;
-			this.active = 0;
-		},
-
-		setDisabled : function(s) {
-			var e;
-
-			if (s != this.disabled) {
-				e = DOM.get(this.id);
-
-				// Add accessibility title for unavailable actions
-				if (e && this.settings.unavailable_prefix) {
-					if (s) {
-						this.prevTitle = e.title;
-						e.title = this.settings.unavailable_prefix + ": " + e.title;
-					} else
-						e.title = this.prevTitle;
-				}
-
-				this.setState('Disabled', s);
-				this.setState('Enabled', !s);
-				this.disabled = s;
-			}
-		},
-
-		isDisabled : function() {
-			return this.disabled;
-		},
-
-		setActive : function(s) {
-			if (s != this.active) {
-				this.setState('Active', s);
-				this.active = s;
-			}
-		},
-
-		isActive : function() {
-			return this.active;
-		},
-
-		setState : function(c, s) {
-			var n = DOM.get(this.id);
-
-			c = this.classPrefix + c;
-
-			if (s)
-				DOM.addClass(n, c);
-			else
-				DOM.removeClass(n, c);
-		},
-
-		isRendered : function() {
-			return this.rendered;
-		},
-
-		renderHTML : function() {
-		},
-
-		renderTo : function(n) {
-			DOM.setHTML(n, this.renderHTML());
-		},
-
-		postRender : function() {
-			var t = this, b;
-
-			// Set pending states
-			if (is(t.disabled)) {
-				b = t.disabled;
-				t.disabled = -1;
-				t.setDisabled(b);
-			}
-
-			if (is(t.active)) {
-				b = t.active;
-				t.active = -1;
-				t.setActive(b);
-			}
-		},
-
-		remove : function() {
-			DOM.remove(this.id);
-			this.destroy();
-		},
-
-		destroy : function() {
-			tinymce.dom.Event.clear(this.id);
-		}
-
-		});
-})();
-/* file:jscripts/tiny_mce/classes/ui/Container.js */
-
-tinymce.create('tinymce.ui.Container:tinymce.ui.Control', {
-	Container : function(id, s) {
-		this.parent(id, s);
-		this.controls = [];
-		this.lookup = {};
-	},
-
-	add : function(c) {
-		this.lookup[c.id] = c;
-		this.controls.push(c);
-
-		return c;
-	},
-
-	get : function(n) {
-		return this.lookup[n];
-	}
-
-	});
-
-
-/* file:jscripts/tiny_mce/classes/ui/Separator.js */
-
-tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
-	Separator : function(id, s) {
-		this.parent(id, s);
-		this.classPrefix = 'mceSeparator';
-	},
-
-	renderHTML : function() {
-		return tinymce.DOM.createHTML('span', {'class' : this.classPrefix});
-	}
-
-	});
-
-/* file:jscripts/tiny_mce/classes/ui/MenuItem.js */
-
-(function() {
-	var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, walk = tinymce.walk;
-
-	tinymce.create('tinymce.ui.MenuItem:tinymce.ui.Control', {
-		MenuItem : function(id, s) {
-			this.parent(id, s);
-			this.classPrefix = 'mceMenuItem';
-		},
-
-		setSelected : function(s) {
-			this.setState('Selected', s);
-			this.selected = s;
-		},
-
-		isSelected : function() {
-			return this.selected;
-		},
-
-		postRender : function() {
-			var t = this;
-			
-			t.parent();
-
-			// Set pending state
-			if (is(t.selected))
-				t.setSelected(t.selected);
-		}
-
-		});
-})();
-
-/* file:jscripts/tiny_mce/classes/ui/Menu.js */
-
-(function() {
-	var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, walk = tinymce.walk;
-
-	tinymce.create('tinymce.ui.Menu:tinymce.ui.MenuItem', {
-		Menu : function(id, s) {
-			var t = this;
-
-			t.parent(id, s);
-			t.items = {};
-			t.collapsed = false;
-			t.menuCount = 0;
-			t.onAddItem = new tinymce.util.Dispatcher(this);
-		},
-
-		expand : function(d) {
-			var t = this;
-
-			if (d) {
-				walk(t, function(o) {
-					if (o.expand)
-						o.expand();
-				}, 'items', t);
-			}
-
-			t.collapsed = false;
-		},
-
-		collapse : function(d) {
-			var t = this;
-
-			if (d) {
-				walk(t, function(o) {
-					if (o.collapse)
-						o.collapse();
-				}, 'items', t);
-			}
-
-			t.collapsed = true;
-		},
-
-		isCollapsed : function() {
-			return this.collapsed;
-		},
-
-		add : function(o) {
-			if (!o.settings)
-				o = new tinymce.ui.MenuItem(o.id || DOM.uniqueId(), o);
-
-			this.onAddItem.dispatch(this, o);
-
-			return this.items[o.id] = o;
-		},
-
-		addSeparator : function() {
-			return this.add({separator : true});
-		},
-
-		addMenu : function(o) {
-			if (!o.collapse)
-				o = this.createMenu(o);
-
-			this.menuCount++;
-
-			return this.add(o);
-		},
-
-		hasMenus : function() {
-			return this.menuCount !== 0;
-		},
-
-		remove : function(o) {
-			delete this.items[o.id];
-		},
-
-		removeAll : function() {
-			var t = this;
-
-			walk(t, function(o) {
-				if (o.removeAll)
-					o.removeAll();
-				else
-					o.remove();
-
-				o.destroy();
-			}, 'items', t);
-
-			t.items = {};
-		},
-
-		createMenu : function(o) {
-			var m = new tinymce.ui.Menu(o.id || DOM.uniqueId(), o);
-
-			m.onAddItem.add(this.onAddItem.dispatch, this.onAddItem);
-
-			return m;
-		}
-
-		});
-})();
-/* file:jscripts/tiny_mce/classes/ui/DropMenu.js */
-
-(function() {
-	var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, Event = tinymce.dom.Event, Element = tinymce.dom.Element;
-
-	tinymce.create('tinymce.ui.DropMenu:tinymce.ui.Menu', {
-		DropMenu : function(id, s) {
-			s = s || {};
-			s.container = s.container || DOM.doc.body;
-			s.offset_x = s.offset_x || 0;
-			s.offset_y = s.offset_y || 0;
-			s.vp_offset_x = s.vp_offset_x || 0;
-			s.vp_offset_y = s.vp_offset_y || 0;
-
-			if (is(s.icons) && !s.icons)
-				s['class'] += ' mceNoIcons';
-
-			this.parent(id, s);
-			this.onShowMenu = new tinymce.util.Dispatcher(this);
-			this.onHideMenu = new tinymce.util.Dispatcher(this);
-			this.classPrefix = 'mceMenu';
-		},
-
-		createMenu : function(s) {
-			var t = this, cs = t.settings, m;
-
-			s.container = s.container || cs.container;
-			s.parent = t;
-			s.constrain = s.constrain || cs.constrain;
-			s['class'] = s['class'] || cs['class'];
-			s.vp_offset_x = s.vp_offset_x || cs.vp_offset_x;
-			s.vp_offset_y = s.vp_offset_y || cs.vp_offset_y;
-			m = new tinymce.ui.DropMenu(s.id || DOM.uniqueId(), s);
-
-			m.onAddItem.add(t.onAddItem.dispatch, t.onAddItem);
-
-			return m;
-		},
-
-		update : function() {
-			var t = this, s = t.settings, tb = DOM.get('menu_' + t.id + '_tbl'), co = DOM.get('menu_' + t.id + '_co'), tw, th;
-
-			tw = s.max_width ? Math.min(tb.clientWidth, s.max_width) : tb.clientWidth;
-			th = s.max_height ? Math.min(tb.clientHeight, s.max_height) : tb.clientHeight;
-
-			if (!DOM.boxModel)
-				t.element.setStyles({width : tw + 2, height : th + 2});
-			else
-				t.element.setStyles({width : tw, height : th});
-
-			if (s.max_width)
-				DOM.setStyle(co, 'width', tw);
-
-			if (s.max_height) {
-				DOM.setStyle(co, 'height', th);
-
-				if (tb.clientHeight < s.max_height)
-					DOM.setStyle(co, 'overflow', 'hidden');
-			}
-		},
-
-		showMenu : function(x, y, px) {
-			var t = this, s = t.settings, co, vp = DOM.getViewPort(), w, h, mx, my, ot = 2, dm, tb, cp = t.classPrefix;
-
-			t.collapse(1);
-
-			if (t.isMenuVisible)
-				return;
-
-			if (!t.rendered) {
-				co = DOM.add(t.settings.container, t.renderNode());
-
-				each(t.items, function(o) {
-					o.postRender();
-				});
-
-				t.element = new Element('menu_' + t.id, {blocker : 1, container : s.container});
-			} else
-				co = DOM.get('menu_' + t.id);
-
-			// Move layer out of sight unless it's Opera since it scrolls to top of page due to an bug
-			if (!tinymce.isOpera)
-				DOM.setStyles(co, {left : -0xFFFF , top : -0xFFFF});
-
-			DOM.show(co);
-			t.update();
-
-			x += s.offset_x || 0;
-			y += s.offset_y || 0;
-			vp.w -= 4;
-			vp.h -= 4;
-
-			// Move inside viewport if not submenu
-			if (s.constrain) {
-				w = co.clientWidth - ot;
-				h = co.clientHeight - ot;
-				mx = vp.x + vp.w;
-				my = vp.y + vp.h;
-
-				if ((x + s.vp_offset_x + w) > mx)
-					x = px ? px - w : Math.max(0, (mx - s.vp_offset_x) - w);
-
-				if ((y + s.vp_offset_y + h) > my)
-					y = Math.max(0, (my - s.vp_offset_y) - h);
-			}
-
-			DOM.setStyles(co, {left : x , top : y});
-			t.element.update();
-
-			t.isMenuVisible = 1;
-			t.mouseClickFunc = Event.add(co, 'click', function(e) {
-				var m;
-
-				e = e.target;
-
-				if (e && (e = DOM.getParent(e, 'TR')) && !DOM.hasClass(e, cp + 'ItemSub')) {
-					m = t.items[e.id];
-
-					if (m.isDisabled())
-						return;
-
-					dm = t;
-
-					while (dm) {
-						if (dm.hideMenu)
-							dm.hideMenu();
-
-						dm = dm.settings.parent;
-					}
-
-					if (m.settings.onclick)
-						m.settings.onclick(e);
-
-					return Event.cancel(e); // Cancel to fix onbeforeunload problem
-				}
-			});
-
-			if (t.hasMenus()) {
-				t.mouseOverFunc = Event.add(co, 'mouseover', function(e) {
-					var m, r, mi;
-
-					e = e.target;
-					if (e && (e = DOM.getParent(e, 'TR'))) {
-						m = t.items[e.id];
-
-						if (t.lastMenu)
-							t.lastMenu.collapse(1);
-
-						if (m.isDisabled())
-							return;
-
-						if (e && DOM.hasClass(e, cp + 'ItemSub')) {
-							//p = DOM.getPos(s.container);
-							r = DOM.getRect(e);
-							m.showMenu((r.x + r.w - ot), r.y - ot, r.x);
-							t.lastMenu = m;
-							DOM.addClass(DOM.get(m.id).firstChild, cp + 'ItemActive');
-						}
-					}
-				});
-			}
-
-			t.onShowMenu.dispatch(t);
-
-			if (s.keyboard_focus) {
-				Event.add(co, 'keydown', t._keyHandler, t);
-				DOM.select('a', 'menu_' + t.id)[0].focus(); // Select first link
-				t._focusIdx = 0;
-			}
-		},
-
-		hideMenu : function(c) {
-			var t = this, co = DOM.get('menu_' + t.id), e;
-
-			if (!t.isMenuVisible)
-				return;
-
-			Event.remove(co, 'mouseover', t.mouseOverFunc);
-			Event.remove(co, 'click', t.mouseClickFunc);
-			Event.remove(co, 'keydown', t._keyHandler);
-			DOM.hide(co);
-			t.isMenuVisible = 0;
-
-			if (!c)
-				t.collapse(1);
-
-			if (t.element)
-				t.element.hide();
-
-			if (e = DOM.get(t.id))
-				DOM.removeClass(e.firstChild, t.classPrefix + 'ItemActive');
-
-			t.onHideMenu.dispatch(t);
-		},
-
-		add : function(o) {
-			var t = this, co;
-
-			o = t.parent(o);
-
-			if (t.isRendered && (co = DOM.get('menu_' + t.id)))
-				t._add(DOM.select('tbody', co)[0], o);
-
-			return o;
-		},
-
-		collapse : function(d) {
-			this.parent(d);
-			this.hideMenu(1);
-		},
-
-		remove : function(o) {
-			DOM.remove(o.id);
-			this.destroy();
-
-			return this.parent(o);
-		},
-
-		destroy : function() {
-			var t = this, co = DOM.get('menu_' + t.id);
-
-			Event.remove(co, 'mouseover', t.mouseOverFunc);
-			Event.remove(co, 'click', t.mouseClickFunc);
-
-			if (t.element)
-				t.element.remove();
-
-			DOM.remove(co);
-		},
-
-		renderNode : function() {
-			var t = this, s = t.settings, n, tb, co, w;
-
-			w = DOM.create('div', {id : 'menu_' + t.id, 'class' : s['class'], 'style' : 'position:absolute;left:0;top:0;z-index:200000'});
-			co = DOM.add(w, 'div', {id : 'menu_' + t.id + '_co', 'class' : t.classPrefix + (s['class'] ? ' ' + s['class'] : '')});
-			t.element = new Element('menu_' + t.id, {blocker : 1, container : s.container});
-
-			if (s.menu_line)
-				DOM.add(co, 'span', {'class' : t.classPrefix + 'Line'});
-
-//			n = DOM.add(co, 'div', {id : 'menu_' + t.id + '_co', 'class' : 'mceMenuContainer'});
-			n = DOM.add(co, 'table', {id : 'menu_' + t.id + '_tbl', border : 0, cellPadding : 0, cellSpacing : 0});
-			tb = DOM.add(n, 'tbody');
-
-			each(t.items, function(o) {
-				t._add(tb, o);
-			});
-
-			t.rendered = true;
-
-			return w;
-		},
-
-		// Internal functions
-
-		_keyHandler : function(e) {
-			var t = this, kc = e.keyCode;
-
-			function focus(d) {
-				var i = t._focusIdx + d, e = DOM.select('a', 'menu_' + t.id)[i];
-
-				if (e) {
-					t._focusIdx = i;
-					e.focus();
-				}
-			};
-
-			switch (kc) {
-				case 38:
-					focus(-1); // Select first link
-					return;
-
-				case 40:
-					focus(1);
-					return;
-
-				case 13:
-					return;
-
-				case 27:
-					return this.hideMenu();
-			}
-		},
-
-		_add : function(tb, o) {
-			var n, s = o.settings, a, ro, it, cp = this.classPrefix;
-
-			if (s.separator) {
-				ro = DOM.add(tb, 'tr', {id : o.id, 'class' : cp + 'ItemSeparator'});
-				DOM.add(ro, 'td', {'class' : cp + 'ItemSeparator'});
-
-				if (n = ro.previousSibling)
-					DOM.addClass(n, 'mceLast');
-
-				return;
-			}
-
-			n = ro = DOM.add(tb, 'tr', {id : o.id, 'class' : cp + 'Item ' + cp + 'ItemEnabled'});
-			n = it = DOM.add(n, 'td');
-			n = a = DOM.add(n, 'a', {href : 'javascript:;', onclick : "return false;", onmousedown : 'return false;'});
-
-			DOM.addClass(it, s['class']);
-//			n = DOM.add(n, 'span', {'class' : 'item'});
-			DOM.add(n, 'span', {'class' : 'mceIcon' + (s.icon ? ' mce_' + s.icon : '')});
-			n = DOM.add(n, s.element || 'span', {'class' : 'mceText', title : o.settings.title}, o.settings.title);
-
-			if (o.settings.style)
-				DOM.setAttrib(n, 'style', o.settings.style);
-
-			if (tb.childNodes.length == 1)
-				DOM.addClass(ro, 'mceFirst');
-
-			if ((n = ro.previousSibling) && DOM.hasClass(n, cp + 'ItemSeparator'))
-				DOM.addClass(ro, 'mceFirst');
-
-			if (o.collapse)
-				DOM.addClass(ro, cp + 'ItemSub');
-
-			if (n = ro.previousSibling)
-				DOM.removeClass(n, 'mceLast');
-
-			DOM.addClass(ro, 'mceLast');
-		}
-
-		});
-})();
-/* file:jscripts/tiny_mce/classes/ui/Button.js */
-
-(function() {
-	var DOM = tinymce.DOM;
-
-	tinymce.create('tinymce.ui.Button:tinymce.ui.Control', {
-		Button : function(id, s) {
-			this.parent(id, s);
-			this.classPrefix = 'mceButton';
-		},
-
-		renderHTML : function() {
-			var cp = this.classPrefix, s = this.settings, h, l;
-
-			l = DOM.encode(s.label || '');
-			h = '<a id="' + this.id + '" href="javascript:;" class="' + cp + ' ' + cp + 'Enabled ' + s['class'] + (l ? ' ' + cp + 'Labeled' : '') +'" onmousedown="return false;" onclick="return false;" title="' + DOM.encode(s.title) + '">';
-
-			if (s.image)
-				h += '<img class="mceIcon" src="' + s.image + '" />' + l + '</a>';
-			else
-				h += '<span class="mceIcon ' + s['class'] + '"></span>' + (l ? '<span class="' + cp + 'Label">' + l + '</span>' : '') + '</a>';
-
-			return h;
-		},
-
-		postRender : function() {
-			var t = this, s = t.settings;
-
-			tinymce.dom.Event.add(t.id, 'click', function(e) {
-				if (!t.isDisabled())
-					return s.onclick.call(s.scope, e);
-			});
-		}
-
-		});
-})();
-
-/* file:jscripts/tiny_mce/classes/ui/ListBox.js */
-
-(function() {
-	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher;
-
-	tinymce.create('tinymce.ui.ListBox:tinymce.ui.Control', {
-		ListBox : function(id, s) {
-			var t = this;
-
-			t.parent(id, s);
-			t.items = [];
-			t.onChange = new Dispatcher(t);
-			t.onPostRender = new Dispatcher(t);
-			t.onAdd = new Dispatcher(t);
-			t.onRenderMenu = new tinymce.util.Dispatcher(this);
-			t.classPrefix = 'mceListBox';
-		},
-
-		select : function(v) {
-			var t = this, e, fv;
-
-			// Do we need to do something?
-			if (v != t.selectedValue) {
-				e = DOM.get(t.id + '_text');
-				t.selectedValue = v;
-
-				// Find item
-				each(t.items, function(o) {
-					if (o.value == v) {
-						DOM.setHTML(e, DOM.encode(o.title));
-						fv = 1;
-						return false;
-					}
-				});
-
-				// If no item was found then present title
-				if (!fv) {
-					DOM.setHTML(e, DOM.encode(t.settings.title));
-					DOM.addClass(e, 'mceTitle');
-					e = 0;
-					return;
-				} else
-					DOM.removeClass(e, 'mceTitle');
-			}
-
-			e = 0;
-		},
-
-		add : function(n, v, o) {
-			var t = this;
-
-			o = o || {};
-			o = tinymce.extend(o, {
-				title : n,
-				value : v
-			});
-
-			t.items.push(o);
-			t.onAdd.dispatch(t, o);
-		},
-
-		getLength : function() {
-			return this.items.length;
-		},
-
-		renderHTML : function() {
-			var h = '', t = this, s = t.settings, cp = t.classPrefix;
-
-			h = '<table id="' + t.id + '" cellpadding="0" cellspacing="0" class="' + cp + ' ' + cp + 'Enabled' + (s['class'] ? (' ' + s['class']) : '') + '"><tbody><tr>';
-			h += '<td>' + DOM.createHTML('a', {id : t.id + '_text', 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>') + '</td>';
-			h += '</tr></tbody></table>';
-
-			return h;
-		},
-
-		showMenu : function() {
-			var t = this, p1, p2, e = DOM.get(this.id), m;
-
-			if (t.isDisabled() || t.items.length == 0)
-				return;
-
-			if (t.menu && t.menu.isMenuVisible)
-				return t.hideMenu();
-
-			if (!t.isMenuRendered) {
-				t.renderMenu();
-				t.isMenuRendered = true;
-			}
-
-			p1 = DOM.getPos(this.settings.menu_container);
-			p2 = DOM.getPos(e);
-
-			m = t.menu;
-			m.settings.offset_x = p2.x;
-			m.settings.offset_y = p2.y;
-			m.settings.keyboard_focus = !tinymce.isOpera; // Opera is buggy when it comes to auto focus
-
-			// Select in menu
-			if (t.oldID)
-				m.items[t.oldID].setSelected(0);
-
-			each(t.items, function(o) {
-				if (o.value === t.selectedValue) {
-					m.items[o.id].setSelected(1);
-					t.oldID = o.id;
-				}
-			});
-
-			m.showMenu(0, e.clientHeight);
-
-			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);
-			DOM.addClass(t.id, t.classPrefix + 'Selected');
-
-			//DOM.get(t.id + '_text').focus();
-		},
-
-		hideMenu : function(e) {
-			var t = this;
-
-			// Prevent double toogles by canceling the mouse click event to the button
-			if (e && e.type == "mousedown" && (e.target.id == t.id + '_text' || e.target.id == t.id + '_open'))
-				return;
-
-			if (!e || !DOM.getParent(e.target, function(n) {return DOM.hasClass(n, 'mceMenu');})) {
-				DOM.removeClass(t.id, t.classPrefix + 'Selected');
-				Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);
-
-				if (t.menu)
-					t.menu.hideMenu();
-			}
-		},
-
-		renderMenu : function() {
-			var t = this, m;
-
-			m = t.settings.control_manager.createDropMenu(t.id + '_menu', {
-				menu_line : 1,
-				'class' : t.classPrefix + 'Menu mceNoIcons',
-				max_width : 150,
-				max_height : 150
-			});
-
-			m.onHideMenu.add(t.hideMenu, t);
-
-			m.add({
-				title : t.settings.title,
-				'class' : 'mceMenuItemTitle',
-				onclick : function() {
-					if (t.settings.onselect('') !== false)
-						t.select(''); // Must be runned after
-				}
-			});
-
-			each(t.items, function(o) {
-				o.id = DOM.uniqueId();
-				o.onclick = function() {
-					if (t.settings.onselect(o.value) !== false)
-						t.select(o.value); // Must be runned after
-				};
-
-				m.add(o);
-			});
-
-			t.onRenderMenu.dispatch(t, m);
-			t.menu = m;
-		},
-
-		postRender : function() {
-			var t = this, cp = t.classPrefix;
-
-			Event.add(t.id, 'click', t.showMenu, t);
-			Event.add(t.id + '_text', 'focus', function(e) {
-				if (!t._focused) {
-					t.keyDownHandler = Event.add(t.id + '_text', 'keydown', function(e) {
-						var idx = -1, v, kc = e.keyCode;
-
-						// Find current index
-						each(t.items, function(v, i) {
-							if (t.selectedValue == v.value)
-								idx = i;
-						});
-
-						// Move up/down
-						if (kc == 38)
-							v = t.items[idx - 1];
-						else if (kc == 40)
-							v = t.items[idx + 1];
-						else if (kc == 13) {
-							// Fake select on enter
-							v = t.selectedValue;
-							t.selectedValue = null; // Needs to be null to fake change
-							t.settings.onselect(v);
-							return Event.cancel(e);
-						}
-
-						if (v) {
-							t.hideMenu();
-							t.select(v.value);
-						}
-					});
-				}
-
-				t._focused = 1;
-			});
-			Event.add(t.id + '_text', 'blur', function() {Event.remove(t.id + '_text', 'keydown', t.keyDownHandler); t._focused = 0;});
-
-			// Old IE doesn't have hover on all elements
-			if (tinymce.isIE6 || !DOM.boxModel) {
-				Event.add(t.id, 'mouseover', function() {
-					if (!DOM.hasClass(t.id, cp + 'Disabled'))
-						DOM.addClass(t.id, cp + 'Hover');
-				});
-
-				Event.add(t.id, 'mouseout', function() {
-					if (!DOM.hasClass(t.id, cp + 'Disabled'))
-						DOM.removeClass(t.id, cp + 'Hover');
-				});
-			}
-
-			t.onPostRender.dispatch(t, DOM.get(t.id));
-		},
-
-		destroy : function() {
-			this.parent();
-
-			Event.clear(this.id + '_text');
-		}
-
-		});
-})();
-/* file:jscripts/tiny_mce/classes/ui/NativeListBox.js */
-
-(function() {
-	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher;
-
-	tinymce.create('tinymce.ui.NativeListBox:tinymce.ui.ListBox', {
-		NativeListBox : function(id, s) {
-			this.parent(id, s);
-			this.classPrefix = 'mceNativeListBox';
-		},
-
-		setDisabled : function(s) {
-			DOM.get(this.id).disabled = s;
-		},
-
-		isDisabled : function() {
-			return DOM.get(this.id).disabled;
-		},
-
-		select : function(v) {
-			var e = DOM.get(this.id), ol = e.options;
-
-			v = '' + (v || '');
-
-			e.selectedIndex = 0;
-			each(ol, function(o, i) {
-				if (o.value == v) {
-					e.selectedIndex = i;
-					return false;
-				}
-			});
-		},
-
-		add : function(n, v, a) {
-			var o, t = this;
-
-			a = a || {};
-			a.value = v;
-
-			if (t.isRendered())
-				DOM.add(DOM.get(this.id), 'option', a, n);
-
-			o = {
-				title : n,
-				value : v,
-				attribs : a
-			};
-
-			t.items.push(o);
-			t.onAdd.dispatch(t, o);
-		},
-
-		getLength : function() {
-			return DOM.get(this.id).options.length - 1;
-		},
-
-		renderHTML : function() {
-			var h, t = this;
-
-			h = DOM.createHTML('option', {value : ''}, '-- ' + t.settings.title + ' --');
-
-			each(t.items, function(it) {
-				h += DOM.createHTML('option', {value : it.value}, it.title);
-			});
-
-			h = DOM.createHTML('select', {id : t.id, 'class' : 'mceNativeListBox'}, h);
-
-			return h;
-		},
-
-		postRender : function() {
-			var t = this, ch;
-
-			t.rendered = true;
-
-			function onChange(e) {
-				var v = e.target.options[e.target.selectedIndex].value;
-
-				t.onChange.dispatch(t, v);
-
-				if (t.settings.onselect)
-					t.settings.onselect(v);
-			};
-
-			Event.add(t.id, 'change', onChange);
-
-			// Accessibility keyhandler
-			Event.add(t.id, 'keydown', function(e) {
-				var bf;
-
-				Event.remove(t.id, 'change', ch);
-
-				bf = Event.add(t.id, 'blur', function() {
-					Event.add(t.id, 'change', onChange);
-					Event.remove(t.id, 'blur', bf);
-				});
-
-				if (e.keyCode == 13 || e.keyCode == 32) {
-					onChange(e);
-					return Event.cancel(e);
-				}
-			});
-
-			t.onPostRender.dispatch(t, DOM.get(t.id));
-		}
-
-		});
-})();
-/* file:jscripts/tiny_mce/classes/ui/MenuButton.js */
-
-(function() {
-	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each;
-
-	tinymce.create('tinymce.ui.MenuButton:tinymce.ui.Button', {
-		MenuButton : function(id, s) {
-			this.parent(id, s);
-			this.onRenderMenu = new tinymce.util.Dispatcher(this);
-			s.menu_container = s.menu_container || DOM.doc.body;
-		},
-
-		showMenu : function() {
-			var t = this, p1, p2, e = DOM.get(t.id), m;
-
-			if (t.isDisabled())
-				return;
-
-			if (!t.isMenuRendered) {
-				t.renderMenu();
-				t.isMenuRendered = true;
-			}
-
-			if (t.isMenuVisible)
-				return t.hideMenu();
-
-			p1 = DOM.getPos(t.settings.menu_container);
-			p2 = DOM.getPos(e);
-
-			m = t.menu;
-			m.settings.offset_x = p2.x;
-			m.settings.offset_y = p2.y;
-			m.settings.vp_offset_x = p2.x;
-			m.settings.vp_offset_y = p2.y;
-			m.settings.keyboard_focus = t._focused;
-			m.showMenu(0, e.clientHeight);
-
-			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);
-			t.setState('Selected', 1);
-
-			t.isMenuVisible = 1;
-		},
-
-		renderMenu : function() {
-			var t = this, m;
-
-			m = t.settings.control_manager.createDropMenu(t.id + '_menu', {
-				menu_line : 1,
-				'class' : this.classPrefix + 'Menu',
-				icons : t.settings.icons
-			});
-
-			m.onHideMenu.add(t.hideMenu, t);
-
-			t.onRenderMenu.dispatch(t, m);
-			t.menu = m;
-		},
-
-		hideMenu : function(e) {
-			var t = this;
-
-			// Prevent double toogles by canceling the mouse click event to the button
-			if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id || e.id === t.id + '_open';}))
-				return;
-
-			if (!e || !DOM.getParent(e.target, function(n) {return DOM.hasClass(n, 'mceMenu');})) {
-				t.setState('Selected', 0);
-				Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);
-				if (t.menu)
-					t.menu.hideMenu();
-			}
-
-			t.isMenuVisible = 0;
-		},
-
-		postRender : function() {
-			var t = this, s = t.settings;
-
-			Event.add(t.id, 'click', function() {
-				if (!t.isDisabled()) {
-					if (s.onclick)
-						s.onclick(t.value);
-
-					t.showMenu();
-				}
-			});
-		}
-
-		});
-})();
-
-/* file:jscripts/tiny_mce/classes/ui/SplitButton.js */
-
-(function() {
-	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each;
-
-	tinymce.create('tinymce.ui.SplitButton:tinymce.ui.MenuButton', {
-		SplitButton : function(id, s) {
-			this.parent(id, s);
-			this.classPrefix = 'mceSplitButton';
-		},
-
-		renderHTML : function() {
-			var h, t = this, s = t.settings, h1;
-
-			h = '<tbody><tr>';
-
-			if (s.image)
-				h1 = DOM.createHTML('img ', {src : s.image, 'class' : 'mceAction ' + s['class']});
-			else
-				h1 = DOM.createHTML('span', {'class' : 'mceAction ' + s['class']}, '');
-
-			h += '<td>' + DOM.createHTML('a', {id : t.id + '_action', 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']});
-			h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', href : 'javascript:;', 'class' : 'mceOpen ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';
-
-			h += '</tr></tbody>';
-
-			return DOM.createHTML('table', {id : t.id, 'class' : 'mceSplitButton mceSplitButtonEnabled ' + s['class'], cellpadding : '0', cellspacing : '0', onmousedown : 'return false;', title : s.title}, h);
-		},
-
-		postRender : function() {
-			var t = this, s = t.settings;
-
-			if (s.onclick) {
-				Event.add(t.id + '_action', 'click', function() {
-					if (!t.isDisabled())
-						s.onclick(t.value);
-				});
-			}
-
-			Event.add(t.id + '_open', 'click', t.showMenu, t);
-			Event.add(t.id + '_open', 'focus', function() {t._focused = 1;});
-			Event.add(t.id + '_open', 'blur', function() {t._focused = 0;});
-
-			// Old IE doesn't have hover on all elements
-			if (tinymce.isIE6 || !DOM.boxModel) {
-				Event.add(t.id, 'mouseover', function() {
-					if (!DOM.hasClass(t.id, 'mceSplitButtonDisabled'))
-						DOM.addClass(t.id, 'mceSplitButtonHover');
-				});
-
-				Event.add(t.id, 'mouseout', function() {
-					if (!DOM.hasClass(t.id, 'mceSplitButtonDisabled'))
-						DOM.removeClass(t.id, 'mceSplitButtonHover');
-				});
-			}
-		},
-
-		destroy : function() {
-			this.parent();
-
-			Event.clear(this.id + '_action');
-			Event.clear(this.id + '_open');
-		}
-
-		});
-})();
-
-/* file:jscripts/tiny_mce/classes/ui/ColorSplitButton.js */
-
-(function() {
-	var DOM = tinymce.DOM, Event = tinymce.dom.Event, is = tinymce.is, each = tinymce.each;
-
-	tinymce.create('tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton', {
-		ColorSplitButton : function(id, s) {
-			var t = this;
-
-			t.parent(id, s);
-
-			t.settings = s = tinymce.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'
-			}, t.settings);
-
-			t.onShowMenu = new tinymce.util.Dispatcher(t);
-			t.onHideMenu = new tinymce.util.Dispatcher(t);
-
-			t.value = s.default_color;
-		},
-
-		showMenu : function() {
-			var t = this, r, p, e, p2;
-
-			if (t.isDisabled())
-				return;
-
-			if (!t.isMenuRendered) {
-				t.renderMenu();
-				t.isMenuRendered = true;
-			}
-
-			if (t.isMenuVisible)
-				return t.hideMenu();
-
-			e = DOM.get(t.id);
-			DOM.show(t.id + '_menu');
-			DOM.addClass(e, 'mceSplitButtonSelected');
-			p2 = DOM.getPos(e);
-			DOM.setStyles(t.id + '_menu', {
-				left : p2.x,
-				top : p2.y + e.clientHeight,
-				zIndex : 200000
-			});
-			e = 0;
-
-			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);
-
-			if (t._focused) {
-				t._keyHandler = Event.add(t.id + '_menu', 'keydown', function(e) {
-					if (e.keyCode == 27)
-						t.hideMenu();
-				});
-
-				DOM.select('a', t.id + '_menu')[0].focus(); // Select first link
-			}
-
-			t.onShowMenu.dispatch(t);
-
-			t.isMenuVisible = 1;
-		},
-
-		hideMenu : function(e) {
-			var t = this;
-
-			// Prevent double toogles by canceling the mouse click event to the button
-			if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id + '_open';}))
-				return;
-
-			if (!e || !DOM.getParent(e.target, function(n) {return DOM.hasClass(n, 'mceSplitButtonMenu');})) {
-				DOM.removeClass(t.id, 'mceSplitButtonSelected');
-				Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);
-				Event.remove(t.id + '_menu', 'keydown', t._keyHandler);
-				DOM.hide(t.id + '_menu');
-			}
-
-			t.onHideMenu.dispatch(t);
-
-			t.isMenuVisible = 0;
-		},
-
-		renderMenu : function() {
-			var t = this, m, i = 0, s = t.settings, n, tb, tr, w;
-
-			w = DOM.add(s.menu_container, 'div', {id : t.id + '_menu', 'class' : s['menu_class'] + ' ' + s['class'], style : 'position:absolute;left:0;top:-1000px;'});
-			m = DOM.add(w, 'div', {'class' : s['class'] + ' mceSplitButtonMenu'});
-			DOM.add(m, 'span', {'class' : 'mceMenuLine'});
-
-			n = DOM.add(m, 'table', {'class' : 'mceColorSplitMenu'});
-			tb = DOM.add(n, 'tbody');
-
-			// Generate color grid
-			i = 0;
-			each(is(s.colors, 'array') ? s.colors : s.colors.split(','), function(c) {
-				c = c.replace(/^#/, '');
-
-				if (!i--) {
-					tr = DOM.add(tb, 'tr');
-					i = s.grid_width - 1;
-				}
-
-				n = DOM.add(tr, 'td');
-
-				n = DOM.add(n, 'a', {
-					href : 'javascript:;',
-					style : {
-						backgroundColor : '#' + c
-					},
-					mce_color : '#' + c
-				});
-			});
-
-			if (s.more_colors_func) {
-				n = DOM.add(tb, 'tr');
-				n = DOM.add(n, 'td', {colspan : s.grid_width, 'class' : 'mceMoreColors'});
-				n = DOM.add(n, 'a', {id : t.id + '_more', href : 'javascript:;', onclick : 'return false;', 'class' : 'mceMoreColors'}, s.more_colors_title);
-
-				Event.add(n, 'click', function(e) {
-					s.more_colors_func.call(s.more_colors_scope || this);
-					return Event.cancel(e); // Cancel to fix onbeforeunload problem
-				});
-			}
-
-			DOM.addClass(m, 'mceColorSplitMenu');
-
-			Event.add(t.id + '_menu', 'click', function(e) {
-				var c;
-
-				e = e.target;
-
-				if (e.nodeName == 'A' && (c = e.getAttribute('mce_color')))
-					t.setColor(c);
-
-				return Event.cancel(e); // Prevent IE auto save warning
-			});
-
-			return w;
-		},
-
-		setColor : function(c) {
-			var t = this;
-
-			DOM.setStyle(t.id + '_preview', 'backgroundColor', c);
-
-			t.value = c;
-			t.hideMenu();
-			t.settings.onselect(c);
-		},
-
-		postRender : function() {
-			var t = this, id = t.id;
-
-			t.parent();
-			DOM.add(id + '_action', 'div', {id : id + '_preview', 'class' : 'mceColorPreview'});
-		},
-
-		destroy : function() {
-			this.parent();
-
-			Event.clear(this.id + '_menu');
-			Event.clear(this.id + '_more');
-			DOM.remove(this.id + '_menu');
-		}
-
-		});
-})();
-
-/* file:jscripts/tiny_mce/classes/ui/Toolbar.js */
-
-tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
-	renderHTML : function() {
-		var t = this, h = '', c, co, dom = tinymce.DOM, s = t.settings, i, pr, nx, cl;
-
-		cl = t.controls;
-		for (i=0; i<cl.length; i++) {
-			// Get current control, prev control, next control and if the control is a list box or not
-			co = cl[i];
-			pr = cl[i - 1];
-			nx = cl[i + 1];
-
-			// Add toolbar start
-			if (i === 0) {
-				c = 'mceToolbarStart';
-
-				if (co.Button)
-					c += ' mceToolbarStartButton';
-				else if (co.SplitButton)
-					c += ' mceToolbarStartSplitButton';
-				else if (co.ListBox)
-					c += ' mceToolbarStartListBox';
-
-				h += dom.createHTML('td', {'class' : c}, dom.createHTML('span', null, '<!-- IE -->'));
-			}
-
-			// Add toolbar end before list box and after the previous button
-			// This is to fix the o2k7 editor skins
-			if (pr && co.ListBox) {
-				if (pr.Button || pr.SplitButton)
-					h += dom.createHTML('td', {'class' : 'mceToolbarEnd'}, dom.createHTML('span', null, '<!-- IE -->'));
-			}
-
-			// Render control HTML
-
-			// IE 8 quick fix, needed to propertly generate a hit area for anchors
-			if (dom.stdMode)
-				h += '<td style="position: relative">' + co.renderHTML() + '</td>';
-			else
-				h += '<td>' + co.renderHTML() + '</td>';
-
-			// Add toolbar start after list box and before the next button
-			// This is to fix the o2k7 editor skins
-			if (nx && co.ListBox) {
-				if (nx.Button || nx.SplitButton)
-					h += dom.createHTML('td', {'class' : 'mceToolbarStart'}, dom.createHTML('span', null, '<!-- IE -->'));
-			}
-		}
-
-		c = 'mceToolbarEnd';
-
-		if (co.Button)
-			c += ' mceToolbarEndButton';
-		else if (co.SplitButton)
-			c += ' mceToolbarEndSplitButton';
-		else if (co.ListBox)
-			c += ' mceToolbarEndListBox';
-
-		h += dom.createHTML('td', {'class' : c}, dom.createHTML('span', null, '<!-- IE -->'));
-
-		return dom.createHTML('table', {id : t.id, 'class' : 'mceToolbar' + (s['class'] ? ' ' + s['class'] : ''), cellpadding : '0', cellspacing : '0', align : t.settings.align || ''}, '<tbody><tr>' + h + '</tr></tbody>');
-	}
-
-	});
-
-/* file:jscripts/tiny_mce/classes/AddOnManager.js */
-
-(function() {
-	var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each;
-
-	tinymce.create('tinymce.AddOnManager', {
-		items : [],
-		urls : {},
-		lookup : {},
-		onAdd : new Dispatcher(this),
-
-		get : function(n) {
-			return this.lookup[n];
-		},
-
-		requireLangPack : function(n) {
-			var u, s = tinymce.EditorManager.settings;
-
-			if (s && s.language) {
-				u = this.urls[n] + '/langs/' + s.language + '.js';
-
-				if (!tinymce.dom.Event.domLoaded && !s.strict_mode)
-					tinymce.ScriptLoader.load(u);
-				else
-					tinymce.ScriptLoader.add(u);
-			}
-		},
-
-		add : function(id, o) {
-			this.items.push(o);
-			this.lookup[id] = o;
-			this.onAdd.dispatch(this, id, o);
-
-			return o;
-		},
-
-		load : function(n, u, cb, s) {
-			var t = this;
-
-			if (t.urls[n])
-				return;
-
-			if (u.indexOf('/') != 0 && u.indexOf('://') == -1)
-				u = tinymce.baseURL + '/' +  u;
-
-			t.urls[n] = u.substring(0, u.lastIndexOf('/'));
-			tinymce.ScriptLoader.add(u, cb, s);
-		}
-
-		});
-
-	// Create plugin and theme managers
-	tinymce.PluginManager = new tinymce.AddOnManager();
-	tinymce.ThemeManager = new tinymce.AddOnManager();
-}());
-/* file:jscripts/tiny_mce/classes/EditorManager.js */
-
-(function() {
-	// Shorten names
-	var each = tinymce.each, extend = tinymce.extend, DOM = tinymce.DOM, Event = tinymce.dom.Event, ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager, explode = tinymce.explode;
-
-	tinymce.create('static tinymce.EditorManager', {
-		editors : {},
-		i18n : {},
-		activeEditor : null,
-
-		preInit : function() {
-			var t = this, lo = window.location;
-
-			// Setup some URLs where the editor API is located and where the document is
-			tinymce.documentBaseURL = lo.href.replace(/[\?#].*$/, '').replace(/[\/\\][^\/]+$/, '');
-			if (!/[\/\\]$/.test(tinymce.documentBaseURL))
-				tinymce.documentBaseURL += '/';
-
-			tinymce.baseURL = new tinymce.util.URI(tinymce.documentBaseURL).toAbsolute(tinymce.baseURL);
-			tinymce.EditorManager.baseURI = new tinymce.util.URI(tinymce.baseURL);
-
-			// User already specified a document.domain value
-			if (document.domain && lo.hostname != document.domain)
-				tinymce.relaxedDomain = document.domain;
-
-			// Setup document domain if tinymce is loaded from other domain
-			if (!tinymce.relaxedDomain && tinymce.EditorManager.baseURI.host != lo.hostname && lo.hostname)
-				document.domain = tinymce.relaxedDomain = lo.hostname.replace(/.*\.(.+\..+)$/, '$1');
-
-			// Add before unload listener
-			// This was required since IE was leaking memory if you added and removed beforeunload listeners
-			// with attachEvent/detatchEvent so this only adds one listener and instances can the attach to the onBeforeUnload event
-			t.onBeforeUnload = new tinymce.util.Dispatcher(t);
-
-			// Must be on window or IE will leak if the editor is placed in frame or iframe
-			Event.add(window, 'beforeunload', function(e) {
-				t.onBeforeUnload.dispatch(t, e);
-			});
-		},
-
-		init : function(s) {
-			var t = this, pl, sl = tinymce.ScriptLoader, c, e, el = [], ed;
-
-			function execCallback(se, n, s) {
-				var f = se[n];
-
-				if (!f)
-					return;
-
-				if (tinymce.is(f, 'string')) {
-					s = f.replace(/\.\w+$/, '');
-					s = s ? tinymce.resolve(s) : 0;
-					f = tinymce.resolve(f);
-				}
-
-				return f.apply(s || this, Array.prototype.slice.call(arguments, 2));
-			};
-
-			s = extend({
-				theme : "simple",
-				language : "en",
-				strict_loading_mode : document.contentType == 'application/xhtml+xml'
-			}, s);
-
-			t.settings = s;
-
-			// If page not loaded and strict mode isn't enabled then load them
-			if (!Event.domLoaded && !s.strict_loading_mode) {
-				// Load language
-				if (s.language)
-					sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');
-
-				// Load theme
-				if (s.theme && s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])
-					ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');
-
-				// Load plugins
-				if (s.plugins) {
-					pl = explode(s.plugins);
-
-					// Load compat2x first
-					if (tinymce.inArray(pl, 'compat2x') != -1)
-						PluginManager.load('compat2x', 'plugins/compat2x/editor_plugin' + tinymce.suffix + '.js');
-
-					// Load rest if plugins
-					each(pl, function(v) {
-						if (v && v.charAt(0) != '-' && !PluginManager.urls[v]) {
-							// Skip safari plugin for other browsers
-							if (!tinymce.isWebKit && v == 'safari')
-								return;
-
-							PluginManager.load(v, 'plugins/' + v + '/editor_plugin' + tinymce.suffix + '.js');
-						}
-					});
-				}
-
-				sl.loadQueue();
-			}
-
-			// Legacy call
-			Event.add(document, 'init', function() {
-				var l, co;
-
-				execCallback(s, 'onpageload');
-
-				// Verify that it's a valid browser
-				if (s.browsers) {
-					l = false;
-
-					each(explode(s.browsers), function(v) {
-						switch (v) {
-							case 'ie':
-							case 'msie':
-								if (tinymce.isIE)
-									l = true;
-								break;
-
-							case 'gecko':
-								if (tinymce.isGecko)
-									l = true;
-								break;
-
-							case 'safari':
-							case 'webkit':
-								if (tinymce.isWebKit)
-									l = true;
-								break;
-
-							case 'opera':
-								if (tinymce.isOpera)
-									l = true;
-
-								break;
-						}
-					});
-
-					// Not a valid one
-					if (!l)
-						return;
-				}
-
-				switch (s.mode) {
-					case "exact":
-						l = s.elements || '';
-
-						if(l.length > 0) {
-							each(explode(l), function(v) {
-								if (DOM.get(v)) {
-									ed = new tinymce.Editor(v, s);
-									el.push(ed);
-									ed.render(1);
-								} else {
-									c = 0;
-
-									each(document.forms, function(f) {
-										each(f.elements, function(e) {
-											if (e.name === v) {
-												v = 'mce_editor_' + c;
-												DOM.setAttrib(e, 'id', v);
-
-												ed = new tinymce.Editor(v, s);
-												el.push(ed);
-												ed.render(1);
-											}
-										});
-									});
-								}
-							});
-						}
-						break;
-
-					case "textareas":
-					case "specific_textareas":
-						function hasClass(n, c) {
-							return c.constructor === RegExp ? c.test(n.className) : DOM.hasClass(n, c);
-						};
-
-						each(DOM.select('textarea'), function(v) {
-							if (s.editor_deselector && hasClass(v, s.editor_deselector))
-								return;
-
-							if (!s.editor_selector || hasClass(v, s.editor_selector)) {
-								// Can we use the name
-								e = DOM.get(v.name);
-								if (!v.id && !e)
-									v.id = v.name;
-
-								// Generate unique name if missing or already exists
-								if (!v.id || t.get(v.id))
-									v.id = DOM.uniqueId();
-
-								ed = new tinymce.Editor(v.id, s);
-								el.push(ed);
-								ed.render(1);
-							}
-						});
-						break;
-				}
-
-				// Call onInit when all editors are initialized
-				if (s.oninit) {
-					l = co = 0;
-
-					each (el, function(ed) {
-						co++;
-
-						if (!ed.initialized) {
-							// Wait for it
-							ed.onInit.add(function() {
-								l++;
-
-								// All done
-								if (l == co)
-									execCallback(s, 'oninit');
-							});
-						} else
-							l++;
-
-						// All done
-						if (l == co)
-							execCallback(s, 'oninit');					
-					});
-				}
-			});
-		},
-
-		get : function(id) {
-			return this.editors[id];
-		},
-
-		getInstanceById : function(id) {
-			return this.get(id);
-		},
-
-		add : function(e) {
-			this.editors[e.id] = e;
-			this._setActive(e);
-
-			return e;
-		},
-
-		remove : function(e) {
-			var t = this;
-
-			// Not in the collection
-			if (!t.editors[e.id])
-				return null;
-
-			delete t.editors[e.id];
-
-			// Select another editor since the active one was removed
-			if (t.activeEditor == e) {
-				each(t.editors, function(e) {
-					t._setActive(e);
-					return false; // Break
-				});
-			}
-
-			e.destroy();
-
-			return e;
-		},
-
-		execCommand : function(c, u, v) {
-			var t = this, ed = t.get(v), w;
-
-			// Manager commands
-			switch (c) {
-				case "mceFocus":
-					ed.focus();
-					return true;
-
-				case "mceAddEditor":
-				case "mceAddControl":
-					if (!t.get(v))
-						new tinymce.Editor(v, t.settings).render();
-
-					return true;
-
-				case "mceAddFrameControl":
-					w = v.window;
-
-					// Add tinyMCE global instance and tinymce namespace to specified window
-					w.tinyMCE = tinyMCE;
-					w.tinymce = tinymce;
-
-					tinymce.DOM.doc = w.document;
-					tinymce.DOM.win = w;
-
-					ed = new tinymce.Editor(v.element_id, v);
-					ed.render();
-
-					// Fix IE memory leaks
-					if (tinymce.isIE) {
-						function clr() {
-							ed.destroy();
-							w.detachEvent('onunload', clr);
-							w = w.tinyMCE = w.tinymce = null; // IE leak
-						};
-
-						w.attachEvent('onunload', clr);
-					}
-
-					v.page_window = null;
-
-					return true;
-
-				case "mceRemoveEditor":
-				case "mceRemoveControl":
-					ed.remove();
-					return true;
-
-				case 'mceToggleEditor':
-					if (!ed) {
-						t.execCommand('mceAddControl', 0, v);
-						return true;
-					}
-
-					if (ed.isHidden())
-						ed.show();
-					else
-						ed.hide();
-
-					return true;
-			}
-
-			// Run command on active editor
-			if (t.activeEditor)
-				return t.activeEditor.execCommand(c, u, v);
-
-			return false;
-		},
-
-		execInstanceCommand : function(id, c, u, v) {
-			var ed = this.get(id);
-
-			if (ed)
-				return ed.execCommand(c, u, v);
-
-			return false;
-		},
-
-		triggerSave : function() {
-			each(this.editors, function(e) {
-				e.save();
-			});
-		},
-
-		addI18n : function(p, o) {
-			var lo, i18n = this.i18n;
-
-			if (!tinymce.is(p, 'string')) {
-				each(p, function(o, lc) {
-					each(o, function(o, g) {
-						each(o, function(o, k) {
-							if (g === 'common')
-								i18n[lc + '.' + k] = o;
-							else
-								i18n[lc + '.' + g + '.' + k] = o;
-						});
-					});
-				});
-			} else {
-				each(o, function(o, k) {
-					i18n[p + '.' + k] = o;
-				});
-			}
-		},
-
-		// Private methods
-
-		_setActive : function(e) {
-			this.selectedInstance = this.activeEditor = e;
-		}
-
-		});
-
-	tinymce.EditorManager.preInit();
-})();
-
-// Short for editor manager window.tinyMCE is needed when TinyMCE gets loaded though a XHR call
-var tinyMCE = window.tinyMCE = tinymce.EditorManager;
-
-/* file:jscripts/tiny_mce/classes/Editor.js */
-
-(function() {
-	var DOM = tinymce.DOM, Event = tinymce.dom.Event, extend = tinymce.extend, Dispatcher = tinymce.util.Dispatcher;
-	var each = tinymce.each, isGecko = tinymce.isGecko, isIE = tinymce.isIE, isWebKit = tinymce.isWebKit;
-	var is = tinymce.is, ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager, EditorManager = tinymce.EditorManager;
-	var inArray = tinymce.inArray, grep = tinymce.grep, explode = tinymce.explode;
-
-	tinymce.create('tinymce.Editor', {
-		Editor : function(id, s) {
-			var t = this;
-
-			t.id = t.editorId = id;
-			t.execCommands = {};
-			t.queryStateCommands = {};
-			t.queryValueCommands = {};
-			t.plugins = {};
-
-			// Add events to the editor
-			each([
-				'onPreInit',
-				'onBeforeRenderUI',
-				'onPostRender',
-				'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'
-			], function(e) {
-				t[e] = new Dispatcher(t);
-			});
-
-			// Default editor config
-			t.settings = s = extend({
-				id : id,
-				language : 'en',
-				docs_language : 'en',
-				theme : 'simple',
-				skin : 'default',
-				delta_width : 0,
-				delta_height : 0,
-				popup_css : '',
-				plugins : '',
-				document_base_url : tinymce.documentBaseURL,
-				add_form_submit_trigger : 1,
-				submit_patch : 1,
-				add_unload_trigger : 1,
-				convert_urls : 1,
-				relative_urls : 1,
-				remove_script_host : 1,
-				table_inline_editing : 0,
-				object_resizing : 1,
-				cleanup : 1,
-				accessibility_focus : 1,
-				custom_shortcuts : 1,
-				custom_undo_redo_keyboard_shortcuts : 1,
-				custom_undo_redo_restore_selection : 1,
-				custom_undo_redo : 1,
-				doctype : '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">',
-				visual_table_class : 'mceItemTable',
-				visual : 1,
-				inline_styles : true,
-				convert_fonts_to_spans : true,
-				font_size_style_values : 'xx-small,x-small,small,medium,large,x-large,xx-large',
-				apply_source_formatting : 1,
-				directionality : 'ltr',
-				forced_root_block : 'p',
-				valid_elements : '@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur],strong/b,em/i,strike,u,#p[align],-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|src|border|alt=|title|hspace|vspace|width|height|align],-sub,-sup,-blockquote[cite],-table[border=0|cellspacing|cellpadding|width|frame|rules|height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],object[classid|width|height|codebase|*],param[name|value],embed[type|width|height|src|*],script[src|type],map[name],area[shape|coords|href|alt|target],bdo,button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|valign|width],dfn,fieldset,form[action|accept|accept-charset|enctype|method],input[accept|alt|checked|disabled|maxlength|name|readonly|size|src|type|value|tabindex|accesskey],kbd,label[for],legend,noscript,optgroup[label|disabled],option[disabled|label|selected|value],q[cite],samp,select[disabled|multiple|name|size],small,textarea[cols|rows|disabled|name|readonly],tt,var,big',
-				hidden_input : 1,
-				padd_empty_editor : 1,
-				render_ui : 1,
-				init_theme : 1,
-				force_p_newlines : 1,
-				indentation : '30px'
-			}, s);
-
-			// Setup URIs
-			t.documentBaseURI = new tinymce.util.URI(s.document_base_url || tinymce.documentBaseURL, {
-				base_uri : tinyMCE.baseURI
-			});
-			t.baseURI = EditorManager.baseURI;
-
-			// Call setup
-			t.execCallback('setup', t);
-		},
-
-		render : function(nst) {
-			var t = this, s = t.settings, id = t.id, sl = tinymce.ScriptLoader;
-
-			// Page is not loaded yet, wait for it
-			if (!Event.domLoaded) {
-				Event.add(document, 'init', function() {
-					t.render();
-				});
-				return;
-			}
-
-			// Force strict loading mode if render us called by user and not internally
-			if (!nst) {
-				s.strict_loading_mode = 1;
-				tinyMCE.settings = s;
-			}
-
-			// Element not found, then skip initialization
-			if (!t.getElement())
-				return;
-
-			if (s.strict_loading_mode) {
-				sl.settings.strict_mode = s.strict_loading_mode;
-				tinymce.DOM.settings.strict = 1;
-			}
-
-			// Add hidden input for non input elements inside form elements
-			if (!/TEXTAREA|INPUT/i.test(t.getElement().nodeName) && s.hidden_input && DOM.getParent(id, 'form'))
-				DOM.insertAfter(DOM.create('input', {type : 'hidden', name : id}), id);
-
-			t.windowManager = new tinymce.WindowManager(t);
-
-			if (s.encoding == 'xml') {
-				t.onGetContent.add(function(ed, o) {
-					if (o.save)
-						o.content = DOM.encode(o.content);
-				});
-			}
-
-			if (s.add_form_submit_trigger) {
-				t.onSubmit.addToTop(function() {
-					if (t.initialized) {
-						t.save();
-						t.isNotDirty = 1;
-					}
-				});
-			}
-
-			if (s.add_unload_trigger && !s.ask) {
-				t._beforeUnload = tinyMCE.onBeforeUnload.add(function() {
-					if (t.initialized && !t.destroyed && !t.isHidden())
-						t.save({format : 'raw', no_events : true});
-				});
-			}
-
-			tinymce.addUnload(t.destroy, t);
-
-			if (s.submit_patch) {
-				t.onBeforeRenderUI.add(function() {
-					var n = t.getElement().form;
-
-					if (!n)
-						return;
-
-					// Already patched
-					if (n._mceOldSubmit)
-						return;
-
-					// Check page uses id="submit" or name="submit" for it's submit button
-					if (!n.submit.nodeType && !n.submit.length) {
-						t.formElement = n;
-						n._mceOldSubmit = n.submit;
-						n.submit = function() {
-							// Save all instances
-							EditorManager.triggerSave();
-							t.isNotDirty = 1;
-
-							return this._mceOldSubmit(this);
-						};
-					}
-
-					n = null;
-				});
-			}
-
-			// Load scripts
-			function loadScripts() {
-				if (s.language)
-					sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');
-
-				if (s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])
-					ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');
-
-				each(explode(s.plugins), function(p) {
-					if (p && p.charAt(0) != '-' && !PluginManager.urls[p]) {
-						// Skip safari plugin for other browsers
-						if (!isWebKit && p == 'safari')
-							return;
-
-						PluginManager.load(p, 'plugins/' + p + '/editor_plugin' + tinymce.suffix + '.js');
-					}
-				});
-
-				// Init when que is loaded
-				sl.loadQueue(function() {
-					if (s.ask) {
-						function ask() {
-							// Yield for awhile to avoid focus bug on FF 3 when cancel is pressed
-							window.setTimeout(function() {
-								Event.remove(t.id, 'focus', ask);
-
-								t.windowManager.confirm(t.getLang('edit_confirm'), function(s) {
-									if (s)
-										t.init();
-								});
-							}, 0);
-						};
-
-						Event.add(t.id, 'focus', ask);
-						return;
-					}
-
-					if (!t.removed)
-						t.init();
-				});
-			};
-
-			// Load compat2x first
-			if (s.plugins.indexOf('compat2x') != -1) {
-				PluginManager.load('compat2x', 'plugins/compat2x/editor_plugin' + tinymce.suffix + '.js');
-				sl.loadQueue(loadScripts);
-			} else
-				loadScripts();
-		},
-
-		init : function() {
-			var n, t = this, s = t.settings, w, h, e = t.getElement(), o, ti, u, bi, bc, re;
-
-			EditorManager.add(t);
-
-			// Create theme
-			s.theme = s.theme.replace(/-/, '');
-			o = ThemeManager.get(s.theme);
-			t.theme = new o();
-
-			if (t.theme.init && s.init_theme)
-				t.theme.init(t, ThemeManager.urls[s.theme] || tinymce.documentBaseURL.replace(/\/$/, ''));
-
-			// Create all plugins
-			each(explode(s.plugins.replace(/\-/g, '')), function(p) {
-				var c = PluginManager.get(p), u = PluginManager.urls[p] || tinymce.documentBaseURL.replace(/\/$/, ''), po;
-
-				if (c) {
-					po = new c(t, u);
-
-					t.plugins[p] = po;
-
-					if (po.init)
-						po.init(t, u);
-				}
-			});
-
-			// Setup popup CSS path(s)
-			if (s.popup_css)
-				s.popup_css = t.documentBaseURI.toAbsolute(s.popup_css);
-			else
-				s.popup_css = t.baseURI.toAbsolute("themes/" + s.theme + "/skins/" + s.skin + "/dialog.css");
-
-			if (s.popup_css_add)
-				s.popup_css += ',' + t.documentBaseURI.toAbsolute(s.popup_css_add);
-
-			// Setup control factory
-			t.controlManager = new tinymce.ControlManager(t);
-			t.undoManager = new tinymce.UndoManager(t);
-
-			// Pass through
-			t.undoManager.onAdd.add(function(um, l) {
-				if (!l.initial)
-					return t.onChange.dispatch(t, l, um);
-			});
-
-			t.undoManager.onUndo.add(function(um, l) {
-				return t.onUndo.dispatch(t, l, um);
-			});
-
-			t.undoManager.onRedo.add(function(um, l) {
-				return t.onRedo.dispatch(t, l, um);
-			});
-
-			if (s.custom_undo_redo) {
-				t.onExecCommand.add(function(ed, cmd, ui, val, a) {
-					if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!a || !a.skip_undo))
-						t.undoManager.add();
-				});
-			}
-
-			t.onExecCommand.add(function(ed, c) {
-				// Don't refresh the select lists until caret move
-				if (!/^(FontName|FontSize)$/.test(c))
-					t.nodeChanged();
-			});
-
-			// Remove ghost selections on images and tables in Gecko
-			if (isGecko) {
-				function repaint(a, o) {
-					if (!o || !o.initial)
-						t.execCommand('mceRepaint');
-				};
-
-				t.onUndo.add(repaint);
-				t.onRedo.add(repaint);
-				t.onSetContent.add(repaint);
-			}
-
-			// Enables users to override the control factory
-			t.onBeforeRenderUI.dispatch(t, t.controlManager);
-
-			// Measure box
-			if (s.render_ui) {
-				w = s.width || e.style.width || e.offsetWidth;
-				h = s.height || e.style.height || e.offsetHeight;
-				t.orgDisplay = e.style.display;
-				re = /^[0-9\.]+(|px)$/i;
-
-				if (re.test('' + w))
-					w = Math.max(parseInt(w) + (o.deltaWidth || 0), 100);
-
-				if (re.test('' + h))
-					h = Math.max(parseInt(h) + (o.deltaHeight || 0), 100);
-
-				// Render UI
-				o = t.theme.renderUI({
-					targetNode : e,
-					width : w,
-					height : h,
-					deltaWidth : s.delta_width,
-					deltaHeight : s.delta_height
-				});
-
-				t.editorContainer = o.editorContainer;
-			}
-
-			
-			// Resize editor
-			DOM.setStyles(o.sizeContainer || o.editorContainer, {
-				width : w,
-				height : h
-			});
-
-			h = (o.iframeHeight || h) + ((h + '').indexOf('%') == -1 ? (o.deltaHeight || 0) : '');
-			if (h < 100)
-				h = 100;
-
-			t.iframeHTML = s.doctype + '<html><head xmlns="http://www.w3.org/1999/xhtml"><base href="' + t.documentBaseURI.getURI() + '" />';
-			t.iframeHTML += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';
-
-			if (tinymce.relaxedDomain)
-				t.iframeHTML += '<script type="text/javascript">document.domain = "' + tinymce.relaxedDomain + '";</script>';
-
-			bi = s.body_id || 'tinymce';
-			if (bi.indexOf('=') != -1) {
-				bi = t.getParam('body_id', '', 'hash');
-				bi = bi[t.id] || bi;
-			}
-
-			bc = s.body_class || '';
-			if (bc.indexOf('=') != -1) {
-				bc = t.getParam('body_class', '', 'hash');
-				bc = bc[t.id] || '';
-			}
-
-			t.iframeHTML += '</head><body id="' + bi + '" class="mceContentBody ' + bc + '"></body></html>';
-
-			// Domain relaxing enabled, then set document domain
-			if (tinymce.relaxedDomain) {
-				// We need to write the contents here in IE since multiple writes messes up refresh button and back button
-				if (isIE || (tinymce.isOpera && parseFloat(opera.version()) >= 9.5))
-					u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";var ed = window.parent.tinyMCE.get("' + t.id + '");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()';
-				else if (tinymce.isOpera)
-					u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";document.close();ed.setupIframe();})()';					
-			}
-
-			// Create iframe
-			n = DOM.add(o.iframeContainer, 'iframe', {
-				id : t.id + "_ifr",
-				src : u || 'javascript:""', // Workaround for HTTPS warning in IE6/7
-				frameBorder : '0',
-				style : {
-					width : '100%',
-					height : h
-				}
-			});
-
-			t.contentAreaContainer = o.iframeContainer;
-			DOM.get(o.editorContainer).style.display = t.orgDisplay;
-			DOM.get(t.id).style.display = 'none';
-
-			// Safari 2.x requires us to wait for the load event and load a real HTML doc
-			if (tinymce.isOldWebKit) {
-				Event.add(n, 'load', t.setupIframe, t);
-				n.src = tinymce.baseURL + '/plugins/safari/blank.htm';
-			} else {
-				if (!isIE || !tinymce.relaxedDomain)
-					t.setupIframe();
-
-				e = n = o = null; // Cleanup
-			}
-		},
-
-		setupIframe : function() {
-			var t = this, s = t.settings, e = DOM.get(t.id), d = t.getDoc(), h, b;
-
-			// Setup iframe body
-			if (!isIE || !tinymce.relaxedDomain) {
-				d.open();
-				d.write(t.iframeHTML);
-				d.close();
-			}
-
-			// Design mode needs to be added here Ctrl+A will fail otherwise
-			if (!isIE) {
-				try {
-					if (!s.readonly)
-						d.designMode = 'On';
-				} catch (ex) {
-					// Will fail on Gecko if the editor is placed in an hidden container element
-					// The design mode will be set ones the editor is focused
-				}
-			}
-
-			// IE needs to use contentEditable or it will display non secure items for HTTPS
-			if (isIE) {
-				// It will not steal focus if we hide it while setting contentEditable
-				b = t.getBody();
-				DOM.hide(b);
-
-				if (!s.readonly)
-					b.contentEditable = true;
-
-				DOM.show(b);
-			}
-
-			// Setup objects
-			t.dom = new tinymce.DOM.DOMUtils(t.getDoc(), {
-				keep_values : true,
-				url_converter : t.convertURL,
-				url_converter_scope : t,
-				hex_colors : s.force_hex_style_colors,
-				class_filter : s.class_filter,
-				update_styles : 1,
-				fix_ie_paragraphs : 1
-			});
-
-			t.serializer = new tinymce.dom.Serializer({
-				entity_encoding : s.entity_encoding,
-				entities : s.entities,
-				valid_elements : s.verify_html === false ? '*[*]' : s.valid_elements,
-				extended_valid_elements : s.extended_valid_elements,
-				valid_child_elements : s.valid_child_elements,
-				invalid_elements : s.invalid_elements,
-				fix_table_elements : s.fix_table_elements,
-				fix_list_elements : s.fix_list_elements,
-				fix_content_duplication : s.fix_content_duplication,
-				convert_fonts_to_spans : s.convert_fonts_to_spans,
-				font_size_classes  : s.font_size_classes,
-				font_size_style_values : s.font_size_style_values,
-				apply_source_formatting : s.apply_source_formatting,
-				remove_linebreaks : s.remove_linebreaks,
-				dom : t.dom
-			});
-
-			t.selection = new tinymce.dom.Selection(t.dom, t.getWin(), t.serializer);
-			t.forceBlocks = new tinymce.ForceBlocks(t, {
-				forced_root_block : s.forced_root_block
-			});
-			t.editorCommands = new tinymce.EditorCommands(t);
-
-			// Pass through
-			t.serializer.onPreProcess.add(function(se, o) {
-				return t.onPreProcess.dispatch(t, o, se);
-			});
-
-			t.serializer.onPostProcess.add(function(se, o) {
-				return t.onPostProcess.dispatch(t, o, se);
-			});
-
-			t.onPreInit.dispatch(t);
-
-			if (!s.gecko_spellcheck)
-				t.getBody().spellcheck = 0;
-
-			if (!s.readonly)
-				t._addEvents();
-
-			t.controlManager.onPostRender.dispatch(t, t.controlManager);
-			t.onPostRender.dispatch(t);
-
-			if (s.directionality)
-				t.getBody().dir = s.directionality;
-
-			if (s.nowrap)
-				t.getBody().style.whiteSpace = "nowrap";
-
-			if (s.auto_resize)
-				t.onNodeChange.add(t.resizeToContent, t);
-
-			if (s.custom_elements) {
-				function handleCustom(ed, o) {
-					each(explode(s.custom_elements), function(v) {
-						var n;
-
-						if (v.indexOf('~') === 0) {
-							v = v.substring(1);
-							n = 'span';
-						} else
-							n = 'div';
-
-						o.content = o.content.replace(new RegExp('<(' + v + ')([^>]*)>', 'g'), '<' + n + ' mce_name="$1"$2>');
-						o.content = o.content.replace(new RegExp('</(' + v + ')>', 'g'), '</' + n + '>');
-					});
-				};
-
-				t.onBeforeSetContent.add(handleCustom);
-				t.onPostProcess.add(function(ed, o) {
-					if (o.set)
-						handleCustom(ed, o)
-				});
-			}
-
-			if (s.handle_node_change_callback) {
-				t.onNodeChange.add(function(ed, cm, n) {
-					t.execCallback('handle_node_change_callback', t.id, n, -1, -1, true, t.selection.isCollapsed());
-				});
-			}
-
-			if (s.save_callback) {
-				t.onSaveContent.add(function(ed, o) {
-					var h = t.execCallback('save_callback', t.id, o.content, t.getBody());
-
-					if (h)
-						o.content = h;
-				});
-			}
-
-			if (s.onchange_callback) {
-				t.onChange.add(function(ed, l) {
-					t.execCallback('onchange_callback', t, l);
-				});
-			}
-
-			if (s.convert_newlines_to_brs) {
-				t.onBeforeSetContent.add(function(ed, o) {
-					if (o.initial)
-						o.content = o.content.replace(/\r?\n/g, '<br />');
-				});
-			}
-
-			if (s.fix_nesting && isIE) {
-				t.onBeforeSetContent.add(function(ed, o) {
-					o.content = t._fixNesting(o.content);
-				});
-			}
-
-			if (s.preformatted) {
-				t.onPostProcess.add(function(ed, o) {
-					o.content = o.content.replace(/^\s*<pre.*?>/, '');
-					o.content = o.content.replace(/<\/pre>\s*$/, '');
-
-					if (o.set)
-						o.content = '<pre class="mceItemHidden">' + o.content + '</pre>';
-				});
-			}
-
-			if (s.verify_css_classes) {
-				t.serializer.attribValueFilter = function(n, v) {
-					var s, cl;
-
-					if (n == 'class') {
-						// Build regexp for classes
-						if (!t.classesRE) {
-							cl = t.dom.getClasses();
-
-							if (cl.length > 0) {
-								s = '';
-
-								each (cl, function(o) {
-									s += (s ? '|' : '') + o['class'];
-								});
-
-								t.classesRE = new RegExp('(' + s + ')', 'gi');
-							}
-						}
-
-						return !t.classesRE || /(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(v) || t.classesRE.test(v) ? v : '';
-					}
-
-					return v;
-				};
-			}
-
-			if (s.convert_fonts_to_spans)
-				t._convertFonts();
-
-			if (s.inline_styles)
-				t._convertInlineElements();
-
-			if (s.cleanup_callback) {
-				t.onBeforeSetContent.add(function(ed, o) {
-					o.content = t.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);
-				});
-
-				t.onPreProcess.add(function(ed, o) {
-					if (o.set)
-						t.execCallback('cleanup_callback', 'insert_to_editor_dom', o.node, o);
-
-					if (o.get)
-						t.execCallback('cleanup_callback', 'get_from_editor_dom', o.node, o);
-				});
-
-				t.onPostProcess.add(function(ed, o) {
-					if (o.set)
-						o.content = t.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);
-
-					if (o.get)						
-						o.content = t.execCallback('cleanup_callback', 'get_from_editor', o.content, o);
-				});
-			}
-
-			if (s.save_callback) {
-				t.onGetContent.add(function(ed, o) {
-					if (o.save)
-						o.content = t.execCallback('save_callback', t.id, o.content, t.getBody());
-				});
-			}
-
-			if (s.handle_event_callback) {
-				t.onEvent.add(function(ed, e, o) {
-					if (t.execCallback('handle_event_callback', e, ed, o) === false)
-						Event.cancel(e);
-				});
-			}
-
-			t.onSetContent.add(function() {
-				// Safari needs some time, it will crash the browser when a link is created otherwise
-				// I think this crash issue is resolved in the latest 3.0.4
-				//window.setTimeout(function() {
-					t.addVisual(t.getBody());
-				//}, 1);
-			});
-
-			// Remove empty contents
-			if (s.padd_empty_editor) {
-				t.onPostProcess.add(function(ed, o) {
-					o.content = o.content.replace(/^(<p>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/, '');
-				});
-			}
-
-			if (isGecko && !s.readonly) {
-				try {
-					// Design mode must be set here once again to fix a bug where
-					// Ctrl+A/Delete/Backspace didn't work if the editor was added using mceAddControl then removed then added again
-					d.designMode = 'Off';
-					d.designMode = 'On';
-				} catch (ex) {
-					// Will fail on Gecko if the editor is placed in an hidden container element
-					// The design mode will be set ones the editor is focused
-				}
-			}
-
-			// A small timeout was needed since firefox will remove. Bug: #1838304
-			setTimeout(function () {
-				if (t.removed)
-					return;
-
-				t.load({initial : true, format : (s.cleanup_on_startup ? 'html' : 'raw')});
-				t.startContent = t.getContent({format : 'raw'});
-				t.undoManager.add({initial : true});
-				t.initialized = true;
-
-				t.onInit.dispatch(t);
-				t.execCallback('setupcontent_callback', t.id, t.getBody(), t.getDoc());
-				t.execCallback('init_instance_callback', t);
-				t.focus(true);
-				t.nodeChanged({initial : 1});
-
-				// Load specified content CSS last
-				if (s.content_css) {
-					tinymce.each(explode(s.content_css), function(u) {
-						t.dom.loadCSS(t.documentBaseURI.toAbsolute(u));
-					});
-				}
-
-				// Handle auto focus
-				if (s.auto_focus) {
-					setTimeout(function () {
-						var ed = EditorManager.get(s.auto_focus);
-
-						ed.selection.select(ed.getBody(), 1);
-						ed.selection.collapse(1);
-						ed.getWin().focus();
-					}, 100);
-				}
-			}, 1);
-	
-			e = null;
-		},
-
-		
-		focus : function(sf) {
-			var oed, t = this, ce = t.settings.content_editable;
-
-			if (!sf) {
-				// Is not content editable or the selection is outside the area in IE
-				// the IE statement is needed to avoid bluring if element selections inside layers since
-				// the layer is like it's own document in IE
-				if (!ce && (!isIE || t.selection.getNode().ownerDocument != t.getDoc()))
-					t.getWin().focus();
-
-							}
-
-			if (EditorManager.activeEditor != t) {
-				if ((oed = EditorManager.activeEditor) != null)
-					oed.onDeactivate.dispatch(oed, t);
-
-				t.onActivate.dispatch(t, oed);
-			}
-
-			EditorManager._setActive(t);
-		},
-
-		execCallback : function(n) {
-			var t = this, f = t.settings[n], s;
-
-			if (!f)
-				return;
-
-			// Look through lookup
-			if (t.callbackLookup && (s = t.callbackLookup[n])) {
-				f = s.func;
-				s = s.scope;
-			}
-
-			if (is(f, 'string')) {
-				s = f.replace(/\.\w+$/, '');
-				s = s ? tinymce.resolve(s) : 0;
-				f = tinymce.resolve(f);
-				t.callbackLookup = t.callbackLookup || {};
-				t.callbackLookup[n] = {func : f, scope : s};
-			}
-
-			return f.apply(s || t, Array.prototype.slice.call(arguments, 1));
-		},
-
-		translate : function(s) {
-			var c = this.settings.language || 'en', i18n = EditorManager.i18n;
-
-			if (!s)
-				return '';
-
-			return i18n[c + '.' + s] || s.replace(/{\#([^}]+)\}/g, function(a, b) {
-				return i18n[c + '.' + b] || '{#' + b + '}';
-			});
-		},
-
-		getLang : function(n, dv) {
-			return EditorManager.i18n[(this.settings.language || 'en') + '.' + n] || (is(dv) ? dv : '{#' + n + '}');
-		},
-
-		getParam : function(n, dv, ty) {
-			var tr = tinymce.trim, v = is(this.settings[n]) ? this.settings[n] : dv, o;
-
-			if (ty === 'hash') {
-				o = {};
-
-				if (is(v, 'string')) {
-					each(v.indexOf('=') > 0 ? v.split(/[;,](?![^=;,]*(?:[;,]|$))/) : v.split(','), function(v) {
-						v = v.split('=');
-
-						if (v.length > 1)
-							o[tr(v[0])] = tr(v[1]);
-						else
-							o[tr(v[0])] = tr(v);
-					});
-				} else
-					o = v;
-
-				return o;
-			}
-
-			return v;
-		},
-
-		nodeChanged : function(o) {
-			var t = this, s = t.selection, n = s.getNode() || t.getBody();
-
-			// Fix for bug #1896577 it seems that this can not be fired while the editor is loading
-			if (t.initialized) {
-				t.onNodeChange.dispatch(
-					t,
-					o ? o.controlManager || t.controlManager : t.controlManager,
-					isIE && n.ownerDocument != t.getDoc() ? t.getBody() : n, // Fix for IE initial state
-					s.isCollapsed(),
-					o
-				);
-			}
-		},
-
-		addButton : function(n, s) {
-			var t = this;
-
-			t.buttons = t.buttons || {};
-			t.buttons[n] = s;
-		},
-
-		addCommand : function(n, f, s) {
-			this.execCommands[n] = {func : f, scope : s || this};
-		},
-
-		addQueryStateHandler : function(n, f, s) {
-			this.queryStateCommands[n] = {func : f, scope : s || this};
-		},
-
-		addQueryValueHandler : function(n, f, s) {
-			this.queryValueCommands[n] = {func : f, scope : s || this};
-		},
-
-		addShortcut : function(pa, desc, cmd_func, sc) {
-			var t = this, c;
-
-			if (!t.settings.custom_shortcuts)
-				return false;
-
-			t.shortcuts = t.shortcuts || {};
-
-			if (is(cmd_func, 'string')) {
-				c = cmd_func;
-
-				cmd_func = function() {
-					t.execCommand(c, false, null);
-				};
-			}
-
-			if (is(cmd_func, 'object')) {
-				c = cmd_func;
-
-				cmd_func = function() {
-					t.execCommand(c[0], c[1], c[2]);
-				};
-			}
-
-			each(explode(pa), function(pa) {
-				var o = {
-					func : cmd_func,
-					scope : sc || this,
-					desc : desc,
-					alt : false,
-					ctrl : false,
-					shift : false
-				};
-
-				each(explode(pa, '+'), function(v) {
-					switch (v) {
-						case 'alt':
-						case 'ctrl':
-						case 'shift':
-							o[v] = true;
-							break;
-
-						default:
-							o.charCode = v.charCodeAt(0);
-							o.keyCode = v.toUpperCase().charCodeAt(0);
-					}
-				});
-
-				t.shortcuts[(o.ctrl ? 'ctrl' : '') + ',' + (o.alt ? 'alt' : '') + ',' + (o.shift ? 'shift' : '') + ',' + o.keyCode] = o;
-			});
-
-			return true;
-		},
-
-		execCommand : function(cmd, ui, val, a) {
-			var t = this, s = 0, o, st;
-
-			if (!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(cmd) && (!a || !a.skip_focus))
-				t.focus();
-
-			o = {};
-			t.onBeforeExecCommand.dispatch(t, cmd, ui, val, o);
-			if (o.terminate)
-				return false;
-
-			// Command callback
-			if (t.execCallback('execcommand_callback', t.id, t.selection.getNode(), cmd, ui, val)) {
-				t.onExecCommand.dispatch(t, cmd, ui, val, a);
-				return true;
-			}
-
-			// Registred commands
-			if (o = t.execCommands[cmd]) {
-				st = o.func.call(o.scope, ui, val);
-
-				// Fall through on true
-				if (st !== true) {
-					t.onExecCommand.dispatch(t, cmd, ui, val, a);
-					return st;
-				}
-			}
-
-			// Plugin commands
-			each(t.plugins, function(p) {
-				if (p.execCommand && p.execCommand(cmd, ui, val)) {
-					t.onExecCommand.dispatch(t, cmd, ui, val, a);
-					s = 1;
-					return false;
-				}
-			});
-
-			if (s)
-				return true;
-
-			// Theme commands
-			if (t.theme.execCommand && t.theme.execCommand(cmd, ui, val)) {
-				t.onExecCommand.dispatch(t, cmd, ui, val, a);
-				return true;
-			}
-
-			// Editor commands
-			if (t.editorCommands.execCommand(cmd, ui, val)) {
-				t.onExecCommand.dispatch(t, cmd, ui, val, a);
-				return true;
-			}
-
-			// Browser commands
-			t.getDoc().execCommand(cmd, ui, val);
-			t.onExecCommand.dispatch(t, cmd, ui, val, a);
-		},
-
-		queryCommandState : function(c) {
-			var t = this, o, s;
-
-			// Is hidden then return undefined
-			if (t._isHidden())
-				return;
-
-			// Registred commands
-			if (o = t.queryStateCommands[c]) {
-				s = o.func.call(o.scope);
-
-				// Fall though on true
-				if (s !== true)
-					return s;
-			}
-
-			// Registred commands
-			o = t.editorCommands.queryCommandState(c);
-			if (o !== -1)
-				return o;
-
-			// Browser commands
-			try {
-				return this.getDoc().queryCommandState(c);
-			} catch (ex) {
-				// Fails sometimes see bug: 1896577
-			}
-		},
-
-		queryCommandValue : function(c) {
-			var t = this, o, s;
-
-			// Is hidden then return undefined
-			if (t._isHidden())
-				return;
-
-			// Registred commands
-			if (o = t.queryValueCommands[c]) {
-				s = o.func.call(o.scope);
-
-				// Fall though on true
-				if (s !== true)
-					return s;
-			}
-
-			// Registred commands
-			o = t.editorCommands.queryCommandValue(c);
-			if (is(o))
-				return o;
-
-			// Browser commands
-			try {
-				return this.getDoc().queryCommandValue(c);
-			} catch (ex) {
-				// Fails sometimes see bug: 1896577
-			}
-		},
-
-		show : function() {
-			var t = this;
-
-			DOM.show(t.getContainer());
-			DOM.hide(t.id);
-			t.load();
-		},
-
-		hide : function() {
-			var t = this, d = t.getDoc();
-
-			// Fixed bug where IE has a blinking cursor left from the editor
-			if (isIE && d)
-				d.execCommand('SelectAll');
-
-			// We must save before we hide so Safari doesn't crash
-			t.save();
-			DOM.hide(t.getContainer());
-			DOM.setStyle(t.id, 'display', t.orgDisplay);
-		},
-
-		isHidden : function() {
-			return !DOM.isHidden(this.id);
-		},
-
-		setProgressState : function(b, ti, o) {
-			this.onSetProgressState.dispatch(this, b, ti, o);
-
-			return b;
-		},
-
-		resizeToContent : function() {
-			var t = this;
-
-			DOM.setStyle(t.id + "_ifr", 'height', t.getBody().scrollHeight);
-		},
-
-		load : function(o) {
-			var t = this, e = t.getElement(), h;
-
-			o = o || {};
-			o.load = true;
-
-			h = t.setContent(is(e.value) ? e.value : e.innerHTML, o);
-			o.element = e;
-
-			if (!o.no_events)
-				t.onLoadContent.dispatch(t, o);
-
-			o.element = e = null;
-
-			return h;
-		},
-
-		save : function(o) {
-			var t = this, e = t.getElement(), h, f;
-
-			if (!t.initialized)
-				return;
-
-			o = o || {};
-			o.save = true;
-
-			// Add undo level will trigger onchange event
-			if (!o.no_events) {
-				t.undoManager.typing = 0;
-				t.undoManager.add();
-			}
-
-			o.element = e;
-			h = o.content = t.getContent(o);
-
-			if (!o.no_events)
-				t.onSaveContent.dispatch(t, o);
-
-			h = o.content;
-
-			if (!/TEXTAREA|INPUT/i.test(e.nodeName)) {
-				e.innerHTML = h;
-
-				// Update hidden form element
-				if (f = DOM.getParent(t.id, 'form')) {
-					each(f.elements, function(e) {
-						if (e.name == t.id) {
-							e.value = h;
-							return false;
-						}
-					});
-				}
-			} else
-				e.value = h;
-
-			o.element = e = null;
-
-			return h;
-		},
-
-		setContent : function(h, o) {
-			var t = this;
-
-			o = o || {};
-			o.format = o.format || 'html';
-			o.set = true;
-			o.content = h;
-
-			if (!o.no_events)
-				t.onBeforeSetContent.dispatch(t, o);
-
-			// Padd empty content in Gecko and Safari. Commands will otherwise fail on the content
-			// It will also be impossible to place the caret in the editor unless there is a BR element present
-			if (!tinymce.isIE && (h.length === 0 || /^\s+$/.test(h))) {
-				o.content = t.dom.setHTML(t.getBody(), '<br mce_bogus="1" />');
-				o.format = 'raw';
-			}
-
-			o.content = t.dom.setHTML(t.getBody(), tinymce.trim(o.content));
-
-			if (o.format != 'raw' && t.settings.cleanup) {
-				o.getInner = true;
-				o.content = t.dom.setHTML(t.getBody(), t.serializer.serialize(t.getBody(), o));
-			}
-
-			if (!o.no_events)
-				t.onSetContent.dispatch(t, o);
-
-			return o.content;
-		},
-
-		getContent : function(o) {
-			var t = this, h;
-
-			o = o || {};
-			o.format = o.format || 'html';
-			o.get = true;
-
-			if (!o.no_events)
-				t.onBeforeGetContent.dispatch(t, o);
-
-			if (o.format != 'raw' && t.settings.cleanup) {
-				o.getInner = true;
-				h = t.serializer.serialize(t.getBody(), o);
-			} else
-				h = t.getBody().innerHTML;
-
-			h = h.replace(/^\s*|\s*$/g, '');
-			o.content = h;
-
-			if (!o.no_events)
-				t.onGetContent.dispatch(t, o);
-
-			return o.content;
-		},
-
-		isDirty : function() {
-			var t = this;
-
-			return tinymce.trim(t.startContent) != tinymce.trim(t.getContent({format : 'raw', no_events : 1})) && !t.isNotDirty;
-		},
-
-		getContainer : function() {
-			var t = this;
-
-			if (!t.container)
-				t.container = DOM.get(t.editorContainer || t.id + '_parent');
-
-			return t.container;
-		},
-
-		getContentAreaContainer : function() {
-			return this.contentAreaContainer;
-		},
-
-		getElement : function() {
-			return DOM.get(this.settings.content_element || this.id);
-		},
-
-		getWin : function() {
-			var t = this, e;
-
-			if (!t.contentWindow) {
-				e = DOM.get(t.id + "_ifr");
-
-				if (e)
-					t.contentWindow = e.contentWindow;
-			}
-
-			return t.contentWindow;
-		},
-
-		getDoc : function() {
-			var t = this, w;
-
-			if (!t.contentDocument) {
-				w = t.getWin();
-
-				if (w)
-					t.contentDocument = w.document;
-			}
-
-			return t.contentDocument;
-		},
-
-		getBody : function() {
-			return this.bodyElement || this.getDoc().body;
-		},
-
-		convertURL : function(u, n, e) {
-			var t = this, s = t.settings;
-
-			// Use callback instead
-			if (s.urlconverter_callback)
-				return t.execCallback('urlconverter_callback', u, e, true, n);
-
-			// Don't convert link href since thats the CSS files that gets loaded into the editor also skip local file URLs
-			if (!s.convert_urls || (e && e.nodeName == 'LINK') || u.indexOf('file:') === 0)
-				return u;
-
-			// Convert to relative
-			if (s.relative_urls)
-				return t.documentBaseURI.toRelative(u);
-
-			// Convert to absolute
-			u = t.documentBaseURI.toAbsolute(u, s.remove_script_host);
-
-			return u;
-		},
-
-		addVisual : function(e) {
-			var t = this, s = t.settings;
-
-			e = e || t.getBody();
-
-			if (!is(t.hasVisual))
-				t.hasVisual = s.visual;
-
-			each(t.dom.select('table,a', e), function(e) {
-				var v;
-
-				switch (e.nodeName) {
-					case 'TABLE':
-						v = t.dom.getAttrib(e, 'border');
-
-						if (!v || v == '0') {
-							if (t.hasVisual)
-								t.dom.addClass(e, s.visual_table_class);
-							else
-								t.dom.removeClass(e, s.visual_table_class);
-						}
-
-						return;
-
-					case 'A':
-						v = t.dom.getAttrib(e, 'name');
-
-						if (v) {
-							if (t.hasVisual)
-								t.dom.addClass(e, 'mceItemAnchor');
-							else
-								t.dom.removeClass(e, 'mceItemAnchor');
-						}
-
-						return;
-				}
-			});
-
-			t.onVisualAid.dispatch(t, e, t.hasVisual);
-		},
-
-		remove : function() {
-			var t = this, e = t.getContainer();
-
-			t.removed = 1; // Cancels post remove event execution
-			t.hide();
-
-			t.execCallback('remove_instance_callback', t);
-			t.onRemove.dispatch(t);
-
-			// Clear all execCommand listeners this is required to avoid errors if the editor was removed inside another command
-			t.onExecCommand.listeners = [];
-
-			EditorManager.remove(t);
-			DOM.remove(e);
-		},
-
-		destroy : function(s) {
-			var t = this;
-
-			// One time is enough
-			if (t.destroyed)
-				return;
-
-			if (!s) {
-				tinymce.removeUnload(t.destroy);
-				tinyMCE.onBeforeUnload.remove(t._beforeUnload);
-
-				// Manual destroy
-				if (t.theme.destroy)
-					t.theme.destroy();
-
-				// Destroy controls, selection and dom
-				t.controlManager.destroy();
-				t.selection.destroy();
-				t.dom.destroy();
-
-				// Remove all events
-
-				// Don't clear the window or document if content editable
-				// is enabled since other instances might still be present
-				if (!t.settings.content_editable) {
-					Event.clear(t.getWin());
-					Event.clear(t.getDoc());
-				}
-
-				Event.clear(t.getBody());
-				Event.clear(t.formElement);
-			}
-
-			if (t.formElement) {
-				t.formElement.submit = t.formElement._mceOldSubmit;
-				t.formElement._mceOldSubmit = null;
-			}
-
-			t.contentAreaContainer = t.formElement = t.container = t.settings.content_element = t.bodyElement = t.contentDocument = t.contentWindow = null;
-
-			if (t.selection)
-				t.selection = t.selection.win = t.selection.dom = t.selection.dom.doc = null;
-
-			t.destroyed = 1;
-		},
-
-		// Internal functions
-
-		_addEvents : function() {
-			// 'focus', 'blur', 'dblclick', 'beforedeactivate', submit, reset
-			var t = this, i, s = t.settings, lo = {
-				mouseup : 'onMouseUp',
-				mousedown : 'onMouseDown',
-				click : 'onClick',
-				keyup : 'onKeyUp',
-				keydown : 'onKeyDown',
-				keypress : 'onKeyPress',
-				submit : 'onSubmit',
-				reset : 'onReset',
-				contextmenu : 'onContextMenu',
-				dblclick : 'onDblClick',
-				paste : 'onPaste' // Doesn't work in all browsers yet
-			};
-
-			function eventHandler(e, o) {
-				var ty = e.type;
-
-				// Don't fire events when it's removed
-				if (t.removed)
-					return;
-
-				// Generic event handler
-				if (t.onEvent.dispatch(t, e, o) !== false) {
-					// Specific event handler
-					t[lo[e.fakeType || e.type]].dispatch(t, e, o);
-				}
-			};
-
-			// Add DOM events
-			each(lo, function(v, k) {
-				switch (k) {
-					case 'contextmenu':
-						if (tinymce.isOpera) {
-							// Fake contextmenu on Opera
-							Event.add(t.getBody(), 'mousedown', function(e) {
-								if (e.ctrlKey) {
-									e.fakeType = 'contextmenu';
-									eventHandler(e);
-								}
-							});
-						} else
-							Event.add(t.getBody(), k, eventHandler);
-						break;
-
-					case 'paste':
-						Event.add(t.getBody(), k, function(e) {
-							var tx, h, el, r;
-
-							// Get plain text data
-							if (e.clipboardData)
-								tx = e.clipboardData.getData('text/plain');
-							else if (tinymce.isIE)
-								tx = t.getWin().clipboardData.getData('Text');
-
-							// Get HTML data
-							/*if (tinymce.isIE) {
-								el = DOM.add(DOM.doc.body, 'div', {style : 'visibility:hidden;overflow:hidden;position:absolute;width:1px;height:1px'});
-								r = DOM.doc.body.createTextRange();
-								r.moveToElementText(el);
-								r.execCommand('Paste');
-								h = el.innerHTML;
-								DOM.remove(el);
-							}*/
-
-							eventHandler(e, {text : tx, html : h});
-						});
-						break;
-
-					case 'submit':
-					case 'reset':
-						Event.add(t.getElement().form || DOM.getParent(t.id, 'form'), k, eventHandler);
-						break;
-
-					default:
-						Event.add(s.content_editable ? t.getBody() : t.getDoc(), k, eventHandler);
-				}
-			});
-
-			Event.add(s.content_editable ? t.getBody() : (isGecko ? t.getDoc() : t.getWin()), 'focus', function(e) {
-				t.focus(true);
-			});
-
-			
-			// Fixes bug where a specified document_base_uri could result in broken images
-			// This will also fix drag drop of images in Gecko
-			if (tinymce.isGecko) {
-				// Convert all images to absolute URLs
-/*				t.onSetContent.add(function(ed, o) {
-					each(ed.dom.select('img'), function(e) {
-						var v;
-
-						if (v = e.getAttribute('mce_src'))
-							e.src = t.documentBaseURI.toAbsolute(v);
-					})
-				});*/
-
-				Event.add(t.getDoc(), 'DOMNodeInserted', function(e) {
-					var v;
-
-					e = e.target;
-
-					if (e.nodeType === 1 && e.nodeName === 'IMG' && (v = e.getAttribute('mce_src')))
-						e.src = t.documentBaseURI.toAbsolute(v);
-				});
-			}
-
-			// Set various midas options in Gecko
-			if (isGecko) {
-				function setOpts() {
-					var t = this, d = t.getDoc(), s = t.settings;
-
-					if (isGecko && !s.readonly) {
-						if (t._isHidden()) {
-							try {
-								if (!s.content_editable)
-									d.designMode = 'On';
-							} catch (ex) {
-								// Fails if it's hidden
-							}
-						}
-
-						try {
-							// Try new Gecko method
-							d.execCommand("styleWithCSS", 0, false);
-						} catch (ex) {
-							// Use old method
-							if (!t._isHidden())
-								try {d.execCommand("useCSS", 0, true);} catch (ex) {}
-						}
-
-						if (!s.table_inline_editing)
-							try {d.execCommand('enableInlineTableEditing', false, false);} catch (ex) {}
-
-						if (!s.object_resizing)
-							try {d.execCommand('enableObjectResizing', false, false);} catch (ex) {}
-					}
-				};
-
-				t.onBeforeExecCommand.add(setOpts);
-				t.onMouseDown.add(setOpts);
-			}
-
-			// Add node change handlers
-			t.onMouseUp.add(t.nodeChanged);
-			t.onClick.add(t.nodeChanged);
-			t.onKeyUp.add(function(ed, e) {
-				var c = e.keyCode;
-
-				if ((c >= 33 && c <= 36) || (c >= 37 && c <= 40) || c == 13 || c == 45 || c == 46 || c == 8 || (tinymce.isMac && c >= 91 && c <= 93) || e.ctrlKey)
-					t.nodeChanged();
-			});
-
-			// Add reset handler
-			t.onReset.add(function() {
-				t.setContent(t.startContent, {format : 'raw'});
-			});
-
-			if (t.getParam('tab_focus')) {
-				function tabCancel(ed, e) {
-					if (e.keyCode === 9)
-						return Event.cancel(e);
-				};
-
-				function tabHandler(ed, e) {
-					var x, i, f, el, v;
-
-					function find(d) {
-						f = DOM.getParent(ed.id, 'form');
-						el = f.elements;
-
-						if (f) {
-							each(el, function(e, i) {
-								if (e.id == ed.id) {
-									x = i;
-									return false;
-								}
-							});
-
-							if (d > 0) {
-								for (i = x + 1; i < el.length; i++) {
-									if (el[i].type != 'hidden')
-										return el[i];
-								}
-							} else {
-								for (i = x - 1; i >= 0; i--) {
-									if (el[i].type != 'hidden')
-										return el[i];
-								}
-							}
-						}
-
-						return null;
-					};
-
-					if (e.keyCode === 9) {
-						v = explode(ed.getParam('tab_focus'));
-
-						if (v.length == 1) {
-							v[1] = v[0];
-							v[0] = ':prev';
-						}
-
-						// Find element to focus
-						if (e.shiftKey) {
-							if (v[0] == ':prev')
-								el = find(-1);
-							else
-								el = DOM.get(v[0]);
-						} else {
-							if (v[1] == ':next')
-								el = find(1);
-							else
-								el = DOM.get(v[1]);
-						}
-
-						if (el) {
-							if (ed = EditorManager.get(el.id || el.name))
-								ed.focus();
-							else
-								window.setTimeout(function() {window.focus();el.focus();}, 10);
-
-							return Event.cancel(e);
-						}
-					}
-				};
-
-				t.onKeyUp.add(tabCancel);
-
-				if (isGecko) {
-					t.onKeyPress.add(tabHandler);
-					t.onKeyDown.add(tabCancel);
-				} else
-					t.onKeyDown.add(tabHandler);
-			}
-
-			// Add shortcuts
-			if (s.custom_shortcuts) {
-				if (s.custom_undo_redo_keyboard_shortcuts) {
-					t.addShortcut('ctrl+z', t.getLang('undo_desc'), 'Undo');
-					t.addShortcut('ctrl+y', t.getLang('redo_desc'), 'Redo');
-				}
-
-				// Add default shortcuts for gecko
-				if (isGecko) {
-					t.addShortcut('ctrl+b', t.getLang('bold_desc'), 'Bold');
-					t.addShortcut('ctrl+i', t.getLang('italic_desc'), 'Italic');
-					t.addShortcut('ctrl+u', t.getLang('underline_desc'), 'Underline');
-				}
-
-				// BlockFormat shortcuts keys
-				for (i=1; i<=6; i++)
-					t.addShortcut('ctrl+' + i, '', ['FormatBlock', false, '<h' + i + '>']);
-
-				t.addShortcut('ctrl+7', '', ['FormatBlock', false, '<p>']);
-				t.addShortcut('ctrl+8', '', ['FormatBlock', false, '<div>']);
-				t.addShortcut('ctrl+9', '', ['FormatBlock', false, '<address>']);
-
-				function find(e) {
-					var v = null;
-
-					if (!e.altKey && !e.ctrlKey && !e.metaKey)
-						return v;
-
-					each(t.shortcuts, function(o) {
-						if (o.ctrl != e.ctrlKey && (!tinymce.isMac || o.ctrl == e.metaKey))
-							return;
-
-						if (o.alt != e.altKey)
-							return;
-
-						if (o.shift != e.shiftKey)
-							return;
-
-						if (e.keyCode == o.keyCode || (e.charCode && e.charCode == o.charCode)) {
-							v = o;
-							return false;
-						}
-					});
-
-					return v;
-				};
-
-				t.onKeyUp.add(function(ed, e) {
-					var o = find(e);
-
-					if (o)
-						return Event.cancel(e);
-				});
-
-				t.onKeyPress.add(function(ed, e) {
-					var o = find(e);
-
-					if (o)
-						return Event.cancel(e);
-				});
-
-				t.onKeyDown.add(function(ed, e) {
-					var o = find(e);
-
-					if (o) {
-						o.func.call(o.scope);
-						return Event.cancel(e);
-					}
-				});
-			}
-
-			if (tinymce.isIE) {
-				// Fix so resize will only update the width and height attributes not the styles of an image
-				// It will also block mceItemNoResize items
-				Event.add(t.getDoc(), 'controlselect', function(e) {
-					var re = t.resizeInfo, cb;
-
-					e = e.target;
-
-					// Don't do this action for non image elements
-					if (e.nodeName !== 'IMG')
-						return;
-
-					if (re)
-						Event.remove(re.node, re.ev, re.cb);
-
-					if (!t.dom.hasClass(e, 'mceItemNoResize')) {
-						ev = 'resizeend';
-						cb = Event.add(e, ev, function(e) {
-							var v;
-
-							e = e.target;
-
-							if (v = t.dom.getStyle(e, 'width')) {
-								t.dom.setAttrib(e, 'width', v.replace(/[^0-9%]+/g, ''));
-								t.dom.setStyle(e, 'width', '');
-							}
-
-							if (v = t.dom.getStyle(e, 'height')) {
-								t.dom.setAttrib(e, 'height', v.replace(/[^0-9%]+/g, ''));
-								t.dom.setStyle(e, 'height', '');
-							}
-						});
-					} else {
-						ev = 'resizestart';
-						cb = Event.add(e, 'resizestart', Event.cancel, Event);
-					}
-
-					re = t.resizeInfo = {
-						node : e,
-						ev : ev,
-						cb : cb
-					};
-				});
-
-				t.onKeyDown.add(function(ed, e) {
-					switch (e.keyCode) {
-						case 8:
-							// Fix IE control + backspace browser bug
-							if (t.selection.getRng().item) {
-								t.selection.getRng().item(0).removeNode();
-								return Event.cancel(e);
-							}
-					}
-				});
-			}
-
-			if (tinymce.isOpera) {
-				t.onClick.add(function(ed, e) {
-					Event.prevent(e);
-				});
-			}
-
-			// Add custom undo/redo handlers
-			if (s.custom_undo_redo) {
-				function addUndo() {
-					t.undoManager.typing = 0;
-					t.undoManager.add();
-				};
-
-				// Add undo level on editor blur
-				if (tinymce.isIE) {
-					Event.add(t.getWin(), 'blur', function(e) {
-						var n;
-
-						// Check added for fullscreen bug
-						if (t.selection) {
-							n = t.selection.getNode();
-
-							// Add undo level is selection was lost to another document
-							if (!t.removed && n.ownerDocument && n.ownerDocument != t.getDoc())
-								addUndo();
-						}
-					});
-				} else {
-					Event.add(t.getDoc(), 'blur', function() {
-						if (t.selection && !t.removed)
-							addUndo();
-					});
-				}
-
-				t.onMouseDown.add(addUndo);
-
-				t.onKeyUp.add(function(ed, e) {
-					if ((e.keyCode >= 33 && e.keyCode <= 36) || (e.keyCode >= 37 && e.keyCode <= 40) || e.keyCode == 13 || e.keyCode == 45 || e.ctrlKey) {
-						t.undoManager.typing = 0;
-						t.undoManager.add();
-					}
-				});
-
-				t.onKeyDown.add(function(ed, e) {
-					// Is caracter positon keys
-					if ((e.keyCode >= 33 && e.keyCode <= 36) || (e.keyCode >= 37 && e.keyCode <= 40) || e.keyCode == 13 || e.keyCode == 45) {
-						if (t.undoManager.typing) {
-							t.undoManager.add();
-							t.undoManager.typing = 0;
-						}
-
-						return;
-					}
-
-					if (!t.undoManager.typing) {
-						t.undoManager.add();
-						t.undoManager.typing = 1;
-					}
-				});
-			}
-		},
-
-		_convertInlineElements : function() {
-			var t = this, s = t.settings, dom = t.dom, v, e, na, st, sp;
-
-			function convert(ed, o) {
-				if (!s.inline_styles)
-					return;
-
-				if (o.get) {
-					each(t.dom.select('table,u,strike', o.node), function(n) {
-						switch (n.nodeName) {
-							case 'TABLE':
-								if (v = dom.getAttrib(n, 'height')) {
-									dom.setStyle(n, 'height', v);
-									dom.setAttrib(n, 'height', '');
-								}
-								break;
-
-							case 'U':
-							case 'STRIKE':
-								//sp = dom.create('span', {style : dom.getAttrib(n, 'style')});
-								n.style.textDecoration = n.nodeName == 'U' ? 'underline' : 'line-through';
-								dom.setAttrib(n, 'mce_style', '');
-								dom.setAttrib(n, 'mce_name', 'span');
-								break;
-						}
-					});
-				} else if (o.set) {
-					each(t.dom.select('table,span', o.node).reverse(), function(n) {
-						if (n.nodeName == 'TABLE') {
-							if (v = dom.getStyle(n, 'height'))
-								dom.setAttrib(n, 'height', v.replace(/[^0-9%]+/g, ''));
-						} else {
-							// Convert spans to elements
-							if (n.style.textDecoration == 'underline')
-								na = 'u';
-							else if (n.style.textDecoration == 'line-through')
-								na = 'strike';
-							else
-								na = '';
-
-							if (na) {
-								n.style.textDecoration = '';
-								dom.setAttrib(n, 'mce_style', '');
-
-								e = dom.create(na, {
-									style : dom.getAttrib(n, 'style')
-								});
-
-								dom.replace(e, n, 1);
-							}
-						}
-					});
-				}
-			};
-
-			t.onPreProcess.add(convert);
-
-			if (!s.cleanup_on_startup) {
-				t.onSetContent.add(function(ed, o) {
-					if (o.initial)
-						convert(t, {node : t.getBody(), set : 1});
-				});
-			}
-		},
-
-		_convertFonts : function() {
-			var t = this, s = t.settings, dom = t.dom, fz, fzn, sl, cl;
-
-			// No need
-			if (!s.inline_styles)
-				return;
-
-			// Font pt values and font size names
-			fz = [8, 10, 12, 14, 18, 24, 36];
-			fzn = ['xx-small', 'x-small','small','medium','large','x-large', 'xx-large'];
-
-			if (sl = s.font_size_style_values)
-				sl = explode(sl);
-
-			if (cl = s.font_size_classes)
-				cl = explode(cl);
-
-			function convertToFonts(no) {
-				var n, f, nl, x, i, v, st;
-
-				// Convert spans to fonts on non WebKit browsers
-				if (tinymce.isWebKit || !s.inline_styles)
-					return;
-
-				nl = t.dom.select('span', no);
-				for (x = nl.length - 1; x >= 0; x--) {
-					n = nl[x];
-
-					f = dom.create('font', {
-						color : dom.toHex(dom.getStyle(n, 'color')),
-						face : dom.getStyle(n, 'fontFamily'),
-						style : dom.getAttrib(n, 'style'),
-						'class' : dom.getAttrib(n, 'class')
-					});
-
-					// Clear color and font family
-					st = f.style;
-					if (st.color || st.fontFamily) {
-						st.color = st.fontFamily = '';
-						dom.setAttrib(f, 'mce_style', ''); // Remove cached style data
-					}
-
-					if (sl) {
-						i = inArray(sl, dom.getStyle(n, 'fontSize'));
-
-						if (i != -1) {
-							dom.setAttrib(f, 'size', '' + (i + 1 || 1));
-							//f.style.fontSize = '';
-						}
-					} else if (cl) {
-						i = inArray(cl, dom.getAttrib(n, 'class'));
-						v = dom.getStyle(n, 'fontSize');
-
-						if (i == -1 && v.indexOf('pt') > 0)
-							i = inArray(fz, parseInt(v));
-
-						if (i == -1)
-							i = inArray(fzn, v);
-
-						if (i != -1) {
-							dom.setAttrib(f, 'size', '' + (i + 1 || 1));
-							f.style.fontSize = '';
-						}
-					}
-
-					if (f.color || f.face || f.size) {
-						f.style.fontFamily = '';
-						dom.setAttrib(f, 'mce_style', '');
-						dom.replace(f, n, 1);
-					}
-
-					f = n = null;
-				}
-			};
-
-			// Run on setup
-			t.onSetContent.add(function(ed, o) {
-				convertToFonts(ed.getBody());
-			});
-
-			// Run on cleanup
-			t.onPreProcess.add(function(ed, o) {
-				var n, sp, nl, x;
-
-				// Keep unit tests happy
-				if (!s.inline_styles)
-					return;
-
-				if (o.get) {
-					nl = t.dom.select('font', o.node);
-					for (x = nl.length - 1; x >= 0; x--) {
-						n = nl[x];
-
-						sp = dom.create('span', {
-							style : dom.getAttrib(n, 'style'),
-							'class' : dom.getAttrib(n, 'class')
-						});
-
-						dom.setStyles(sp, {
-							fontFamily : dom.getAttrib(n, 'face'),
-							color : dom.getAttrib(n, 'color'),
-							backgroundColor : n.style.backgroundColor
-						});
-
-						if (n.size) {
-							if (sl)
-								dom.setStyle(sp, 'fontSize', sl[parseInt(n.size) - 1]);
-							else
-								dom.setAttrib(sp, 'class', cl[parseInt(n.size) - 1]);
-						}
-
-						dom.setAttrib(sp, 'mce_style', '');
-						dom.replace(sp, n, 1);
-					}
-				}
-			});
-		},
-
-		_isHidden : function() {
-			var s;
-
-			if (!isGecko)
-				return 0;
-
-			// Weird, wheres that cursor selection?
-			s = this.selection.getSel();
-			return (!s || !s.rangeCount || s.rangeCount == 0);
-		},
-
-		// Fix for bug #1867292
-		_fixNesting : function(s) {
-			var d = [], i;
-
-			s = s.replace(/<(\/)?([^\s>]+)[^>]*?>/g, function(a, b, c) {
-				var e;
-
-				// Handle end element
-				if (b === '/') {
-					if (!d.length)
-						return '';
-
-					if (c !== d[d.length - 1].tag) {
-						for (i=d.length - 1; i>=0; i--) {
-							if (d[i].tag === c) {
-								d[i].close = 1;
-								break;
-							}
-						}
-
-						return '';
-					} else {
-						d.pop();
-
-						if (d.length && d[d.length - 1].close) {
-							a = a + '</' + d[d.length - 1].tag + '>';
-							d.pop();
-						}
-					}
-				} else {
-					// Ignore these
-					if (/^(br|hr|input|meta|img|link|param)$/i.test(c))
-						return a;
-
-					// Ignore closed ones
-					if (/\/>$/.test(a))
-						return a;
-
-					d.push({tag : c}); // Push start element
-				}
-
-				return a;
-			});
-
-			// End all open tags
-			for (i=d.length - 1; i>=0; i--)
-				s += '</' + d[i].tag + '>';
-
-			return s;
-		}
-
-		});
-})();
-
-/* file:jscripts/tiny_mce/classes/EditorCommands.js */
-
-(function() {
-	var each = tinymce.each, isIE = tinymce.isIE, isGecko = tinymce.isGecko, isOpera = tinymce.isOpera, isWebKit = tinymce.isWebKit;
-
-	tinymce.create('tinymce.EditorCommands', {
-		EditorCommands : function(ed) {
-			this.editor = ed;
-		},
-
-		execCommand : function(cmd, ui, val) {
-			var t = this, ed = t.editor, f;
-
-			switch (cmd) {
-				case 'Cut':
-				case 'Copy':
-				case 'Paste':
-					try {
-						ed.getDoc().execCommand(cmd, ui, val);
-					} catch (ex) {
-						if (isGecko) {
-							ed.windowManager.confirm(ed.getLang('clipboard_msg'), function(s) {
-								if (s)
-									window.open('http://www.mozilla.org/editor/midasdemo/securityprefs.html', 'mceExternal');
-							});
-						} else
-							ed.windowManager.alert(ed.getLang('clipboard_no_support'));
-					}
-
-					return true;
-
-				// Ignore these
-				case 'mceResetDesignMode':
-				case 'mceBeginUndoLevel':
-					return true;
-
-				// Ignore these
-				case 'unlink':
-					t.UnLink();
-					return true;
-
-				// Bundle these together
-				case 'JustifyLeft':
-				case 'JustifyCenter':
-				case 'JustifyRight':
-				case 'JustifyFull':
-					t.mceJustify(cmd, cmd.substring(7).toLowerCase());
-					return true;
-
-				case 'mceEndUndoLevel':
-				case 'mceAddUndoLevel':
-					ed.undoManager.add();
-					return true;
-
-				default:
-					f = this[cmd];
-
-					if (f) {
-						f.call(this, ui, val);
-						return true;
-					}
-			}
-
-			return false;
-		},
-
-		Indent : function() {
-			var ed = this.editor, d = ed.dom, s = ed.selection, e, iv, iu;
-
-			// Setup indent level
-			iv = ed.settings.indentation;
-			iu = /[a-z%]+$/i.exec(iv);
-			iv = parseInt(iv);
-
-			if (ed.settings.inline_styles && (!this.queryStateInsertUnorderedList() && !this.queryStateInsertOrderedList())) {
-				each(this._getSelectedBlocks(), function(e) {
-					d.setStyle(e, 'paddingLeft', (parseInt(e.style.paddingLeft || 0) + iv) + iu);
-				});
-
-				return;
-			}
-
-			ed.getDoc().execCommand('Indent', false, null);
-
-			if (isIE) {
-				d.getParent(s.getNode(), function(n) {
-					if (n.nodeName == 'BLOCKQUOTE') {
-						n.dir = n.style.cssText = '';
-					}
-				});
-			}
-		},
-
-		Outdent : function() {
-			var ed = this.editor, d = ed.dom, s = ed.selection, e, v, iv, iu;
-
-			// Setup indent level
-			iv = ed.settings.indentation;
-			iu = /[a-z%]+$/i.exec(iv);
-			iv = parseInt(iv);
-
-			if (ed.settings.inline_styles && (!this.queryStateInsertUnorderedList() && !this.queryStateInsertOrderedList())) {
-				each(this._getSelectedBlocks(), function(e) {
-					v = Math.max(0, parseInt(e.style.paddingLeft || 0) - iv);
-					d.setStyle(e, 'paddingLeft', v ? v + iu : '');
-				});
-
-				return;
-			}
-
-			ed.getDoc().execCommand('Outdent', false, null);
-		},
-
-		mceSetAttribute : function(u, v) {
-			var ed = this.editor, d = ed.dom, e;
-
-			if (e = d.getParent(ed.selection.getNode(), d.isBlock))
-				d.setAttrib(e, v.name, v.value);
-		},
-
-		mceSetContent : function(u, v) {
-			this.editor.setContent(v);
-		},
-
-		mceToggleVisualAid : function() {
-			var ed = this.editor;
-
-			ed.hasVisual = !ed.hasVisual;
-			ed.addVisual();
-		},
-
-		mceReplaceContent : function(u, v) {
-			var s = this.editor.selection;
-
-			s.setContent(v.replace(/\{\$selection\}/g, s.getContent({format : 'text'})));
-		},
-
-		mceInsertLink : function(u, v) {
-			var ed = this.editor, s = ed.selection, e = ed.dom.getParent(s.getNode(), 'A');
-
-			if (tinymce.is(v, 'string'))
-				v = {href : v};
-
-			function set(e) {
-				each(v, function(v, k) {
-					ed.dom.setAttrib(e, k, v);
-				});
-			};
-
-			if (!e) {
-				ed.execCommand('CreateLink', false, 'javascript:mctmp(0);');
-				each(ed.dom.select('a'), function(e) {
-					if (e.href == 'javascript:mctmp(0);')
-						set(e);
-				});
-			} else {
-				if (v.href)
-					set(e);
-				else
-					ed.dom.remove(e, 1);
-			}
-		},
-
-		UnLink : function() {
-			var ed = this.editor, s = ed.selection;
-
-			if (s.isCollapsed())
-				s.select(s.getNode());
-
-			ed.getDoc().execCommand('unlink', false, null);
-			s.collapse(0);
-		},
-
-		FontName : function(u, v) {
-			var t = this, ed = t.editor, s = ed.selection, e;
-
-			if (!v) {
-				if (s.isCollapsed())
-					s.select(s.getNode());
-
-				t.RemoveFormat();
-			} else
-				ed.getDoc().execCommand('FontName', false, v);
-		},
-
-		FontSize : function(u, v) {
-			var ed = this.editor, s = ed.settings, fz = tinymce.explode(s.font_size_style_values), fzc = tinymce.explode(s.font_size_classes), h, bm;
-
-			// Remove style sizes
-			each(ed.dom.select('font'), function(e) {
-				e.style.fontSize = '';
-			});
-
-			// Let the browser add new size it will remove unneded ones in some browsers
-			ed.getDoc().execCommand('FontSize', false, v);
-
-			// Add style values
-			if (s.inline_styles) {
-				each(ed.dom.select('font'), function(e) {
-					// Try remove redundant font elements
-					if (e.parentNode.nodeName == 'FONT' && e.size == e.parentNode.size) {
-						if (!bm)
-							bm = ed.selection.getBookmark();
-
-						ed.dom.remove(e, 1);
-						return;
-					}
-
-					// Setup font size based on font size value
-					if (v = e.size) {
-						if (fzc && fzc.length > 0)
-							ed.dom.setAttrib(e, 'class', fzc[parseInt(v) - 1]);
-						else
-							ed.dom.setStyle(e, 'fontSize', fz[parseInt(v) - 1]);
-					}
-				});
-			}
-
-			ed.selection.moveToBookmark(bm);
-		},
-
-		queryCommandValue : function(c) {
-			var f = this['queryValue' + c];
-
-			if (f)
-				return f.call(this, c);
-
-			return false;
-		},
-
-		queryCommandState : function(cmd) {
-			var f;
-
-			switch (cmd) {
-				// Bundle these together
-				case 'JustifyLeft':
-				case 'JustifyCenter':
-				case 'JustifyRight':
-				case 'JustifyFull':
-					return this.queryStateJustify(cmd, cmd.substring(7).toLowerCase());
-
-				default:
-					if (f = this['queryState' + cmd])
-						return f.call(this, cmd);
-			}
-
-			return -1;
-		},
-
-		_queryState : function(c) {
-			try {
-				return this.editor.getDoc().queryCommandState(c);
-			} catch (ex) {
-				// Ignore exception
-			}
-		},
-
-		_queryVal : function(c) {
-			try {
-				return this.editor.getDoc().queryCommandValue(c);
-			} catch (ex) {
-				// Ignore exception
-			}
-		},
-
-		queryValueFontSize : function() {
-			var ed = this.editor, v = 0, p;
-
-			if (isOpera || isWebKit) {
-				if (p = ed.dom.getParent(ed.selection.getNode(), 'FONT'))
-					v = p.size;
-
-				return v;
-			}
-
-			return this._queryVal('FontSize');
-		},
-
-		queryValueFontName : function() {
-			var ed = this.editor, v = 0, p;
-
-			if (p = ed.dom.getParent(ed.selection.getNode(), 'FONT'))
-				v = p.face;
-
-			if (!v)
-				v = this._queryVal('FontName');
-
-			return v;
-		},
-
-		mceJustify : function(c, v) {
-			var ed = this.editor, se = ed.selection, n = se.getNode(), nn = n.nodeName, bl, nb, dom = ed.dom, rm;
-
-			if (ed.settings.inline_styles && this.queryStateJustify(c, v))
-				rm = 1;
-
-			bl = dom.getParent(n, ed.dom.isBlock);
-
-			if (nn == 'IMG') {
-				if (v == 'full')
-					return;
-
-				if (rm) {
-					if (v == 'center')
-						dom.setStyle(bl || n.parentNode, 'textAlign', '');
-
-					dom.setStyle(n, 'float', '');
-					this.mceRepaint();
-					return;
-				}
-
-				if (v == 'center') {
-					// Do not change table elements
-					if (bl && /^(TD|TH)$/.test(bl.nodeName))
-						bl = 0;
-
-					if (!bl || bl.childNodes.length > 1) {
-						nb = dom.create('p');
-						nb.appendChild(n.cloneNode(false));
-
-						if (bl)
-							dom.insertAfter(nb, bl);
-						else
-							dom.insertAfter(nb, n);
-
-						dom.remove(n);
-						n = nb.firstChild;
-						bl = nb;
-					}
-
-					dom.setStyle(bl, 'textAlign', v);
-					dom.setStyle(n, 'float', '');
-				} else {
-					dom.setStyle(n, 'float', v);
-					dom.setStyle(bl || n.parentNode, 'textAlign', '');
-				}
-
-				this.mceRepaint();
-				return;
-			}
-
-			// Handle the alignment outselfs, less quirks in all browsers
-			if (ed.settings.inline_styles && ed.settings.forced_root_block) {
-				if (rm)
-					v = '';
-
-				each(this._getSelectedBlocks(dom.getParent(se.getStart(), dom.isBlock), dom.getParent(se.getEnd(), dom.isBlock)), function(e) {
-					dom.setAttrib(e, 'align', '');
-					dom.setStyle(e, 'textAlign', v == 'full' ? 'justify' : v);
-				});
-
-				return;
-			} else if (!rm)
-				ed.getDoc().execCommand(c, false, null);
-
-			if (ed.settings.inline_styles) {
-				if (rm) {
-					dom.getParent(ed.selection.getNode(), function(n) {
-						if (n.style && n.style.textAlign)
-							dom.setStyle(n, 'textAlign', '');
-					});
-
-					return;
-				}
-
-				each(dom.select('*'), function(n) {
-					var v = n.align;
-
-					if (v) {
-						if (v == 'full')
-							v = 'justify';
-
-						dom.setStyle(n, 'textAlign', v);
-						dom.setAttrib(n, 'align', '');
-					}
-				});
-			}
-		},
-
-		mceSetCSSClass : function(u, v) {
-			this.mceSetStyleInfo(0, {command : 'setattrib', name : 'class', value : v});
-		},
-
-		getSelectedElement : function() {
-			var t = this, ed = t.editor, dom = ed.dom, se = ed.selection, r = se.getRng(), r1, r2, sc, ec, so, eo, e, sp, ep, re;
-
-			if (se.isCollapsed() || r.item)
-				return se.getNode();
-
-			// Setup regexp
-			re = ed.settings.merge_styles_invalid_parents;
-			if (tinymce.is(re, 'string'))
-				re = new RegExp(re, 'i');
-
-			if (isIE) {
-				r1 = r.duplicate();
-				r1.collapse(true);
-				sc = r1.parentElement();
-
-				r2 = r.duplicate();
-				r2.collapse(false);
-				ec = r2.parentElement();
-
-				if (sc != ec) {
-					r1.move('character', 1);
-					sc = r1.parentElement();
-				}
-
-				if (sc == ec) {
-					r1 = r.duplicate();
-					r1.moveToElementText(sc);
-
-					if (r1.compareEndPoints('StartToStart', r) == 0 && r1.compareEndPoints('EndToEnd', r) == 0)
-						return re && re.test(sc.nodeName) ? null : sc;
-				}
-			} else {
-				function getParent(n) {
-					return dom.getParent(n, function(n) {return n.nodeType == 1;});
-				};
-
-				sc = r.startContainer;
-				ec = r.endContainer;
-				so = r.startOffset;
-				eo = r.endOffset;
-
-				if (!r.collapsed) {
-					if (sc == ec) {
-						if (so - eo < 2) {
-							if (sc.hasChildNodes()) {
-								sp = sc.childNodes[so];
-								return re && re.test(sp.nodeName) ? null : sp;
-							}
-						}
-					}
-				}
-
-				if (sc.nodeType != 3 || ec.nodeType != 3)
-					return null;
-
-				if (so == 0) {
-					sp = getParent(sc);
-
-					if (sp && sp.firstChild != sc)
-						sp = null;
-				}
-
-				if (so == sc.nodeValue.length) {
-					e = sc.nextSibling;
-
-					if (e && e.nodeType == 1)
-						sp = sc.nextSibling;
-				}
-
-				if (eo == 0) {
-					e = ec.previousSibling;
-
-					if (e && e.nodeType == 1)
-						ep = e;
-				}
-
-				if (eo == ec.nodeValue.length) {
-					ep = getParent(ec);
-
-					if (ep && ep.lastChild != ec)
-						ep = null;
-				}
-
-				// Same element
-				if (sp == ep)
-					return re && sp && re.test(sp.nodeName) ? null : sp;
-			}
-
-			return null;
-		},
-
-		InsertHorizontalRule : function() {
-			// Fix for Gecko <hr size="1" /> issue and IE bug rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");
-			if (isGecko || isIE)
-				this.editor.selection.setContent('<hr />');
-			else
-				this.editor.getDoc().execCommand('InsertHorizontalRule', false, '');
-		},
-
-		RemoveFormat : function() {
-			var t = this, ed = t.editor, s = ed.selection, b;
-
-			// Safari breaks tables
-			if (isWebKit)
-				s.setContent(s.getContent({format : 'raw'}).replace(/(<(span|b|i|strong|em|strike) [^>]+>|<(span|b|i|strong|em|strike)>|<\/(span|b|i|strong|em|strike)>|)/g, ''), {format : 'raw'});
-			else
-				ed.getDoc().execCommand('RemoveFormat', false, null);
-
-			t.mceSetStyleInfo(0, {command : 'removeformat'});
-			ed.addVisual();
-		},
-
-		mceSetStyleInfo : function(u, v) {
-			var t = this, ed = t.editor, d = ed.getDoc(), dom = ed.dom, e, b, s = ed.selection, nn = v.wrapper || 'span', b = s.getBookmark(), re;
-
-			function set(n, e) {
-				if (n.nodeType == 1) {
-					switch (v.command) {
-						case 'setattrib':
-							return dom.setAttrib(n, v.name, v.value);
-
-						case 'setstyle':
-							return dom.setStyle(n, v.name, v.value);
-
-						case 'removeformat':
-							return dom.setAttrib(n, 'class', '');
-					}
-				}
-			};
-
-			// Setup regexp
-			re = ed.settings.merge_styles_invalid_parents;
-			if (tinymce.is(re, 'string'))
-				re = new RegExp(re, 'i');
-
-			// Set style info on selected element
-			if ((e = t.getSelectedElement()) && !ed.settings.force_span_wrappers)
-				set(e, 1);
-			else {
-				// Generate wrappers and set styles on them
-				d.execCommand('FontName', false, '__');
-				each(isWebKit ? dom.select('span') : dom.select('font'), function(n) {
-					var sp, e;
-
-					if (dom.getAttrib(n, 'face') == '__' || n.style.fontFamily === '__') {
-						sp = dom.create(nn, {mce_new : '1'});
-
-						set(sp);
-
-						each (n.childNodes, function(n) {
-							sp.appendChild(n.cloneNode(true));
-						});
-
-						dom.replace(sp, n);
-					}
-				});
-			}
-
-			// Remove wrappers inside new ones
-			each(dom.select(nn).reverse(), function(n) {
-				var p = n.parentNode;
-
-				// Check if it's an old span in a new wrapper
-				if (!dom.getAttrib(n, 'mce_new')) {
-					// Find new wrapper
-					p = dom.getParent(n, function(n) {
-						return n.nodeType == 1 && dom.getAttrib(n, 'mce_new');
-					});
-
-					if (p)
-						dom.remove(n, 1);
-				}
-			});
-
-			// Merge wrappers with parent wrappers
-			each(dom.select(nn).reverse(), function(n) {
-				var p = n.parentNode;
-
-				if (!p || !dom.getAttrib(n, 'mce_new'))
-					return;
-
-				if (ed.settings.force_span_wrappers && p.nodeName != 'SPAN')
-					return;
-
-				// Has parent of the same type and only child
-				if (p.nodeName == nn.toUpperCase() && p.childNodes.length == 1)
-					return dom.remove(p, 1);
-
-				// Has parent that is more suitable to have the class and only child
-				if (n.nodeType == 1 && (!re || !re.test(p.nodeName)) && p.childNodes.length == 1) {
-					set(p); // Set style info on parent instead
-					dom.setAttrib(n, 'class', '');
-				}
-			});
-
-			// Remove empty wrappers
-			each(dom.select(nn).reverse(), function(n) {
-				if (dom.getAttrib(n, 'mce_new') || (dom.getAttribs(n).length <= 1 && n.className === '')) {
-					if (!dom.getAttrib(n, 'class') && !dom.getAttrib(n, 'style'))
-						return dom.remove(n, 1);
-
-					dom.setAttrib(n, 'mce_new', ''); // Remove mce_new marker
-				}
-			});
-
-			s.moveToBookmark(b);
-		},
-
-		queryStateJustify : function(c, v) {
-			var ed = this.editor, n = ed.selection.getNode(), dom = ed.dom;
-
-			if (n && n.nodeName == 'IMG') {
-				if (dom.getStyle(n, 'float') == v)
-					return 1;
-
-				return n.parentNode.style.textAlign == v;
-			}
-
-			n = dom.getParent(ed.selection.getStart(), function(n) {
-				return n.nodeType == 1 && n.style.textAlign;
-			});
-
-			if (v == 'full')
-				v = 'justify';
-
-			if (ed.settings.inline_styles)
-				return (n && n.style.textAlign == v);
-
-			return this._queryState(c);
-		},
-
-		HiliteColor : function(ui, val) {
-			var t = this, ed = t.editor, d = ed.getDoc();
-
-			function set(s) {
-				if (!isGecko)
-					return;
-
-				try {
-					// Try new Gecko method
-					d.execCommand("styleWithCSS", 0, s);
-				} catch (ex) {
-					// Use old
-					d.execCommand("useCSS", 0, !s);
-				}
-			};
-
-			if (isGecko || isOpera) {
-				set(true);
-				d.execCommand('hilitecolor', false, val);
-				set(false);
-			} else
-				d.execCommand('BackColor', false, val);
-		},
-
-		Undo : function() {
-			var ed = this.editor;
-
-			if (ed.settings.custom_undo_redo) {
-				ed.undoManager.undo();
-				ed.nodeChanged();
-			} else
-				ed.getDoc().execCommand('Undo', false, null);
-		},
-
-		Redo : function() {
-			var ed = this.editor;
-
-			if (ed.settings.custom_undo_redo) {
-				ed.undoManager.redo();
-				ed.nodeChanged();
-			} else
-				ed.getDoc().execCommand('Redo', false, null);
-		},
-
-		FormatBlock : function(ui, val) {
-			var t = this, ed = t.editor, s = ed.selection, dom = ed.dom, bl, nb, b;
-
-			function isBlock(n) {
-				return /^(P|DIV|H[1-6]|ADDRESS|BLOCKQUOTE|PRE)$/.test(n.nodeName);
-			};
-
-			bl = dom.getParent(s.getNode(), function(n) {
-				return isBlock(n);
-			});
-
-			// IE has an issue where it removes the parent div if you change format on the paragrah in <div><p>Content</p></div>
-			// FF and Opera doesn't change parent DIV elements if you switch format
-			if (bl) {
-				if ((isIE && isBlock(bl.parentNode)) || bl.nodeName == 'DIV') {
-					// Rename block element
-					nb = ed.dom.create(val);
-
-					each(dom.getAttribs(bl), function(v) {
-						dom.setAttrib(nb, v.nodeName, dom.getAttrib(bl, v.nodeName));
-					});
-
-					b = s.getBookmark();
-					dom.replace(nb, bl, 1);
-					s.moveToBookmark(b);
-					ed.nodeChanged();
-					return;
-				}
-			}
-
-			val = ed.settings.forced_root_block ? (val || '<p>') : val;
-
-			if (val.indexOf('<') == -1)
-				val = '<' + val + '>';
-
-			if (tinymce.isGecko)
-				val = val.replace(/<(div|blockquote|code|dt|dd|dl|samp)>/gi, '$1');
-
-			ed.getDoc().execCommand('FormatBlock', false, val);
-		},
-
-		mceCleanup : function() {
-			var ed = this.editor, s = ed.selection, b = s.getBookmark();
-			ed.setContent(ed.getContent());
-			s.moveToBookmark(b);
-		},
-
-		mceRemoveNode : function(ui, val) {
-			var ed = this.editor, s = ed.selection, b, n = val || s.getNode();
-
-			// Make sure that the body node isn't removed
-			if (n == ed.getBody())
-				return;
-
-			b = s.getBookmark();
-			ed.dom.remove(n, 1);
-			s.moveToBookmark(b);
-			ed.nodeChanged();
-		},
-
-		mceSelectNodeDepth : function(ui, val) {
-			var ed = this.editor, s = ed.selection, c = 0;
-
-			ed.dom.getParent(s.getNode(), function(n) {
-				if (n.nodeType == 1 && c++ == val) {
-					s.select(n);
-					ed.nodeChanged();
-					return false;
-				}
-			}, ed.getBody());
-		},
-
-		mceSelectNode : function(u, v) {
-			this.editor.selection.select(v);
-		},
-
-		mceInsertContent : function(ui, val) {
-			this.editor.selection.setContent(val);
-		},
-
-		mceInsertRawHTML : function(ui, val) {
-			var ed = this.editor;
-
-			ed.selection.setContent('tiny_mce_marker');
-			ed.setContent(ed.getContent().replace(/tiny_mce_marker/g, val));
-		},
-
-		mceRepaint : function() {
-			var s, b, e = this.editor;
-
-			if (tinymce.isGecko) {
-				try {
-					s = e.selection;
-					b = s.getBookmark(true);
-
-					if (s.getSel())
-						s.getSel().selectAllChildren(e.getBody());
-
-					s.collapse(true);
-					s.moveToBookmark(b);
-				} catch (ex) {
-					// Ignore
-				}
-			}
-		},
-
-		queryStateUnderline : function() {
-			var ed = this.editor, n = ed.selection.getNode();
-
-			if (n && n.nodeName == 'A')
-				return false;
-
-			return this._queryState('Underline');
-		},
-
-		queryStateOutdent : function() {
-			var ed = this.editor, n;
-
-			if (ed.settings.inline_styles) {
-				if ((n = ed.dom.getParent(ed.selection.getStart(), ed.dom.isBlock)) && parseInt(n.style.paddingLeft) > 0)
-					return true;
-
-				if ((n = ed.dom.getParent(ed.selection.getEnd(), ed.dom.isBlock)) && parseInt(n.style.paddingLeft) > 0)
-					return true;
-			} else
-				return !!ed.dom.getParent(ed.selection.getNode(), 'BLOCKQUOTE');
-
-			return this.queryStateInsertUnorderedList() || this.queryStateInsertOrderedList();
-		},
-
-		queryStateInsertUnorderedList : function() {
-			return this.editor.dom.getParent(this.editor.selection.getNode(), 'UL');
-		},
-
-		queryStateInsertOrderedList : function() {
-			return this.editor.dom.getParent(this.editor.selection.getNode(), 'OL');
-		},
-
-		queryStatemceBlockQuote : function() {
-			return !!this.editor.dom.getParent(this.editor.selection.getStart(), function(n) {return n.nodeName === 'BLOCKQUOTE';});
-		},
-
-		mceBlockQuote : function() {
-			var t = this, ed = t.editor, s = ed.selection, dom = ed.dom, sb, eb, n, bm, bq, r, bq2, i, nl;
-
-			function getBQ(e) {
-				return dom.getParent(e, function(n) {return n.nodeName === 'BLOCKQUOTE';});
-			};
-
-			// Get start/end block
-			sb = dom.getParent(s.getStart(), dom.isBlock);
-			eb = dom.getParent(s.getEnd(), dom.isBlock);
-
-			// Remove blockquote(s)
-			if (bq = getBQ(sb)) {
-				if (sb != eb || sb.childNodes.length > 1 || (sb.childNodes.length == 1 && sb.firstChild.nodeName != 'BR'))
-					bm = s.getBookmark();
-
-				// Move all elements after the end block into new bq
-				if (getBQ(eb)) {
-					bq2 = bq.cloneNode(false);
-
-					while (n = eb.nextSibling)
-						bq2.appendChild(n.parentNode.removeChild(n));
-				}
-
-				// Add new bq after
-				if (bq2)
-					dom.insertAfter(bq2, bq);
-
-				// Move all selected blocks after the current bq
-				nl = t._getSelectedBlocks(sb, eb);
-				for (i = nl.length - 1; i >= 0; i--) {
-					dom.insertAfter(nl[i], bq);
-				}
-
-				// Empty bq, then remove it
-				if (/^\s*$/.test(bq.innerHTML))
-					dom.remove(bq, 1); // Keep children so boomark restoration works correctly
-
-				// Empty bq, then remote it
-				if (bq2 && /^\s*$/.test(bq2.innerHTML))
-					dom.remove(bq2, 1); // Keep children so boomark restoration works correctly
-
-				if (!bm) {
-					// Move caret inside empty block element
-					if (!isIE) {
-						r = ed.getDoc().createRange();
-						r.setStart(sb, 0);
-						r.setEnd(sb, 0);
-						s.setRng(r);
-					} else {
-						s.select(sb);
-						s.collapse(0);
-
-						// IE misses the empty block some times element so we must move back the caret
-						if (dom.getParent(s.getStart(), dom.isBlock) != sb) {
-							r = s.getRng();
-							r.move('character', -1);
-							r.select();
-						}
-					}
-				} else
-					t.editor.selection.moveToBookmark(bm);
-
-				return;
-			}
-
-			// Since IE can start with a totally empty document we need to add the first bq and paragraph
-			if (isIE && !sb && !eb) {
-				t.editor.getDoc().execCommand('Indent');
-				n = getBQ(s.getNode());
-				n.style.margin = n.dir = ''; // IE adds margin and dir to bq
-				return;
-			}
-
-			if (!sb || !eb)
-				return;
-
-			// If empty paragraph node then do not use bookmark
-			if (sb != eb || sb.childNodes.length > 1 || (sb.childNodes.length == 1 && sb.firstChild.nodeName != 'BR'))
-				bm = s.getBookmark();
-
-			// Move selected block elements into a bq
-			each(t._getSelectedBlocks(getBQ(s.getStart()), getBQ(s.getEnd())), function(e) {
-				// Found existing BQ add to this one
-				if (e.nodeName == 'BLOCKQUOTE' && !bq) {
-					bq = e;
-					return;
-				}
-
-				// No BQ found, create one
-				if (!bq) {
-					bq = dom.create('blockquote');
-					e.parentNode.insertBefore(bq, e);
-				}
-
-				// Add children from existing BQ
-				if (e.nodeName == 'BLOCKQUOTE' && bq) {
-					n = e.firstChild;
-
-					while (n) {
-						bq.appendChild(n.cloneNode(true));
-						n = n.nextSibling;
-					}
-
-					dom.remove(e);
-					return;
-				}
-
-				// Add non BQ element to BQ
-				bq.appendChild(dom.remove(e));
-			});
-
-			if (!bm) {
-				// Move caret inside empty block element
-				if (!isIE) {
-					r = ed.getDoc().createRange();
-					r.setStart(sb, 0);
-					r.setEnd(sb, 0);
-					s.setRng(r);
-				} else {
-					s.select(sb);
-					s.collapse(1);
-				}
-			} else
-				s.moveToBookmark(bm);
-		},
-/*
-		_mceBlockQuote : function() {
-			var t = this, s = t.editor.selection, b = s.getBookmark(), bq, dom = t.editor.dom;
-
-			function findBQ(e) {
-				return dom.getParent(e, function(n) {return n.nodeName === 'BLOCKQUOTE';});
-			};
-
-			// Remove blockquote(s)
-			if (findBQ(s.getStart())) {
-				each(t._getSelectedBlocks(findBQ(s.getStart()), findBQ(s.getEnd())), function(e) {
-					// Found BQ lets remove it
-					if (e.nodeName == 'BLOCKQUOTE')
-						dom.remove(e, 1);
-				});
-
-				t.editor.selection.moveToBookmark(b);
-				return;
-			}
-
-			each(t._getSelectedBlocks(findBQ(s.getStart()), findBQ(s.getEnd())), function(e) {
-				var n;
-
-				// Found existing BQ add to this one
-				if (e.nodeName == 'BLOCKQUOTE' && !bq) {
-					bq = e;
-					return;
-				}
-
-				// No BQ found, create one
-				if (!bq) {
-					bq = dom.create('blockquote');
-					e.parentNode.insertBefore(bq, e);
-				}
-
-				// Add children from existing BQ
-				if (e.nodeName == 'BLOCKQUOTE' && bq) {
-					n = e.firstChild;
-
-					while (n) {
-						bq.appendChild(n.cloneNode(true));
-						n = n.nextSibling;
-					}
-
-					dom.remove(e);
-
-					return;
-				}
-
-				// Add non BQ element to BQ
-				bq.appendChild(dom.remove(e));
-			});
-
-			t.editor.selection.moveToBookmark(b);
-		},
-*/
-		_getSelectedBlocks : function(st, en) {
-			var ed = this.editor, dom = ed.dom, s = ed.selection, sb, eb, n, bl = [];
-
-			sb = dom.getParent(st || s.getStart(), dom.isBlock);
-			eb = dom.getParent(en || s.getEnd(), dom.isBlock);
-
-			if (sb)
-				bl.push(sb);
-
-			if (sb && eb && sb != eb) {
-				n = sb;
-
-				while ((n = n.nextSibling) && n != eb) {
-					if (dom.isBlock(n))
-						bl.push(n);
-				}
-			}
-
-			if (eb && sb != eb)
-				bl.push(eb);
-
-			return bl;
-		}
-	});
-})();
-
-
-/* file:jscripts/tiny_mce/classes/UndoManager.js */
-
-tinymce.create('tinymce.UndoManager', {
-	index : 0,
-	data : null,
-	typing : 0,
-
-	UndoManager : function(ed) {
-		var t = this, Dispatcher = tinymce.util.Dispatcher;
-
-		t.editor = ed;
-		t.data = [];
-		t.onAdd = new Dispatcher(this);
-		t.onUndo = new Dispatcher(this);
-		t.onRedo = new Dispatcher(this);
-	},
-
-	add : function(l) {
-		var t = this, i, ed = t.editor, b, s = ed.settings, la;
-
-		l = l || {};
-		l.content = l.content || ed.getContent({format : 'raw', no_events : 1});
-
-		// Add undo level if needed
-		l.content = l.content.replace(/^\s*|\s*$/g, '');
-		la = t.data[t.index > 0 && (t.index == 0 || t.index == t.data.length) ? t.index - 1 : t.index];
-		if (!l.initial && la && l.content == la.content)
-			return null;
-
-		// Time to compress
-		if (s.custom_undo_redo_levels) {
-			if (t.data.length > s.custom_undo_redo_levels) {
-				for (i = 0; i < t.data.length - 1; i++)
-					t.data[i] = t.data[i + 1];
-
-				t.data.length--;
-				t.index = t.data.length;
-			}
-		}
-
-		if (s.custom_undo_redo_restore_selection && !l.initial)
-			l.bookmark = b = l.bookmark || ed.selection.getBookmark();
-
-		if (t.index < t.data.length)
-			t.index++;
-
-		// Only initial marked undo levels should be allowed as first item
-		// This to workaround a bug with Firefox and the blur event
-		if (t.data.length === 0 && !l.initial)
-			return null;
-
-		// Add level
-		t.data.length = t.index + 1;
-		t.data[t.index++] = l;
-
-		if (l.initial)
-			t.index = 0;
-
-		// Set initial bookmark use first real undo level
-		if (t.data.length == 2 && t.data[0].initial)
-			t.data[0].bookmark = b;
-
-		t.onAdd.dispatch(t, l);
-		ed.isNotDirty = 0;
-
-		//console.dir(t.data);
-
-		return l;
-	},
-
-	undo : function() {
-		var t = this, ed = t.editor, l = l, i;
-
-		if (t.typing) {
-			t.add();
-			t.typing = 0;
-		}
-
-		if (t.index > 0) {
-			// If undo on last index then take snapshot
-			if (t.index == t.data.length && t.index > 1) {
-				i = t.index;
-				t.typing = 0;
-
-				if (!t.add())
-					t.index = i;
-
-				--t.index;
-			}
-
-			l = t.data[--t.index];
-			ed.setContent(l.content, {format : 'raw'});
-			ed.selection.moveToBookmark(l.bookmark);
-
-			t.onUndo.dispatch(t, l);
-		}
-
-		return l;
-	},
-
-	redo : function() {
-		var t = this, ed = t.editor, l = null;
-
-		if (t.index < t.data.length - 1) {
-			l = t.data[++t.index];
-			ed.setContent(l.content, {format : 'raw'});
-			ed.selection.moveToBookmark(l.bookmark);
-
-			t.onRedo.dispatch(t, l);
-		}
-
-		return l;
-	},
-
-	clear : function() {
-		var t = this;
-
-		t.data = [];
-		t.index = 0;
-		t.typing = 0;
-		t.add({initial : true});
-	},
-
-	hasUndo : function() {
-		return this.index != 0 || this.typing;
-	},
-
-	hasRedo : function() {
-		return this.index < this.data.length - 1;
-	}
-
-	});
-/* file:jscripts/tiny_mce/classes/ForceBlocks.js */
-
-(function() {
-	// Shorten names
-	var Event, isIE, isGecko, isOpera, each, extend;
-
-	Event = tinymce.dom.Event;
-	isIE = tinymce.isIE;
-	isGecko = tinymce.isGecko;
-	isOpera = tinymce.isOpera;
-	each = tinymce.each;
-	extend = tinymce.extend;
-
-	tinymce.create('tinymce.ForceBlocks', {
-		ForceBlocks : function(ed) {
-			var t = this, s = ed.settings, elm;
-
-			t.editor = ed;
-			t.dom = ed.dom;
-			elm = (s.forced_root_block || 'p').toLowerCase();
-			s.element = elm.toUpperCase();
-
-			ed.onPreInit.add(t.setup, t);
-
-			t.reOpera = new RegExp('(\\u00a0|&#160;|&nbsp;)<\/' + elm + '>', 'gi');
-			t.rePadd = new RegExp('<p( )([^>]+)><\\\/p>|<p( )([^>]+)\\\/>|<p( )([^>]+)>\\s+<\\\/p>|<p><\\\/p>|<p\\\/>|<p>\\s+<\\\/p>'.replace(/p/g, elm), 'gi');
-			t.reNbsp2BR1 = new RegExp('<p( )([^>]+)>[\\s\\u00a0]+<\\\/p>|<p>[\\s\\u00a0]+<\\\/p>'.replace(/p/g, elm), 'gi');
-			t.reNbsp2BR2 = new RegExp('<p( )([^>]+)>(&nbsp;|&#160;)<\\\/p>|<p>(&nbsp;|&#160;)<\\\/p>'.replace(/p/g, elm), 'gi');
-			t.reBR2Nbsp = new RegExp('<p( )([^>]+)>\\s*<br \\\/>\\s*<\\\/p>|<p>\\s*<br \\\/>\\s*<\\\/p>'.replace(/p/g, elm), 'gi');
-			t.reTrailBr = new RegExp('\\s*<br \\/>\\s*<\\\/p>'.replace(/p/g, elm), 'gi');
-
-			function padd(ed, o) {
-				if (isOpera)
-					o.content = o.content.replace(t.reOpera, '</' + elm + '>');
-
-				o.content = o.content.replace(t.rePadd, '<' + elm + '$1$2$3$4$5$6>\u00a0</' + elm + '>');
-
-				if (!isIE && !isOpera && o.set) {
-					// Use &nbsp; instead of BR in padded paragraphs
-					o.content = o.content.replace(t.reNbsp2BR1, '<' + elm + '$1$2><br /></' + elm + '>');
-					o.content = o.content.replace(t.reNbsp2BR2, '<' + elm + '$1$2><br /></' + elm + '>');
-				} else {
-					o.content = o.content.replace(t.reBR2Nbsp, '<' + elm + '$1$2>\u00a0</' + elm + '>');
-					o.content = o.content.replace(t.reTrailBr, '</' + elm + '>');
-				}
-			};
-
-			ed.onBeforeSetContent.add(padd);
-			ed.onPostProcess.add(padd);
-
-			if (s.forced_root_block) {
-				ed.onInit.add(t.forceRoots, t);
-				ed.onSetContent.add(t.forceRoots, t);
-				ed.onBeforeGetContent.add(t.forceRoots, t);
-			}
-		},
-
-		setup : function() {
-			var t = this, ed = t.editor, s = ed.settings;
-
-			// Force root blocks when typing and when getting output
-			if (s.forced_root_block) {
-				ed.onKeyUp.add(t.forceRoots, t);
-				ed.onPreProcess.add(t.forceRoots, t);
-			}
-
-			if (s.force_br_newlines) {
-				// Force IE to produce BRs on enter
-				if (isIE) {
-					ed.onKeyPress.add(function(ed, e) {
-						var n, s = ed.selection;
-
-						if (e.keyCode == 13 && s.getNode().nodeName != 'LI') {
-							s.setContent('<br id="__" /> ', {format : 'raw'});
-							n = ed.dom.get('__');
-							n.removeAttribute('id');
-							s.select(n);
-							s.collapse();
-							return Event.cancel(e);
-						}
-					});
-				}
-
-				return;
-			}
-
-			if (!isIE && s.force_p_newlines) {
-/*				ed.onPreProcess.add(function(ed, o) {
-					each(ed.dom.select('br', o.node), function(n) {
-						var p = n.parentNode;
-
-						// Replace <p><br /></p> with <p>&nbsp;</p>
-						if (p && p.nodeName == 'p' && (p.childNodes.length == 1 || p.lastChild == n)) {
-							p.replaceChild(ed.getDoc().createTextNode('\u00a0'), n);
-						}
-					});
-				});*/
-
-				ed.onKeyPress.add(function(ed, e) {
-					if (e.keyCode == 13 && !e.shiftKey) {
-						if (!t.insertPara(e))
-							Event.cancel(e);
-					}
-				});
-
-				if (isGecko) {
-					ed.onKeyDown.add(function(ed, e) {
-						if ((e.keyCode == 8 || e.keyCode == 46) && !e.shiftKey)
-							t.backspaceDelete(e, e.keyCode == 8);
-					});
-				}
-			}
-
-			function ren(rn, na) {
-				var ne = ed.dom.create(na);
-
-				each(rn.attributes, function(a) {
-					if (a.specified && a.nodeValue)
-						ne.setAttribute(a.nodeName.toLowerCase(), a.nodeValue);
-				});
-
-				each(rn.childNodes, function(n) {
-					ne.appendChild(n.cloneNode(true));
-				});
-
-				rn.parentNode.replaceChild(ne, rn);
-
-				return ne;
-			};
-
-			// Replaces IE:s auto generated paragraphs with the specified element name
-			if (isIE && s.element != 'P') {
-				ed.onKeyPress.add(function(ed, e) {
-					t.lastElm = ed.selection.getNode().nodeName;
-				});
-
-				ed.onKeyUp.add(function(ed, e) {
-					var bl, sel = ed.selection, n = sel.getNode(), b = ed.getBody();
-
-					if (b.childNodes.length === 1 && n.nodeName == 'P') {
-						n = ren(n, s.element);
-						sel.select(n);
-						sel.collapse();
-						ed.nodeChanged();
-					} else if (e.keyCode == 13 && !e.shiftKey && t.lastElm != 'P') {
-						bl = ed.dom.getParent(n, 'P');
-
-						if (bl) {
-							ren(bl, s.element);
-							ed.nodeChanged();
-						}
-					}
-				});
-			}
-		},
-
-		find : function(n, t, s) {
-			var ed = this.editor, w = ed.getDoc().createTreeWalker(n, 4, null, false), c = -1;
-
-			while (n = w.nextNode()) {
-				c++;
-
-				// Index by node
-				if (t == 0 && n == s)
-					return c;
-
-				// Node by index
-				if (t == 1 && c == s)
-					return n;
-			}
-
-			return -1;
-		},
-
-		forceRoots : function(ed, e) {
-			var t = this, ed = t.editor, b = ed.getBody(), d = ed.getDoc(), se = ed.selection, s = se.getSel(), r = se.getRng(), si = -2, ei, so, eo, tr, c = -0xFFFFFF;
-			var nx, bl, bp, sp, le, nl = b.childNodes, i;
-
-			// Fix for bug #1863847
-			if (e && e.keyCode == 13)
-				return true;
-
-			// Wrap non blocks into blocks
-			for (i = nl.length - 1; i >= 0; i--) {
-				nx = nl[i];
-
-				// Is text or non block element
-				if (nx.nodeType == 3 || (!t.dom.isBlock(nx) && nx.nodeType != 8)) {
-					if (!bl) {
-						// Create new block but ignore whitespace
-						if (nx.nodeType != 3 || /[^\s]/g.test(nx.nodeValue)) {
-							// Store selection
-							if (si == -2 && r) {
-								if (!isIE) {
-									// If element is inside body, might not be the case in contentEdiable mode
-									if (ed.dom.getParent(r.startContainer, function(e) {return e === b;})) {
-										so = r.startOffset;
-										eo = r.endOffset;
-										si = t.find(b, 0, r.startContainer);
-										ei = t.find(b, 0, r.endContainer);
-									}
-								} else {
-									tr = d.body.createTextRange();
-									tr.moveToElementText(b);
-									tr.collapse(1);
-									bp = tr.move('character', c) * -1;
-
-									tr = r.duplicate();
-									tr.collapse(1);
-									sp = tr.move('character', c) * -1;
-
-									tr = r.duplicate();
-									tr.collapse(0);
-									le = (tr.move('character', c) * -1) - sp;
-
-									si = sp - bp;
-									ei = le;
-								}
-							}
-
-							bl = ed.dom.create(ed.settings.forced_root_block);
-							bl.appendChild(nx.cloneNode(1));
-							nx.parentNode.replaceChild(bl, nx);
-						}
-					} else {
-						if (bl.hasChildNodes())
-							bl.insertBefore(nx, bl.firstChild);
-						else
-							bl.appendChild(nx);
-					}
-				} else
-					bl = null; // Time to create new block
-			}
-
-			// Restore selection
-			if (si != -2) {
-				if (!isIE) {
-					bl = b.getElementsByTagName(ed.settings.element)[0];
-					r = d.createRange();
-
-					// Select last location or generated block
-					if (si != -1)
-						r.setStart(t.find(b, 1, si), so);
-					else
-						r.setStart(bl, 0);
-
-					// Select last location or generated block
-					if (ei != -1)
-						r.setEnd(t.find(b, 1, ei), eo);
-					else
-						r.setEnd(bl, 0);
-
-					if (s) {
-						s.removeAllRanges();
-						s.addRange(r);
-					}
-				} else {
-					try {
-						r = s.createRange();
-						r.moveToElementText(b);
-						r.collapse(1);
-						r.moveStart('character', si);
-						r.moveEnd('character', ei);
-						r.select();
-					} catch (ex) {
-						// Ignore
-					}
-				}
-			}
-		},
-
-		getParentBlock : function(n) {
-			var d = this.dom;
-
-			return d.getParent(n, d.isBlock);
-		},
-
-		insertPara : function(e) {
-			var t = this, ed = t.editor, dom = ed.dom, d = ed.getDoc(), se = ed.settings, s = ed.selection.getSel(), r = s.getRangeAt(0), b = d.body;
-			var rb, ra, dir, sn, so, en, eo, sb, eb, bn, bef, aft, sc, ec, n, vp = dom.getViewPort(ed.getWin()), y, ch;
-
-			function isEmpty(n) {
-				n = n.innerHTML;
-				n = n.replace(/<(img|hr|table)/gi, '-'); // Keep these convert them to - chars
-				n = n.replace(/<[^>]+>/g, ''); // Remove all tags
-
-				return n.replace(/[ \t\r\n]+/g, '') == '';
-			};
-
-			// If root blocks are forced then use Operas default behavior since it's really good
-// Removed due to bug: #1853816
-//			if (se.forced_root_block && isOpera)
-//				return true;
-
-			// Setup before range
-			rb = d.createRange();
-
-			// If is before the first block element and in body, then move it into first block element
-			rb.setStart(s.anchorNode, s.anchorOffset);
-			rb.collapse(true);
-
-			// Setup after range
-			ra = d.createRange();
-
-			// If is before the first block element and in body, then move it into first block element
-			ra.setStart(s.focusNode, s.focusOffset);
-			ra.collapse(true);
-
-			// Setup start/end points
-			dir = rb.compareBoundaryPoints(rb.START_TO_END, ra) < 0;
-			sn = dir ? s.anchorNode : s.focusNode;
-			so = dir ? s.anchorOffset : s.focusOffset;
-			en = dir ? s.focusNode : s.anchorNode;
-			eo = dir ? s.focusOffset : s.anchorOffset;
-
-			// If selection is in empty table cell
-			if (sn === en && /^(TD|TH)$/.test(sn.nodeName)) {
-				dom.remove(sn.firstChild); // Remove BR
-
-				// Create two new block elements
-				ed.dom.add(sn, se.element, null, '<br />');
-				aft = ed.dom.add(sn, se.element, null, '<br />');
-
-				// Move caret into the last one
-				r = d.createRange();
-				r.selectNodeContents(aft);
-				r.collapse(1);
-				ed.selection.setRng(r);
-
-				return false;
-			}
-
-			// If the caret is in an invalid location in FF we need to move it into the first block
-			if (sn == b && en == b && b.firstChild && ed.dom.isBlock(b.firstChild)) {
-				sn = en = sn.firstChild;
-				so = eo = 0;
-				rb = d.createRange();
-				rb.setStart(sn, 0);
-				ra = d.createRange();
-				ra.setStart(en, 0);
-			}
-
-			// Never use body as start or end node
-			sn = sn.nodeName == "HTML" ? d.body : sn; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes
-			sn = sn.nodeName == "BODY" ? sn.firstChild : sn;
-			en = en.nodeName == "HTML" ? d.body : en; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes
-			en = en.nodeName == "BODY" ? en.firstChild : en;
-
-			// Get start and end blocks
-			sb = t.getParentBlock(sn);
-			eb = t.getParentBlock(en);
-			bn = sb ? sb.nodeName : se.element; // Get block name to create
-
-			// Return inside list use default browser behavior
-			if (t.dom.getParent(sb, function(n) { return /OL|UL|PRE/.test(n.nodeName); }))
-				return true;
-
-			// If caption or absolute layers then always generate new blocks within
-			if (sb && (sb.nodeName == 'CAPTION' || /absolute|relative|static/gi.test(sb.style.position))) {
-				bn = se.element;
-				sb = null;
-			}
-
-			// If caption or absolute layers then always generate new blocks within
-			if (eb && (eb.nodeName == 'CAPTION' || /absolute|relative|static/gi.test(eb.style.position))) {
-				bn = se.element;
-				eb = null;
-			}
-
-			// Use P instead
-			if (/(TD|TABLE|TH|CAPTION)/.test(bn) || (sb && bn == "DIV" && /left|right/gi.test(sb.style.cssFloat))) {
-				bn = se.element;
-				sb = eb = null;
-			}
-
-			// Setup new before and after blocks
-			bef = (sb && sb.nodeName == bn) ? sb.cloneNode(0) : ed.dom.create(bn);
-			aft = (eb && eb.nodeName == bn) ? eb.cloneNode(0) : ed.dom.create(bn);
-
-			// Remove id from after clone
-			aft.removeAttribute('id');
-
-			// Is header and cursor is at the end, then force paragraph under
-			if (/^(H[1-6])$/.test(bn) && sn.nodeValue && so == sn.nodeValue.length)
-				aft = ed.dom.create(se.element);
-
-			// Find start chop node
-			n = sc = sn;
-			do {
-				if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName))
-					break;
-
-				sc = n;
-			} while ((n = n.previousSibling ? n.previousSibling : n.parentNode));
-
-			// Find end chop node
-			n = ec = en;
-			do {
-				if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName))
-					break;
-
-				ec = n;
-			} while ((n = n.nextSibling ? n.nextSibling : n.parentNode));
-
-			// Place first chop part into before block element
-			if (sc.nodeName == bn)
-				rb.setStart(sc, 0);
-			else
-				rb.setStartBefore(sc);
-
-			rb.setEnd(sn, so);
-			bef.appendChild(rb.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari
-
-			// Place secnd chop part within new block element
-			try {
-				ra.setEndAfter(ec);
-			} catch(ex) {
-				//console.debug(s.focusNode, s.focusOffset);
-			}
-
-			ra.setStart(en, eo);
-			aft.appendChild(ra.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari
-
-			// Create range around everything
-			r = d.createRange();
-			if (!sc.previousSibling && sc.parentNode.nodeName == bn) {
-				r.setStartBefore(sc.parentNode);
-			} else {
-				if (rb.startContainer.nodeName == bn && rb.startOffset == 0)
-					r.setStartBefore(rb.startContainer);
-				else
-					r.setStart(rb.startContainer, rb.startOffset);
-			}
-
-			if (!ec.nextSibling && ec.parentNode.nodeName == bn)
-				r.setEndAfter(ec.parentNode);
-			else
-				r.setEnd(ra.endContainer, ra.endOffset);
-
-			// Delete and replace it with new block elements
-			r.deleteContents();
-
-			if (isOpera)
-				ed.getWin().scrollTo(0, vp.y);
-
-			// Never wrap blocks in blocks
-			if (bef.firstChild && bef.firstChild.nodeName == bn)
-				bef.innerHTML = bef.firstChild.innerHTML;
-
-			if (aft.firstChild && aft.firstChild.nodeName == bn)
-				aft.innerHTML = aft.firstChild.innerHTML;
-
-			// Padd empty blocks
-			if (isEmpty(bef))
-				bef.innerHTML = '<br />';
-
-			if (isEmpty(aft))
-				aft.innerHTML = isOpera ? '&nbsp;' : '<br />'; // Extra space for Opera so that the caret can move there
-
-			// Opera needs this one backwards for older versions
-			if (isOpera && parseFloat(opera.version()) < 9.5) {
-				r.insertNode(bef);
-				r.insertNode(aft);
-			} else {
-				r.insertNode(aft);
-				r.insertNode(bef);
-			}
-
-			// Normalize
-			aft.normalize();
-			bef.normalize();
-
-			function first(n) {
-				return d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false).nextNode() || n;
-			};
-
-			// Move cursor and scroll into view
-			r = d.createRange();
-			r.selectNodeContents(isGecko ? first(aft) : aft);
-			r.collapse(1);
-			s.removeAllRanges();
-			s.addRange(r);
-
-			// scrollIntoView seems to scroll the parent window in most browsers now including FF 3.0b4 so it's time to stop using it and do it our selfs
-			y = ed.dom.getPos(aft).y;
-			ch = aft.clientHeight;
-
-			// Is element within viewport
-			if (y < vp.y || y + ch > vp.y + vp.h) {
-				ed.getWin().scrollTo(0, y < vp.y ? y : y - vp.h + 25); // Needs to be hardcoded to roughly one line of text if a huge text block is broken into two blocks
-				//console.debug('SCROLL!', 'vp.y: ' + vp.y, 'y' + y, 'vp.h' + vp.h, 'clientHeight' + aft.clientHeight, 'yyy: ' + (y < vp.y ? y : y - vp.h + aft.clientHeight));
-			}
-
-			return false;
-		},
-
-		backspaceDelete : function(e, bs) {
-			var t = this, ed = t.editor, b = ed.getBody(), n, se = ed.selection, r = se.getRng(), sc = r.startContainer, n, w, tn;
-
-			// The caret sometimes gets stuck in Gecko if you delete empty paragraphs
-			// This workaround removes the element by hand and moves the caret to the previous element
-			if (sc && ed.dom.isBlock(sc) && !/^(TD|TH)$/.test(sc.nodeName) && bs) {
-				if (sc.childNodes.length == 0 || (sc.childNodes.length == 1 && sc.firstChild.nodeName == 'BR')) {
-					// Find previous block element
-					n = sc;
-					while ((n = n.previousSibling) && !ed.dom.isBlock(n)) ;
-
-					if (n) {
-						if (sc != b.firstChild) {
-							// Find last text node
-							w = ed.dom.doc.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);
-							while (tn = w.nextNode())
-								n = tn;
-
-							// Place caret at the end of last text node
-							r = ed.getDoc().createRange();
-							r.setStart(n, n.nodeValue ? n.nodeValue.length : 0);
-							r.setEnd(n, n.nodeValue ? n.nodeValue.length : 0);
-							se.setRng(r);
-
-							// Remove the target container
-							ed.dom.remove(sc);
-						}
-
-						return Event.cancel(e);
-					}
-				}
-			}
-
-			// Gecko generates BR elements here and there, we don't like those so lets remove them
-			function handler(e) {
-				var pr;
-
-				e = e.target;
-
-				// A new BR was created in a block element, remove it
-				if (e && e.parentNode && e.nodeName == 'BR' && (n = t.getParentBlock(e))) {
-					pr = e.previousSibling;
-
-					Event.remove(b, 'DOMNodeInserted', handler);
-
-					// Is there whitespace at the end of the node before then we might need the pesky BR
-					// to place the caret at a correct location see bug: #2013943
-					if (pr && pr.nodeType == 3 && /\s+$/.test(pr.nodeValue))
-						return;
-
-					// Only remove BR elements that got inserted in the middle of the text
-					if (e.previousSibling || e.nextSibling)
-						ed.dom.remove(e);
-				}
-			};
-
-			// Listen for new nodes
-			Event._add(b, 'DOMNodeInserted', handler);
-
-			// Remove listener
-			window.setTimeout(function() {
-				Event._remove(b, 'DOMNodeInserted', handler);
-			}, 1);
-		}
-	});
-})();
-
-/* file:jscripts/tiny_mce/classes/ControlManager.js */
-
-(function() {
-	// Shorten names
-	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, extend = tinymce.extend;
-
-	tinymce.create('tinymce.ControlManager', {
-		ControlManager : function(ed, s) {
-			var t = this, i;
-
-			s = s || {};
-			t.editor = ed;
-			t.controls = {};
-			t.onAdd = new tinymce.util.Dispatcher(t);
-			t.onPostRender = new tinymce.util.Dispatcher(t);
-			t.prefix = s.prefix || ed.id + '_';
-			t._cls = {};
-
-			t.onPostRender.add(function() {
-				each(t.controls, function(c) {
-					c.postRender();
-				});
-			});
-		},
-
-		get : function(id) {
-			return this.controls[this.prefix + id] || this.controls[id];
-		},
-
-		setActive : function(id, s) {
-			var c = null;
-
-			if (c = this.get(id))
-				c.setActive(s);
-
-			return c;
-		},
-
-		setDisabled : function(id, s) {
-			var c = null;
-
-			if (c = this.get(id))
-				c.setDisabled(s);
-
-			return c;
-		},
-
-		add : function(c) {
-			var t = this;
-
-			if (c) {
-				t.controls[c.id] = c;
-				t.onAdd.dispatch(c, t);
-			}
-
-			return c;
-		},
-
-		createControl : function(n) {
-			var c, t = this, ed = t.editor;
-
-			each(ed.plugins, function(p) {
-				if (p.createControl) {
-					c = p.createControl(n, t);
-
-					if (c)
-						return false;
-				}
-			});
-
-			switch (n) {
-				case "|":
-				case "separator":
-					return t.createSeparator();
-			}
-
-			if (!c && ed.buttons && (c = ed.buttons[n]))
-				return t.createButton(n, c);
-
-			return t.add(c);
-		},
-
-		createDropMenu : function(id, s, cc) {
-			var t = this, ed = t.editor, c, bm, v, cls;
-
-			s = extend({
-				'class' : 'mceDropDown',
-				constrain : ed.settings.constrain_menus
-			}, s);
-
-			s['class'] = s['class'] + ' ' + ed.getParam('skin') + 'Skin';
-			if (v = ed.getParam('skin_variant'))
-				s['class'] += ' ' + ed.getParam('skin') + 'Skin' + v.substring(0, 1).toUpperCase() + v.substring(1);
-
-			id = t.prefix + id;
-			cls = cc || t._cls.dropmenu || tinymce.ui.DropMenu;
-			c = t.controls[id] = new cls(id, s);
-			c.onAddItem.add(function(c, o) {
-				var s = o.settings;
-
-				s.title = ed.getLang(s.title, s.title);
-
-				if (!s.onclick) {
-					s.onclick = function(v) {
-						ed.execCommand(s.cmd, s.ui || false, s.value);
-					};
-				}
-			});
-
-			ed.onRemove.add(function() {
-				c.destroy();
-			});
-
-			// Fix for bug #1897785, #1898007
-			if (tinymce.isIE) {
-				c.onShowMenu.add(function() {
-					bm = ed.selection.getBookmark(1);
-				});
-
-				c.onHideMenu.add(function() {
-					if (bm)
-						ed.selection.moveToBookmark(bm);
-				});
-			}
-
-			return t.add(c);
-		},
-
-		createListBox : function(id, s, cc) {
-			var t = this, ed = t.editor, cmd, c, cls;
-
-			if (t.get(id))
-				return null;
-
-			s.title = ed.translate(s.title);
-			s.scope = s.scope || ed;
-
-			if (!s.onselect) {
-				s.onselect = function(v) {
-					ed.execCommand(s.cmd, s.ui || false, v || s.value);
-				};
-			}
-
-			s = extend({
-				title : s.title,
-				'class' : 'mce_' + id,
-				scope : s.scope,
-				control_manager : t
-			}, s);
-
-			id = t.prefix + id;
-
-			if (ed.settings.use_native_selects)
-				c = new tinymce.ui.NativeListBox(id, s);
-			else {
-				cls = cc || t._cls.listbox || tinymce.ui.ListBox;
-				c = new cls(id, s);
-			}
-
-			t.controls[id] = c;
-
-			// Fix focus problem in Safari
-			if (tinymce.isWebKit) {
-				c.onPostRender.add(function(c, n) {
-					// Store bookmark on mousedown
-					Event.add(n, 'mousedown', function() {
-						ed.bookmark = ed.selection.getBookmark('simple');
-					});
-
-					// Restore on focus, since it might be lost
-					Event.add(n, 'focus', function() {
-						ed.selection.moveToBookmark(ed.bookmark);
-						ed.bookmark = null;
-					});
-				});
-			}
-
-			if (c.hideMenu)
-				ed.onMouseDown.add(c.hideMenu, c);
-
-			return t.add(c);
-		},
-
-		createButton : function(id, s, cc) {
-			var t = this, ed = t.editor, o, c, cls;
-
-			if (t.get(id))
-				return null;
-
-			s.title = ed.translate(s.title);
-			s.label = ed.translate(s.label);
-			s.scope = s.scope || ed;
-
-			if (!s.onclick && !s.menu_button) {
-				s.onclick = function() {
-					ed.execCommand(s.cmd, s.ui || false, s.value);
-				};
-			}
-
-			s = extend({
-				title : s.title,
-				'class' : 'mce_' + id,
-				unavailable_prefix : ed.getLang('unavailable', ''),
-				scope : s.scope,
-				control_manager : t
-			}, s);
-
-			id = t.prefix + id;
-
-			if (s.menu_button) {
-				cls = cc || t._cls.menubutton || tinymce.ui.MenuButton;
-				c = new cls(id, s);
-				ed.onMouseDown.add(c.hideMenu, c);
-			} else {
-				cls = t._cls.button || tinymce.ui.Button;
-				c = new cls(id, s);
-			}
-
-			return t.add(c);
-		},
-
-		createMenuButton : function(id, s) {
-			s = s || {};
-			s.menu_button = 1;
-
-			return this.createButton(id, s);
-		},
-
-		createSplitButton : function(id, s, cc) {
-			var t = this, ed = t.editor, cmd, c, cls;
-
-			if (t.get(id))
-				return null;
-
-			s.title = ed.translate(s.title);
-			s.scope = s.scope || ed;
-
-			if (!s.onclick) {
-				s.onclick = function(v) {
-					ed.execCommand(s.cmd, s.ui || false, v || s.value);
-				};
-			}
-
-			if (!s.onselect) {
-				s.onselect = function(v) {
-					ed.execCommand(s.cmd, s.ui || false, v || s.value);
-				};
-			}
-
-			s = extend({
-				title : s.title,
-				'class' : 'mce_' + id,
-				scope : s.scope,
-				control_manager : t
-			}, s);
-
-			id = t.prefix + id;
-			cls = cc || t._cls.splitbutton || tinymce.ui.SplitButton;
-			c = t.add(new cls(id, s));
-			ed.onMouseDown.add(c.hideMenu, c);
-
-			return c;
-		},
-
-		createColorSplitButton : function(id, s, cc) {
-			var t = this, ed = t.editor, cmd, c, cls, bm;
-
-			if (t.get(id))
-				return null;
-
-			s.title = ed.translate(s.title);
-			s.scope = s.scope || ed;
-
-			if (!s.onclick) {
-				s.onclick = function(v) {
-					ed.execCommand(s.cmd, s.ui || false, v || s.value);
-				};
-			}
-
-			if (!s.onselect) {
-				s.onselect = function(v) {
-					ed.execCommand(s.cmd, s.ui || false, v || s.value);
-				};
-			}
-
-			s = extend({
-				title : s.title,
-				'class' : 'mce_' + id,
-				'menu_class' : ed.getParam('skin') + 'Skin',
-				scope : s.scope,
-				more_colors_title : ed.getLang('more_colors')
-			}, s);
-
-			id = t.prefix + id;
-			cls = cc || t._cls.colorsplitbutton || tinymce.ui.ColorSplitButton;
-			c = new cls(id, s);
-			ed.onMouseDown.add(c.hideMenu, c);
-
-			// Remove the menu element when the editor is removed
-			ed.onRemove.add(function() {
-				c.destroy();
-			});
-
-			// Fix for bug #1897785, #1898007
-			if (tinymce.isIE) {
-				c.onShowMenu.add(function() {
-					bm = ed.selection.getBookmark(1);
-				});
-
-				c.onHideMenu.add(function() {
-					if (bm) {
-						ed.selection.moveToBookmark(bm);
-						bm = 0;
-					}
-				});
-			}
-
-			return t.add(c);
-		},
-
-		createToolbar : function(id, s, cc) {
-			var c, t = this, cls;
-
-			id = t.prefix + id;
-			cls = cc || t._cls.toolbar || tinymce.ui.Toolbar;
-			c = new cls(id, s);
-
-			if (t.get(id))
-				return null;
-
-			return t.add(c);
-		},
-
-		createSeparator : function(cc) {
-			var cls = cc || this._cls.separator || tinymce.ui.Separator;
-
-			return new cls();
-		},
-
-		setControlType : function(n, c) {
-			return this._cls[n.toLowerCase()] = c;
-		},
-
-		destroy : function() {
-			each(this.controls, function(c) {
-				c.destroy();
-			});
-
-			this.controls = null;
-		}
-
-		});
-})();
-
-/* file:jscripts/tiny_mce/classes/WindowManager.js */
-
-(function() {
-	var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each, isIE = tinymce.isIE, isOpera = tinymce.isOpera;
-
-	tinymce.create('tinymce.WindowManager', {
-		WindowManager : function(ed) {
-			var t = this;
-
-			t.editor = ed;
-			t.onOpen = new Dispatcher(t);
-			t.onClose = new Dispatcher(t);
-			t.params = {};
-			t.features = {};
-		},
-
-		open : function(s, p) {
-			var t = this, f = '', x, y, mo = t.editor.settings.dialog_type == 'modal', w, sw, sh, vp = tinymce.DOM.getViewPort(), u;
-
-			// Default some options
-			s = s || {};
-			p = p || {};
-			sw = isOpera ? vp.w : screen.width; // Opera uses windows inside the Opera window
-			sh = isOpera ? vp.h : screen.height;
-			s.name = s.name || 'mc_' + new Date().getTime();
-			s.width = parseInt(s.width || 320);
-			s.height = parseInt(s.height || 240);
-			s.resizable = true;
-			s.left = s.left || parseInt(sw / 2.0) - (s.width / 2.0);
-			s.top = s.top || parseInt(sh / 2.0) - (s.height / 2.0);
-			p.inline = false;
-			p.mce_width = s.width;
-			p.mce_height = s.height;
-			p.mce_auto_focus = s.auto_focus;
-
-			if (mo) {
-				if (isIE) {
-					s.center = true;
-					s.help = false;
-					s.dialogWidth = s.width + 'px';
-					s.dialogHeight = s.height + 'px';
-					s.scroll = s.scrollbars || false;
-				}
-			}
-
-			// Build features string
-			each(s, function(v, k) {
-				if (tinymce.is(v, 'boolean'))
-					v = v ? 'yes' : 'no';
-
-				if (!/^(name|url)$/.test(k)) {
-					if (isIE && mo)
-						f += (f ? ';' : '') + k + ':' + v;
-					else
-						f += (f ? ',' : '') + k + '=' + v;
-				}
-			});
-
-			t.features = s;
-			t.params = p;
-			t.onOpen.dispatch(t, s, p);
-
-			u = s.url || s.file;
-			if (tinymce.relaxedDomain)
-				u += (u.indexOf('?') == -1 ? '?' : '&') + 'mce_rdomain=' + tinymce.relaxedDomain;
-
-			u = tinymce._addVer(u);
-
-			try {
-				if (isIE && mo) {
-					w = 1;
-					window.showModalDialog(u, window, f);
-				} else
-					w = window.open(u, s.name, f);
-			} catch (ex) {
-				// Ignore
-			}
-
-			if (!w)
-				alert(t.editor.getLang('popup_blocked'));
-		},
-
-		close : function(w) {
-			w.close();
-			this.onClose.dispatch(this);
-		},
-
-		createInstance : function(cl, a, b, c, d, e) {
-			var f = tinymce.resolve(cl);
-
-			return new f(a, b, c, d, e);
-		},
-
-		confirm : function(t, cb, s, w) {
-			w = w || window;
-
-			cb.call(s || this, w.confirm(this._decode(this.editor.getLang(t, t))));
-		},
-
-		alert : function(tx, cb, s, w) {
-			var t = this;
-
-			w = w || window;
-			w.alert(t._decode(t.editor.getLang(tx, tx)));
-
-			if (cb)
-				cb.call(s || t);
-		},
-
-		// Internal functions
-
-		_decode : function(s) {
-			return tinymce.DOM.decode(s).replace(/\\n/g, '\n');
-		}
-
-		});
+
+/* file:jscripts/tiny_mce/classes/tinymce.js */
+
+var tinymce = {
+	majorVersion : '3',
+	minorVersion : '1.1',
+	releaseDate : '2008-08-18',
+
+	_init : function() {
+		var t = this, d = document, w = window, na = navigator, ua = na.userAgent, i, nl, n, base, p, v;
+
+		// Browser checks
+		t.isOpera = w.opera && opera.buildNumber;
+		t.isWebKit = /WebKit/.test(ua);
+		t.isOldWebKit = t.isWebKit && !w.getSelection().getRangeAt;
+		t.isIE = !t.isWebKit && !t.isOpera && (/MSIE/gi).test(ua) && (/Explorer/gi).test(na.appName);
+		t.isIE6 = t.isIE && /MSIE [56]/.test(ua);
+		t.isGecko = !t.isWebKit && /Gecko/.test(ua);
+		t.isMac = ua.indexOf('Mac') != -1;
+
+		// TinyMCE .NET webcontrol might be setting the values for TinyMCE
+		if (w.tinyMCEPreInit) {
+			t.suffix = tinyMCEPreInit.suffix;
+			t.baseURL = tinyMCEPreInit.base;
+			t.query = tinyMCEPreInit.query;
+			return;
+		}
+
+		// Get suffix and base
+		t.suffix = '';
+
+		// If base element found, add that infront of baseURL
+		nl = d.getElementsByTagName('base');
+		for (i=0; i<nl.length; i++) {
+			if (v = nl[i].href) {
+				// Host only value like http://site.com or http://site.com:8008
+				if (/^https?:\/\/[^\/]+$/.test(v))
+					v += '/';
+
+				base = v ? v.match(/.*\//)[0] : ''; // Get only directory
+			}
+		}
+
+		function getBase(n) {
+			if (n.src && /tiny_mce(|_dev|_src|_gzip|_jquery|_prototype).js/.test(n.src)) {
+				if (/_(src|dev)\.js/g.test(n.src))
+					t.suffix = '_src';
+
+				if ((p = n.src.indexOf('?')) != -1)
+					t.query = n.src.substring(p + 1);
+
+				t.baseURL = n.src.substring(0, n.src.lastIndexOf('/'));
+
+				// If path to script is relative and a base href was found add that one infront
+				if (base && t.baseURL.indexOf('://') == -1)
+					t.baseURL = base + t.baseURL;
+
+				return t.baseURL;
+			}
+
+			return null;
+		};
+
+		// Check document
+		nl = d.getElementsByTagName('script');
+		for (i=0; i<nl.length; i++) {
+			if (getBase(nl[i]))
+				return;
+		}
+
+		// Check head
+		n = d.getElementsByTagName('head')[0];
+		if (n) {
+			nl = n.getElementsByTagName('script');
+			for (i=0; i<nl.length; i++) {
+				if (getBase(nl[i]))
+					return;
+			}
+		}
+
+		return;
+	},
+
+	is : function(o, t) {
+		var n = typeof(o);
+
+		if (!t)
+			return n != 'undefined';
+
+		if (t == 'array' && (o instanceof Array))
+			return true;
+
+		return n == t;
+	},
+
+	// #if !jquery
+
+	each : function(o, cb, s) {
+		var n, l;
+
+		if (!o)
+			return 0;
+
+		s = s || o;
+
+		if (typeof(o.length) != 'undefined') {
+			// Indexed arrays, needed for Safari
+			for (n=0, l = o.length; n<l; n++) {
+				if (cb.call(s, o[n], n, o) === false)
+					return 0;
+			}
+		} else {
+			// Hashtables
+			for (n in o) {
+				if (o.hasOwnProperty(n)) {
+					if (cb.call(s, o[n], n, o) === false)
+						return 0;
+				}
+			}
+		}
+
+		return 1;
+	},
+
+	map : function(a, f) {
+		var o = [];
+
+		tinymce.each(a, function(v) {
+			o.push(f(v));
+		});
+
+		return o;
+	},
+
+	grep : function(a, f) {
+		var o = [];
+
+		tinymce.each(a, function(v) {
+			if (!f || f(v))
+				o.push(v);
+		});
+
+		return o;
+	},
+
+	inArray : function(a, v) {
+		var i, l;
+
+		if (a) {
+			for (i = 0, l = a.length; i < l; i++) {
+				if (a[i] === v)
+					return i;
+			}
+		}
+
+		return -1;
+	},
+
+	extend : function(o, e) {
+		var i, a = arguments;
+
+		for (i=1; i<a.length; i++) {
+			e = a[i];
+
+			tinymce.each(e, function(v, n) {
+				if (typeof(v) !== 'undefined')
+					o[n] = v;
+			});
+		}
+
+		return o;
+	},
+
+	trim : function(s) {
+		return (s ? '' + s : '').replace(/^\s*|\s*$/g, '');
+	},
+
+	// #endif
+
+	create : function(s, p) {
+		var t = this, sp, ns, cn, scn, c, de = 0;
+
+		// Parse : <prefix> <class>:<super class>
+		s = /^((static) )?([\w.]+)(:([\w.]+))?/.exec(s);
+		cn = s[3].match(/(^|\.)(\w+)$/i)[2]; // Class name
+
+		// Create namespace for new class
+		ns = t.createNS(s[3].replace(/\.\w+$/, ''));
+
+		// Class already exists
+		if (ns[cn])
+			return;
+
+		// Make pure static class
+		if (s[2] == 'static') {
+			ns[cn] = p;
+
+			if (this.onCreate)
+				this.onCreate(s[2], s[3], ns[cn]);
+
+			return;
+		}
+
+		// Create default constructor
+		if (!p[cn]) {
+			p[cn] = function() {};
+			de = 1;
+		}
+
+		// Add constructor and methods
+		ns[cn] = p[cn];
+		t.extend(ns[cn].prototype, p);
+
+		// Extend
+		if (s[5]) {
+			sp = t.resolve(s[5]).prototype;
+			scn = s[5].match(/\.(\w+)$/i)[1]; // Class name
+
+			// Extend constructor
+			c = ns[cn];
+			if (de) {
+				// Add passthrough constructor
+				ns[cn] = function() {
+					return sp[scn].apply(this, arguments);
+				};
+			} else {
+				// Add inherit constructor
+				ns[cn] = function() {
+					this.parent = sp[scn];
+					return c.apply(this, arguments);
+				};
+			}
+			ns[cn].prototype[cn] = ns[cn];
+
+			// Add super methods
+			t.each(sp, function(f, n) {
+				ns[cn].prototype[n] = sp[n];
+			});
+
+			// Add overridden methods
+			t.each(p, function(f, n) {
+				// Extend methods if needed
+				if (sp[n]) {
+					ns[cn].prototype[n] = function() {
+						this.parent = sp[n];
+						return f.apply(this, arguments);
+					};
+				} else {
+					if (n != cn)
+						ns[cn].prototype[n] = f;
+				}
+			});
+		}
+
+		// Add static methods
+		t.each(p['static'], function(f, n) {
+			ns[cn][n] = f;
+		});
+
+		if (this.onCreate)
+			this.onCreate(s[2], s[3], ns[cn].prototype);
+	},
+
+	walk : function(o, f, n, s) {
+		s = s || this;
+
+		if (o) {
+			if (n)
+				o = o[n];
+
+			tinymce.each(o, function(o, i) {
+				if (f.call(s, o, i, n) === false)
+					return false;
+
+				tinymce.walk(o, f, n, s);
+			});
+		}
+	},
+
+	createNS : function(n, o) {
+		var i, v;
+
+		o = o || window;
+
+		n = n.split('.');
+		for (i=0; i<n.length; i++) {
+			v = n[i];
+
+			if (!o[v])
+				o[v] = {};
+
+			o = o[v];
+		}
+
+		return o;
+	},
+
+	resolve : function(n, o) {
+		var i, l;
+
+		o = o || window;
+
+		n = n.split('.');
+		for (i=0, l = n.length; i<l; i++) {
+			o = o[n[i]];
+
+			if (!o)
+				break;
+		}
+
+		return o;
+	},
+
+	addUnload : function(f, s) {
+		var t = this, w = window;
+
+		f = {func : f, scope : s || this};
+
+		if (!t.unloads) {
+			function unload() {
+				var li = t.unloads, o, n;
+
+				if (li) {
+					// Call unload handlers
+					for (n in li) {
+						o = li[n];
+
+						if (o && o.func)
+							o.func.call(o.scope, 1); // Send in one arg to distinct unload and user destroy
+					}
+
+					// Detach unload function
+					if (w.detachEvent) {
+						w.detachEvent('onbeforeunload', fakeUnload);
+						w.detachEvent('onunload', unload);
+					} else if (w.removeEventListener)
+						w.removeEventListener('unload', unload, false);
+
+					// Destroy references
+					t.unloads = o = li = w = unload = null;
+
+					// Run garbarge collector on IE
+					if (window.CollectGarbage)
+						window.CollectGarbage();
+				}
+			};
+
+			function fakeUnload() {
+				var d = document;
+
+				// Is there things still loading, then do some magic
+				if (d.readyState == 'interactive') {
+					function stop() {
+						// Prevent memory leak
+						d.detachEvent('onstop', stop);
+
+						// Call unload handler
+						unload();
+
+						d = null;
+					};
+
+					// Fire unload when the currently loading page is stopped
+					d.attachEvent('onstop', stop);
+
+					// Remove onstop listener after a while to prevent the unload function
+					// to execute if the user presses cancel in an onbeforeunload
+					// confirm dialog and then presses the browser stop button
+					window.setTimeout(function() {
+						d.detachEvent('onstop', stop);
+					}, 0);
+				}
+			};
+
+			// Attach unload handler
+			if (w.attachEvent) {
+				w.attachEvent('onunload', unload);
+				w.attachEvent('onbeforeunload', fakeUnload);
+			} else if (w.addEventListener)
+				w.addEventListener('unload', unload, false);
+
+			// Setup initial unload handler array
+			t.unloads = [f];
+		} else
+			t.unloads.push(f);
+
+		return f;
+	},
+
+	removeUnload : function(f) {
+		var u = this.unloads, r = null;
+
+		tinymce.each(u, function(o, i) {
+			if (o && o.func == f) {
+				u.splice(i, 1);
+				r = f;
+				return false;
+			}
+		});
+
+		return r;
+	},
+
+	explode : function(s, d) {
+		return s ? tinymce.map(s.split(d || ','), tinymce.trim) : s;
+	},
+
+	_addVer : function(u) {
+		var v;
+
+		if (!this.query)
+			return u;
+
+		v = (u.indexOf('?') == -1 ? '?' : '&') + this.query;
+
+		if (u.indexOf('#') == -1)
+			return u + v;
+
+		return u.replace('#', v + '#');
+	}
+
+	};
+
+// Required for GZip AJAX loading
+window.tinymce = tinymce;
+
+// Initialize the API
+tinymce._init();
+
+/* file:jscripts/tiny_mce/classes/adapter/jquery/adapter.js */
+
+
+/* file:jscripts/tiny_mce/classes/adapter/prototype/adapter.js */
+
+
+/* file:jscripts/tiny_mce/classes/util/Dispatcher.js */
+
+tinymce.create('tinymce.util.Dispatcher', {
+	scope : null,
+	listeners : null,
+
+	Dispatcher : function(s) {
+		this.scope = s || this;
+		this.listeners = [];
+	},
+
+	add : function(cb, s) {
+		this.listeners.push({cb : cb, scope : s || this.scope});
+
+		return cb;
+	},
+
+	addToTop : function(cb, s) {
+		this.listeners.unshift({cb : cb, scope : s || this.scope});
+
+		return cb;
+	},
+
+	remove : function(cb) {
+		var l = this.listeners, o = null;
+
+		tinymce.each(l, function(c, i) {
+			if (cb == c.cb) {
+				o = cb;
+				l.splice(i, 1);
+				return false;
+			}
+		});
+
+		return o;
+	},
+
+	dispatch : function() {
+		var s, a = arguments, i, li = this.listeners, c;
+
+		// Needs to be a real loop since the listener count might change while looping
+		// And this is also more efficient
+		for (i = 0; i<li.length; i++) {
+			c = li[i];
+			s = c.cb.apply(c.scope, a);
+
+			if (s === false)
+				break;
+		}
+
+		return s;
+	}
+
+	});
+
+/* file:jscripts/tiny_mce/classes/util/URI.js */
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('tinymce.util.URI', {
+		URI : function(u, s) {
+			var t = this, o, a, b;
+
+			// Default settings
+			s = t.settings = s || {};
+
+			// Strange app protocol or local anchor
+			if (/^(mailto|news|javascript|about):/i.test(u) || /^\s*#/.test(u)) {
+				t.source = u;
+				return;
+			}
+
+			// Absolute path with no host, fake host and protocol
+			if (u.indexOf('/') === 0 && u.indexOf('//') !== 0)
+				u = (s.base_uri ? s.base_uri.protocol || 'http' : 'http') + '://mce_host' + u;
+
+			// Relative path
+			if (u.indexOf('://') === -1 && u.indexOf('//') !== 0)
+				u = (s.base_uri.protocol || 'http') + '://mce_host' + t.toAbsPath(s.base_uri.path, u);
+
+			// Parse URL (Credits goes to Steave, http://blog.stevenlevithan.com/archives/parseuri)
+			u = u.replace(/@@/g, '(mce_at)'); // Zope 3 workaround, they use @@something
+			u = /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(u);
+			each(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"], function(v, i) {
+				var s = u[i];
+
+				// Zope 3 workaround, they use @@something
+				if (s)
+					s = s.replace(/\(mce_at\)/g, '@@');
+
+				t[v] = s;
+			});
+
+			if (b = s.base_uri) {
+				if (!t.protocol)
+					t.protocol = b.protocol;
+
+				if (!t.userInfo)
+					t.userInfo = b.userInfo;
+
+				if (!t.port && t.host == 'mce_host')
+					t.port = b.port;
+
+				if (!t.host || t.host == 'mce_host')
+					t.host = b.host;
+
+				t.source = '';
+			}
+
+			//t.path = t.path || '/';
+		},
+
+		setPath : function(p) {
+			var t = this;
+
+			p = /^(.*?)\/?(\w+)?$/.exec(p);
+
+			// Update path parts
+			t.path = p[0];
+			t.directory = p[1];
+			t.file = p[2];
+
+			// Rebuild source
+			t.source = '';
+			t.getURI();
+		},
+
+		toRelative : function(u) {
+			var t = this, o;
+
+			u = new tinymce.util.URI(u, {base_uri : t});
+
+			// Not on same domain/port or protocol
+			if ((u.host != 'mce_host' && t.host != u.host && u.host) || t.port != u.port || t.protocol != u.protocol)
+				return u.getURI();
+
+			o = t.toRelPath(t.path, u.path);
+
+			// Add query
+			if (u.query)
+				o += '?' + u.query;
+
+			// Add anchor
+			if (u.anchor)
+				o += '#' + u.anchor;
+
+			return o;
+		},
+	
+		toAbsolute : function(u, nh) {
+			var u = new tinymce.util.URI(u, {base_uri : this});
+
+			return u.getURI(this.host == u.host ? nh : 0);
+		},
+
+		toRelPath : function(base, path) {
+			var items, bp = 0, out = '', i;
+
+			// Split the paths
+			base = base.substring(0, base.lastIndexOf('/'));
+			base = base.split('/');
+			items = path.split('/');
+
+			if (base.length >= items.length) {
+				for (i = 0; i < base.length; i++) {
+					if (i >= items.length || base[i] != items[i]) {
+						bp = i + 1;
+						break;
+					}
+				}
+			}
+
+			if (base.length < items.length) {
+				for (i = 0; i < items.length; i++) {
+					if (i >= base.length || base[i] != items[i]) {
+						bp = i + 1;
+						break;
+					}
+				}
+			}
+
+			if (bp == 1)
+				return path;
+
+			for (i = 0; i < base.length - (bp - 1); i++)
+				out += "../";
+
+			for (i = bp - 1; i < items.length; i++) {
+				if (i != bp - 1)
+					out += "/" + items[i];
+				else
+					out += items[i];
+			}
+
+			return out;
+		},
+
+		toAbsPath : function(base, path) {
+			var i, nb = 0, o = [];
+
+			// Split paths
+			base = base.split('/');
+			path = path.split('/');
+
+			// Remove empty chunks
+			each(base, function(k) {
+				if (k)
+					o.push(k);
+			});
+
+			base = o;
+
+			// Merge relURLParts chunks
+			for (i = path.length - 1, o = []; i >= 0; i--) {
+				// Ignore empty or .
+				if (path[i].length == 0 || path[i] == ".")
+					continue;
+
+				// Is parent
+				if (path[i] == '..') {
+					nb++;
+					continue;
+				}
+
+				// Move up
+				if (nb > 0) {
+					nb--;
+					continue;
+				}
+
+				o.push(path[i]);
+			}
+
+			i = base.length - nb;
+
+			// If /a/b/c or /
+			if (i <= 0)
+				return '/' + o.reverse().join('/');
+
+			return '/' + base.slice(0, i).join('/') + '/' + o.reverse().join('/');
+		},
+
+		getURI : function(nh) {
+			var s, t = this;
+
+			// Rebuild source
+			if (!t.source || nh) {
+				s = '';
+
+				if (!nh) {
+					if (t.protocol)
+						s += t.protocol + '://';
+
+					if (t.userInfo)
+						s += t.userInfo + '@';
+
+					if (t.host)
+						s += t.host;
+
+					if (t.port)
+						s += ':' + t.port;
+				}
+
+				if (t.path)
+					s += t.path;
+
+				if (t.query)
+					s += '?' + t.query;
+
+				if (t.anchor)
+					s += '#' + t.anchor;
+
+				t.source = s;
+			}
+
+			return t.source;
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/util/Cookie.js */
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('static tinymce.util.Cookie', {
+		getHash : function(n) {
+			var v = this.get(n), h;
+
+			if (v) {
+				each(v.split('&'), function(v) {
+					v = v.split('=');
+					h = h || {};
+					h[unescape(v[0])] = unescape(v[1]);
+				});
+			}
+
+			return h;
+		},
+
+		setHash : function(n, v, e, p, d, s) {
+			var o = '';
+
+			each(v, function(v, k) {
+				o += (!o ? '' : '&') + escape(k) + '=' + escape(v);
+			});
+
+			this.set(n, o, e, p, d, s);
+		},
+
+		get : function(n) {
+			var c = document.cookie, e, p = n + "=", b;
+
+			// Strict mode
+			if (!c)
+				return;
+
+			b = c.indexOf("; " + p);
+
+			if (b == -1) {
+				b = c.indexOf(p);
+
+				if (b != 0)
+					return null;
+			} else
+				b += 2;
+
+			e = c.indexOf(";", b);
+
+			if (e == -1)
+				e = c.length;
+
+			return unescape(c.substring(b + p.length, e));
+		},
+
+		set : function(n, v, e, p, d, s) {
+			document.cookie = n + "=" + escape(v) +
+				((e) ? "; expires=" + e.toGMTString() : "") +
+				((p) ? "; path=" + escape(p) : "") +
+				((d) ? "; domain=" + d : "") +
+				((s) ? "; secure" : "");
+		},
+
+		remove : function(n, p) {
+			var d = new Date();
+
+			d.setTime(d.getTime() - 1000);
+
+			this.set(n, '', d, p, d);
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/util/JSON.js */
+
+tinymce.create('static tinymce.util.JSON', {
+	serialize : function(o) {
+		var i, v, s = tinymce.util.JSON.serialize, t;
+
+		if (o == null)
+			return 'null';
+
+		t = typeof o;
+
+		if (t == 'string') {
+			v = '\bb\tt\nn\ff\rr\""\'\'\\\\';
+
+			return '"' + o.replace(/([\u0080-\uFFFF\x00-\x1f\"\'])/g, function(a, b) {
+				i = v.indexOf(b);
+
+				if (i + 1)
+					return '\\' + v.charAt(i + 1);
+
+				a = b.charCodeAt().toString(16);
+
+				return '\\u' + '0000'.substring(a.length) + a;
+			}) + '"';
+		}
+
+		if (t == 'object') {
+			if (o instanceof Array) {
+					for (i=0, v = '['; i<o.length; i++)
+						v += (i > 0 ? ',' : '') + s(o[i]);
+
+					return v + ']';
+				}
+
+				v = '{';
+
+				for (i in o)
+					v += typeof o[i] != 'function' ? (v.length > 1 ? ',"' : '"') + i + '":' + s(o[i]) : '';
+
+				return v + '}';
+		}
+
+		return '' + o;
+	},
+
+	parse : function(s) {
+		try {
+			return eval('(' + s + ')');
+		} catch (ex) {
+			// Ignore
+		}
+	}
+
+	});
+
+/* file:jscripts/tiny_mce/classes/util/XHR.js */
+
+tinymce.create('static tinymce.util.XHR', {
+	send : function(o) {
+		var x, t, w = window, c = 0;
+
+		// Default settings
+		o.scope = o.scope || this;
+		o.success_scope = o.success_scope || o.scope;
+		o.error_scope = o.error_scope || o.scope;
+		o.async = o.async === false ? false : true;
+		o.data = o.data || '';
+
+		function get(s) {
+			x = 0;
+
+			try {
+				x = new ActiveXObject(s);
+			} catch (ex) {
+			}
+
+			return x;
+		};
+
+		x = w.XMLHttpRequest ? new XMLHttpRequest() : get('Microsoft.XMLHTTP') || get('Msxml2.XMLHTTP');
+
+		if (x) {
+			if (x.overrideMimeType)
+				x.overrideMimeType(o.content_type);
+
+			x.open(o.type || (o.data ? 'POST' : 'GET'), o.url, o.async);
+
+			if (o.content_type)
+				x.setRequestHeader('Content-Type', o.content_type);
+
+			x.send(o.data);
+
+			function ready() {
+				if (!o.async || x.readyState == 4 || c++ > 10000) {
+					if (o.success && c < 10000 && x.status == 200)
+						o.success.call(o.success_scope, '' + x.responseText, x, o);
+					else if (o.error)
+						o.error.call(o.error_scope, c > 10000 ? 'TIMED_OUT' : 'GENERAL', x, o);
+
+					x = null;
+				} else
+					w.setTimeout(ready, 10);
+			};
+
+			// Syncronous request
+			if (!o.async)
+				return ready();
+
+			// Wait for response, onReadyStateChange can not be used since it leaks memory in IE
+			t = w.setTimeout(ready, 10);
+		}
+
+		}
+});
+
+/* file:jscripts/tiny_mce/classes/util/JSONRequest.js */
+
+(function() {
+	var extend = tinymce.extend, JSON = tinymce.util.JSON, XHR = tinymce.util.XHR;
+
+	tinymce.create('tinymce.util.JSONRequest', {
+		JSONRequest : function(s) {
+			this.settings = extend({
+			}, s);
+			this.count = 0;
+		},
+
+		send : function(o) {
+			var ecb = o.error, scb = o.success;
+
+			o = extend(this.settings, o);
+
+			o.success = function(c, x) {
+				c = JSON.parse(c);
+
+				if (typeof(c) == 'undefined') {
+					c = {
+						error : 'JSON Parse error.'
+					};
+				}
+
+				if (c.error)
+					ecb.call(o.error_scope || o.scope, c.error, x);
+				else
+					scb.call(o.success_scope || o.scope, c.result);
+			};
+
+			o.error = function(ty, x) {
+				ecb.call(o.error_scope || o.scope, ty, x);
+			};
+
+			o.data = JSON.serialize({
+				id : o.id || 'c' + (this.count++),
+				method : o.method,
+				params : o.params
+			});
+
+			// JSON content type for Ruby on rails. Bug: #1883287
+			o.content_type = 'application/json';
+
+			XHR.send(o);
+		},
+
+		'static' : {
+			sendRPC : function(o) {
+				return new tinymce.util.JSONRequest().send(o);
+			}
+		}
+
+		});
+}());
+/* file:jscripts/tiny_mce/classes/dom/DOMUtils.js */
+
+(function() {
+	// Shorten names
+	var each = tinymce.each, is = tinymce.is;
+	var isWebKit = tinymce.isWebKit, isIE = tinymce.isIE;
+
+	tinymce.create('tinymce.dom.DOMUtils', {
+		doc : null,
+		root : null,
+		files : null,
+		listeners : {},
+		pixelStyles : /^(top|left|bottom|right|width|height|borderWidth)$/,
+		cache : {},
+		idPattern : /^#[\w]+$/,
+		elmPattern : /^[\w_*]+$/,
+		elmClassPattern : /^([\w_]*)\.([\w_]+)$/,
+		props : {
+			"for" : "htmlFor",
+			"class" : "className",
+			className : "className",
+			checked : "checked",
+			disabled : "disabled",
+			maxlength : "maxLength",
+			readonly : "readOnly",
+			selected : "selected",
+			value : "value"
+		},
+
+		DOMUtils : function(d, s) {
+			var t = this;
+
+			t.doc = d;
+			t.win = window;
+			t.files = {};
+			t.cssFlicker = false;
+			t.counter = 0;
+			t.boxModel = !tinymce.isIE || d.compatMode == "CSS1Compat"; 
+			t.stdMode = d.documentMode === 8;
+
+			this.settings = s = tinymce.extend({
+				keep_values : false,
+				hex_colors : 1,
+				process_html : 1
+			}, s);
+
+			// Fix IE6SP2 flicker and check it failed for pre SP2
+			if (tinymce.isIE6) {
+				try {
+					d.execCommand('BackgroundImageCache', false, true);
+				} catch (e) {
+					t.cssFlicker = true;
+				}
+			}
+
+			tinymce.addUnload(t.destroy, t);
+		},
+
+		getRoot : function() {
+			var t = this, s = t.settings;
+
+			return (s && t.get(s.root_element)) || t.doc.body;
+		},
+
+		getViewPort : function(w) {
+			var d, b;
+
+			w = !w ? this.win : w;
+			d = w.document;
+			b = this.boxModel ? d.documentElement : d.body;
+
+			// Returns viewport size excluding scrollbars
+			return {
+				x : w.pageXOffset || b.scrollLeft,
+				y : w.pageYOffset || b.scrollTop,
+				w : w.innerWidth || b.clientWidth,
+				h : w.innerHeight || b.clientHeight
+			};
+		},
+
+		getRect : function(e) {
+			var p, t = this, sr;
+
+			e = t.get(e);
+			p = t.getPos(e);
+			sr = t.getSize(e);
+
+			return {
+				x : p.x,
+				y : p.y,
+				w : sr.w,
+				h : sr.h
+			};
+		},
+
+		getSize : function(e) {
+			var t = this, w, h;
+
+			e = t.get(e);
+			w = t.getStyle(e, 'width');
+			h = t.getStyle(e, 'height');
+
+			// Non pixel value, then force offset/clientWidth
+			if (w.indexOf('px') === -1)
+				w = 0;
+
+			// Non pixel value, then force offset/clientWidth
+			if (h.indexOf('px') === -1)
+				h = 0;
+
+			return {
+				w : parseInt(w) || e.offsetWidth || e.clientWidth,
+				h : parseInt(h) || e.offsetHeight || e.clientHeight
+			};
+		},
+
+		getParent : function(n, f, r) {
+			var na, se = this.settings;
+
+			n = this.get(n);
+
+			if (se.strict_root)
+				r = r || this.getRoot();
+
+			// Wrap node name as func
+			if (is(f, 'string')) {
+				na = f.toUpperCase();
+
+				f = function(n) {
+					var s = false;
+
+					// Any element
+					if (n.nodeType == 1 && na === '*') {
+						s = true;
+						return false;
+					}
+
+					each(na.split(','), function(v) {
+						if (n.nodeType == 1 && ((se.strict && n.nodeName.toUpperCase() == v) || n.nodeName.toUpperCase() == v)) {
+							s = true;
+							return false; // Break loop
+						}
+					});
+
+					return s;
+				};
+			}
+
+			while (n) {
+				if (n == r)
+					return null;
+
+				if (f(n))
+					return n;
+
+				n = n.parentNode;
+			}
+
+			return null;
+		},
+
+		get : function(e) {
+			var n;
+
+			if (e && this.doc && typeof(e) == 'string') {
+				n = e;
+				e = this.doc.getElementById(e);
+
+				// IE and Opera returns meta elements when they match the specified input ID, but getElementsByName seems to do the trick
+				if (e && e.id !== n)
+					return this.doc.getElementsByName(n)[1];
+			}
+
+			return e;
+		},
+
+		// #if !jquery
+
+		select : function(pa, s) {
+			var t = this, cs, c, pl, o = [], x, i, l, n;
+
+			s = t.get(s) || t.doc;
+
+			// Look for native support and use that if it's found
+			if (s.querySelectorAll) {
+				// Element scope then use temp id
+				// We need to do this to be compatible with other implementations
+				// See bug report: http://bugs.webkit.org/show_bug.cgi?id=17461
+				if (s != t.doc) {
+					i = s.id;
+					s.id = '_mc_tmp';
+					pa = '#_mc_tmp ' + pa;
+				}
+
+				// Select elements
+				l = tinymce.grep(s.querySelectorAll(pa));
+
+				// Restore old id
+				s.id = i;
+
+				return l;
+			}
+
+			if (t.settings.strict) {
+				function get(s, n) {
+					return s.getElementsByTagName(n.toLowerCase());
+				};
+			} else {
+				function get(s, n) {
+					return s.getElementsByTagName(n);
+				};
+			}
+
+			// Simple element pattern. For example: "p" or "*"
+			if (t.elmPattern.test(pa)) {
+				x = get(s, pa);
+
+				for (i = 0, l = x.length; i<l; i++)
+					o.push(x[i]);
+
+				return o;
+			}
+
+			// Simple class pattern. For example: "p.class" or ".class"
+			if (t.elmClassPattern.test(pa)) {
+				pl = t.elmClassPattern.exec(pa);
+				x = get(s, pl[1] || '*');
+				c = ' ' + pl[2] + ' ';
+
+				for (i = 0, l = x.length; i<l; i++) {
+					n = x[i];
+
+					if (n.className && (' ' + n.className + ' ').indexOf(c) !== -1)
+						o.push(n);
+				}
+
+				return o;
+			}
+
+			function collect(n) {
+				if (!n.mce_save) {
+					n.mce_save = 1;
+					o.push(n);
+				}
+			};
+
+			function collectIE(n) {
+				if (!n.getAttribute('mce_save')) {
+					n.setAttribute('mce_save', '1');
+					o.push(n);
+				}
+			};
+
+			function find(n, f, r) {
+				var i, l, nl = get(r, n);
+
+				for (i = 0, l = nl.length; i < l; i++)
+					f(nl[i]);
+			};
+
+			each(pa.split(','), function(v, i) {
+				v = tinymce.trim(v);
+
+				// Simple element pattern, most common in TinyMCE
+				if (t.elmPattern.test(v)) {
+					each(get(s, v), function(n) {
+						collect(n);
+					});
+
+					return;
+				}
+
+				// Simple element pattern with class, fairly common in TinyMCE
+				if (t.elmClassPattern.test(v)) {
+					x = t.elmClassPattern.exec(v);
+
+					each(get(s, x[1]), function(n) {
+						if (t.hasClass(n, x[2]))
+							collect(n);
+					});
+
+					return;
+				}
+
+				if (!(cs = t.cache[pa])) {
+					cs = 'x=(function(cf, s) {';
+					pl = v.split(' ');
+
+					each(pl, function(v) {
+						var p = /^([\w\\*]+)?(?:#([\w\\]+))?(?:\.([\w\\\.]+))?(?:\[\@([\w\\]+)([\^\$\*!]?=)([\w\\]+)\])?(?:\:([\w\\]+))?/i.exec(v);
+
+						// Find elements
+						p[1] = p[1] || '*';
+						cs += 'find("' + p[1] + '", function(n) {';
+
+						// Check id
+						if (p[2])
+							cs += 'if (n.id !== "' + p[2] + '") return;';
+
+						// Check classes
+						if (p[3]) {
+							cs += 'var c = " " + n.className + " ";';
+							cs += 'if (';
+							c = '';
+							each(p[3].split('.'), function(v) {
+								if (v)
+									c += (c ? '||' : '') + 'c.indexOf(" ' + v + ' ") === -1';
+							});
+							cs += c + ') return;';
+						}
+					});
+
+					cs += 'cf(n);';
+
+					for (i = pl.length - 1; i >= 0; i--)
+						cs += '}, ' + (i ? 'n' : 's') + ');';
+
+					cs += '})';
+
+					// Compile CSS pattern function
+					t.cache[pa] = cs = eval(cs);
+				}
+
+				// Run selector function
+				cs(isIE ? collectIE : collect, s);
+			});
+
+			// Cleanup
+			each(o, function(n) {
+				if (isIE)
+					n.removeAttribute('mce_save');
+				else
+					delete n.mce_save;
+			});
+
+			return o;
+		},
+
+		// #endif
+
+		add : function(p, n, a, h, c) {
+			var t = this;
+
+			return this.run(p, function(p) {
+				var e, k;
+
+				e = is(n, 'string') ? t.doc.createElement(n) : n;
+
+				if (a) {
+					for (k in a) {
+						if (a.hasOwnProperty(k) && !is(a[k], 'object'))
+							t.setAttrib(e, k, '' + a[k]);
+					}
+
+					if (a.style && !is(a.style, 'string')) {
+						each(a.style, function(v, n) {
+							t.setStyle(e, n, v);
+						});
+					}
+				}
+
+				if (h) {
+					if (h.nodeType)
+						e.appendChild(h);
+					else
+						t.setHTML(e, h);
+				}
+
+				return !c ? p.appendChild(e) : e;
+			});
+		},
+
+		create : function(n, a, h) {
+			return this.add(this.doc.createElement(n), n, a, h, 1);
+		},
+
+		createHTML : function(n, a, h) {
+			var o = '', t = this, k;
+
+			o += '<' + n;
+
+			for (k in a) {
+				if (a.hasOwnProperty(k))
+					o += ' ' + k + '="' + t.encode(a[k]) + '"';
+			}
+
+			if (tinymce.is(h))
+				return o + '>' + h + '</' + n + '>';
+
+			return o + ' />';
+		},
+
+		remove : function(n, k) {
+			return this.run(n, function(n) {
+				var p, g;
+
+				p = n.parentNode;
+
+				if (!p)
+					return null;
+
+				if (k) {
+					each (n.childNodes, function(c) {
+						p.insertBefore(c.cloneNode(true), n);
+					});
+				}
+
+				// Fix IE psuedo leak
+		/*		if (isIE) {
+					p = n.cloneNode(true);
+					n.outerHTML = '';
+
+					return p;
+				}*/
+
+				return p.removeChild(n);
+			});
+		},
+
+		// #if !jquery
+
+		setStyle : function(n, na, v) {
+			var t = this;
+
+			return t.run(n, function(e) {
+				var s, i;
+
+				s = e.style;
+
+				// Camelcase it, if needed
+				na = na.replace(/-(\D)/g, function(a, b){
+					return b.toUpperCase();
+				});
+
+				// Default px suffix on these
+				if (t.pixelStyles.test(na) && (tinymce.is(v, 'number') || /^[\-0-9\.]+$/.test(v)))
+					v += 'px';
+
+				switch (na) {
+					case 'opacity':
+						// IE specific opacity
+						if (isIE) {
+							s.filter = v === '' ? '' : "alpha(opacity=" + (v * 100) + ")";
+
+							if (!n.currentStyle || !n.currentStyle.hasLayout)
+								s.display = 'inline-block';
+						}
+
+						// Fix for older browsers
+						s[na] = s['-moz-opacity'] = s['-khtml-opacity'] = v || '';
+						break;
+
+					case 'float':
+						isIE ? s.styleFloat = v : s.cssFloat = v;
+						break;
+					
+					default:
+						s[na] = v || '';
+				}
+
+				// Force update of the style data
+				if (t.settings.update_styles)
+					t.setAttrib(e, 'mce_style');
+			});
+		},
+
+		getStyle : function(n, na, c) {
+			n = this.get(n);
+
+			if (!n)
+				return false;
+
+			// Gecko
+			if (this.doc.defaultView && c) {
+				// Remove camelcase
+				na = na.replace(/[A-Z]/g, function(a){
+					return '-' + a;
+				});
+
+				try {
+					return this.doc.defaultView.getComputedStyle(n, null).getPropertyValue(na);
+				} catch (ex) {
+					// Old safari might fail
+					return null;
+				}
+			}
+
+			// Camelcase it, if needed
+			na = na.replace(/-(\D)/g, function(a, b){
+				return b.toUpperCase();
+			});
+
+			if (na == 'float')
+				na = isIE ? 'styleFloat' : 'cssFloat';
+
+			// IE & Opera
+			if (n.currentStyle && c)
+				return n.currentStyle[na];
+
+			return n.style[na];
+		},
+
+		setStyles : function(e, o) {
+			var t = this, s = t.settings, ol;
+
+			ol = s.update_styles;
+			s.update_styles = 0;
+
+			each(o, function(v, n) {
+				t.setStyle(e, n, v);
+			});
+
+			// Update style info
+			s.update_styles = ol;
+			if (s.update_styles)
+				t.setAttrib(e, s.cssText);
+		},
+
+		setAttrib : function(e, n, v) {
+			var t = this;
+
+			// Whats the point
+			if (!e || !n)
+				return;
+
+			// Strict XML mode
+			if (t.settings.strict)
+				n = n.toLowerCase();
+
+			return this.run(e, function(e) {
+				var s = t.settings;
+
+				switch (n) {
+					case "style":
+						// No mce_style for elements with these since they might get resized by the user
+						if (s.keep_values) {
+							if (v && !t._isRes(v))
+								e.setAttribute('mce_style', v, 2);
+							else
+								e.removeAttribute('mce_style', 2);
+						}
+
+						e.style.cssText = v;
+						break;
+
+					case "class":
+						e.className = v || ''; // Fix IE null bug
+						break;
+
+					case "src":
+					case "href":
+						if (s.keep_values) {
+							if (s.url_converter)
+								v = s.url_converter.call(s.url_converter_scope || t, v, n, e);
+
+							t.setAttrib(e, 'mce_' + n, v, 2);
+						}
+
+						break;
+					
+					case "shape":
+						e.setAttribute('mce_style', v);
+						break;
+				}
+
+				if (is(v) && v !== null && v.length !== 0)
+					e.setAttribute(n, '' + v, 2);
+				else
+					e.removeAttribute(n, 2);
+			});
+		},
+
+		setAttribs : function(e, o) {
+			var t = this;
+
+			return this.run(e, function(e) {
+				each(o, function(v, n) {
+					t.setAttrib(e, n, v);
+				});
+			});
+		},
+
+		// #endif
+
+		getAttrib : function(e, n, dv) {
+			var v, t = this;
+
+			e = t.get(e);
+
+			if (!e || e.nodeType !== 1)
+				return false;
+
+			if (!is(dv))
+				dv = '';
+
+			// Try the mce variant for these
+			if (/^(src|href|style|coords|shape)$/.test(n)) {
+				v = e.getAttribute("mce_" + n);
+
+				if (v)
+					return v;
+			}
+
+			if (isIE && t.props[n]) {
+				v = e[t.props[n]];
+				v = v && v.nodeValue ? v.nodeValue : v;
+			}
+
+			if (!v)
+				v = e.getAttribute(n, 2);
+
+			if (n === 'style') {
+				v = v || e.style.cssText;
+
+				if (v) {
+					v = t.serializeStyle(t.parseStyle(v));
+
+					if (t.settings.keep_values && !t._isRes(v))
+						e.setAttribute('mce_style', v);
+				}
+			}
+
+			// Remove Apple and WebKit stuff
+			if (isWebKit && n === "class" && v)
+				v = v.replace(/(apple|webkit)\-[a-z\-]+/gi, '');
+
+			// Handle IE issues
+			if (isIE) {
+				switch (n) {
+					case 'rowspan':
+					case 'colspan':
+						// IE returns 1 as default value
+						if (v === 1)
+							v = '';
+
+						break;
+
+					case 'size':
+						// IE returns +0 as default value for size
+						if (v === '+0' || v === 20)
+							v = '';
+
+						break;
+
+					case 'width':
+					case 'height':
+					case 'vspace':
+						if (v === 0)
+							v = '';
+
+						break;
+
+					case 'hspace':
+						// IE returns -1 as default value
+						if (v === -1)
+							v = '';
+
+						break;
+
+					case 'maxlength':
+					case 'tabindex':
+						// IE returns default value
+						if (v === 32768 || v === 2147483647)
+							v = '';
+
+						break;
+
+					case 'compact':
+					case 'noshade':
+						if (v === 65535)
+							return n;
+
+						return dv;
+
+					case 'shape':
+						v = v.toLowerCase();
+						break;
+
+					default:
+						// IE has odd anonymous function for event attributes
+						if (n.indexOf('on') === 0 && v)
+							v = ('' + v).replace(/^function\s+anonymous\(\)\s+\{\s+(.*)\s+\}$/, '$1');
+				}
+			}
+
+			return (v !== undefined && v !== null && v !== '') ? '' + v : dv;
+		},
+
+		getPos : function(n) {
+			var t = this, x = 0, y = 0, e, d = t.doc, r;
+
+			n = t.get(n);
+
+			// Use getBoundingClientRect on IE, Opera has it but it's not perfect
+			if (n && isIE) {
+				n = n.getBoundingClientRect();
+				e = t.boxModel ? d.documentElement : d.body;
+				x = t.getStyle(t.select('html')[0], 'borderWidth'); // Remove border
+				x = (x == 'medium' || t.boxModel && !t.isIE6) && 2 || x;
+				n.top += t.win.self != t.win.top ? 2 : 0; // IE adds some strange extra cord if used in a frameset
+
+				return {x : n.left + e.scrollLeft - x, y : n.top + e.scrollTop - x};
+			}
+
+			r = n;
+			while (r) {
+				x += r.offsetLeft || 0;
+				y += r.offsetTop || 0;
+				r = r.offsetParent;
+			}
+
+			r = n;
+			while (r) {
+				// Opera 9.25 bug fix, fixed in 9.50
+				if (!/^table-row|inline.*/i.test(t.getStyle(r, "display", 1))) {
+					x -= r.scrollLeft || 0;
+					y -= r.scrollTop || 0;
+				}
+
+				r = r.parentNode;
+
+				if (r == d.body)
+					break;
+			}
+
+			return {x : x, y : y};
+		},
+
+		parseStyle : function(st) {
+			var t = this, s = t.settings, o = {};
+
+			if (!st)
+				return o;
+
+			function compress(p, s, ot) {
+				var t, r, b, l;
+
+				// Get values and check it it needs compressing
+				t = o[p + '-top' + s];
+				if (!t)
+					return;
+
+				r = o[p + '-right' + s];
+				if (t != r)
+					return;
+
+				b = o[p + '-bottom' + s];
+				if (r != b)
+					return;
+
+				l = o[p + '-left' + s];
+				if (b != l)
+					return;
+
+				// Compress
+				o[ot] = l;
+				delete o[p + '-top' + s];
+				delete o[p + '-right' + s];
+				delete o[p + '-bottom' + s];
+				delete o[p + '-left' + s];
+			};
+
+			function compress2(ta, a, b, c) {
+				var t;
+
+				t = o[a];
+				if (!t)
+					return;
+
+				t = o[b];
+				if (!t)
+					return;
+
+				t = o[c];
+				if (!t)
+					return;
+
+				// Compress
+				o[ta] = o[a] + ' ' + o[b] + ' ' + o[c];
+				delete o[a];
+				delete o[b];
+				delete o[c];
+			};
+
+			st = st.replace(/&(#?[a-z0-9]+);/g, '&$1_MCE_SEMI_'); // Protect entities
+
+			each(st.split(';'), function(v) {
+				var sv, ur = [];
+
+				if (v) {
+					v = v.replace(/_MCE_SEMI_/g, ';'); // Restore entities
+					v = v.replace(/url\([^\)]+\)/g, function(v) {ur.push(v);return 'url(' + ur.length + ')';});
+					v = v.split(':');
+					sv = tinymce.trim(v[1]);
+					sv = sv.replace(/url\(([^\)]+)\)/g, function(a, b) {return ur[parseInt(b) - 1];});
+
+					sv = sv.replace(/rgb\([^\)]+\)/g, function(v) {
+						return t.toHex(v);
+					});
+
+					if (s.url_converter) {
+						sv = sv.replace(/url\([\'\"]?([^\)\'\"]+)[\'\"]?\)/g, function(x, c) {
+							return 'url(' + s.url_converter.call(s.url_converter_scope || t, t.decode(c), 'style', null) + ')';
+						});
+					}
+
+					o[tinymce.trim(v[0]).toLowerCase()] = sv;
+				}
+			});
+
+			compress("border", "", "border");
+			compress("border", "-width", "border-width");
+			compress("border", "-color", "border-color");
+			compress("border", "-style", "border-style");
+			compress("padding", "", "padding");
+			compress("margin", "", "margin");
+			compress2('border', 'border-width', 'border-style', 'border-color');
+
+			if (isIE) {
+				// Remove pointless border
+				if (o.border == 'medium none')
+					o.border = '';
+			}
+
+			return o;
+		},
+
+		serializeStyle : function(o) {
+			var s = '';
+
+			each(o, function(v, k) {
+				if (k && v) {
+					if (tinymce.isGecko && k.indexOf('-moz-') === 0)
+						return;
+
+					switch (k) {
+						case 'color':
+						case 'background-color':
+							v = v.toLowerCase();
+							break;
+					}
+
+					s += (s ? ' ' : '') + k + ': ' + v + ';';
+				}
+			});
+
+			return s;
+		},
+
+		loadCSS : function(u) {
+			var t = this, d = t.doc;
+
+			if (!u)
+				u = '';
+
+			each(u.split(','), function(u) {
+				if (t.files[u])
+					return;
+
+				t.files[u] = true;
+				t.add(t.select('head')[0], 'link', {rel : 'stylesheet', href : tinymce._addVer(u)});
+			});
+		},
+
+		// #if !jquery
+
+		addClass : function(e, c) {
+			return this.run(e, function(e) {
+				var o;
+
+				if (!c)
+					return 0;
+
+				if (this.hasClass(e, c))
+					return e.className;
+
+				o = this.removeClass(e, c);
+
+				return e.className = (o != '' ? (o + ' ') : '') + c;
+			});
+		},
+
+		removeClass : function(e, c) {
+			var t = this, re;
+
+			return t.run(e, function(e) {
+				var v;
+
+				if (t.hasClass(e, c)) {
+					if (!re)
+						re = new RegExp("(^|\\s+)" + c + "(\\s+|$)", "g");
+
+					v = e.className.replace(re, ' ');
+
+					return e.className = tinymce.trim(v != ' ' ? v : '');
+				}
+
+				return e.className;
+			});
+		},
+
+		hasClass : function(n, c) {
+			n = this.get(n);
+
+			if (!n || !c)
+				return false;
+
+			return (' ' + n.className + ' ').indexOf(' ' + c + ' ') !== -1;
+		},
+
+		show : function(e) {
+			return this.setStyle(e, 'display', 'block');
+		},
+
+		hide : function(e) {
+			return this.setStyle(e, 'display', 'none');
+		},
+
+		isHidden : function(e) {
+			e = this.get(e);
+
+			return e.style.display == 'none' || this.getStyle(e, 'display') == 'none';
+		},
+
+		// #endif
+
+		uniqueId : function(p) {
+			return (!p ? 'mce_' : p) + (this.counter++);
+		},
+
+		setHTML : function(e, h) {
+			var t = this;
+
+			return this.run(e, function(e) {
+				var x, i, nl, n, p, x;
+
+				h = t.processHTML(h);
+
+				if (isIE) {
+					function set() {
+						try {
+							// IE will remove comments from the beginning
+							// unless you padd the contents with something
+							e.innerHTML = '<br />' + h;
+							e.removeChild(e.firstChild);
+						} catch (ex) {
+							// IE sometimes produces an unknown runtime error on innerHTML if it's an block element within a block element for example a div inside a p
+							// This seems to fix this problem
+
+							// Remove all child nodes
+							while (e.firstChild)
+								e.firstChild.removeNode();
+
+							// Create new div with HTML contents and a BR infront to keep comments
+							x = t.create('div');
+							x.innerHTML = '<br />' + h;
+
+							// Add all children from div to target
+							each (x.childNodes, function(n, i) {
+								// Skip br element
+								if (i)
+									e.appendChild(n);
+							});
+						}
+					};
+
+					// IE has a serious bug when it comes to paragraphs it can produce an invalid
+					// DOM tree if contents like this <p><ul><li>Item 1</li></ul></p> is inserted
+					// It seems to be that IE doesn't like a root block element placed inside another root block element
+					if (t.settings.fix_ie_paragraphs)
+						h = h.replace(/<p><\/p>|<p([^>]+)><\/p>|<p[^\/+]\/>/gi, '<p$1 mce_keep="true">&nbsp;</p>');
+
+					set();
+
+					if (t.settings.fix_ie_paragraphs) {
+						// Check for odd paragraphs this is a sign of a broken DOM
+						nl = e.getElementsByTagName("p");
+						for (i = nl.length - 1, x = 0; i >= 0; i--) {
+							n = nl[i];
+
+							if (!n.hasChildNodes()) {
+								if (!n.mce_keep) {
+									x = 1; // Is broken
+									break;
+								}
+
+								n.removeAttribute('mce_keep');
+							}
+						}
+					}
+
+					// Time to fix the madness IE left us
+					if (x) {
+						// So if we replace the p elements with divs and mark them and then replace them back to paragraphs
+						// after we use innerHTML we can fix the DOM tree
+						h = h.replace(/<p([^>]+)>|<p>/g, '<div$1 mce_tmp="1">');
+						h = h.replace(/<\/p>/g, '</div>');
+
+						// Set the new HTML with DIVs
+						set();
+
+						// Replace all DIV elements with he mce_tmp attibute back to paragraphs
+						// This is needed since IE has a annoying bug see above for details
+						// This is a slow process but it has to be done. :(
+						if (t.settings.fix_ie_paragraphs) {
+							nl = e.getElementsByTagName("DIV");
+							for (i = nl.length - 1; i >= 0; i--) {
+								n = nl[i];
+
+								// Is it a temp div
+								if (n.mce_tmp) {
+									// Create new paragraph
+									p = t.doc.createElement('p');
+
+									// Copy all attributes
+									n.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi, function(a, b) {
+										var v;
+
+										if (b !== 'mce_tmp') {
+											v = n.getAttribute(b);
+
+											if (!v && b === 'class')
+												v = n.className;
+
+											p.setAttribute(b, v);
+										}
+									});
+
+									// Append all children to new paragraph
+									for (x = 0; x<n.childNodes.length; x++)
+										p.appendChild(n.childNodes[x].cloneNode(true));
+
+									// Replace div with new paragraph
+									n.swapNode(p);
+								}
+							}
+						}
+					}
+				} else
+					e.innerHTML = h;
+
+				return h;
+			});
+		},
+
+		processHTML : function(h) {
+			var t = this, s = t.settings;
+
+			if (!s.process_html)
+				return h;
+
+			// Convert strong and em to b and i in FF since it can't handle them
+			if (tinymce.isGecko) {
+				h = h.replace(/<(\/?)strong>|<strong( [^>]+)>/gi, '<$1b$2>');
+				h = h.replace(/<(\/?)em>|<em( [^>]+)>/gi, '<$1i$2>');
+			} else if (isIE)
+				h = h.replace(/&apos;/g, '&#39;'); // IE can't handle apos
+
+			// Fix some issues
+			h = h.replace(/<a( )([^>]+)\/>|<a\/>/gi, '<a$1$2></a>'); // Force open
+
+			// Store away src and href in mce_src and mce_href since browsers mess them up
+			if (s.keep_values) {
+				h = h.replace(/<!\[CDATA\[([\s\S]+)\]\]>/g, '<!--[CDATA[$1]]-->');
+
+				// Wrap scripts and styles in comments for serialization purposes
+				if (/<script|style/.test(h)) {
+					function trim(s) {
+						// Remove prefix and suffix code for element
+						s = s.replace(/^[\r\n]*|[\r\n]*$/g, '');
+						s = s.replace(/^\s*(\/\/\s*<!--|\/\/\s*<\[CDATA\[|<!--|<\[CDATA\[)[\r\n]*/g, '');
+						s = s.replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->)\s*$/g, '');
+
+						return s;
+					};
+
+					// Preserve script elements
+					h = h.replace(/<script([^>]+|)>([\s\S]*?)<\/script>/g, function(v, a, b) {
+						// Remove prefix and suffix code for script element
+						b = trim(b);
+
+						// Force type attribute
+						if (!a)
+							a = ' type="text/javascript"';
+
+						// Wrap contents in a comment
+						if (b)
+							b = '<!--\n' + b + '\n// -->';
+
+						// Output fake element
+						return '<mce:script' + a + '>' + b + '</mce:script>';
+					});
+
+					// Preserve style elements
+					h = h.replace(/<style([^>]+|)>([\s\S]*?)<\/style>/g, function(v, a, b) {
+						b = trim(b);
+						return '<mce:style' + a + '><!--\n' + b + '\n--></mce:style><style' + a + ' mce_bogus="1">' + b + '</style>';
+					});
+				}
+
+				// Process all tags with src, href or style
+				h = h.replace(/<([\w:]+) [^>]*(src|href|style|shape|coords)[^>]*>/gi, function(a, n) {
+					function handle(m, b, c) {
+						var u = c;
+
+						// Tag already got a mce_ version
+						if (a.indexOf('mce_' + b) != -1)
+							return m;
+
+						if (b == 'style') {
+							// Why did I need this one?
+							//if (isIE)
+							//	u = t.serializeStyle(t.parseStyle(u));
+
+							// No mce_style for elements with these since they might get resized by the user
+							if (t._isRes(c))
+								return m;
+
+							if (s.hex_colors) {
+								u = u.replace(/rgb\([^\)]+\)/g, function(v) {
+									return t.toHex(v);
+								});
+							}
+
+							if (s.url_converter) {
+								u = u.replace(/url\([\'\"]?([^\)\'\"]+)\)/g, function(x, c) {
+									return 'url(' + t.encode(s.url_converter.call(s.url_converter_scope || t, t.decode(c), b, n)) + ')';
+								});
+							}
+						} else if (b != 'coords' && b != 'shape') {
+							if (s.url_converter)
+								u = t.encode(s.url_converter.call(s.url_converter_scope || t, t.decode(c), b, n));
+						}
+
+						return ' ' + b + '="' + c + '" mce_' + b + '="' + u + '"';
+					};
+
+					a = a.replace(/ (src|href|style|coords|shape)=[\"]([^\"]+)[\"]/gi, handle); // W3C
+					a = a.replace(/ (src|href|style|coords|shape)=[\']([^\']+)[\']/gi, handle); // W3C
+
+					return a.replace(/ (src|href|style|coords|shape)=([^\s\"\'>]+)/gi, handle); // IE
+				});
+			}
+
+			return h;
+		},
+
+		getOuterHTML : function(e) {
+			var d;
+
+			e = this.get(e);
+
+			if (!e)
+				return null;
+
+			if (isIE)
+				return e.outerHTML;
+
+			d = (e.ownerDocument || this.doc).createElement("body");
+			d.appendChild(e.cloneNode(true));
+
+			return d.innerHTML;
+		},
+
+		setOuterHTML : function(e, h, d) {
+			var t = this;
+
+			return this.run(e, function(e) {
+				var n, tp;
+
+				e = t.get(e);
+				d = d || e.ownerDocument || t.doc;
+
+				if (isIE && e.nodeType == 1)
+					e.outerHTML = h;
+				else {
+					tp = d.createElement("body");
+					tp.innerHTML = h;
+
+					n = tp.lastChild;
+					while (n) {
+						t.insertAfter(n.cloneNode(true), e);
+						n = n.previousSibling;
+					}
+
+					t.remove(e);
+				}
+			});
+		},
+
+		decode : function(s) {
+			var e;
+
+			// Look for entities to decode
+			if (/&[^;]+;/.test(s)) {
+				// Decode the entities using a div element not super efficient but less code
+				e = this.doc.createElement("div");
+				e.innerHTML = s;
+
+				return !e.firstChild ? s : e.firstChild.nodeValue;
+			}
+
+			return s;
+		},
+
+		encode : function(s) {
+			return s ? ('' + s).replace(/[<>&\"]/g, function (c, b) {
+				switch (c) {
+					case '&':
+						return '&amp;';
+
+					case '"':
+						return '&quot;';
+
+					case '<':
+						return '&lt;';
+
+					case '>':
+						return '&gt;';
+				}
+
+				return c;
+			}) : s;
+		},
+
+		// #if !jquery
+
+		insertAfter : function(n, r) {
+			var t = this;
+
+			r = t.get(r);
+
+			return this.run(n, function(n) {
+				var p, ns;
+
+				p = r.parentNode;
+				ns = r.nextSibling;
+
+				if (ns)
+					p.insertBefore(n, ns);
+				else
+					p.appendChild(n);
+
+				return n;
+			});
+		},
+
+		// #endif
+
+		isBlock : function(n) {
+			if (n.nodeType && n.nodeType !== 1)
+				return false;
+
+			n = n.nodeName || n;
+
+			return /^(H[1-6]|HR|P|DIV|ADDRESS|PRE|FORM|TABLE|LI|OL|UL|TD|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|NOFRAMES|MENU|ISINDEX|SAMP)$/.test(n);
+		},
+
+		// #if !jquery
+
+		replace : function(n, o, k) {
+			if (is(o, 'array'))
+				n = n.cloneNode(true);
+
+			return this.run(o, function(o) {
+				if (k) {
+					each(o.childNodes, function(c) {
+						n.appendChild(c.cloneNode(true));
+					});
+				}
+
+				// Fix IE psuedo leak for elements since replacing elements if fairly common
+				// Will break parentNode for some unknown reason
+	/*			if (isIE && o.nodeType === 1) {
+					o.parentNode.insertBefore(n, o);
+					o.outerHTML = '';
+					return n;
+				}*/
+
+				return o.parentNode.replaceChild(n, o);
+			});
+		},
+
+		// #endif
+
+		toHex : function(s) {
+			var c = /^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(s);
+
+			function hex(s) {
+				s = parseInt(s).toString(16);
+
+				return s.length > 1 ? s : '0' + s; // 0 -> 00
+			};
+
+			if (c) {
+				s = '#' + hex(c[1]) + hex(c[2]) + hex(c[3]);
+
+				return s;
+			}
+
+			return s;
+		},
+
+		getClasses : function() {
+			var t = this, cl = [], i, lo = {}, f = t.settings.class_filter, ov;
+
+			if (t.classes)
+				return t.classes;
+
+			function addClasses(s) {
+				// IE style imports
+				each(s.imports, function(r) {
+					addClasses(r);
+				});
+
+				each(s.cssRules || s.rules, function(r) {
+					// Real type or fake it on IE
+					switch (r.type || 1) {
+						// Rule
+						case 1:
+							if (r.selectorText) {
+								each(r.selectorText.split(','), function(v) {
+									v = v.replace(/^\s*|\s*$|^\s\./g, "");
+
+									// Is internal or it doesn't contain a class
+									if (/\.mce/.test(v) || !/\.[\w\-]+$/.test(v))
+										return;
+
+									// Remove everything but class name
+									ov = v;
+									v = v.replace(/.*\.([a-z0-9_\-]+).*/i, '$1');
+
+									// Filter classes
+									if (f && !(v = f(v, ov)))
+										return;
+
+									if (!lo[v]) {
+										cl.push({'class' : v});
+										lo[v] = 1;
+									}
+								});
+							}
+							break;
+
+						// Import
+						case 3:
+							addClasses(r.styleSheet);
+							break;
+					}
+				});
+			};
+
+			try {
+				each(t.doc.styleSheets, addClasses);
+			} catch (ex) {
+				// Ignore
+			}
+
+			if (cl.length > 0)
+				t.classes = cl;
+
+			return cl;
+		},
+
+		run : function(e, f, s) {
+			var t = this, o;
+
+			if (t.doc && typeof(e) === 'string')
+				e = t.doc.getElementById(e);
+
+			if (!e)
+				return false;
+
+			s = s || this;
+			if (!e.nodeType && (e.length || e.length === 0)) {
+				o = [];
+
+				each(e, function(e, i) {
+					if (e) {
+						if (typeof(e) == 'string')
+							e = t.doc.getElementById(e);
+
+						o.push(f.call(s, e, i));
+					}
+				});
+
+				return o;
+			}
+
+			return f.call(s, e);
+		},
+
+		getAttribs : function(n) {
+			var o;
+
+			n = this.get(n);
+
+			if (!n)
+				return [];
+
+			if (isIE) {
+				o = [];
+
+				// Object will throw exception in IE
+				if (n.nodeName == 'OBJECT')
+					return n.attributes;
+
+				// It's crazy that this is faster in IE but it's because it returns all attributes all the time
+				n.cloneNode(false).outerHTML.replace(/([a-z0-9\:\-_]+)=/gi, function(a, b) {
+					o.push({specified : 1, nodeName : b});
+				});
+
+				return o;
+			}
+
+			return n.attributes;
+		},
+
+		destroy : function(s) {
+			var t = this;
+
+			t.win = t.doc = t.root = null;
+
+			// Manual destroy then remove unload handler
+			if (!s)
+				tinymce.removeUnload(t.destroy);
+		},
+
+		_isRes : function(c) {
+			// Is live resizble element
+			return /^(top|left|bottom|right|width|height)/i.test(c) || /;\s*(top|left|bottom|right|width|height)/i.test(c);
+		}
+
+		/*
+		walk : function(n, f, s) {
+			var d = this.doc, w;
+
+			if (d.createTreeWalker) {
+				w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);
+
+				while ((n = w.nextNode()) != null)
+					f.call(s || this, n);
+			} else
+				tinymce.walk(n, f, 'childNodes', s);
+		}
+		*/
+
+		/*
+		toRGB : function(s) {
+			var c = /^\s*?#([0-9A-F]{2})([0-9A-F]{1,2})([0-9A-F]{2})?\s*?$/.exec(s);
+
+			if (c) {
+				// #FFF -> #FFFFFF
+				if (!is(c[3]))
+					c[3] = c[2] = c[1];
+
+				return "rgb(" + parseInt(c[1], 16) + "," + parseInt(c[2], 16) + "," + parseInt(c[3], 16) + ")";
+			}
+
+			return s;
+		}
+		*/
+
+		});
+
+	// Setup page DOM
+	tinymce.DOM = new tinymce.dom.DOMUtils(document, {process_html : 0});
+})();
+
+/* file:jscripts/tiny_mce/classes/dom/Event.js */
+
+(function() {
+	// Shorten names
+	var each = tinymce.each, DOM = tinymce.DOM, isIE = tinymce.isIE, isWebKit = tinymce.isWebKit, Event;
+
+	tinymce.create('static tinymce.dom.Event', {
+		inits : [],
+		events : [],
+
+		// #if !jquery
+
+		add : function(o, n, f, s) {
+			var cb, t = this, el = t.events, r;
+
+			// Handle array
+			if (o && o instanceof Array) {
+				r = [];
+
+				each(o, function(o) {
+					o = DOM.get(o);
+					r.push(t.add(o, n, f, s));
+				});
+
+				return r;
+			}
+
+			o = DOM.get(o);
+
+			if (!o)
+				return;
+
+			// Setup event callback
+			cb = function(e) {
+				e = e || window.event;
+
+				// Patch in target in IE it's W3C valid
+				if (e && !e.target && isIE)
+					e.target = e.srcElement;
+
+				if (!s)
+					return f(e);
+
+				return f.call(s, e);
+			};
+
+			if (n == 'unload') {
+				tinymce.unloads.unshift({func : cb});
+				return cb;
+			}
+
+			if (n == 'init') {
+				if (t.domLoaded)
+					cb();
+				else
+					t.inits.push(cb);
+
+				return cb;
+			}
+
+			// Store away listener reference
+			el.push({
+				obj : o,
+				name : n,
+				func : f,
+				cfunc : cb,
+				scope : s
+			});
+
+			t._add(o, n, cb);
+
+			return f;
+		},
+
+		remove : function(o, n, f) {
+			var t = this, a = t.events, s = false, r;
+
+			// Handle array
+			if (o && o instanceof Array) {
+				r = [];
+
+				each(o, function(o) {
+					o = DOM.get(o);
+					r.push(t.remove(o, n, f));
+				});
+
+				return r;
+			}
+
+			o = DOM.get(o);
+
+			each(a, function(e, i) {
+				if (e.obj == o && e.name == n && (!f || (e.func == f || e.cfunc == f))) {
+					a.splice(i, 1);
+					t._remove(o, n, e.cfunc);
+					s = true;
+					return false;
+				}
+			});
+
+			return s;
+		},
+
+		clear : function(o) {
+			var t = this, a = t.events, i, e;
+
+			if (o) {
+				o = DOM.get(o);
+
+				for (i = a.length - 1; i >= 0; i--) {
+					e = a[i];
+
+					if (e.obj === o) {
+						t._remove(e.obj, e.name, e.cfunc);
+						e.obj = e.cfunc = null;
+						a.splice(i, 1);
+					}
+				}
+			}
+		},
+
+		// #endif
+
+		cancel : function(e) {
+			if (!e)
+				return false;
+
+			this.stop(e);
+			return this.prevent(e);
+		},
+
+		stop : function(e) {
+			if (e.stopPropagation)
+				e.stopPropagation();
+			else
+				e.cancelBubble = true;
+
+			return false;
+		},
+
+		prevent : function(e) {
+			if (e.preventDefault)
+				e.preventDefault();
+			else
+				e.returnValue = false;
+
+			return false;
+		},
+
+		_unload : function() {
+			var t = Event;
+
+			each(t.events, function(e, i) {
+				t._remove(e.obj, e.name, e.cfunc);
+				e.obj = e.cfunc = null;
+			});
+
+			t.events = [];
+			t = null;
+		},
+
+		_add : function(o, n, f) {
+			if (o.attachEvent)
+				o.attachEvent('on' + n, f);
+			else if (o.addEventListener)
+				o.addEventListener(n, f, false);
+			else
+				o['on' + n] = f;
+		},
+
+		_remove : function(o, n, f) {
+			if (o) {
+				try {
+					if (o.detachEvent)
+						o.detachEvent('on' + n, f);
+					else if (o.removeEventListener)
+						o.removeEventListener(n, f, false);
+					else
+						o['on' + n] = null;
+				} catch (ex) {
+					// Might fail with permission denined on IE so we just ignore that
+				}
+			}
+		},
+
+		_pageInit : function() {
+			var e = Event;
+
+			e._remove(window, 'DOMContentLoaded', e._pageInit);
+			e.domLoaded = true;
+
+			each(e.inits, function(c) {
+				c();
+			});
+
+			e.inits = [];
+		},
+
+		_wait : function() {
+			var t;
+
+			// No need since the document is already loaded
+			if (window.tinyMCE_GZ && tinyMCE_GZ.loaded) {
+				Event.domLoaded = 1;
+				return;
+			}
+
+			if (isIE && document.location.protocol != 'https:') {
+				// Fake DOMContentLoaded on IE
+				document.write('<script id=__ie_onload defer src=\'javascript:""\';><\/script>');
+				DOM.get("__ie_onload").onreadystatechange = function() {
+					if (this.readyState == "complete") {
+						Event._pageInit();
+						DOM.get("__ie_onload").onreadystatechange = null; // Prevent leak
+					}
+				};
+			} else {
+				Event._add(window, 'DOMContentLoaded', Event._pageInit, Event);
+
+				if (isIE || isWebKit) {
+					t = setInterval(function() {
+						if (/loaded|complete/.test(document.readyState)) {
+							clearInterval(t);
+							Event._pageInit();
+						}
+					}, 10);
+				}
+			}
+		}
+
+		});
+
+	// Shorten name
+	Event = tinymce.dom.Event;
+
+	// Dispatch DOM content loaded event for IE and Safari
+	Event._wait();
+	tinymce.addUnload(Event._unload);
+})();
+
+/* file:jscripts/tiny_mce/classes/dom/Element.js */
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('tinymce.dom.Element', {
+		Element : function(id, s) {
+			var t = this, dom, el;
+
+			s = s || {};
+			t.id = id;
+			t.dom = dom = s.dom || tinymce.DOM;
+			t.settings = s;
+
+			// Only IE leaks DOM references, this is a lot faster
+			if (!tinymce.isIE)
+				el = t.dom.get(t.id);
+
+			each([
+				'getPos',
+				'getRect',
+				'getParent',
+				'add',
+				'setStyle',
+				'getStyle',
+				'setStyles',
+				'setAttrib',
+				'setAttribs',
+				'getAttrib',
+				'addClass',
+				'removeClass',
+				'hasClass',
+				'getOuterHTML',
+				'setOuterHTML',
+				'remove',
+				'show',
+				'hide',
+				'isHidden',
+				'setHTML',
+				'get'
+			], function(k) {
+				t[k] = function() {
+					var a = arguments, o;
+
+					// Opera fails
+					if (tinymce.isOpera) {
+						a = [id];
+
+						each(arguments, function(v) {
+							a.push(v);
+						});
+					} else
+						Array.prototype.unshift.call(a, el || id);
+
+					o = dom[k].apply(dom, a);
+					t.update(k);
+
+					return o;
+				};
+			});
+		},
+
+		on : function(n, f, s) {
+			return tinymce.dom.Event.add(this.id, n, f, s);
+		},
+
+		getXY : function() {
+			return {
+				x : parseInt(this.getStyle('left')),
+				y : parseInt(this.getStyle('top'))
+			};
+		},
+
+		getSize : function() {
+			var n = this.dom.get(this.id);
+
+			return {
+				w : parseInt(this.getStyle('width') || n.clientWidth),
+				h : parseInt(this.getStyle('height') || n.clientHeight)
+			};
+		},
+
+		moveTo : function(x, y) {
+			this.setStyles({left : x, top : y});
+		},
+
+		moveBy : function(x, y) {
+			var p = this.getXY();
+
+			this.moveTo(p.x + x, p.y + y);
+		},
+
+		resizeTo : function(w, h) {
+			this.setStyles({width : w, height : h});
+		},
+
+		resizeBy : function(w, h) {
+			var s = this.getSize();
+
+			this.resizeTo(s.w + w, s.h + h);
+		},
+
+		update : function(k) {
+			var t = this, b, dom = t.dom;
+
+			if (tinymce.isIE6 && t.settings.blocker) {
+				k = k || '';
+
+				// Ignore getters
+				if (k.indexOf('get') === 0 || k.indexOf('has') === 0 || k.indexOf('is') === 0)
+					return;
+
+				// Remove blocker on remove
+				if (k == 'remove') {
+					dom.remove(t.blocker);
+					return;
+				}
+
+				if (!t.blocker) {
+					t.blocker = dom.uniqueId();
+					b = dom.add(t.settings.container || dom.getRoot(), 'iframe', {id : t.blocker, style : 'position:absolute;', frameBorder : 0, src : 'javascript:""'});
+					dom.setStyle(b, 'opacity', 0);
+				} else
+					b = dom.get(t.blocker);
+
+				dom.setStyle(b, 'left', t.getStyle('left', 1));
+				dom.setStyle(b, 'top', t.getStyle('top', 1));
+				dom.setStyle(b, 'width', t.getStyle('width', 1));
+				dom.setStyle(b, 'height', t.getStyle('height', 1));
+				dom.setStyle(b, 'display', t.getStyle('display', 1));
+				dom.setStyle(b, 'zIndex', parseInt(t.getStyle('zIndex', 1) || 0) - 1);
+			}
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/dom/Selection.js */
+
+(function() {
+	function trimNl(s) {
+		return s.replace(/[\n\r]+/g, '');
+	};
+
+	// Shorten names
+	var is = tinymce.is, isIE = tinymce.isIE, each = tinymce.each;
+
+	tinymce.create('tinymce.dom.Selection', {
+		Selection : function(dom, win, serializer) {
+			var t = this;
+
+			t.dom = dom;
+			t.win = win;
+			t.serializer = serializer;
+
+			// Prevent leaks
+			tinymce.addUnload(t.destroy, t);
+		},
+
+		getContent : function(s) {
+			var t = this, r = t.getRng(), e = t.dom.create("body"), se = t.getSel(), wb, wa, n;
+
+			s = s || {};
+			wb = wa = '';
+			s.get = true;
+			s.format = s.format || 'html';
+
+			if (s.format == 'text')
+				return t.isCollapsed() ? '' : (r.text || (se.toString ? se.toString() : ''));
+
+			if (r.cloneContents) {
+				n = r.cloneContents();
+
+				if (n)
+					e.appendChild(n);
+			} else if (is(r.item) || is(r.htmlText))
+				e.innerHTML = r.item ? r.item(0).outerHTML : r.htmlText;
+			else
+				e.innerHTML = r.toString();
+
+			// Keep whitespace before and after
+			if (/^\s/.test(e.innerHTML))
+				wb = ' ';
+
+			if (/\s+$/.test(e.innerHTML))
+				wa = ' ';
+
+			s.getInner = true;
+
+			return t.isCollapsed() ? '' : wb + t.serializer.serialize(e, s) + wa;
+		},
+
+		setContent : function(h, s) {
+			var t = this, r = t.getRng(), c, d = t.win.document;
+
+			s = s || {format : 'html'};
+			s.set = true;
+			h = t.dom.processHTML(h);
+
+			if (r.insertNode) {
+				// Make caret marker since insertNode places the caret in the beginning of text after insert
+				h += '<span id="__caret">_</span>';
+
+				// Delete and insert new node
+				r.deleteContents();
+				r.insertNode(t.getRng().createContextualFragment(h));
+
+				// Move to caret marker
+				c = t.dom.get('__caret');
+
+				// Make sure we wrap it compleatly, Opera fails with a simple select call
+				r = d.createRange();
+				r.setStartBefore(c);
+				r.setEndAfter(c);
+				t.setRng(r);
+
+				// Delete the marker, and hopefully the caret gets placed in the right location
+				d.execCommand('Delete', false, null);
+
+				// In case it's still there
+				t.dom.remove('__caret');
+			} else {
+				if (r.item) {
+					// Delete content and get caret text selection
+					d.execCommand('Delete', false, null);
+					r = t.getRng();
+				}
+
+				r.pasteHTML(h);
+			}
+		},
+
+		getStart : function() {
+			var t = this, r = t.getRng(), e;
+
+			if (isIE) {
+				if (r.item)
+					return r.item(0);
+
+				r = r.duplicate();
+				r.collapse(1);
+				e = r.parentElement();
+
+				if (e && e.nodeName == 'BODY')
+					return e.firstChild;
+
+				return e;
+			} else {
+				e = r.startContainer;
+
+				if (e.nodeName == 'BODY')
+					return e.firstChild;
+
+				return t.dom.getParent(e, function(n) {return n.nodeType == 1;});
+			}
+		},
+
+		getEnd : function() {
+			var t = this, r = t.getRng(), e;
+
+			if (isIE) {
+				if (r.item)
+					return r.item(0);
+
+				r = r.duplicate();
+				r.collapse(0);
+				e = r.parentElement();
+
+				if (e && e.nodeName == 'BODY')
+					return e.lastChild;
+
+				return e;
+			} else {
+				e = r.endContainer;
+
+				if (e.nodeName == 'BODY')
+					return e.lastChild;
+
+				return t.dom.getParent(e, function(n) {return n.nodeType == 1;});
+			}
+		},
+
+		getBookmark : function(si) {
+			var t = this, r = t.getRng(), tr, sx, sy, vp = t.dom.getViewPort(t.win), e, sp, bp, le, c = -0xFFFFFF, s, ro = t.dom.getRoot(), wb = 0, wa = 0, nv;
+			sx = vp.x;
+			sy = vp.y;
+
+			// Simple bookmark fast but not as persistent
+			if (si == 'simple')
+				return {rng : r, scrollX : sx, scrollY : sy};
+
+			// Handle IE
+			if (isIE) {
+				// Control selection
+				if (r.item) {
+					e = r.item(0);
+
+					each(t.dom.select(e.nodeName), function(n, i) {
+						if (e == n) {
+							sp = i;
+							return false;
+						}
+					});
+
+					return {
+						tag : e.nodeName,
+						index : sp,
+						scrollX : sx,
+						scrollY : sy
+					};
+				}
+
+				// Text selection
+				tr = t.dom.doc.body.createTextRange();
+				tr.moveToElementText(ro);
+				tr.collapse(true);
+				bp = Math.abs(tr.move('character', c));
+
+				tr = r.duplicate();
+				tr.collapse(true);
+				sp = Math.abs(tr.move('character', c));
+
+				tr = r.duplicate();
+				tr.collapse(false);
+				le = Math.abs(tr.move('character', c)) - sp;
+
+				return {
+					start : sp - bp,
+					length : le,
+					scrollX : sx,
+					scrollY : sy
+				};
+			}
+
+			// Handle W3C
+			e = t.getNode();
+			s = t.getSel();
+
+			if (!s)
+				return null;
+
+			// Image selection
+			if (e && e.nodeName == 'IMG') {
+				return {
+					scrollX : sx,
+					scrollY : sy
+				};
+			}
+
+			// Text selection
+
+			function getPos(r, sn, en) {
+				var w = t.dom.doc.createTreeWalker(r, NodeFilter.SHOW_TEXT, null, false), n, p = 0, d = {};
+
+				while ((n = w.nextNode()) != null) {
+					if (n == sn)
+						d.start = p;
+
+					if (n == en) {
+						d.end = p;
+						return d;
+					}
+
+					p += trimNl(n.nodeValue || '').length;
+				}
+
+				return null;
+			};
+
+			// Caret or selection
+			if (s.anchorNode == s.focusNode && s.anchorOffset == s.focusOffset) {
+				e = getPos(ro, s.anchorNode, s.focusNode);
+
+				if (!e)
+					return {scrollX : sx, scrollY : sy};
+
+				// Count whitespace before
+				trimNl(s.anchorNode.nodeValue || '').replace(/^\s+/, function(a) {wb = a.length;});
+
+				return {
+					start : Math.max(e.start + s.anchorOffset - wb, 0),
+					end : Math.max(e.end + s.focusOffset - wb, 0),
+					scrollX : sx,
+					scrollY : sy,
+					beg : s.anchorOffset - wb == 0
+				};
+			} else {
+				e = getPos(ro, r.startContainer, r.endContainer);
+
+				// Count whitespace before start and end container
+				//(r.startContainer.nodeValue || '').replace(/^\s+/, function(a) {wb = a.length;});
+				//(r.endContainer.nodeValue || '').replace(/^\s+/, function(a) {wa = a.length;});
+
+				if (!e)
+					return {scrollX : sx, scrollY : sy};
+
+				return {
+					start : Math.max(e.start + r.startOffset - wb, 0),
+					end : Math.max(e.end + r.endOffset - wa, 0),
+					scrollX : sx,
+					scrollY : sy,
+					beg : r.startOffset - wb == 0
+				};
+			}
+		},
+
+		moveToBookmark : function(b) {
+			var t = this, r = t.getRng(), s = t.getSel(), ro = t.dom.getRoot(), sd, nvl, nv;
+
+			function getPos(r, sp, ep) {
+				var w = t.dom.doc.createTreeWalker(r, NodeFilter.SHOW_TEXT, null, false), n, p = 0, d = {}, o, v, wa, wb;
+
+				while ((n = w.nextNode()) != null) {
+					wa = wb = 0;
+
+					nv = n.nodeValue || '';
+					//nv.replace(/^\s+[^\s]/, function(a) {wb = a.length - 1;});
+					//nv.replace(/[^\s]\s+$/, function(a) {wa = a.length - 1;});
+
+					nvl = trimNl(nv).length;
+					p += nvl;
+
+					if (p >= sp && !d.startNode) {
+						o = sp - (p - nvl);
+
+						// Fix for odd quirk in FF
+						if (b.beg && o >= nvl)
+							continue;
+
+						d.startNode = n;
+						d.startOffset = o + wb;
+					}
+
+					if (p >= ep) {
+						d.endNode = n;
+						d.endOffset = ep - (p - nvl) + wb;
+						return d;
+					}
+				}
+
+				return null;
+			};
+
+			if (!b)
+				return false;
+
+			t.win.scrollTo(b.scrollX, b.scrollY);
+
+			// Handle explorer
+			if (isIE) {
+				// Handle simple
+				if (r = b.rng) {
+					try {
+						r.select();
+					} catch (ex) {
+						// Ignore
+					}
+
+					return true;
+				}
+
+				t.win.focus();
+
+				// Handle control bookmark
+				if (b.tag) {
+					r = ro.createControlRange();
+
+					each(t.dom.select(b.tag), function(n, i) {
+						if (i == b.index)
+							r.addElement(n);
+					});
+				} else {
+					// Try/catch needed since this operation breaks when TinyMCE is placed in hidden divs/tabs
+					try {
+						// Incorrect bookmark
+						if (b.start < 0)
+							return true;
+
+						r = s.createRange();
+						r.moveToElementText(ro);
+						r.collapse(true);
+						r.moveStart('character', b.start);
+						r.moveEnd('character', b.length);
+					} catch (ex2) {
+						return true;
+					}
+				}
+
+				try {
+					r.select();
+				} catch (ex) {
+					// Needed for some odd IE bug #1843306
+				}
+
+				return true;
+			}
+
+			// Handle W3C
+			if (!s)
+				return false;
+
+			// Handle simple
+			if (b.rng) {
+				s.removeAllRanges();
+				s.addRange(b.rng);
+			} else {
+				if (is(b.start) && is(b.end)) {
+					try {
+						sd = getPos(ro, b.start, b.end);
+
+						if (sd) {
+							r = t.dom.doc.createRange();
+							r.setStart(sd.startNode, sd.startOffset);
+							r.setEnd(sd.endNode, sd.endOffset);
+							s.removeAllRanges();
+							s.addRange(r);
+						}
+
+						if (!tinymce.isOpera)
+							t.win.focus();
+					} catch (ex) {
+						// Ignore
+					}
+				}
+			}
+		},
+
+		select : function(n, c) {
+			var t = this, r = t.getRng(), s = t.getSel(), b, fn, ln, d = t.win.document;
+
+			function first(n) {
+				return n ? d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false).nextNode() : null;
+			};
+
+			function last(n) {
+				var c, o, w;
+
+				if (!n)
+					return null;
+
+				w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);
+				while (c = w.nextNode())
+					o = c;
+
+				return o;
+			};
+
+			if (isIE) {
+				try {
+					b = d.body;
+
+					if (/^(IMG|TABLE)$/.test(n.nodeName)) {
+						r = b.createControlRange();
+						r.addElement(n);
+					} else {
+						r = b.createTextRange();
+						r.moveToElementText(n);
+					}
+
+					r.select();
+				} catch (ex) {
+					// Throws illigal agrument in IE some times
+				}
+			} else {
+				if (c) {
+					fn = first(n);
+					ln = last(n);
+
+					if (fn && ln) {
+						//console.debug(fn, ln);
+						r = d.createRange();
+						r.setStart(fn, 0);
+						r.setEnd(ln, ln.nodeValue.length);
+					} else
+						r.selectNode(n);
+				} else
+					r.selectNode(n);
+
+				t.setRng(r);
+			}
+
+			return n;
+		},
+
+		isCollapsed : function() {
+			var t = this, r = t.getRng(), s = t.getSel();
+
+			if (!r || r.item)
+				return false;
+
+			return !s || r.boundingWidth == 0 || r.collapsed;
+		},
+
+		collapse : function(b) {
+			var t = this, r = t.getRng(), n;
+
+			// Control range on IE
+			if (r.item) {
+				n = r.item(0);
+				r = this.win.document.body.createTextRange();
+				r.moveToElementText(n);
+			}
+
+			r.collapse(!!b);
+			t.setRng(r);
+		},
+
+		getSel : function() {
+			var t = this, w = this.win;
+
+			return w.getSelection ? w.getSelection() : w.document.selection;
+		},
+
+		getRng : function() {
+			var t = this, s = t.getSel(), r;
+
+			try {
+				if (s)
+					r = s.rangeCount > 0 ? s.getRangeAt(0) : (s.createRange ? s.createRange() : t.win.document.createRange());
+			} catch (ex) {
+				// IE throws unspecified error here if TinyMCE is placed in a frame/iframe
+			}
+
+			// No range found then create an empty one
+			// This can occur when the editor is placed in a hidden container element on Gecko
+			// Or on IE when there was an exception
+			if (!r)
+				r = isIE ? t.win.document.body.createTextRange() : t.win.document.createRange();
+
+			return r;
+		},
+
+		setRng : function(r) {
+			var s;
+
+			if (!isIE) {
+				s = this.getSel();
+
+				if (s) {
+					s.removeAllRanges();
+					s.addRange(r);
+				}
+			} else {
+				try {
+					r.select();
+				} catch (ex) {
+					// Needed for some odd IE bug #1843306
+				}
+			}
+		},
+
+		setNode : function(n) {
+			var t = this;
+
+			t.setContent(t.dom.getOuterHTML(n));
+
+			return n;
+		},
+
+		getNode : function() {
+			var t = this, r = t.getRng(), s = t.getSel(), e;
+
+			if (!isIE) {
+				// Range maybe lost after the editor is made visible again
+				if (!r)
+					return t.dom.getRoot();
+
+				e = r.commonAncestorContainer;
+
+				// Handle selection a image or other control like element such as anchors
+				if (!r.collapsed) {
+					// If the anchor node is a element instead of a text node then return this element
+					if (tinymce.isWebKit && s.anchorNode && s.anchorNode.nodeType == 1) 
+						return s.anchorNode.childNodes[s.anchorOffset]; 
+
+					if (r.startContainer == r.endContainer) {
+						if (r.startOffset - r.endOffset < 2) {
+							if (r.startContainer.hasChildNodes())
+								e = r.startContainer.childNodes[r.startOffset];
+						}
+					}
+				}
+
+				return t.dom.getParent(e, function(n) {
+					return n.nodeType == 1;
+				});
+			}
+
+			return r.item ? r.item(0) : r.parentElement();
+		},
+
+		destroy : function(s) {
+			var t = this;
+
+			t.win = null;
+
+			// Manual destroy then remove unload handler
+			if (!s)
+				tinymce.removeUnload(t.destroy);
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/dom/XMLWriter.js */
+
+(function() {
+	tinymce.create('tinymce.dom.XMLWriter', {
+		node : null,
+
+		XMLWriter : function(s) {
+			// Get XML document
+			function getXML() {
+				var i = document.implementation;
+
+				if (!i || !i.createDocument) {
+					// Try IE objects
+					try {return new ActiveXObject('MSXML2.DOMDocument');} catch (ex) {}
+					try {return new ActiveXObject('Microsoft.XmlDom');} catch (ex) {}
+				} else
+					return i.createDocument('', '', null);
+			};
+
+			this.doc = getXML();
+			
+			// Since Opera and WebKit doesn't escape > into &gt; we need to do it our self to normalize the output for all browsers
+			this.valid = tinymce.isOpera || tinymce.isWebKit;
+
+			this.reset();
+		},
+
+		reset : function() {
+			var t = this, d = t.doc;
+
+			if (d.firstChild)
+				d.removeChild(d.firstChild);
+
+			t.node = d.appendChild(d.createElement("html"));
+		},
+
+		writeStartElement : function(n) {
+			var t = this;
+
+			t.node = t.node.appendChild(t.doc.createElement(n));
+		},
+
+		writeAttribute : function(n, v) {
+			if (this.valid)
+				v = v.replace(/>/g, '%MCGT%');
+
+			this.node.setAttribute(n, v);
+		},
+
+		writeEndElement : function() {
+			this.node = this.node.parentNode;
+		},
+
+		writeFullEndElement : function() {
+			var t = this, n = t.node;
+
+			n.appendChild(t.doc.createTextNode(""));
+			t.node = n.parentNode;
+		},
+
+		writeText : function(v) {
+			if (this.valid)
+				v = v.replace(/>/g, '%MCGT%');
+
+			this.node.appendChild(this.doc.createTextNode(v));
+		},
+
+		writeCDATA : function(v) {
+			this.node.appendChild(this.doc.createCDATA(v));
+		},
+
+		writeComment : function(v) {
+			this.node.appendChild(this.doc.createComment(v.replace(/\-\-/g, ' ')));
+		},
+
+		getContent : function() {
+			var h;
+
+			h = this.doc.xml || new XMLSerializer().serializeToString(this.doc);
+			h = h.replace(/<\?[^?]+\?>|<html>|<\/html>|<html\/>|<!DOCTYPE[^>]+>/g, '');
+			h = h.replace(/ ?\/>/g, ' />');
+
+			if (this.valid)
+				h = h.replace(/\%MCGT%/g, '&gt;');
+
+			return h;
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/dom/StringWriter.js */
+
+(function() {
+	tinymce.create('tinymce.dom.StringWriter', {
+		str : null,
+		tags : null,
+		count : 0,
+		settings : null,
+		indent : null,
+
+		StringWriter : function(s) {
+			this.settings = tinymce.extend({
+				indent_char : ' ',
+				indentation : 1
+			}, s);
+
+			this.reset();
+		},
+
+		reset : function() {
+			this.indent = '';
+			this.str = "";
+			this.tags = [];
+			this.count = 0;
+		},
+
+		writeStartElement : function(n) {
+			this._writeAttributesEnd();
+			this.writeRaw('<' + n);
+			this.tags.push(n);
+			this.inAttr = true;
+			this.count++;
+			this.elementCount = this.count;
+		},
+
+		writeAttribute : function(n, v) {
+			var t = this;
+
+			t.writeRaw(" " + t.encode(n) + '="' + t.encode(v) + '"');
+		},
+
+		writeEndElement : function() {
+			var n;
+
+			if (this.tags.length > 0) {
+				n = this.tags.pop();
+
+				if (this._writeAttributesEnd(1))
+					this.writeRaw('</' + n + '>');
+
+				if (this.settings.indentation > 0)
+					this.writeRaw('\n');
+			}
+		},
+
+		writeFullEndElement : function() {
+			if (this.tags.length > 0) {
+				this._writeAttributesEnd();
+				this.writeRaw('</' + this.tags.pop() + '>');
+
+				if (this.settings.indentation > 0)
+					this.writeRaw('\n');
+			}
+		},
+
+		writeText : function(v) {
+			this._writeAttributesEnd();
+			this.writeRaw(this.encode(v));
+			this.count++;
+		},
+
+		writeCDATA : function(v) {
+			this._writeAttributesEnd();
+			this.writeRaw('<![CDATA[' + v + ']]>');
+			this.count++;
+		},
+
+		writeComment : function(v) {
+			this._writeAttributesEnd();
+			this.writeRaw('<!-- ' + v + '-->');
+			this.count++;
+		},
+
+		writeRaw : function(v) {
+			this.str += v;
+		},
+
+		encode : function(s) {
+			return s.replace(/[<>&"]/g, function(v) {
+				switch (v) {
+					case '<':
+						return '&lt;';
+
+					case '>':
+						return '&gt;';
+
+					case '&':
+						return '&amp;';
+
+					case '"':
+						return '&quot;';
+				}
+
+				return v;
+			});
+		},
+
+		getContent : function() {
+			return this.str;
+		},
+
+		_writeAttributesEnd : function(s) {
+			if (!this.inAttr)
+				return;
+
+			this.inAttr = false;
+
+			if (s && this.elementCount == this.count) {
+				this.writeRaw(' />');
+				return false;
+			}
+
+			this.writeRaw('>');
+
+			return true;
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/dom/Serializer.js */
+
+(function() {
+	// Shorten names
+	var extend = tinymce.extend, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher, isIE = tinymce.isIE, isGecko = tinymce.isGecko;
+
+	// Returns only attribites that have values not all attributes in IE
+	function getIEAtts(n) {
+		var o = [];
+
+		// Object will throw exception in IE
+		if (n.nodeName == 'OBJECT')
+			return n.attributes;
+
+		n.cloneNode(false).outerHTML.replace(/([a-z0-9\:\-_]+)=/gi, function(a, b) {
+			o.push({specified : 1, nodeName : b});
+		});
+
+		return o;
+	};
+
+	function wildcardToRE(s) {
+		return s.replace(/([?+*])/g, '.$1');
+	};
+
+	tinymce.create('tinymce.dom.Serializer', {
+		Serializer : function(s) {
+			var t = this;
+
+			t.key = 0;
+			t.onPreProcess = new Dispatcher(t);
+			t.onPostProcess = new Dispatcher(t);
+
+			if (tinymce.relaxedDomain && tinymce.isGecko) {
+				// Gecko has a bug where we can't create a new XML document if domain relaxing is used
+				t.writer = new tinymce.dom.StringWriter();
+			} else {
+				try {
+					t.writer = new tinymce.dom.XMLWriter();
+				} catch (ex) {
+					// IE might throw exception if ActiveX is disabled so we then switch to the slightly slower StringWriter
+					t.writer = new tinymce.dom.StringWriter();
+				}
+			}
+
+			// Default settings
+			t.settings = s = extend({
+				dom : tinymce.DOM,
+				valid_nodes : 0,
+				node_filter : 0,
+				attr_filter : 0,
+				invalid_attrs : /^(mce_|_moz_)/,
+				closed : /(br|hr|input|meta|img|link|param)/,
+				entity_encoding : 'named',
+				entities : '160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro',
+				valid_elements : '*[*]',
+				extended_valid_elements : 0,
+				valid_child_elements : 0,
+				invalid_elements : 0,
+				fix_table_elements : 0,
+				fix_list_elements : true,
+				fix_content_duplication : true,
+				convert_fonts_to_spans : false,
+				font_size_classes : 0,
+				font_size_style_values : 0,
+				apply_source_formatting : 0,
+				indent_mode : 'simple',
+				indent_char : '\t',
+				indent_levels : 1,
+				remove_linebreaks : 1,
+				remove_redundant_brs : 1
+			}, s);
+
+			t.dom = s.dom;
+
+			if (s.remove_redundant_brs) {
+				t.onPostProcess.add(function(se, o) {
+					// Remove BR elements at end of list elements since they get rendered in IE
+					o.content = o.content.replace(/<br \/>(\s*<\/li>)/g, '$1');
+				});
+			}
+
+			if (s.fix_list_elements) {
+				t.onPreProcess.add(function(se, o) {
+					var nl, x, a = ['ol', 'ul'], i, n, p, r = /^(OL|UL)$/, np;
+
+					function prevNode(e, n) {
+						var a = n.split(','), i;
+
+						while ((e = e.previousSibling) != null) {
+							for (i=0; i<a.length; i++) {
+								if (e.nodeName == a[i])
+									return e;
+							}
+						}
+
+						return null;
+					};
+
+					for (x=0; x<a.length; x++) {
+						nl = t.dom.select(a[x], o.node);
+
+						for (i=0; i<nl.length; i++) {
+							n = nl[i];
+							p = n.parentNode;
+
+							if (r.test(p.nodeName)) {
+								np = prevNode(n, 'LI');
+
+								if (!np) {
+									np = t.dom.create('li');
+									np.innerHTML = '&nbsp;';
+									np.appendChild(n);
+									p.insertBefore(np, p.firstChild);
+								} else
+									np.appendChild(n);
+							}
+						}
+					}
+				});
+			}
+
+			if (s.fix_table_elements) {
+				t.onPreProcess.add(function(se, o) {
+					each(t.dom.select('table', o.node), function(e) {
+						var pa = t.dom.getParent(e, 'H1,H2,H3,H4,H5,H6,P'), pa2, n, tm, pl = [], i, ns;
+
+						if (pa) {
+							pa2 = pa.cloneNode(false);
+
+							pl.push(e);
+							for (n = e; n = n.parentNode;) {
+								pl.push(n);
+
+								if (n == pa)
+									break;
+							}
+
+							tm = pa2;
+							for (i = pl.length - 1; i >= 0; i--) {
+								if (i == pl.length - 1) {
+									while (ns = pl[i - 1].nextSibling)
+										tm.appendChild(ns.parentNode.removeChild(ns));
+								} else {
+									n = pl[i].cloneNode(false);
+
+									if (i != 0) {
+										while (ns = pl[i - 1].nextSibling)
+											n.appendChild(ns.parentNode.removeChild(ns));
+									}
+
+									tm = tm.appendChild(n);
+								}
+							}
+
+							e = t.dom.insertAfter(e.parentNode.removeChild(e), pa);
+							t.dom.insertAfter(e, pa);
+							t.dom.insertAfter(pa2, e);
+						}
+					});
+				});
+			}
+		},
+
+		setEntities : function(s) {
+			var t = this, a, i, l = {}, re = '', v;
+
+			// No need to setup more than once
+			if (t.entityLookup)
+				return;
+
+			// Build regex and lookup array
+			a = s.split(',');
+			for (i = 0; i < a.length; i += 2) {
+				v = a[i];
+
+				// Don't add default &amp; &quot; etc.
+				if (v == 34 || v == 38 || v == 60 || v == 62)
+					continue;
+
+				l[String.fromCharCode(a[i])] = a[i + 1];
+
+				v = parseInt(a[i]).toString(16);
+				re += '\\u' + '0000'.substring(v.length) + v;
+			}
+
+			if (!re) {
+				t.settings.entity_encoding = 'raw';
+				return;
+			}
+
+			t.entitiesRE = new RegExp('[' + re + ']', 'g');
+			t.entityLookup = l;
+		},
+
+		setValidChildRules : function(s) {
+			this.childRules = null;
+			this.addValidChildRules(s);
+		},
+
+		addValidChildRules : function(s) {
+			var t = this, inst, intr, bloc;
+
+			if (!s)
+				return;
+
+			inst = 'A|BR|SPAN|BDO|MAP|OBJECT|IMG|TT|I|B|BIG|SMALL|EM|STRONG|DFN|CODE|Q|SAMP|KBD|VAR|CITE|ABBR|ACRONYM|SUB|SUP|#text|#comment';
+			intr = 'A|BR|SPAN|BDO|OBJECT|APPLET|IMG|MAP|IFRAME|TT|I|B|U|S|STRIKE|BIG|SMALL|FONT|BASEFONT|EM|STRONG|DFN|CODE|Q|SAMP|KBD|VAR|CITE|ABBR|ACRONYM|SUB|SUP|INPUT|SELECT|TEXTAREA|LABEL|BUTTON|#text|#comment';
+			bloc = 'H[1-6]|P|DIV|ADDRESS|PRE|FORM|TABLE|LI|OL|UL|TD|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|FORM|NOSCRIPT|NOFRAMES|MENU|ISINDEX|SAMP';
+
+			each(s.split(','), function(s) {
+				var p = s.split(/\[|\]/), re;
+
+				s = '';
+				each(p[1].split('|'), function(v) {
+					if (s)
+						s += '|';
+
+					switch (v) {
+						case '%itrans':
+							v = intr;
+							break;
+
+						case '%itrans_na':
+							v = intr.substring(2);
+							break;
+
+						case '%istrict':
+							v = inst;
+							break;
+
+						case '%istrict_na':
+							v = inst.substring(2);
+							break;
+
+						case '%btrans':
+							v = bloc;
+							break;
+
+						case '%bstrict':
+							v = bloc;
+							break;
+					}
+
+					s += v;
+				});
+				re = new RegExp('^(' + s.toLowerCase() + ')$', 'i');
+
+				each(p[0].split('/'), function(s) {
+					t.childRules = t.childRules || {};
+					t.childRules[s] = re;
+				});
+			});
+
+			// Build regex
+			s = '';
+			each(t.childRules, function(v, k) {
+				if (s)
+					s += '|';
+
+				s += k;
+			});
+
+			t.parentElementsRE = new RegExp('^(' + s.toLowerCase() + ')$', 'i');
+
+			/*console.debug(t.parentElementsRE.toString());
+			each(t.childRules, function(v) {
+				console.debug(v.toString());
+			});*/
+		},
+
+		setRules : function(s) {
+			var t = this;
+
+			t._setup();
+			t.rules = {};
+			t.wildRules = [];
+			t.validElements = {};
+
+			return t.addRules(s);
+		},
+
+		addRules : function(s) {
+			var t = this, dr;
+
+			if (!s)
+				return;
+
+			t._setup();
+
+			each(s.split(','), function(s) {
+				var p = s.split(/\[|\]/), tn = p[0].split('/'), ra, at, wat, va = [];
+
+				// Extend with default rules
+				if (dr)
+					at = tinymce.extend([], dr.attribs);
+
+				// Parse attributes
+				if (p.length > 1) {
+					each(p[1].split('|'), function(s) {
+						var ar = {}, i;
+
+						at = at || [];
+
+						// Parse attribute rule
+						s = s.replace(/::/g, '~');
+						s = /^([!\-])?([\w*.?~_\-]+|)([=:<])?(.+)?$/.exec(s);
+						s[2] = s[2].replace(/~/g, ':');
+
+						// Add required attributes
+						if (s[1] == '!') {
+							ra = ra || [];
+							ra.push(s[2]);
+						}
+
+						// Remove inherited attributes
+						if (s[1] == '-') {
+							for (i = 0; i <at.length; i++) {
+								if (at[i].name == s[2]) {
+									at.splice(i, 1);
+									return;
+								}
+							}
+						}
+
+						switch (s[3]) {
+							// Add default attrib values
+							case '=':
+								ar.defaultVal = s[4] || '';
+								break;
+
+							// Add forced attrib values
+							case ':':
+								ar.forcedVal = s[4];
+								break;
+
+							// Add validation values
+							case '<':
+								ar.validVals = s[4].split('?');
+								break;
+						}
+
+						if (/[*.?]/.test(s[2])) {
+							wat = wat || [];
+							ar.nameRE = new RegExp('^' + wildcardToRE(s[2]) + '$');
+							wat.push(ar);
+						} else {
+							ar.name = s[2];
+							at.push(ar);
+						}
+
+						va.push(s[2]);
+					});
+				}
+
+				// Handle element names
+				each(tn, function(s, i) {
+					var pr = s.charAt(0), x = 1, ru = {};
+
+					// Extend with default rule data
+					if (dr) {
+						if (dr.noEmpty)
+							ru.noEmpty = dr.noEmpty;
+
+						if (dr.fullEnd)
+							ru.fullEnd = dr.fullEnd;
+
+						if (dr.padd)
+							ru.padd = dr.padd;
+					}
+
+					// Handle prefixes
+					switch (pr) {
+						case '-':
+							ru.noEmpty = true;
+							break;
+
+						case '+':
+							ru.fullEnd = true;
+							break;
+
+						case '#':
+							ru.padd = true;
+							break;
+
+						default:
+							x = 0;
+					}
+
+					tn[i] = s = s.substring(x);
+					t.validElements[s] = 1;
+
+					// Add element name or element regex
+					if (/[*.?]/.test(tn[0])) {
+						ru.nameRE = new RegExp('^' + wildcardToRE(tn[0]) + '$');
+						t.wildRules = t.wildRules || {};
+						t.wildRules.push(ru);
+					} else {
+						ru.name = tn[0];
+
+						// Store away default rule
+						if (tn[0] == '@')
+							dr = ru;
+
+						t.rules[s] = ru;
+					}
+
+					ru.attribs = at;
+
+					if (ra)
+						ru.requiredAttribs = ra;
+
+					if (wat) {
+						// Build valid attributes regexp
+						s = '';
+						each(va, function(v) {
+							if (s)
+								s += '|';
+
+							s += '(' + wildcardToRE(v) + ')';
+						});
+						ru.validAttribsRE = new RegExp('^' + s.toLowerCase() + '$');
+						ru.wildAttribs = wat;
+					}
+				});
+			});
+
+			// Build valid elements regexp
+			s = '';
+			each(t.validElements, function(v, k) {
+				if (s)
+					s += '|';
+
+				if (k != '@')
+					s += k;
+			});
+			t.validElementsRE = new RegExp('^(' + wildcardToRE(s.toLowerCase()) + ')$');
+
+			//console.debug(t.validElementsRE.toString());
+			//console.dir(t.rules);
+			//console.dir(t.wildRules);
+		},
+
+		findRule : function(n) {
+			var t = this, rl = t.rules, i, r;
+
+			t._setup();
+
+			// Exact match
+			r = rl[n];
+			if (r)
+				return r;
+
+			// Try wildcards
+			rl = t.wildRules;
+			for (i = 0; i < rl.length; i++) {
+				if (rl[i].nameRE.test(n))
+					return rl[i];
+			}
+
+			return null;
+		},
+
+		findAttribRule : function(ru, n) {
+			var i, wa = ru.wildAttribs;
+
+			for (i = 0; i < wa.length; i++) {
+				if (wa[i].nameRE.test(n))
+					return wa[i];
+			}
+
+			return null;
+		},
+
+		serialize : function(n, o) {
+			var h, t = this;
+
+			t._setup();
+			o = o || {};
+			o.format = o.format || 'html';
+			t.processObj = o;
+			n = n.cloneNode(true);
+			t.key = '' + (parseInt(t.key) + 1);
+
+			// Pre process
+			if (!o.no_events) {
+				o.node = n;
+				t.onPreProcess.dispatch(t, o);
+			}
+
+			// Serialize HTML DOM into a string
+			t.writer.reset();
+			t._serializeNode(n, o.getInner);
+
+			// Post process
+			o.content = t.writer.getContent();
+
+			if (!o.no_events)
+				t.onPostProcess.dispatch(t, o);
+
+			t._postProcess(o);
+			o.node = null;
+
+			return tinymce.trim(o.content);
+		},
+
+		// Internal functions
+
+		_postProcess : function(o) {
+			var t = this, s = t.settings, h = o.content, sc = [], p;
+
+			if (o.format == 'html') {
+				// Protect some elements
+				p = t._protect({
+					content : h,
+					patterns : [
+						{pattern : /(<script[^>]*>)(.*?)(<\/script>)/g},
+						{pattern : /(<style[^>]*>)(.*?)(<\/style>)/g},
+						{pattern : /(<pre[^>]*>)(.*?)(<\/pre>)/g, encode : 1},
+						{pattern : /(<!--\[CDATA\[)(.*?)(\]\]-->)/g}
+					]
+				});
+
+				h = p.content;
+
+				// Entity encode
+				if (s.entity_encoding !== 'raw')
+					h = t._encode(h);
+
+				// Use BR instead of &nbsp; padded P elements inside editor and use <p>&nbsp;</p> outside editor
+/*				if (o.set)
+					h = h.replace(/<p>\s+(&nbsp;|&#160;|\u00a0|<br \/>)\s+<\/p>/g, '<p><br /></p>');
+				else
+					h = h.replace(/<p>\s+(&nbsp;|&#160;|\u00a0|<br \/>)\s+<\/p>/g, '<p>$1</p>');*/
+
+				// Since Gecko and Safari keeps whitespace in the DOM we need to
+				// remove it inorder to match other browsers. But I think Gecko and Safari is right.
+				// This process is only done when getting contents out from the editor.
+				if (!o.set) {
+					// We need to replace paragraph whitespace with an nbsp before indentation to keep the \u00a0 char
+					h = h.replace(/<p>\s+<\/p>|<p([^>]+)>\s+<\/p>/g, s.entity_encoding == 'numeric' ? '<p$1>&#160;</p>' : '<p$1>&nbsp;</p>');
+
+					if (s.remove_linebreaks) {
+						h = h.replace(/\r?\n|\r/g, ' ');
+						h = h.replace(/(<[^>]+>)\s+/g, '$1 ');
+						h = h.replace(/\s+(<\/[^>]+>)/g, ' $1');
+						h = h.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object) ([^>]+)>\s+/g, '<$1 $2>'); // Trim block start
+						h = h.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>\s+/g, '<$1>'); // Trim block start
+						h = h.replace(/\s+<\/(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>/g, '</$1>'); // Trim block end
+					}
+
+					// Simple indentation
+					if (s.apply_source_formatting && s.indent_mode == 'simple') {
+						// Add line breaks before and after block elements
+						h = h.replace(/<(\/?)(ul|hr|table|meta|link|tbody|tr|object|body|head|html|map)(|[^>]+)>\s*/g, '\n<$1$2$3>\n');
+						h = h.replace(/\s*<(p|h[1-6]|blockquote|div|title|style|pre|script|td|li|area)(|[^>]+)>/g, '\n<$1$2>');
+						h = h.replace(/<\/(p|h[1-6]|blockquote|div|title|style|pre|script|td|li)>\s*/g, '</$1>\n');
+						h = h.replace(/\n\n/g, '\n');
+					}
+				}
+
+				h = t._unprotect(h, p);
+
+				// Restore CDATA sections
+				h = h.replace(/<!--\[CDATA\[([\s\S]+)\]\]-->/g, '<![CDATA[$1]]>');
+
+				// Restore the \u00a0 character if raw mode is enabled
+				if (s.entity_encoding == 'raw')
+					h = h.replace(/<p>&nbsp;<\/p>|<p([^>]+)>&nbsp;<\/p>/g, '<p$1>\u00a0</p>');
+			}
+
+			o.content = h;
+		},
+
+		_serializeNode : function(n, inn) {
+			var t = this, s = t.settings, w = t.writer, hc, el, cn, i, l, a, at, no, v, nn, ru, ar, iv;
+
+			if (!s.node_filter || s.node_filter(n)) {
+				switch (n.nodeType) {
+					case 1: // Element
+						if (n.hasAttribute ? n.hasAttribute('mce_bogus') : n.getAttribute('mce_bogus'))
+							return;
+
+						iv = false;
+						hc = n.hasChildNodes();
+						nn = n.getAttribute('mce_name') || n.nodeName.toLowerCase();
+
+						// Add correct prefix on IE
+						if (isIE) {
+							if (n.scopeName !== 'HTML' && n.scopeName !== 'html')
+								nn = n.scopeName + ':' + nn;
+						}
+
+						// Remove mce prefix on IE needed for the abbr element
+						if (nn.indexOf('mce:') === 0)
+							nn = nn.substring(4);
+
+						// Check if valid
+						if (!t.validElementsRE.test(nn) || (t.invalidElementsRE && t.invalidElementsRE.test(nn)) || inn) {
+							iv = true;
+							break;
+						}
+
+						if (isIE) {
+							// Fix IE content duplication (DOM can have multiple copies of the same node)
+							if (s.fix_content_duplication) {
+								if (n.mce_serialized == t.key)
+									return;
+
+								n.mce_serialized = t.key;
+							}
+
+							// IE sometimes adds a / infront of the node name
+							if (nn.charAt(0) == '/')
+								nn = nn.substring(1);
+						} else if (isGecko) {
+							// Ignore br elements
+							if (n.nodeName === 'BR' && n.getAttribute('type') == '_moz')
+								return;
+						}
+
+						// Check if valid child
+						if (t.childRules) {
+							if (t.parentElementsRE.test(t.elementName)) {
+								if (!t.childRules[t.elementName].test(nn)) {
+									iv = true;
+									break;
+								}
+							}
+
+							t.elementName = nn;
+						}
+
+						ru = t.findRule(nn);
+						nn = ru.name || nn;
+
+						// Skip empty nodes or empty node name in IE
+						if ((!hc && ru.noEmpty) || (isIE && !nn)) {
+							iv = true;
+							break;
+						}
+
+						// Check required
+						if (ru.requiredAttribs) {
+							a = ru.requiredAttribs;
+
+							for (i = a.length - 1; i >= 0; i--) {
+								if (this.dom.getAttrib(n, a[i]) !== '')
+									break;
+							}
+
+							// None of the required was there
+							if (i == -1) {
+								iv = true;
+								break;
+							}
+						}
+
+						w.writeStartElement(nn);
+
+						// Add ordered attributes
+						if (ru.attribs) {
+							for (i=0, at = ru.attribs, l = at.length; i<l; i++) {
+								a = at[i];
+								v = t._getAttrib(n, a);
+
+								if (v !== null)
+									w.writeAttribute(a.name, v);
+							}
+						}
+
+						// Add wild attributes
+						if (ru.validAttribsRE) {
+							at = isIE ? getIEAtts(n) : n.attributes;
+							for (i=at.length-1; i>-1; i--) {
+								no = at[i];
+
+								if (no.specified) {
+									a = no.nodeName.toLowerCase();
+
+									if (s.invalid_attrs.test(a) || !ru.validAttribsRE.test(a))
+										continue;
+
+									ar = t.findAttribRule(ru, a);
+									v = t._getAttrib(n, ar, a);
+
+									if (v !== null)
+										w.writeAttribute(a, v);
+								}
+							}
+						}
+
+						// Padd empty nodes with a &nbsp;
+						if (!hc && ru.padd)
+							w.writeText('\u00a0');
+
+						break;
+
+					case 3: // Text
+						// Check if valid child
+						if (t.childRules && t.parentElementsRE.test(t.elementName)) {
+							if (!t.childRules[t.elementName].test(n.nodeName))
+								return;
+						}
+
+						return w.writeText(n.nodeValue);
+
+					case 4: // CDATA
+						return w.writeCDATA(n.nodeValue);
+
+					case 8: // Comment
+						return w.writeComment(n.nodeValue);
+				}
+			} else if (n.nodeType == 1)
+				hc = n.hasChildNodes();
+
+			if (hc) {
+				cn = n.firstChild;
+
+				while (cn) {
+					t._serializeNode(cn);
+					t.elementName = nn;
+					cn = cn.nextSibling;
+				}
+			}
+
+			// Write element end
+			if (!iv) {
+				if (hc || !s.closed.test(nn))
+					w.writeFullEndElement();
+				else
+					w.writeEndElement();
+			}
+		},
+
+		_protect : function(o) {
+			var t = this;
+
+			o.items = o.items || [];
+
+			function enc(s) {
+				return s.replace(/[\r\n\\]/g, function(c) {
+					if (c === '\n')
+						return '\\n';
+					else if (c === '\\')
+						return '\\\\';
+
+					return '\\r';
+				});
+			};
+
+			function dec(s) {
+				return s.replace(/\\[\\rn]/g, function(c) {
+					if (c === '\\n')
+						return '\n';
+					else if (c === '\\\\')
+						return '\\';
+
+					return '\r';
+				});
+			};
+
+			each(o.patterns, function(p) {
+				o.content = dec(enc(o.content).replace(p.pattern, function(x, a, b, c) {
+					b = dec(b);
+
+					if (p.encode)
+						b = t._encode(b);
+
+					o.items.push(b);
+					return a + '<!--mce:' + (o.items.length - 1) + '-->' + c;
+				}));
+			});
+
+			return o;
+		},
+
+		_unprotect : function(h, o) {
+			h = h.replace(/\<!--mce:([0-9]+)--\>/g, function(a, b) {
+				return o.items[parseInt(b)];
+			});
+
+			o.items = [];
+
+			return h;
+		},
+
+		_encode : function(h) {
+			var t = this, s = t.settings, l;
+
+			// Entity encode
+			if (s.entity_encoding !== 'raw') {
+				if (s.entity_encoding.indexOf('named') != -1) {
+					t.setEntities(s.entities);
+					l = t.entityLookup;
+
+					h = h.replace(t.entitiesRE, function(a) {
+						var v;
+
+						if (v = l[a])
+							a = '&' + v + ';';
+
+						return a;
+					});
+				}
+
+				if (s.entity_encoding.indexOf('numeric') != -1) {
+					h = h.replace(/[\u007E-\uFFFF]/g, function(a) {
+						return '&#' + a.charCodeAt(0) + ';';
+					});
+				}
+			}
+
+			return h;
+		},
+
+		_setup : function() {
+			var t = this, s = this.settings;
+
+			if (t.done)
+				return;
+
+			t.done = 1;
+
+			t.setRules(s.valid_elements);
+			t.addRules(s.extended_valid_elements);
+			t.addValidChildRules(s.valid_child_elements);
+
+			if (s.invalid_elements)
+				t.invalidElementsRE = new RegExp('^(' + wildcardToRE(s.invalid_elements.replace(/,/g, '|').toLowerCase()) + ')$');
+
+			if (s.attrib_value_filter)
+				t.attribValueFilter = s.attribValueFilter;
+		},
+
+		_getAttrib : function(n, a, na) {
+			var i, v;
+
+			na = na || a.name;
+
+			if (a.forcedVal && (v = a.forcedVal)) {
+				if (v === '{$uid}')
+					return this.dom.uniqueId();
+
+				return v;
+			}
+
+			v = this.dom.getAttrib(n, na);
+
+			switch (na) {
+				case 'rowspan':
+				case 'colspan':
+					// Whats the point? Remove usless attribute value
+					if (v == '1')
+						v = '';
+
+					break;
+			}
+
+			if (this.attribValueFilter)
+				v = this.attribValueFilter(na, v, n);
+
+			if (a.validVals) {
+				for (i = a.validVals.length - 1; i >= 0; i--) {
+					if (v == a.validVals[i])
+						break;
+				}
+
+				if (i == -1)
+					return null;
+			}
+
+			if (v === '' && typeof(a.defaultVal) != 'undefined') {
+				v = a.defaultVal;
+
+				if (v === '{$uid}')
+					return this.dom.uniqueId();
+
+				return v;
+			} else {
+				// Remove internal mceItemXX classes when content is extracted from editor
+				if (na == 'class' && this.processObj.get)
+					v = v.replace(/\s?mceItem\w+\s?/g, '');
+			}
+
+			if (v === '')
+				return null;
+
+
+			return v;
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/dom/ScriptLoader.js */
+
+(function() {
+	var each = tinymce.each;
+
+	tinymce.create('tinymce.dom.ScriptLoader', {
+		ScriptLoader : function(s) {
+			this.settings = s || {};
+			this.queue = [];
+			this.lookup = {};
+		},
+
+		isDone : function(u) {
+			return this.lookup[u] ? this.lookup[u].state == 2 : 0;
+		},
+
+		markDone : function(u) {
+			this.lookup[u] = {state : 2, url : u};
+		},
+
+		add : function(u, cb, s, pr) {
+			var t = this, lo = t.lookup, o;
+
+			if (o = lo[u]) {
+				// Is loaded fire callback
+				if (cb && o.state == 2)
+					cb.call(s || this);
+
+				return o;
+			}
+
+			o = {state : 0, url : u, func : cb, scope : s || this};
+
+			if (pr)
+				t.queue.unshift(o);
+			else
+				t.queue.push(o);
+
+			lo[u] = o;
+
+			return o;
+		},
+
+		load : function(u, cb, s) {
+			var t = this, o;
+
+			if (o = t.lookup[u]) {
+				// Is loaded fire callback
+				if (cb && o.state == 2)
+					cb.call(s || t);
+
+				return o;
+			}
+
+			function loadScript(u) {
+				if (tinymce.dom.Event.domLoaded || t.settings.strict_mode) {
+					tinymce.util.XHR.send({
+						url : tinymce._addVer(u),
+						error : t.settings.error,
+						async : false,
+						success : function(co) {
+							t.eval(co);
+						}
+					});
+				} else
+					document.write('<script type="text/javascript" src="' + tinymce._addVer(u) + '"></script>');
+			};
+
+			if (!tinymce.is(u, 'string')) {
+				each(u, function(u) {
+					loadScript(u);
+				});
+
+				if (cb)
+					cb.call(s || t);
+			} else {
+				loadScript(u);
+
+				if (cb)
+					cb.call(s || t);
+			}
+		},
+
+		loadQueue : function(cb, s) {
+			var t = this;
+
+			if (!t.queueLoading) {
+				t.queueLoading = 1;
+				t.queueCallbacks = [];
+
+				t.loadScripts(t.queue, function() {
+					t.queueLoading = 0;
+
+					if (cb)
+						cb.call(s || t);
+
+					each(t.queueCallbacks, function(o) {
+						o.func.call(o.scope);
+					});
+				});
+			} else if (cb)
+				t.queueCallbacks.push({func : cb, scope : s || t});
+		},
+
+		eval : function(co) {
+			var w = window;
+
+			// Evaluate script
+			if (!w.execScript) {
+				try {
+					eval.call(w, co);
+				} catch (ex) {
+					eval(co, w); // Firefox 3.0a8
+				}
+			} else
+				w.execScript(co); // IE
+		},
+
+		loadScripts : function(sc, cb, s) {
+			var t = this, lo = t.lookup;
+
+			function done(o) {
+				o.state = 2; // Has been loaded
+
+				// Run callback
+				if (o.func)
+					o.func.call(o.scope || t);
+			};
+
+			function allDone() {
+				var l;
+
+				// Check if all files are loaded
+				l = sc.length;
+				each(sc, function(o) {
+					o = lo[o.url];
+
+					if (o.state === 2) {// It has finished loading
+						done(o);
+						l--;
+					} else
+						load(o);
+				});
+
+				// They are all loaded
+				if (l === 0 && cb) {
+					cb.call(s || t);
+					cb = 0;
+				}
+			};
+
+			function load(o) {
+				if (o.state > 0)
+					return;
+
+				o.state = 1; // Is loading
+
+				tinymce.util.XHR.send({
+					url : o.url,
+					error : t.settings.error,
+					success : function(co) {
+						t.eval(co);
+						done(o);
+						allDone();
+					}
+				});
+			};
+
+			each(sc, function(o) {
+				var u = o.url;
+
+				// Add to queue if needed
+				if (!lo[u]) {
+					lo[u] = o;
+					t.queue.push(o);
+				} else
+					o = lo[u];
+
+				// Is already loading or has been loaded
+				if (o.state > 0)
+					return;
+
+				if (!tinymce.dom.Event.domLoaded && !t.settings.strict_mode) {
+					var ix, ol = '';
+
+					// Add onload events
+					if (cb || o.func) {
+						o.state = 1; // Is loading
+
+						ix = tinymce.dom.ScriptLoader._addOnLoad(function() {
+							done(o);
+							allDone();
+						});
+
+						if (tinymce.isIE)
+							ol = ' onreadystatechange="';
+						else
+							ol = ' onload="';
+
+						ol += 'tinymce.dom.ScriptLoader._onLoad(this,\'' + u + '\',' + ix + ');"';
+					}
+
+					document.write('<script type="text/javascript" src="' + tinymce._addVer(u) + '"' + ol + '></script>');
+
+					if (!o.func)
+						done(o);
+				} else
+					load(o);
+			});
+
+			allDone();
+		},
+
+		// Static methods
+		'static' : {
+			_addOnLoad : function(f) {
+				var t = this;
+
+				t._funcs = t._funcs || [];
+				t._funcs.push(f);
+
+				return t._funcs.length - 1;
+			},
+
+			_onLoad : function(e, u, ix) {
+				if (!tinymce.isIE || e.readyState == 'complete')
+					this._funcs[ix].call(this);
+			}
+		}
+
+		});
+
+	// Global script loader
+	tinymce.ScriptLoader = new tinymce.dom.ScriptLoader();
+})();
+
+/* file:jscripts/tiny_mce/classes/ui/Control.js */
+
+(function() {
+	// Shorten class names
+	var DOM = tinymce.DOM, is = tinymce.is;
+
+	tinymce.create('tinymce.ui.Control', {
+		Control : function(id, s) {
+			this.id = id;
+			this.settings = s = s || {};
+			this.rendered = false;
+			this.onRender = new tinymce.util.Dispatcher(this);
+			this.classPrefix = '';
+			this.scope = s.scope || this;
+			this.disabled = 0;
+			this.active = 0;
+		},
+
+		setDisabled : function(s) {
+			var e;
+
+			if (s != this.disabled) {
+				e = DOM.get(this.id);
+
+				// Add accessibility title for unavailable actions
+				if (e && this.settings.unavailable_prefix) {
+					if (s) {
+						this.prevTitle = e.title;
+						e.title = this.settings.unavailable_prefix + ": " + e.title;
+					} else
+						e.title = this.prevTitle;
+				}
+
+				this.setState('Disabled', s);
+				this.setState('Enabled', !s);
+				this.disabled = s;
+			}
+		},
+
+		isDisabled : function() {
+			return this.disabled;
+		},
+
+		setActive : function(s) {
+			if (s != this.active) {
+				this.setState('Active', s);
+				this.active = s;
+			}
+		},
+
+		isActive : function() {
+			return this.active;
+		},
+
+		setState : function(c, s) {
+			var n = DOM.get(this.id);
+
+			c = this.classPrefix + c;
+
+			if (s)
+				DOM.addClass(n, c);
+			else
+				DOM.removeClass(n, c);
+		},
+
+		isRendered : function() {
+			return this.rendered;
+		},
+
+		renderHTML : function() {
+		},
+
+		renderTo : function(n) {
+			DOM.setHTML(n, this.renderHTML());
+		},
+
+		postRender : function() {
+			var t = this, b;
+
+			// Set pending states
+			if (is(t.disabled)) {
+				b = t.disabled;
+				t.disabled = -1;
+				t.setDisabled(b);
+			}
+
+			if (is(t.active)) {
+				b = t.active;
+				t.active = -1;
+				t.setActive(b);
+			}
+		},
+
+		remove : function() {
+			DOM.remove(this.id);
+			this.destroy();
+		},
+
+		destroy : function() {
+			tinymce.dom.Event.clear(this.id);
+		}
+
+		});
+})();
+/* file:jscripts/tiny_mce/classes/ui/Container.js */
+
+tinymce.create('tinymce.ui.Container:tinymce.ui.Control', {
+	Container : function(id, s) {
+		this.parent(id, s);
+		this.controls = [];
+		this.lookup = {};
+	},
+
+	add : function(c) {
+		this.lookup[c.id] = c;
+		this.controls.push(c);
+
+		return c;
+	},
+
+	get : function(n) {
+		return this.lookup[n];
+	}
+
+	});
+
+
+/* file:jscripts/tiny_mce/classes/ui/Separator.js */
+
+tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {
+	Separator : function(id, s) {
+		this.parent(id, s);
+		this.classPrefix = 'mceSeparator';
+	},
+
+	renderHTML : function() {
+		return tinymce.DOM.createHTML('span', {'class' : this.classPrefix});
+	}
+
+	});
+
+/* file:jscripts/tiny_mce/classes/ui/MenuItem.js */
+
+(function() {
+	var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, walk = tinymce.walk;
+
+	tinymce.create('tinymce.ui.MenuItem:tinymce.ui.Control', {
+		MenuItem : function(id, s) {
+			this.parent(id, s);
+			this.classPrefix = 'mceMenuItem';
+		},
+
+		setSelected : function(s) {
+			this.setState('Selected', s);
+			this.selected = s;
+		},
+
+		isSelected : function() {
+			return this.selected;
+		},
+
+		postRender : function() {
+			var t = this;
+			
+			t.parent();
+
+			// Set pending state
+			if (is(t.selected))
+				t.setSelected(t.selected);
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/ui/Menu.js */
+
+(function() {
+	var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, walk = tinymce.walk;
+
+	tinymce.create('tinymce.ui.Menu:tinymce.ui.MenuItem', {
+		Menu : function(id, s) {
+			var t = this;
+
+			t.parent(id, s);
+			t.items = {};
+			t.collapsed = false;
+			t.menuCount = 0;
+			t.onAddItem = new tinymce.util.Dispatcher(this);
+		},
+
+		expand : function(d) {
+			var t = this;
+
+			if (d) {
+				walk(t, function(o) {
+					if (o.expand)
+						o.expand();
+				}, 'items', t);
+			}
+
+			t.collapsed = false;
+		},
+
+		collapse : function(d) {
+			var t = this;
+
+			if (d) {
+				walk(t, function(o) {
+					if (o.collapse)
+						o.collapse();
+				}, 'items', t);
+			}
+
+			t.collapsed = true;
+		},
+
+		isCollapsed : function() {
+			return this.collapsed;
+		},
+
+		add : function(o) {
+			if (!o.settings)
+				o = new tinymce.ui.MenuItem(o.id || DOM.uniqueId(), o);
+
+			this.onAddItem.dispatch(this, o);
+
+			return this.items[o.id] = o;
+		},
+
+		addSeparator : function() {
+			return this.add({separator : true});
+		},
+
+		addMenu : function(o) {
+			if (!o.collapse)
+				o = this.createMenu(o);
+
+			this.menuCount++;
+
+			return this.add(o);
+		},
+
+		hasMenus : function() {
+			return this.menuCount !== 0;
+		},
+
+		remove : function(o) {
+			delete this.items[o.id];
+		},
+
+		removeAll : function() {
+			var t = this;
+
+			walk(t, function(o) {
+				if (o.removeAll)
+					o.removeAll();
+				else
+					o.remove();
+
+				o.destroy();
+			}, 'items', t);
+
+			t.items = {};
+		},
+
+		createMenu : function(o) {
+			var m = new tinymce.ui.Menu(o.id || DOM.uniqueId(), o);
+
+			m.onAddItem.add(this.onAddItem.dispatch, this.onAddItem);
+
+			return m;
+		}
+
+		});
+})();
+/* file:jscripts/tiny_mce/classes/ui/DropMenu.js */
+
+(function() {
+	var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, Event = tinymce.dom.Event, Element = tinymce.dom.Element;
+
+	tinymce.create('tinymce.ui.DropMenu:tinymce.ui.Menu', {
+		DropMenu : function(id, s) {
+			s = s || {};
+			s.container = s.container || DOM.doc.body;
+			s.offset_x = s.offset_x || 0;
+			s.offset_y = s.offset_y || 0;
+			s.vp_offset_x = s.vp_offset_x || 0;
+			s.vp_offset_y = s.vp_offset_y || 0;
+
+			if (is(s.icons) && !s.icons)
+				s['class'] += ' mceNoIcons';
+
+			this.parent(id, s);
+			this.onShowMenu = new tinymce.util.Dispatcher(this);
+			this.onHideMenu = new tinymce.util.Dispatcher(this);
+			this.classPrefix = 'mceMenu';
+		},
+
+		createMenu : function(s) {
+			var t = this, cs = t.settings, m;
+
+			s.container = s.container || cs.container;
+			s.parent = t;
+			s.constrain = s.constrain || cs.constrain;
+			s['class'] = s['class'] || cs['class'];
+			s.vp_offset_x = s.vp_offset_x || cs.vp_offset_x;
+			s.vp_offset_y = s.vp_offset_y || cs.vp_offset_y;
+			m = new tinymce.ui.DropMenu(s.id || DOM.uniqueId(), s);
+
+			m.onAddItem.add(t.onAddItem.dispatch, t.onAddItem);
+
+			return m;
+		},
+
+		update : function() {
+			var t = this, s = t.settings, tb = DOM.get('menu_' + t.id + '_tbl'), co = DOM.get('menu_' + t.id + '_co'), tw, th;
+
+			tw = s.max_width ? Math.min(tb.clientWidth, s.max_width) : tb.clientWidth;
+			th = s.max_height ? Math.min(tb.clientHeight, s.max_height) : tb.clientHeight;
+
+			if (!DOM.boxModel)
+				t.element.setStyles({width : tw + 2, height : th + 2});
+			else
+				t.element.setStyles({width : tw, height : th});
+
+			if (s.max_width)
+				DOM.setStyle(co, 'width', tw);
+
+			if (s.max_height) {
+				DOM.setStyle(co, 'height', th);
+
+				if (tb.clientHeight < s.max_height)
+					DOM.setStyle(co, 'overflow', 'hidden');
+			}
+		},
+
+		showMenu : function(x, y, px) {
+			var t = this, s = t.settings, co, vp = DOM.getViewPort(), w, h, mx, my, ot = 2, dm, tb, cp = t.classPrefix;
+
+			t.collapse(1);
+
+			if (t.isMenuVisible)
+				return;
+
+			if (!t.rendered) {
+				co = DOM.add(t.settings.container, t.renderNode());
+
+				each(t.items, function(o) {
+					o.postRender();
+				});
+
+				t.element = new Element('menu_' + t.id, {blocker : 1, container : s.container});
+			} else
+				co = DOM.get('menu_' + t.id);
+
+			// Move layer out of sight unless it's Opera since it scrolls to top of page due to an bug
+			if (!tinymce.isOpera)
+				DOM.setStyles(co, {left : -0xFFFF , top : -0xFFFF});
+
+			DOM.show(co);
+			t.update();
+
+			x += s.offset_x || 0;
+			y += s.offset_y || 0;
+			vp.w -= 4;
+			vp.h -= 4;
+
+			// Move inside viewport if not submenu
+			if (s.constrain) {
+				w = co.clientWidth - ot;
+				h = co.clientHeight - ot;
+				mx = vp.x + vp.w;
+				my = vp.y + vp.h;
+
+				if ((x + s.vp_offset_x + w) > mx)
+					x = px ? px - w : Math.max(0, (mx - s.vp_offset_x) - w);
+
+				if ((y + s.vp_offset_y + h) > my)
+					y = Math.max(0, (my - s.vp_offset_y) - h);
+			}
+
+			DOM.setStyles(co, {left : x , top : y});
+			t.element.update();
+
+			t.isMenuVisible = 1;
+			t.mouseClickFunc = Event.add(co, 'click', function(e) {
+				var m;
+
+				e = e.target;
+
+				if (e && (e = DOM.getParent(e, 'TR')) && !DOM.hasClass(e, cp + 'ItemSub')) {
+					m = t.items[e.id];
+
+					if (m.isDisabled())
+						return;
+
+					dm = t;
+
+					while (dm) {
+						if (dm.hideMenu)
+							dm.hideMenu();
+
+						dm = dm.settings.parent;
+					}
+
+					if (m.settings.onclick)
+						m.settings.onclick(e);
+
+					return Event.cancel(e); // Cancel to fix onbeforeunload problem
+				}
+			});
+
+			if (t.hasMenus()) {
+				t.mouseOverFunc = Event.add(co, 'mouseover', function(e) {
+					var m, r, mi;
+
+					e = e.target;
+					if (e && (e = DOM.getParent(e, 'TR'))) {
+						m = t.items[e.id];
+
+						if (t.lastMenu)
+							t.lastMenu.collapse(1);
+
+						if (m.isDisabled())
+							return;
+
+						if (e && DOM.hasClass(e, cp + 'ItemSub')) {
+							//p = DOM.getPos(s.container);
+							r = DOM.getRect(e);
+							m.showMenu((r.x + r.w - ot), r.y - ot, r.x);
+							t.lastMenu = m;
+							DOM.addClass(DOM.get(m.id).firstChild, cp + 'ItemActive');
+						}
+					}
+				});
+			}
+
+			t.onShowMenu.dispatch(t);
+
+			if (s.keyboard_focus) {
+				Event.add(co, 'keydown', t._keyHandler, t);
+				DOM.select('a', 'menu_' + t.id)[0].focus(); // Select first link
+				t._focusIdx = 0;
+			}
+		},
+
+		hideMenu : function(c) {
+			var t = this, co = DOM.get('menu_' + t.id), e;
+
+			if (!t.isMenuVisible)
+				return;
+
+			Event.remove(co, 'mouseover', t.mouseOverFunc);
+			Event.remove(co, 'click', t.mouseClickFunc);
+			Event.remove(co, 'keydown', t._keyHandler);
+			DOM.hide(co);
+			t.isMenuVisible = 0;
+
+			if (!c)
+				t.collapse(1);
+
+			if (t.element)
+				t.element.hide();
+
+			if (e = DOM.get(t.id))
+				DOM.removeClass(e.firstChild, t.classPrefix + 'ItemActive');
+
+			t.onHideMenu.dispatch(t);
+		},
+
+		add : function(o) {
+			var t = this, co;
+
+			o = t.parent(o);
+
+			if (t.isRendered && (co = DOM.get('menu_' + t.id)))
+				t._add(DOM.select('tbody', co)[0], o);
+
+			return o;
+		},
+
+		collapse : function(d) {
+			this.parent(d);
+			this.hideMenu(1);
+		},
+
+		remove : function(o) {
+			DOM.remove(o.id);
+			this.destroy();
+
+			return this.parent(o);
+		},
+
+		destroy : function() {
+			var t = this, co = DOM.get('menu_' + t.id);
+
+			Event.remove(co, 'mouseover', t.mouseOverFunc);
+			Event.remove(co, 'click', t.mouseClickFunc);
+
+			if (t.element)
+				t.element.remove();
+
+			DOM.remove(co);
+		},
+
+		renderNode : function() {
+			var t = this, s = t.settings, n, tb, co, w;
+
+			w = DOM.create('div', {id : 'menu_' + t.id, 'class' : s['class'], 'style' : 'position:absolute;left:0;top:0;z-index:200000'});
+			co = DOM.add(w, 'div', {id : 'menu_' + t.id + '_co', 'class' : t.classPrefix + (s['class'] ? ' ' + s['class'] : '')});
+			t.element = new Element('menu_' + t.id, {blocker : 1, container : s.container});
+
+			if (s.menu_line)
+				DOM.add(co, 'span', {'class' : t.classPrefix + 'Line'});
+
+//			n = DOM.add(co, 'div', {id : 'menu_' + t.id + '_co', 'class' : 'mceMenuContainer'});
+			n = DOM.add(co, 'table', {id : 'menu_' + t.id + '_tbl', border : 0, cellPadding : 0, cellSpacing : 0});
+			tb = DOM.add(n, 'tbody');
+
+			each(t.items, function(o) {
+				t._add(tb, o);
+			});
+
+			t.rendered = true;
+
+			return w;
+		},
+
+		// Internal functions
+
+		_keyHandler : function(e) {
+			var t = this, kc = e.keyCode;
+
+			function focus(d) {
+				var i = t._focusIdx + d, e = DOM.select('a', 'menu_' + t.id)[i];
+
+				if (e) {
+					t._focusIdx = i;
+					e.focus();
+				}
+			};
+
+			switch (kc) {
+				case 38:
+					focus(-1); // Select first link
+					return;
+
+				case 40:
+					focus(1);
+					return;
+
+				case 13:
+					return;
+
+				case 27:
+					return this.hideMenu();
+			}
+		},
+
+		_add : function(tb, o) {
+			var n, s = o.settings, a, ro, it, cp = this.classPrefix;
+
+			if (s.separator) {
+				ro = DOM.add(tb, 'tr', {id : o.id, 'class' : cp + 'ItemSeparator'});
+				DOM.add(ro, 'td', {'class' : cp + 'ItemSeparator'});
+
+				if (n = ro.previousSibling)
+					DOM.addClass(n, 'mceLast');
+
+				return;
+			}
+
+			n = ro = DOM.add(tb, 'tr', {id : o.id, 'class' : cp + 'Item ' + cp + 'ItemEnabled'});
+			n = it = DOM.add(n, 'td');
+			n = a = DOM.add(n, 'a', {href : 'javascript:;', onclick : "return false;", onmousedown : 'return false;'});
+
+			DOM.addClass(it, s['class']);
+//			n = DOM.add(n, 'span', {'class' : 'item'});
+			DOM.add(n, 'span', {'class' : 'mceIcon' + (s.icon ? ' mce_' + s.icon : '')});
+			n = DOM.add(n, s.element || 'span', {'class' : 'mceText', title : o.settings.title}, o.settings.title);
+
+			if (o.settings.style)
+				DOM.setAttrib(n, 'style', o.settings.style);
+
+			if (tb.childNodes.length == 1)
+				DOM.addClass(ro, 'mceFirst');
+
+			if ((n = ro.previousSibling) && DOM.hasClass(n, cp + 'ItemSeparator'))
+				DOM.addClass(ro, 'mceFirst');
+
+			if (o.collapse)
+				DOM.addClass(ro, cp + 'ItemSub');
+
+			if (n = ro.previousSibling)
+				DOM.removeClass(n, 'mceLast');
+
+			DOM.addClass(ro, 'mceLast');
+		}
+
+		});
+})();
+/* file:jscripts/tiny_mce/classes/ui/Button.js */
+
+(function() {
+	var DOM = tinymce.DOM;
+
+	tinymce.create('tinymce.ui.Button:tinymce.ui.Control', {
+		Button : function(id, s) {
+			this.parent(id, s);
+			this.classPrefix = 'mceButton';
+		},
+
+		renderHTML : function() {
+			var cp = this.classPrefix, s = this.settings, h, l;
+
+			l = DOM.encode(s.label || '');
+			h = '<a id="' + this.id + '" href="javascript:;" class="' + cp + ' ' + cp + 'Enabled ' + s['class'] + (l ? ' ' + cp + 'Labeled' : '') +'" onmousedown="return false;" onclick="return false;" title="' + DOM.encode(s.title) + '">';
+
+			if (s.image)
+				h += '<img class="mceIcon" src="' + s.image + '" />' + l + '</a>';
+			else
+				h += '<span class="mceIcon ' + s['class'] + '"></span>' + (l ? '<span class="' + cp + 'Label">' + l + '</span>' : '') + '</a>';
+
+			return h;
+		},
+
+		postRender : function() {
+			var t = this, s = t.settings;
+
+			tinymce.dom.Event.add(t.id, 'click', function(e) {
+				if (!t.isDisabled())
+					return s.onclick.call(s.scope, e);
+			});
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/ui/ListBox.js */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher;
+
+	tinymce.create('tinymce.ui.ListBox:tinymce.ui.Control', {
+		ListBox : function(id, s) {
+			var t = this;
+
+			t.parent(id, s);
+			t.items = [];
+			t.onChange = new Dispatcher(t);
+			t.onPostRender = new Dispatcher(t);
+			t.onAdd = new Dispatcher(t);
+			t.onRenderMenu = new tinymce.util.Dispatcher(this);
+			t.classPrefix = 'mceListBox';
+		},
+
+		select : function(v) {
+			var t = this, e, fv;
+
+			// Do we need to do something?
+			if (v != t.selectedValue) {
+				e = DOM.get(t.id + '_text');
+				t.selectedValue = v;
+
+				// Find item
+				each(t.items, function(o) {
+					if (o.value == v) {
+						DOM.setHTML(e, DOM.encode(o.title));
+						fv = 1;
+						return false;
+					}
+				});
+
+				// If no item was found then present title
+				if (!fv) {
+					DOM.setHTML(e, DOM.encode(t.settings.title));
+					DOM.addClass(e, 'mceTitle');
+					e = 0;
+					return;
+				} else
+					DOM.removeClass(e, 'mceTitle');
+			}
+
+			e = 0;
+		},
+
+		add : function(n, v, o) {
+			var t = this;
+
+			o = o || {};
+			o = tinymce.extend(o, {
+				title : n,
+				value : v
+			});
+
+			t.items.push(o);
+			t.onAdd.dispatch(t, o);
+		},
+
+		getLength : function() {
+			return this.items.length;
+		},
+
+		renderHTML : function() {
+			var h = '', t = this, s = t.settings, cp = t.classPrefix;
+
+			h = '<table id="' + t.id + '" cellpadding="0" cellspacing="0" class="' + cp + ' ' + cp + 'Enabled' + (s['class'] ? (' ' + s['class']) : '') + '"><tbody><tr>';
+			h += '<td>' + DOM.createHTML('a', {id : t.id + '_text', 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>') + '</td>';
+			h += '</tr></tbody></table>';
+
+			return h;
+		},
+
+		showMenu : function() {
+			var t = this, p1, p2, e = DOM.get(this.id), m;
+
+			if (t.isDisabled() || t.items.length == 0)
+				return;
+
+			if (t.menu && t.menu.isMenuVisible)
+				return t.hideMenu();
+
+			if (!t.isMenuRendered) {
+				t.renderMenu();
+				t.isMenuRendered = true;
+			}
+
+			p1 = DOM.getPos(this.settings.menu_container);
+			p2 = DOM.getPos(e);
+
+			m = t.menu;
+			m.settings.offset_x = p2.x;
+			m.settings.offset_y = p2.y;
+			m.settings.keyboard_focus = !tinymce.isOpera; // Opera is buggy when it comes to auto focus
+
+			// Select in menu
+			if (t.oldID)
+				m.items[t.oldID].setSelected(0);
+
+			each(t.items, function(o) {
+				if (o.value === t.selectedValue) {
+					m.items[o.id].setSelected(1);
+					t.oldID = o.id;
+				}
+			});
+
+			m.showMenu(0, e.clientHeight);
+
+			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);
+			DOM.addClass(t.id, t.classPrefix + 'Selected');
+
+			//DOM.get(t.id + '_text').focus();
+		},
+
+		hideMenu : function(e) {
+			var t = this;
+
+			// Prevent double toogles by canceling the mouse click event to the button
+			if (e && e.type == "mousedown" && (e.target.id == t.id + '_text' || e.target.id == t.id + '_open'))
+				return;
+
+			if (!e || !DOM.getParent(e.target, function(n) {return DOM.hasClass(n, 'mceMenu');})) {
+				DOM.removeClass(t.id, t.classPrefix + 'Selected');
+				Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);
+
+				if (t.menu)
+					t.menu.hideMenu();
+			}
+		},
+
+		renderMenu : function() {
+			var t = this, m;
+
+			m = t.settings.control_manager.createDropMenu(t.id + '_menu', {
+				menu_line : 1,
+				'class' : t.classPrefix + 'Menu mceNoIcons',
+				max_width : 150,
+				max_height : 150
+			});
+
+			m.onHideMenu.add(t.hideMenu, t);
+
+			m.add({
+				title : t.settings.title,
+				'class' : 'mceMenuItemTitle',
+				onclick : function() {
+					if (t.settings.onselect('') !== false)
+						t.select(''); // Must be runned after
+				}
+			});
+
+			each(t.items, function(o) {
+				o.id = DOM.uniqueId();
+				o.onclick = function() {
+					if (t.settings.onselect(o.value) !== false)
+						t.select(o.value); // Must be runned after
+				};
+
+				m.add(o);
+			});
+
+			t.onRenderMenu.dispatch(t, m);
+			t.menu = m;
+		},
+
+		postRender : function() {
+			var t = this, cp = t.classPrefix;
+
+			Event.add(t.id, 'click', t.showMenu, t);
+			Event.add(t.id + '_text', 'focus', function(e) {
+				if (!t._focused) {
+					t.keyDownHandler = Event.add(t.id + '_text', 'keydown', function(e) {
+						var idx = -1, v, kc = e.keyCode;
+
+						// Find current index
+						each(t.items, function(v, i) {
+							if (t.selectedValue == v.value)
+								idx = i;
+						});
+
+						// Move up/down
+						if (kc == 38)
+							v = t.items[idx - 1];
+						else if (kc == 40)
+							v = t.items[idx + 1];
+						else if (kc == 13) {
+							// Fake select on enter
+							v = t.selectedValue;
+							t.selectedValue = null; // Needs to be null to fake change
+							t.settings.onselect(v);
+							return Event.cancel(e);
+						}
+
+						if (v) {
+							t.hideMenu();
+							t.select(v.value);
+						}
+					});
+				}
+
+				t._focused = 1;
+			});
+			Event.add(t.id + '_text', 'blur', function() {Event.remove(t.id + '_text', 'keydown', t.keyDownHandler); t._focused = 0;});
+
+			// Old IE doesn't have hover on all elements
+			if (tinymce.isIE6 || !DOM.boxModel) {
+				Event.add(t.id, 'mouseover', function() {
+					if (!DOM.hasClass(t.id, cp + 'Disabled'))
+						DOM.addClass(t.id, cp + 'Hover');
+				});
+
+				Event.add(t.id, 'mouseout', function() {
+					if (!DOM.hasClass(t.id, cp + 'Disabled'))
+						DOM.removeClass(t.id, cp + 'Hover');
+				});
+			}
+
+			t.onPostRender.dispatch(t, DOM.get(t.id));
+		},
+
+		destroy : function() {
+			this.parent();
+
+			Event.clear(this.id + '_text');
+		}
+
+		});
+})();
+/* file:jscripts/tiny_mce/classes/ui/NativeListBox.js */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher;
+
+	tinymce.create('tinymce.ui.NativeListBox:tinymce.ui.ListBox', {
+		NativeListBox : function(id, s) {
+			this.parent(id, s);
+			this.classPrefix = 'mceNativeListBox';
+		},
+
+		setDisabled : function(s) {
+			DOM.get(this.id).disabled = s;
+		},
+
+		isDisabled : function() {
+			return DOM.get(this.id).disabled;
+		},
+
+		select : function(v) {
+			var e = DOM.get(this.id), ol = e.options;
+
+			v = '' + (v || '');
+
+			e.selectedIndex = 0;
+			each(ol, function(o, i) {
+				if (o.value == v) {
+					e.selectedIndex = i;
+					return false;
+				}
+			});
+		},
+
+		add : function(n, v, a) {
+			var o, t = this;
+
+			a = a || {};
+			a.value = v;
+
+			if (t.isRendered())
+				DOM.add(DOM.get(this.id), 'option', a, n);
+
+			o = {
+				title : n,
+				value : v,
+				attribs : a
+			};
+
+			t.items.push(o);
+			t.onAdd.dispatch(t, o);
+		},
+
+		getLength : function() {
+			return DOM.get(this.id).options.length - 1;
+		},
+
+		renderHTML : function() {
+			var h, t = this;
+
+			h = DOM.createHTML('option', {value : ''}, '-- ' + t.settings.title + ' --');
+
+			each(t.items, function(it) {
+				h += DOM.createHTML('option', {value : it.value}, it.title);
+			});
+
+			h = DOM.createHTML('select', {id : t.id, 'class' : 'mceNativeListBox'}, h);
+
+			return h;
+		},
+
+		postRender : function() {
+			var t = this, ch;
+
+			t.rendered = true;
+
+			function onChange(e) {
+				var v = e.target.options[e.target.selectedIndex].value;
+
+				t.onChange.dispatch(t, v);
+
+				if (t.settings.onselect)
+					t.settings.onselect(v);
+			};
+
+			Event.add(t.id, 'change', onChange);
+
+			// Accessibility keyhandler
+			Event.add(t.id, 'keydown', function(e) {
+				var bf;
+
+				Event.remove(t.id, 'change', ch);
+
+				bf = Event.add(t.id, 'blur', function() {
+					Event.add(t.id, 'change', onChange);
+					Event.remove(t.id, 'blur', bf);
+				});
+
+				if (e.keyCode == 13 || e.keyCode == 32) {
+					onChange(e);
+					return Event.cancel(e);
+				}
+			});
+
+			t.onPostRender.dispatch(t, DOM.get(t.id));
+		}
+
+		});
+})();
+/* file:jscripts/tiny_mce/classes/ui/MenuButton.js */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each;
+
+	tinymce.create('tinymce.ui.MenuButton:tinymce.ui.Button', {
+		MenuButton : function(id, s) {
+			this.parent(id, s);
+			this.onRenderMenu = new tinymce.util.Dispatcher(this);
+			s.menu_container = s.menu_container || DOM.doc.body;
+		},
+
+		showMenu : function() {
+			var t = this, p1, p2, e = DOM.get(t.id), m;
+
+			if (t.isDisabled())
+				return;
+
+			if (!t.isMenuRendered) {
+				t.renderMenu();
+				t.isMenuRendered = true;
+			}
+
+			if (t.isMenuVisible)
+				return t.hideMenu();
+
+			p1 = DOM.getPos(t.settings.menu_container);
+			p2 = DOM.getPos(e);
+
+			m = t.menu;
+			m.settings.offset_x = p2.x;
+			m.settings.offset_y = p2.y;
+			m.settings.vp_offset_x = p2.x;
+			m.settings.vp_offset_y = p2.y;
+			m.settings.keyboard_focus = t._focused;
+			m.showMenu(0, e.clientHeight);
+
+			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);
+			t.setState('Selected', 1);
+
+			t.isMenuVisible = 1;
+		},
+
+		renderMenu : function() {
+			var t = this, m;
+
+			m = t.settings.control_manager.createDropMenu(t.id + '_menu', {
+				menu_line : 1,
+				'class' : this.classPrefix + 'Menu',
+				icons : t.settings.icons
+			});
+
+			m.onHideMenu.add(t.hideMenu, t);
+
+			t.onRenderMenu.dispatch(t, m);
+			t.menu = m;
+		},
+
+		hideMenu : function(e) {
+			var t = this;
+
+			// Prevent double toogles by canceling the mouse click event to the button
+			if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id || e.id === t.id + '_open';}))
+				return;
+
+			if (!e || !DOM.getParent(e.target, function(n) {return DOM.hasClass(n, 'mceMenu');})) {
+				t.setState('Selected', 0);
+				Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);
+				if (t.menu)
+					t.menu.hideMenu();
+			}
+
+			t.isMenuVisible = 0;
+		},
+
+		postRender : function() {
+			var t = this, s = t.settings;
+
+			Event.add(t.id, 'click', function() {
+				if (!t.isDisabled()) {
+					if (s.onclick)
+						s.onclick(t.value);
+
+					t.showMenu();
+				}
+			});
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/ui/SplitButton.js */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each;
+
+	tinymce.create('tinymce.ui.SplitButton:tinymce.ui.MenuButton', {
+		SplitButton : function(id, s) {
+			this.parent(id, s);
+			this.classPrefix = 'mceSplitButton';
+		},
+
+		renderHTML : function() {
+			var h, t = this, s = t.settings, h1;
+
+			h = '<tbody><tr>';
+
+			if (s.image)
+				h1 = DOM.createHTML('img ', {src : s.image, 'class' : 'mceAction ' + s['class']});
+			else
+				h1 = DOM.createHTML('span', {'class' : 'mceAction ' + s['class']}, '');
+
+			h += '<td>' + DOM.createHTML('a', {id : t.id + '_action', 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']});
+			h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', href : 'javascript:;', 'class' : 'mceOpen ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';
+
+			h += '</tr></tbody>';
+
+			return DOM.createHTML('table', {id : t.id, 'class' : 'mceSplitButton mceSplitButtonEnabled ' + s['class'], cellpadding : '0', cellspacing : '0', onmousedown : 'return false;', title : s.title}, h);
+		},
+
+		postRender : function() {
+			var t = this, s = t.settings;
+
+			if (s.onclick) {
+				Event.add(t.id + '_action', 'click', function() {
+					if (!t.isDisabled())
+						s.onclick(t.value);
+				});
+			}
+
+			Event.add(t.id + '_open', 'click', t.showMenu, t);
+			Event.add(t.id + '_open', 'focus', function() {t._focused = 1;});
+			Event.add(t.id + '_open', 'blur', function() {t._focused = 0;});
+
+			// Old IE doesn't have hover on all elements
+			if (tinymce.isIE6 || !DOM.boxModel) {
+				Event.add(t.id, 'mouseover', function() {
+					if (!DOM.hasClass(t.id, 'mceSplitButtonDisabled'))
+						DOM.addClass(t.id, 'mceSplitButtonHover');
+				});
+
+				Event.add(t.id, 'mouseout', function() {
+					if (!DOM.hasClass(t.id, 'mceSplitButtonDisabled'))
+						DOM.removeClass(t.id, 'mceSplitButtonHover');
+				});
+			}
+		},
+
+		destroy : function() {
+			this.parent();
+
+			Event.clear(this.id + '_action');
+			Event.clear(this.id + '_open');
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/ui/ColorSplitButton.js */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, is = tinymce.is, each = tinymce.each;
+
+	tinymce.create('tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton', {
+		ColorSplitButton : function(id, s) {
+			var t = this;
+
+			t.parent(id, s);
+
+			t.settings = s = tinymce.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'
+			}, t.settings);
+
+			t.onShowMenu = new tinymce.util.Dispatcher(t);
+			t.onHideMenu = new tinymce.util.Dispatcher(t);
+
+			t.value = s.default_color;
+		},
+
+		showMenu : function() {
+			var t = this, r, p, e, p2;
+
+			if (t.isDisabled())
+				return;
+
+			if (!t.isMenuRendered) {
+				t.renderMenu();
+				t.isMenuRendered = true;
+			}
+
+			if (t.isMenuVisible)
+				return t.hideMenu();
+
+			e = DOM.get(t.id);
+			DOM.show(t.id + '_menu');
+			DOM.addClass(e, 'mceSplitButtonSelected');
+			p2 = DOM.getPos(e);
+			DOM.setStyles(t.id + '_menu', {
+				left : p2.x,
+				top : p2.y + e.clientHeight,
+				zIndex : 200000
+			});
+			e = 0;
+
+			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);
+
+			if (t._focused) {
+				t._keyHandler = Event.add(t.id + '_menu', 'keydown', function(e) {
+					if (e.keyCode == 27)
+						t.hideMenu();
+				});
+
+				DOM.select('a', t.id + '_menu')[0].focus(); // Select first link
+			}
+
+			t.onShowMenu.dispatch(t);
+
+			t.isMenuVisible = 1;
+		},
+
+		hideMenu : function(e) {
+			var t = this;
+
+			// Prevent double toogles by canceling the mouse click event to the button
+			if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id + '_open';}))
+				return;
+
+			if (!e || !DOM.getParent(e.target, function(n) {return DOM.hasClass(n, 'mceSplitButtonMenu');})) {
+				DOM.removeClass(t.id, 'mceSplitButtonSelected');
+				Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);
+				Event.remove(t.id + '_menu', 'keydown', t._keyHandler);
+				DOM.hide(t.id + '_menu');
+			}
+
+			t.onHideMenu.dispatch(t);
+
+			t.isMenuVisible = 0;
+		},
+
+		renderMenu : function() {
+			var t = this, m, i = 0, s = t.settings, n, tb, tr, w;
+
+			w = DOM.add(s.menu_container, 'div', {id : t.id + '_menu', 'class' : s['menu_class'] + ' ' + s['class'], style : 'position:absolute;left:0;top:-1000px;'});
+			m = DOM.add(w, 'div', {'class' : s['class'] + ' mceSplitButtonMenu'});
+			DOM.add(m, 'span', {'class' : 'mceMenuLine'});
+
+			n = DOM.add(m, 'table', {'class' : 'mceColorSplitMenu'});
+			tb = DOM.add(n, 'tbody');
+
+			// Generate color grid
+			i = 0;
+			each(is(s.colors, 'array') ? s.colors : s.colors.split(','), function(c) {
+				c = c.replace(/^#/, '');
+
+				if (!i--) {
+					tr = DOM.add(tb, 'tr');
+					i = s.grid_width - 1;
+				}
+
+				n = DOM.add(tr, 'td');
+
+				n = DOM.add(n, 'a', {
+					href : 'javascript:;',
+					style : {
+						backgroundColor : '#' + c
+					},
+					mce_color : '#' + c
+				});
+			});
+
+			if (s.more_colors_func) {
+				n = DOM.add(tb, 'tr');
+				n = DOM.add(n, 'td', {colspan : s.grid_width, 'class' : 'mceMoreColors'});
+				n = DOM.add(n, 'a', {id : t.id + '_more', href : 'javascript:;', onclick : 'return false;', 'class' : 'mceMoreColors'}, s.more_colors_title);
+
+				Event.add(n, 'click', function(e) {
+					s.more_colors_func.call(s.more_colors_scope || this);
+					return Event.cancel(e); // Cancel to fix onbeforeunload problem
+				});
+			}
+
+			DOM.addClass(m, 'mceColorSplitMenu');
+
+			Event.add(t.id + '_menu', 'click', function(e) {
+				var c;
+
+				e = e.target;
+
+				if (e.nodeName == 'A' && (c = e.getAttribute('mce_color')))
+					t.setColor(c);
+
+				return Event.cancel(e); // Prevent IE auto save warning
+			});
+
+			return w;
+		},
+
+		setColor : function(c) {
+			var t = this;
+
+			DOM.setStyle(t.id + '_preview', 'backgroundColor', c);
+
+			t.value = c;
+			t.hideMenu();
+			t.settings.onselect(c);
+		},
+
+		postRender : function() {
+			var t = this, id = t.id;
+
+			t.parent();
+			DOM.add(id + '_action', 'div', {id : id + '_preview', 'class' : 'mceColorPreview'});
+		},
+
+		destroy : function() {
+			this.parent();
+
+			Event.clear(this.id + '_menu');
+			Event.clear(this.id + '_more');
+			DOM.remove(this.id + '_menu');
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/ui/Toolbar.js */
+
+tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {
+	renderHTML : function() {
+		var t = this, h = '', c, co, dom = tinymce.DOM, s = t.settings, i, pr, nx, cl;
+
+		cl = t.controls;
+		for (i=0; i<cl.length; i++) {
+			// Get current control, prev control, next control and if the control is a list box or not
+			co = cl[i];
+			pr = cl[i - 1];
+			nx = cl[i + 1];
+
+			// Add toolbar start
+			if (i === 0) {
+				c = 'mceToolbarStart';
+
+				if (co.Button)
+					c += ' mceToolbarStartButton';
+				else if (co.SplitButton)
+					c += ' mceToolbarStartSplitButton';
+				else if (co.ListBox)
+					c += ' mceToolbarStartListBox';
+
+				h += dom.createHTML('td', {'class' : c}, dom.createHTML('span', null, '<!-- IE -->'));
+			}
+
+			// Add toolbar end before list box and after the previous button
+			// This is to fix the o2k7 editor skins
+			if (pr && co.ListBox) {
+				if (pr.Button || pr.SplitButton)
+					h += dom.createHTML('td', {'class' : 'mceToolbarEnd'}, dom.createHTML('span', null, '<!-- IE -->'));
+			}
+
+			// Render control HTML
+
+			// IE 8 quick fix, needed to propertly generate a hit area for anchors
+			if (dom.stdMode)
+				h += '<td style="position: relative">' + co.renderHTML() + '</td>';
+			else
+				h += '<td>' + co.renderHTML() + '</td>';
+
+			// Add toolbar start after list box and before the next button
+			// This is to fix the o2k7 editor skins
+			if (nx && co.ListBox) {
+				if (nx.Button || nx.SplitButton)
+					h += dom.createHTML('td', {'class' : 'mceToolbarStart'}, dom.createHTML('span', null, '<!-- IE -->'));
+			}
+		}
+
+		c = 'mceToolbarEnd';
+
+		if (co.Button)
+			c += ' mceToolbarEndButton';
+		else if (co.SplitButton)
+			c += ' mceToolbarEndSplitButton';
+		else if (co.ListBox)
+			c += ' mceToolbarEndListBox';
+
+		h += dom.createHTML('td', {'class' : c}, dom.createHTML('span', null, '<!-- IE -->'));
+
+		return dom.createHTML('table', {id : t.id, 'class' : 'mceToolbar' + (s['class'] ? ' ' + s['class'] : ''), cellpadding : '0', cellspacing : '0', align : t.settings.align || ''}, '<tbody><tr>' + h + '</tr></tbody>');
+	}
+
+	});
+
+/* file:jscripts/tiny_mce/classes/AddOnManager.js */
+
+(function() {
+	var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each;
+
+	tinymce.create('tinymce.AddOnManager', {
+		items : [],
+		urls : {},
+		lookup : {},
+		onAdd : new Dispatcher(this),
+
+		get : function(n) {
+			return this.lookup[n];
+		},
+
+		requireLangPack : function(n) {
+			var u, s = tinymce.EditorManager.settings;
+
+			if (s && s.language) {
+				u = this.urls[n] + '/langs/' + s.language + '.js';
+
+				if (!tinymce.dom.Event.domLoaded && !s.strict_mode)
+					tinymce.ScriptLoader.load(u);
+				else
+					tinymce.ScriptLoader.add(u);
+			}
+		},
+
+		add : function(id, o) {
+			this.items.push(o);
+			this.lookup[id] = o;
+			this.onAdd.dispatch(this, id, o);
+
+			return o;
+		},
+
+		load : function(n, u, cb, s) {
+			var t = this;
+
+			if (t.urls[n])
+				return;
+
+			if (u.indexOf('/') != 0 && u.indexOf('://') == -1)
+				u = tinymce.baseURL + '/' +  u;
+
+			t.urls[n] = u.substring(0, u.lastIndexOf('/'));
+			tinymce.ScriptLoader.add(u, cb, s);
+		}
+
+		});
+
+	// Create plugin and theme managers
+	tinymce.PluginManager = new tinymce.AddOnManager();
+	tinymce.ThemeManager = new tinymce.AddOnManager();
+}());
+/* file:jscripts/tiny_mce/classes/EditorManager.js */
+
+(function() {
+	// Shorten names
+	var each = tinymce.each, extend = tinymce.extend, DOM = tinymce.DOM, Event = tinymce.dom.Event, ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager, explode = tinymce.explode;
+
+	tinymce.create('static tinymce.EditorManager', {
+		editors : {},
+		i18n : {},
+		activeEditor : null,
+
+		preInit : function() {
+			var t = this, lo = window.location;
+
+			// Setup some URLs where the editor API is located and where the document is
+			tinymce.documentBaseURL = lo.href.replace(/[\?#].*$/, '').replace(/[\/\\][^\/]+$/, '');
+			if (!/[\/\\]$/.test(tinymce.documentBaseURL))
+				tinymce.documentBaseURL += '/';
+
+			tinymce.baseURL = new tinymce.util.URI(tinymce.documentBaseURL).toAbsolute(tinymce.baseURL);
+			tinymce.EditorManager.baseURI = new tinymce.util.URI(tinymce.baseURL);
+
+			// User already specified a document.domain value
+			if (document.domain && lo.hostname != document.domain)
+				tinymce.relaxedDomain = document.domain;
+
+			// Setup document domain if tinymce is loaded from other domain
+			if (!tinymce.relaxedDomain && tinymce.EditorManager.baseURI.host != lo.hostname && lo.hostname)
+				document.domain = tinymce.relaxedDomain = lo.hostname.replace(/.*\.(.+\..+)$/, '$1');
+
+			// Add before unload listener
+			// This was required since IE was leaking memory if you added and removed beforeunload listeners
+			// with attachEvent/detatchEvent so this only adds one listener and instances can the attach to the onBeforeUnload event
+			t.onBeforeUnload = new tinymce.util.Dispatcher(t);
+
+			// Must be on window or IE will leak if the editor is placed in frame or iframe
+			Event.add(window, 'beforeunload', function(e) {
+				t.onBeforeUnload.dispatch(t, e);
+			});
+		},
+
+		init : function(s) {
+			var t = this, pl, sl = tinymce.ScriptLoader, c, e, el = [], ed;
+
+			function execCallback(se, n, s) {
+				var f = se[n];
+
+				if (!f)
+					return;
+
+				if (tinymce.is(f, 'string')) {
+					s = f.replace(/\.\w+$/, '');
+					s = s ? tinymce.resolve(s) : 0;
+					f = tinymce.resolve(f);
+				}
+
+				return f.apply(s || this, Array.prototype.slice.call(arguments, 2));
+			};
+
+			s = extend({
+				theme : "simple",
+				language : "en",
+				strict_loading_mode : document.contentType == 'application/xhtml+xml'
+			}, s);
+
+			t.settings = s;
+
+			// If page not loaded and strict mode isn't enabled then load them
+			if (!Event.domLoaded && !s.strict_loading_mode) {
+				// Load language
+				if (s.language)
+					sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');
+
+				// Load theme
+				if (s.theme && s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])
+					ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');
+
+				// Load plugins
+				if (s.plugins) {
+					pl = explode(s.plugins);
+
+					// Load compat2x first
+					if (tinymce.inArray(pl, 'compat2x') != -1)
+						PluginManager.load('compat2x', 'plugins/compat2x/editor_plugin' + tinymce.suffix + '.js');
+
+					// Load rest if plugins
+					each(pl, function(v) {
+						if (v && v.charAt(0) != '-' && !PluginManager.urls[v]) {
+							// Skip safari plugin for other browsers
+							if (!tinymce.isWebKit && v == 'safari')
+								return;
+
+							PluginManager.load(v, 'plugins/' + v + '/editor_plugin' + tinymce.suffix + '.js');
+						}
+					});
+				}
+
+				sl.loadQueue();
+			}
+
+			// Legacy call
+			Event.add(document, 'init', function() {
+				var l, co;
+
+				execCallback(s, 'onpageload');
+
+				// Verify that it's a valid browser
+				if (s.browsers) {
+					l = false;
+
+					each(explode(s.browsers), function(v) {
+						switch (v) {
+							case 'ie':
+							case 'msie':
+								if (tinymce.isIE)
+									l = true;
+								break;
+
+							case 'gecko':
+								if (tinymce.isGecko)
+									l = true;
+								break;
+
+							case 'safari':
+							case 'webkit':
+								if (tinymce.isWebKit)
+									l = true;
+								break;
+
+							case 'opera':
+								if (tinymce.isOpera)
+									l = true;
+
+								break;
+						}
+					});
+
+					// Not a valid one
+					if (!l)
+						return;
+				}
+
+				switch (s.mode) {
+					case "exact":
+						l = s.elements || '';
+
+						if(l.length > 0) {
+							each(explode(l), function(v) {
+								if (DOM.get(v)) {
+									ed = new tinymce.Editor(v, s);
+									el.push(ed);
+									ed.render(1);
+								} else {
+									c = 0;
+
+									each(document.forms, function(f) {
+										each(f.elements, function(e) {
+											if (e.name === v) {
+												v = 'mce_editor_' + c;
+												DOM.setAttrib(e, 'id', v);
+
+												ed = new tinymce.Editor(v, s);
+												el.push(ed);
+												ed.render(1);
+											}
+										});
+									});
+								}
+							});
+						}
+						break;
+
+					case "textareas":
+					case "specific_textareas":
+						function hasClass(n, c) {
+							return c.constructor === RegExp ? c.test(n.className) : DOM.hasClass(n, c);
+						};
+
+						each(DOM.select('textarea'), function(v) {
+							if (s.editor_deselector && hasClass(v, s.editor_deselector))
+								return;
+
+							if (!s.editor_selector || hasClass(v, s.editor_selector)) {
+								// Can we use the name
+								e = DOM.get(v.name);
+								if (!v.id && !e)
+									v.id = v.name;
+
+								// Generate unique name if missing or already exists
+								if (!v.id || t.get(v.id))
+									v.id = DOM.uniqueId();
+
+								ed = new tinymce.Editor(v.id, s);
+								el.push(ed);
+								ed.render(1);
+							}
+						});
+						break;
+				}
+
+				// Call onInit when all editors are initialized
+				if (s.oninit) {
+					l = co = 0;
+
+					each (el, function(ed) {
+						co++;
+
+						if (!ed.initialized) {
+							// Wait for it
+							ed.onInit.add(function() {
+								l++;
+
+								// All done
+								if (l == co)
+									execCallback(s, 'oninit');
+							});
+						} else
+							l++;
+
+						// All done
+						if (l == co)
+							execCallback(s, 'oninit');					
+					});
+				}
+			});
+		},
+
+		get : function(id) {
+			return this.editors[id];
+		},
+
+		getInstanceById : function(id) {
+			return this.get(id);
+		},
+
+		add : function(e) {
+			this.editors[e.id] = e;
+			this._setActive(e);
+
+			return e;
+		},
+
+		remove : function(e) {
+			var t = this;
+
+			// Not in the collection
+			if (!t.editors[e.id])
+				return null;
+
+			delete t.editors[e.id];
+
+			// Select another editor since the active one was removed
+			if (t.activeEditor == e) {
+				each(t.editors, function(e) {
+					t._setActive(e);
+					return false; // Break
+				});
+			}
+
+			e.destroy();
+
+			return e;
+		},
+
+		execCommand : function(c, u, v) {
+			var t = this, ed = t.get(v), w;
+
+			// Manager commands
+			switch (c) {
+				case "mceFocus":
+					ed.focus();
+					return true;
+
+				case "mceAddEditor":
+				case "mceAddControl":
+					if (!t.get(v))
+						new tinymce.Editor(v, t.settings).render();
+
+					return true;
+
+				case "mceAddFrameControl":
+					w = v.window;
+
+					// Add tinyMCE global instance and tinymce namespace to specified window
+					w.tinyMCE = tinyMCE;
+					w.tinymce = tinymce;
+
+					tinymce.DOM.doc = w.document;
+					tinymce.DOM.win = w;
+
+					ed = new tinymce.Editor(v.element_id, v);
+					ed.render();
+
+					// Fix IE memory leaks
+					if (tinymce.isIE) {
+						function clr() {
+							ed.destroy();
+							w.detachEvent('onunload', clr);
+							w = w.tinyMCE = w.tinymce = null; // IE leak
+						};
+
+						w.attachEvent('onunload', clr);
+					}
+
+					v.page_window = null;
+
+					return true;
+
+				case "mceRemoveEditor":
+				case "mceRemoveControl":
+					ed.remove();
+					return true;
+
+				case 'mceToggleEditor':
+					if (!ed) {
+						t.execCommand('mceAddControl', 0, v);
+						return true;
+					}
+
+					if (ed.isHidden())
+						ed.show();
+					else
+						ed.hide();
+
+					return true;
+			}
+
+			// Run command on active editor
+			if (t.activeEditor)
+				return t.activeEditor.execCommand(c, u, v);
+
+			return false;
+		},
+
+		execInstanceCommand : function(id, c, u, v) {
+			var ed = this.get(id);
+
+			if (ed)
+				return ed.execCommand(c, u, v);
+
+			return false;
+		},
+
+		triggerSave : function() {
+			each(this.editors, function(e) {
+				e.save();
+			});
+		},
+
+		addI18n : function(p, o) {
+			var lo, i18n = this.i18n;
+
+			if (!tinymce.is(p, 'string')) {
+				each(p, function(o, lc) {
+					each(o, function(o, g) {
+						each(o, function(o, k) {
+							if (g === 'common')
+								i18n[lc + '.' + k] = o;
+							else
+								i18n[lc + '.' + g + '.' + k] = o;
+						});
+					});
+				});
+			} else {
+				each(o, function(o, k) {
+					i18n[p + '.' + k] = o;
+				});
+			}
+		},
+
+		// Private methods
+
+		_setActive : function(e) {
+			this.selectedInstance = this.activeEditor = e;
+		}
+
+		});
+
+	tinymce.EditorManager.preInit();
+})();
+
+// Short for editor manager window.tinyMCE is needed when TinyMCE gets loaded though a XHR call
+var tinyMCE = window.tinyMCE = tinymce.EditorManager;
+
+/* file:jscripts/tiny_mce/classes/Editor.js */
+
+(function() {
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, extend = tinymce.extend, Dispatcher = tinymce.util.Dispatcher;
+	var each = tinymce.each, isGecko = tinymce.isGecko, isIE = tinymce.isIE, isWebKit = tinymce.isWebKit;
+	var is = tinymce.is, ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager, EditorManager = tinymce.EditorManager;
+	var inArray = tinymce.inArray, grep = tinymce.grep, explode = tinymce.explode;
+
+	tinymce.create('tinymce.Editor', {
+		Editor : function(id, s) {
+			var t = this;
+
+			t.id = t.editorId = id;
+			t.execCommands = {};
+			t.queryStateCommands = {};
+			t.queryValueCommands = {};
+			t.plugins = {};
+
+			// Add events to the editor
+			each([
+				'onPreInit',
+				'onBeforeRenderUI',
+				'onPostRender',
+				'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'
+			], function(e) {
+				t[e] = new Dispatcher(t);
+			});
+
+			// Default editor config
+			t.settings = s = extend({
+				id : id,
+				language : 'en',
+				docs_language : 'en',
+				theme : 'simple',
+				skin : 'default',
+				delta_width : 0,
+				delta_height : 0,
+				popup_css : '',
+				plugins : '',
+				document_base_url : tinymce.documentBaseURL,
+				add_form_submit_trigger : 1,
+				submit_patch : 1,
+				add_unload_trigger : 1,
+				convert_urls : 1,
+				relative_urls : 1,
+				remove_script_host : 1,
+				table_inline_editing : 0,
+				object_resizing : 1,
+				cleanup : 1,
+				accessibility_focus : 1,
+				custom_shortcuts : 1,
+				custom_undo_redo_keyboard_shortcuts : 1,
+				custom_undo_redo_restore_selection : 1,
+				custom_undo_redo : 1,
+				doctype : '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">',
+				visual_table_class : 'mceItemTable',
+				visual : 1,
+				inline_styles : true,
+				convert_fonts_to_spans : true,
+				font_size_style_values : 'xx-small,x-small,small,medium,large,x-large,xx-large',
+				apply_source_formatting : 1,
+				directionality : 'ltr',
+				forced_root_block : 'p',
+				valid_elements : '@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur],strong/b,em/i,strike,u,#p[align],-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|src|border|alt=|title|hspace|vspace|width|height|align],-sub,-sup,-blockquote[cite],-table[border=0|cellspacing|cellpadding|width|frame|rules|height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],object[classid|width|height|codebase|*],param[name|value],embed[type|width|height|src|*],script[src|type],map[name],area[shape|coords|href|alt|target],bdo,button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|valign|width],dfn,fieldset,form[action|accept|accept-charset|enctype|method],input[accept|alt|checked|disabled|maxlength|name|readonly|size|src|type|value|tabindex|accesskey],kbd,label[for],legend,noscript,optgroup[label|disabled],option[disabled|label|selected|value],q[cite],samp,select[disabled|multiple|name|size],small,textarea[cols|rows|disabled|name|readonly],tt,var,big',
+				hidden_input : 1,
+				padd_empty_editor : 1,
+				render_ui : 1,
+				init_theme : 1,
+				force_p_newlines : 1,
+				indentation : '30px'
+			}, s);
+
+			// Setup URIs
+			t.documentBaseURI = new tinymce.util.URI(s.document_base_url || tinymce.documentBaseURL, {
+				base_uri : tinyMCE.baseURI
+			});
+			t.baseURI = EditorManager.baseURI;
+
+			// Call setup
+			t.execCallback('setup', t);
+		},
+
+		render : function(nst) {
+			var t = this, s = t.settings, id = t.id, sl = tinymce.ScriptLoader;
+
+			// Page is not loaded yet, wait for it
+			if (!Event.domLoaded) {
+				Event.add(document, 'init', function() {
+					t.render();
+				});
+				return;
+			}
+
+			// Force strict loading mode if render us called by user and not internally
+			if (!nst) {
+				s.strict_loading_mode = 1;
+				tinyMCE.settings = s;
+			}
+
+			// Element not found, then skip initialization
+			if (!t.getElement())
+				return;
+
+			if (s.strict_loading_mode) {
+				sl.settings.strict_mode = s.strict_loading_mode;
+				tinymce.DOM.settings.strict = 1;
+			}
+
+			// Add hidden input for non input elements inside form elements
+			if (!/TEXTAREA|INPUT/i.test(t.getElement().nodeName) && s.hidden_input && DOM.getParent(id, 'form'))
+				DOM.insertAfter(DOM.create('input', {type : 'hidden', name : id}), id);
+
+			t.windowManager = new tinymce.WindowManager(t);
+
+			if (s.encoding == 'xml') {
+				t.onGetContent.add(function(ed, o) {
+					if (o.save)
+						o.content = DOM.encode(o.content);
+				});
+			}
+
+			if (s.add_form_submit_trigger) {
+				t.onSubmit.addToTop(function() {
+					if (t.initialized) {
+						t.save();
+						t.isNotDirty = 1;
+					}
+				});
+			}
+
+			if (s.add_unload_trigger && !s.ask) {
+				t._beforeUnload = tinyMCE.onBeforeUnload.add(function() {
+					if (t.initialized && !t.destroyed && !t.isHidden())
+						t.save({format : 'raw', no_events : true});
+				});
+			}
+
+			tinymce.addUnload(t.destroy, t);
+
+			if (s.submit_patch) {
+				t.onBeforeRenderUI.add(function() {
+					var n = t.getElement().form;
+
+					if (!n)
+						return;
+
+					// Already patched
+					if (n._mceOldSubmit)
+						return;
+
+					// Check page uses id="submit" or name="submit" for it's submit button
+					if (!n.submit.nodeType && !n.submit.length) {
+						t.formElement = n;
+						n._mceOldSubmit = n.submit;
+						n.submit = function() {
+							// Save all instances
+							EditorManager.triggerSave();
+							t.isNotDirty = 1;
+
+							return this._mceOldSubmit(this);
+						};
+					}
+
+					n = null;
+				});
+			}
+
+			// Load scripts
+			function loadScripts() {
+				if (s.language)
+					sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');
+
+				if (s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])
+					ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');
+
+				each(explode(s.plugins), function(p) {
+					if (p && p.charAt(0) != '-' && !PluginManager.urls[p]) {
+						// Skip safari plugin for other browsers
+						if (!isWebKit && p == 'safari')
+							return;
+
+						PluginManager.load(p, 'plugins/' + p + '/editor_plugin' + tinymce.suffix + '.js');
+					}
+				});
+
+				// Init when que is loaded
+				sl.loadQueue(function() {
+					if (s.ask) {
+						function ask() {
+							// Yield for awhile to avoid focus bug on FF 3 when cancel is pressed
+							window.setTimeout(function() {
+								Event.remove(t.id, 'focus', ask);
+
+								t.windowManager.confirm(t.getLang('edit_confirm'), function(s) {
+									if (s)
+										t.init();
+								});
+							}, 0);
+						};
+
+						Event.add(t.id, 'focus', ask);
+						return;
+					}
+
+					if (!t.removed)
+						t.init();
+				});
+			};
+
+			// Load compat2x first
+			if (s.plugins.indexOf('compat2x') != -1) {
+				PluginManager.load('compat2x', 'plugins/compat2x/editor_plugin' + tinymce.suffix + '.js');
+				sl.loadQueue(loadScripts);
+			} else
+				loadScripts();
+		},
+
+		init : function() {
+			var n, t = this, s = t.settings, w, h, e = t.getElement(), o, ti, u, bi, bc, re;
+
+			EditorManager.add(t);
+
+			// Create theme
+			s.theme = s.theme.replace(/-/, '');
+			o = ThemeManager.get(s.theme);
+			t.theme = new o();
+
+			if (t.theme.init && s.init_theme)
+				t.theme.init(t, ThemeManager.urls[s.theme] || tinymce.documentBaseURL.replace(/\/$/, ''));
+
+			// Create all plugins
+			each(explode(s.plugins.replace(/\-/g, '')), function(p) {
+				var c = PluginManager.get(p), u = PluginManager.urls[p] || tinymce.documentBaseURL.replace(/\/$/, ''), po;
+
+				if (c) {
+					po = new c(t, u);
+
+					t.plugins[p] = po;
+
+					if (po.init)
+						po.init(t, u);
+				}
+			});
+
+			// Setup popup CSS path(s)
+			if (s.popup_css)
+				s.popup_css = t.documentBaseURI.toAbsolute(s.popup_css);
+			else
+				s.popup_css = t.baseURI.toAbsolute("themes/" + s.theme + "/skins/" + s.skin + "/dialog.css");
+
+			if (s.popup_css_add)
+				s.popup_css += ',' + t.documentBaseURI.toAbsolute(s.popup_css_add);
+
+			// Setup control factory
+			t.controlManager = new tinymce.ControlManager(t);
+			t.undoManager = new tinymce.UndoManager(t);
+
+			// Pass through
+			t.undoManager.onAdd.add(function(um, l) {
+				if (!l.initial)
+					return t.onChange.dispatch(t, l, um);
+			});
+
+			t.undoManager.onUndo.add(function(um, l) {
+				return t.onUndo.dispatch(t, l, um);
+			});
+
+			t.undoManager.onRedo.add(function(um, l) {
+				return t.onRedo.dispatch(t, l, um);
+			});
+
+			if (s.custom_undo_redo) {
+				t.onExecCommand.add(function(ed, cmd, ui, val, a) {
+					if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!a || !a.skip_undo))
+						t.undoManager.add();
+				});
+			}
+
+			t.onExecCommand.add(function(ed, c) {
+				// Don't refresh the select lists until caret move
+				if (!/^(FontName|FontSize)$/.test(c))
+					t.nodeChanged();
+			});
+
+			// Remove ghost selections on images and tables in Gecko
+			if (isGecko) {
+				function repaint(a, o) {
+					if (!o || !o.initial)
+						t.execCommand('mceRepaint');
+				};
+
+				t.onUndo.add(repaint);
+				t.onRedo.add(repaint);
+				t.onSetContent.add(repaint);
+			}
+
+			// Enables users to override the control factory
+			t.onBeforeRenderUI.dispatch(t, t.controlManager);
+
+			// Measure box
+			if (s.render_ui) {
+				w = s.width || e.style.width || e.offsetWidth;
+				h = s.height || e.style.height || e.offsetHeight;
+				t.orgDisplay = e.style.display;
+				re = /^[0-9\.]+(|px)$/i;
+
+				if (re.test('' + w))
+					w = Math.max(parseInt(w) + (o.deltaWidth || 0), 100);
+
+				if (re.test('' + h))
+					h = Math.max(parseInt(h) + (o.deltaHeight || 0), 100);
+
+				// Render UI
+				o = t.theme.renderUI({
+					targetNode : e,
+					width : w,
+					height : h,
+					deltaWidth : s.delta_width,
+					deltaHeight : s.delta_height
+				});
+
+				t.editorContainer = o.editorContainer;
+			}
+
+			
+			// Resize editor
+			DOM.setStyles(o.sizeContainer || o.editorContainer, {
+				width : w,
+				height : h
+			});
+
+			h = (o.iframeHeight || h) + ((h + '').indexOf('%') == -1 ? (o.deltaHeight || 0) : '');
+			if (h < 100)
+				h = 100;
+
+			t.iframeHTML = s.doctype + '<html><head xmlns="http://www.w3.org/1999/xhtml"><base href="' + t.documentBaseURI.getURI() + '" />';
+			t.iframeHTML += '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';
+
+			if (tinymce.relaxedDomain)
+				t.iframeHTML += '<script type="text/javascript">document.domain = "' + tinymce.relaxedDomain + '";</script>';
+
+			bi = s.body_id || 'tinymce';
+			if (bi.indexOf('=') != -1) {
+				bi = t.getParam('body_id', '', 'hash');
+				bi = bi[t.id] || bi;
+			}
+
+			bc = s.body_class || '';
+			if (bc.indexOf('=') != -1) {
+				bc = t.getParam('body_class', '', 'hash');
+				bc = bc[t.id] || '';
+			}
+
+			t.iframeHTML += '</head><body id="' + bi + '" class="mceContentBody ' + bc + '"></body></html>';
+
+			// Domain relaxing enabled, then set document domain
+			if (tinymce.relaxedDomain) {
+				// We need to write the contents here in IE since multiple writes messes up refresh button and back button
+				if (isIE || (tinymce.isOpera && parseFloat(opera.version()) >= 9.5))
+					u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";var ed = window.parent.tinyMCE.get("' + t.id + '");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()';
+				else if (tinymce.isOpera)
+					u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";document.close();ed.setupIframe();})()';					
+			}
+
+			// Create iframe
+			n = DOM.add(o.iframeContainer, 'iframe', {
+				id : t.id + "_ifr",
+				src : u || 'javascript:""', // Workaround for HTTPS warning in IE6/7
+				frameBorder : '0',
+				style : {
+					width : '100%',
+					height : h
+				}
+			});
+
+			t.contentAreaContainer = o.iframeContainer;
+			DOM.get(o.editorContainer).style.display = t.orgDisplay;
+			DOM.get(t.id).style.display = 'none';
+
+			// Safari 2.x requires us to wait for the load event and load a real HTML doc
+			if (tinymce.isOldWebKit) {
+				Event.add(n, 'load', t.setupIframe, t);
+				n.src = tinymce.baseURL + '/plugins/safari/blank.htm';
+			} else {
+				if (!isIE || !tinymce.relaxedDomain)
+					t.setupIframe();
+
+				e = n = o = null; // Cleanup
+			}
+		},
+
+		setupIframe : function() {
+			var t = this, s = t.settings, e = DOM.get(t.id), d = t.getDoc(), h, b;
+
+			// Setup iframe body
+			if (!isIE || !tinymce.relaxedDomain) {
+				d.open();
+				d.write(t.iframeHTML);
+				d.close();
+			}
+
+			// Design mode needs to be added here Ctrl+A will fail otherwise
+			if (!isIE) {
+				try {
+					if (!s.readonly)
+						d.designMode = 'On';
+				} catch (ex) {
+					// Will fail on Gecko if the editor is placed in an hidden container element
+					// The design mode will be set ones the editor is focused
+				}
+			}
+
+			// IE needs to use contentEditable or it will display non secure items for HTTPS
+			if (isIE) {
+				// It will not steal focus if we hide it while setting contentEditable
+				b = t.getBody();
+				DOM.hide(b);
+
+				if (!s.readonly)
+					b.contentEditable = true;
+
+				DOM.show(b);
+			}
+
+			// Setup objects
+			t.dom = new tinymce.DOM.DOMUtils(t.getDoc(), {
+				keep_values : true,
+				url_converter : t.convertURL,
+				url_converter_scope : t,
+				hex_colors : s.force_hex_style_colors,
+				class_filter : s.class_filter,
+				update_styles : 1,
+				fix_ie_paragraphs : 1
+			});
+
+			t.serializer = new tinymce.dom.Serializer({
+				entity_encoding : s.entity_encoding,
+				entities : s.entities,
+				valid_elements : s.verify_html === false ? '*[*]' : s.valid_elements,
+				extended_valid_elements : s.extended_valid_elements,
+				valid_child_elements : s.valid_child_elements,
+				invalid_elements : s.invalid_elements,
+				fix_table_elements : s.fix_table_elements,
+				fix_list_elements : s.fix_list_elements,
+				fix_content_duplication : s.fix_content_duplication,
+				convert_fonts_to_spans : s.convert_fonts_to_spans,
+				font_size_classes  : s.font_size_classes,
+				font_size_style_values : s.font_size_style_values,
+				apply_source_formatting : s.apply_source_formatting,
+				remove_linebreaks : s.remove_linebreaks,
+				dom : t.dom
+			});
+
+			t.selection = new tinymce.dom.Selection(t.dom, t.getWin(), t.serializer);
+			t.forceBlocks = new tinymce.ForceBlocks(t, {
+				forced_root_block : s.forced_root_block
+			});
+			t.editorCommands = new tinymce.EditorCommands(t);
+
+			// Pass through
+			t.serializer.onPreProcess.add(function(se, o) {
+				return t.onPreProcess.dispatch(t, o, se);
+			});
+
+			t.serializer.onPostProcess.add(function(se, o) {
+				return t.onPostProcess.dispatch(t, o, se);
+			});
+
+			t.onPreInit.dispatch(t);
+
+			if (!s.gecko_spellcheck)
+				t.getBody().spellcheck = 0;
+
+			if (!s.readonly)
+				t._addEvents();
+
+			t.controlManager.onPostRender.dispatch(t, t.controlManager);
+			t.onPostRender.dispatch(t);
+
+			if (s.directionality)
+				t.getBody().dir = s.directionality;
+
+			if (s.nowrap)
+				t.getBody().style.whiteSpace = "nowrap";
+
+			if (s.auto_resize)
+				t.onNodeChange.add(t.resizeToContent, t);
+
+			if (s.custom_elements) {
+				function handleCustom(ed, o) {
+					each(explode(s.custom_elements), function(v) {
+						var n;
+
+						if (v.indexOf('~') === 0) {
+							v = v.substring(1);
+							n = 'span';
+						} else
+							n = 'div';
+
+						o.content = o.content.replace(new RegExp('<(' + v + ')([^>]*)>', 'g'), '<' + n + ' mce_name="$1"$2>');
+						o.content = o.content.replace(new RegExp('</(' + v + ')>', 'g'), '</' + n + '>');
+					});
+				};
+
+				t.onBeforeSetContent.add(handleCustom);
+				t.onPostProcess.add(function(ed, o) {
+					if (o.set)
+						handleCustom(ed, o)
+				});
+			}
+
+			if (s.handle_node_change_callback) {
+				t.onNodeChange.add(function(ed, cm, n) {
+					t.execCallback('handle_node_change_callback', t.id, n, -1, -1, true, t.selection.isCollapsed());
+				});
+			}
+
+			if (s.save_callback) {
+				t.onSaveContent.add(function(ed, o) {
+					var h = t.execCallback('save_callback', t.id, o.content, t.getBody());
+
+					if (h)
+						o.content = h;
+				});
+			}
+
+			if (s.onchange_callback) {
+				t.onChange.add(function(ed, l) {
+					t.execCallback('onchange_callback', t, l);
+				});
+			}
+
+			if (s.convert_newlines_to_brs) {
+				t.onBeforeSetContent.add(function(ed, o) {
+					if (o.initial)
+						o.content = o.content.replace(/\r?\n/g, '<br />');
+				});
+			}
+
+			if (s.fix_nesting && isIE) {
+				t.onBeforeSetContent.add(function(ed, o) {
+					o.content = t._fixNesting(o.content);
+				});
+			}
+
+			if (s.preformatted) {
+				t.onPostProcess.add(function(ed, o) {
+					o.content = o.content.replace(/^\s*<pre.*?>/, '');
+					o.content = o.content.replace(/<\/pre>\s*$/, '');
+
+					if (o.set)
+						o.content = '<pre class="mceItemHidden">' + o.content + '</pre>';
+				});
+			}
+
+			if (s.verify_css_classes) {
+				t.serializer.attribValueFilter = function(n, v) {
+					var s, cl;
+
+					if (n == 'class') {
+						// Build regexp for classes
+						if (!t.classesRE) {
+							cl = t.dom.getClasses();
+
+							if (cl.length > 0) {
+								s = '';
+
+								each (cl, function(o) {
+									s += (s ? '|' : '') + o['class'];
+								});
+
+								t.classesRE = new RegExp('(' + s + ')', 'gi');
+							}
+						}
+
+						return !t.classesRE || /(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(v) || t.classesRE.test(v) ? v : '';
+					}
+
+					return v;
+				};
+			}
+
+			if (s.convert_fonts_to_spans)
+				t._convertFonts();
+
+			if (s.inline_styles)
+				t._convertInlineElements();
+
+			if (s.cleanup_callback) {
+				t.onBeforeSetContent.add(function(ed, o) {
+					o.content = t.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);
+				});
+
+				t.onPreProcess.add(function(ed, o) {
+					if (o.set)
+						t.execCallback('cleanup_callback', 'insert_to_editor_dom', o.node, o);
+
+					if (o.get)
+						t.execCallback('cleanup_callback', 'get_from_editor_dom', o.node, o);
+				});
+
+				t.onPostProcess.add(function(ed, o) {
+					if (o.set)
+						o.content = t.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);
+
+					if (o.get)						
+						o.content = t.execCallback('cleanup_callback', 'get_from_editor', o.content, o);
+				});
+			}
+
+			if (s.save_callback) {
+				t.onGetContent.add(function(ed, o) {
+					if (o.save)
+						o.content = t.execCallback('save_callback', t.id, o.content, t.getBody());
+				});
+			}
+
+			if (s.handle_event_callback) {
+				t.onEvent.add(function(ed, e, o) {
+					if (t.execCallback('handle_event_callback', e, ed, o) === false)
+						Event.cancel(e);
+				});
+			}
+
+			t.onSetContent.add(function() {
+				// Safari needs some time, it will crash the browser when a link is created otherwise
+				// I think this crash issue is resolved in the latest 3.0.4
+				//window.setTimeout(function() {
+					t.addVisual(t.getBody());
+				//}, 1);
+			});
+
+			// Remove empty contents
+			if (s.padd_empty_editor) {
+				t.onPostProcess.add(function(ed, o) {
+					o.content = o.content.replace(/^(<p>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/, '');
+				});
+			}
+
+			if (isGecko && !s.readonly) {
+				try {
+					// Design mode must be set here once again to fix a bug where
+					// Ctrl+A/Delete/Backspace didn't work if the editor was added using mceAddControl then removed then added again
+					d.designMode = 'Off';
+					d.designMode = 'On';
+				} catch (ex) {
+					// Will fail on Gecko if the editor is placed in an hidden container element
+					// The design mode will be set ones the editor is focused
+				}
+			}
+
+			// A small timeout was needed since firefox will remove. Bug: #1838304
+			setTimeout(function () {
+				if (t.removed)
+					return;
+
+				t.load({initial : true, format : (s.cleanup_on_startup ? 'html' : 'raw')});
+				t.startContent = t.getContent({format : 'raw'});
+				t.undoManager.add({initial : true});
+				t.initialized = true;
+
+				t.onInit.dispatch(t);
+				t.execCallback('setupcontent_callback', t.id, t.getBody(), t.getDoc());
+				t.execCallback('init_instance_callback', t);
+				t.focus(true);
+				t.nodeChanged({initial : 1});
+
+				// Load specified content CSS last
+				if (s.content_css) {
+					tinymce.each(explode(s.content_css), function(u) {
+						t.dom.loadCSS(t.documentBaseURI.toAbsolute(u));
+					});
+				}
+
+				// Handle auto focus
+				if (s.auto_focus) {
+					setTimeout(function () {
+						var ed = EditorManager.get(s.auto_focus);
+
+						ed.selection.select(ed.getBody(), 1);
+						ed.selection.collapse(1);
+						ed.getWin().focus();
+					}, 100);
+				}
+			}, 1);
+	
+			e = null;
+		},
+
+		
+		focus : function(sf) {
+			var oed, t = this, ce = t.settings.content_editable;
+
+			if (!sf) {
+				// Is not content editable or the selection is outside the area in IE
+				// the IE statement is needed to avoid bluring if element selections inside layers since
+				// the layer is like it's own document in IE
+				if (!ce && (!isIE || t.selection.getNode().ownerDocument != t.getDoc()))
+					t.getWin().focus();
+
+							}
+
+			if (EditorManager.activeEditor != t) {
+				if ((oed = EditorManager.activeEditor) != null)
+					oed.onDeactivate.dispatch(oed, t);
+
+				t.onActivate.dispatch(t, oed);
+			}
+
+			EditorManager._setActive(t);
+		},
+
+		execCallback : function(n) {
+			var t = this, f = t.settings[n], s;
+
+			if (!f)
+				return;
+
+			// Look through lookup
+			if (t.callbackLookup && (s = t.callbackLookup[n])) {
+				f = s.func;
+				s = s.scope;
+			}
+
+			if (is(f, 'string')) {
+				s = f.replace(/\.\w+$/, '');
+				s = s ? tinymce.resolve(s) : 0;
+				f = tinymce.resolve(f);
+				t.callbackLookup = t.callbackLookup || {};
+				t.callbackLookup[n] = {func : f, scope : s};
+			}
+
+			return f.apply(s || t, Array.prototype.slice.call(arguments, 1));
+		},
+
+		translate : function(s) {
+			var c = this.settings.language || 'en', i18n = EditorManager.i18n;
+
+			if (!s)
+				return '';
+
+			return i18n[c + '.' + s] || s.replace(/{\#([^}]+)\}/g, function(a, b) {
+				return i18n[c + '.' + b] || '{#' + b + '}';
+			});
+		},
+
+		getLang : function(n, dv) {
+			return EditorManager.i18n[(this.settings.language || 'en') + '.' + n] || (is(dv) ? dv : '{#' + n + '}');
+		},
+
+		getParam : function(n, dv, ty) {
+			var tr = tinymce.trim, v = is(this.settings[n]) ? this.settings[n] : dv, o;
+
+			if (ty === 'hash') {
+				o = {};
+
+				if (is(v, 'string')) {
+					each(v.indexOf('=') > 0 ? v.split(/[;,](?![^=;,]*(?:[;,]|$))/) : v.split(','), function(v) {
+						v = v.split('=');
+
+						if (v.length > 1)
+							o[tr(v[0])] = tr(v[1]);
+						else
+							o[tr(v[0])] = tr(v);
+					});
+				} else
+					o = v;
+
+				return o;
+			}
+
+			return v;
+		},
+
+		nodeChanged : function(o) {
+			var t = this, s = t.selection, n = s.getNode() || t.getBody();
+
+			// Fix for bug #1896577 it seems that this can not be fired while the editor is loading
+			if (t.initialized) {
+				t.onNodeChange.dispatch(
+					t,
+					o ? o.controlManager || t.controlManager : t.controlManager,
+					isIE && n.ownerDocument != t.getDoc() ? t.getBody() : n, // Fix for IE initial state
+					s.isCollapsed(),
+					o
+				);
+			}
+		},
+
+		addButton : function(n, s) {
+			var t = this;
+
+			t.buttons = t.buttons || {};
+			t.buttons[n] = s;
+		},
+
+		addCommand : function(n, f, s) {
+			this.execCommands[n] = {func : f, scope : s || this};
+		},
+
+		addQueryStateHandler : function(n, f, s) {
+			this.queryStateCommands[n] = {func : f, scope : s || this};
+		},
+
+		addQueryValueHandler : function(n, f, s) {
+			this.queryValueCommands[n] = {func : f, scope : s || this};
+		},
+
+		addShortcut : function(pa, desc, cmd_func, sc) {
+			var t = this, c;
+
+			if (!t.settings.custom_shortcuts)
+				return false;
+
+			t.shortcuts = t.shortcuts || {};
+
+			if (is(cmd_func, 'string')) {
+				c = cmd_func;
+
+				cmd_func = function() {
+					t.execCommand(c, false, null);
+				};
+			}
+
+			if (is(cmd_func, 'object')) {
+				c = cmd_func;
+
+				cmd_func = function() {
+					t.execCommand(c[0], c[1], c[2]);
+				};
+			}
+
+			each(explode(pa), function(pa) {
+				var o = {
+					func : cmd_func,
+					scope : sc || this,
+					desc : desc,
+					alt : false,
+					ctrl : false,
+					shift : false
+				};
+
+				each(explode(pa, '+'), function(v) {
+					switch (v) {
+						case 'alt':
+						case 'ctrl':
+						case 'shift':
+							o[v] = true;
+							break;
+
+						default:
+							o.charCode = v.charCodeAt(0);
+							o.keyCode = v.toUpperCase().charCodeAt(0);
+					}
+				});
+
+				t.shortcuts[(o.ctrl ? 'ctrl' : '') + ',' + (o.alt ? 'alt' : '') + ',' + (o.shift ? 'shift' : '') + ',' + o.keyCode] = o;
+			});
+
+			return true;
+		},
+
+		execCommand : function(cmd, ui, val, a) {
+			var t = this, s = 0, o, st;
+
+			if (!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(cmd) && (!a || !a.skip_focus))
+				t.focus();
+
+			o = {};
+			t.onBeforeExecCommand.dispatch(t, cmd, ui, val, o);
+			if (o.terminate)
+				return false;
+
+			// Command callback
+			if (t.execCallback('execcommand_callback', t.id, t.selection.getNode(), cmd, ui, val)) {
+				t.onExecCommand.dispatch(t, cmd, ui, val, a);
+				return true;
+			}
+
+			// Registred commands
+			if (o = t.execCommands[cmd]) {
+				st = o.func.call(o.scope, ui, val);
+
+				// Fall through on true
+				if (st !== true) {
+					t.onExecCommand.dispatch(t, cmd, ui, val, a);
+					return st;
+				}
+			}
+
+			// Plugin commands
+			each(t.plugins, function(p) {
+				if (p.execCommand && p.execCommand(cmd, ui, val)) {
+					t.onExecCommand.dispatch(t, cmd, ui, val, a);
+					s = 1;
+					return false;
+				}
+			});
+
+			if (s)
+				return true;
+
+			// Theme commands
+			if (t.theme.execCommand && t.theme.execCommand(cmd, ui, val)) {
+				t.onExecCommand.dispatch(t, cmd, ui, val, a);
+				return true;
+			}
+
+			// Editor commands
+			if (t.editorCommands.execCommand(cmd, ui, val)) {
+				t.onExecCommand.dispatch(t, cmd, ui, val, a);
+				return true;
+			}
+
+			// Browser commands
+			t.getDoc().execCommand(cmd, ui, val);
+			t.onExecCommand.dispatch(t, cmd, ui, val, a);
+		},
+
+		queryCommandState : function(c) {
+			var t = this, o, s;
+
+			// Is hidden then return undefined
+			if (t._isHidden())
+				return;
+
+			// Registred commands
+			if (o = t.queryStateCommands[c]) {
+				s = o.func.call(o.scope);
+
+				// Fall though on true
+				if (s !== true)
+					return s;
+			}
+
+			// Registred commands
+			o = t.editorCommands.queryCommandState(c);
+			if (o !== -1)
+				return o;
+
+			// Browser commands
+			try {
+				return this.getDoc().queryCommandState(c);
+			} catch (ex) {
+				// Fails sometimes see bug: 1896577
+			}
+		},
+
+		queryCommandValue : function(c) {
+			var t = this, o, s;
+
+			// Is hidden then return undefined
+			if (t._isHidden())
+				return;
+
+			// Registred commands
+			if (o = t.queryValueCommands[c]) {
+				s = o.func.call(o.scope);
+
+				// Fall though on true
+				if (s !== true)
+					return s;
+			}
+
+			// Registred commands
+			o = t.editorCommands.queryCommandValue(c);
+			if (is(o))
+				return o;
+
+			// Browser commands
+			try {
+				return this.getDoc().queryCommandValue(c);
+			} catch (ex) {
+				// Fails sometimes see bug: 1896577
+			}
+		},
+
+		show : function() {
+			var t = this;
+
+			DOM.show(t.getContainer());
+			DOM.hide(t.id);
+			t.load();
+		},
+
+		hide : function() {
+			var t = this, d = t.getDoc();
+
+			// Fixed bug where IE has a blinking cursor left from the editor
+			if (isIE && d)
+				d.execCommand('SelectAll');
+
+			// We must save before we hide so Safari doesn't crash
+			t.save();
+			DOM.hide(t.getContainer());
+			DOM.setStyle(t.id, 'display', t.orgDisplay);
+		},
+
+		isHidden : function() {
+			return !DOM.isHidden(this.id);
+		},
+
+		setProgressState : function(b, ti, o) {
+			this.onSetProgressState.dispatch(this, b, ti, o);
+
+			return b;
+		},
+
+		resizeToContent : function() {
+			var t = this;
+
+			DOM.setStyle(t.id + "_ifr", 'height', t.getBody().scrollHeight);
+		},
+
+		load : function(o) {
+			var t = this, e = t.getElement(), h;
+
+			o = o || {};
+			o.load = true;
+
+			h = t.setContent(is(e.value) ? e.value : e.innerHTML, o);
+			o.element = e;
+
+			if (!o.no_events)
+				t.onLoadContent.dispatch(t, o);
+
+			o.element = e = null;
+
+			return h;
+		},
+
+		save : function(o) {
+			var t = this, e = t.getElement(), h, f;
+
+			if (!t.initialized)
+				return;
+
+			o = o || {};
+			o.save = true;
+
+			// Add undo level will trigger onchange event
+			if (!o.no_events) {
+				t.undoManager.typing = 0;
+				t.undoManager.add();
+			}
+
+			o.element = e;
+			h = o.content = t.getContent(o);
+
+			if (!o.no_events)
+				t.onSaveContent.dispatch(t, o);
+
+			h = o.content;
+
+			if (!/TEXTAREA|INPUT/i.test(e.nodeName)) {
+				e.innerHTML = h;
+
+				// Update hidden form element
+				if (f = DOM.getParent(t.id, 'form')) {
+					each(f.elements, function(e) {
+						if (e.name == t.id) {
+							e.value = h;
+							return false;
+						}
+					});
+				}
+			} else
+				e.value = h;
+
+			o.element = e = null;
+
+			return h;
+		},
+
+		setContent : function(h, o) {
+			var t = this;
+
+			o = o || {};
+			o.format = o.format || 'html';
+			o.set = true;
+			o.content = h;
+
+			if (!o.no_events)
+				t.onBeforeSetContent.dispatch(t, o);
+
+			// Padd empty content in Gecko and Safari. Commands will otherwise fail on the content
+			// It will also be impossible to place the caret in the editor unless there is a BR element present
+			if (!tinymce.isIE && (h.length === 0 || /^\s+$/.test(h))) {
+				o.content = t.dom.setHTML(t.getBody(), '<br mce_bogus="1" />');
+				o.format = 'raw';
+			}
+
+			o.content = t.dom.setHTML(t.getBody(), tinymce.trim(o.content));
+
+			if (o.format != 'raw' && t.settings.cleanup) {
+				o.getInner = true;
+				o.content = t.dom.setHTML(t.getBody(), t.serializer.serialize(t.getBody(), o));
+			}
+
+			if (!o.no_events)
+				t.onSetContent.dispatch(t, o);
+
+			return o.content;
+		},
+
+		getContent : function(o) {
+			var t = this, h;
+
+			o = o || {};
+			o.format = o.format || 'html';
+			o.get = true;
+
+			if (!o.no_events)
+				t.onBeforeGetContent.dispatch(t, o);
+
+			if (o.format != 'raw' && t.settings.cleanup) {
+				o.getInner = true;
+				h = t.serializer.serialize(t.getBody(), o);
+			} else
+				h = t.getBody().innerHTML;
+
+			h = h.replace(/^\s*|\s*$/g, '');
+			o.content = h;
+
+			if (!o.no_events)
+				t.onGetContent.dispatch(t, o);
+
+			return o.content;
+		},
+
+		isDirty : function() {
+			var t = this;
+
+			return tinymce.trim(t.startContent) != tinymce.trim(t.getContent({format : 'raw', no_events : 1})) && !t.isNotDirty;
+		},
+
+		getContainer : function() {
+			var t = this;
+
+			if (!t.container)
+				t.container = DOM.get(t.editorContainer || t.id + '_parent');
+
+			return t.container;
+		},
+
+		getContentAreaContainer : function() {
+			return this.contentAreaContainer;
+		},
+
+		getElement : function() {
+			return DOM.get(this.settings.content_element || this.id);
+		},
+
+		getWin : function() {
+			var t = this, e;
+
+			if (!t.contentWindow) {
+				e = DOM.get(t.id + "_ifr");
+
+				if (e)
+					t.contentWindow = e.contentWindow;
+			}
+
+			return t.contentWindow;
+		},
+
+		getDoc : function() {
+			var t = this, w;
+
+			if (!t.contentDocument) {
+				w = t.getWin();
+
+				if (w)
+					t.contentDocument = w.document;
+			}
+
+			return t.contentDocument;
+		},
+
+		getBody : function() {
+			return this.bodyElement || this.getDoc().body;
+		},
+
+		convertURL : function(u, n, e) {
+			var t = this, s = t.settings;
+
+			// Use callback instead
+			if (s.urlconverter_callback)
+				return t.execCallback('urlconverter_callback', u, e, true, n);
+
+			// Don't convert link href since thats the CSS files that gets loaded into the editor also skip local file URLs
+			if (!s.convert_urls || (e && e.nodeName == 'LINK') || u.indexOf('file:') === 0)
+				return u;
+
+			// Convert to relative
+			if (s.relative_urls)
+				return t.documentBaseURI.toRelative(u);
+
+			// Convert to absolute
+			u = t.documentBaseURI.toAbsolute(u, s.remove_script_host);
+
+			return u;
+		},
+
+		addVisual : function(e) {
+			var t = this, s = t.settings;
+
+			e = e || t.getBody();
+
+			if (!is(t.hasVisual))
+				t.hasVisual = s.visual;
+
+			each(t.dom.select('table,a', e), function(e) {
+				var v;
+
+				switch (e.nodeName) {
+					case 'TABLE':
+						v = t.dom.getAttrib(e, 'border');
+
+						if (!v || v == '0') {
+							if (t.hasVisual)
+								t.dom.addClass(e, s.visual_table_class);
+							else
+								t.dom.removeClass(e, s.visual_table_class);
+						}
+
+						return;
+
+					case 'A':
+						v = t.dom.getAttrib(e, 'name');
+
+						if (v) {
+							if (t.hasVisual)
+								t.dom.addClass(e, 'mceItemAnchor');
+							else
+								t.dom.removeClass(e, 'mceItemAnchor');
+						}
+
+						return;
+				}
+			});
+
+			t.onVisualAid.dispatch(t, e, t.hasVisual);
+		},
+
+		remove : function() {
+			var t = this, e = t.getContainer();
+
+			t.removed = 1; // Cancels post remove event execution
+			t.hide();
+
+			t.execCallback('remove_instance_callback', t);
+			t.onRemove.dispatch(t);
+
+			// Clear all execCommand listeners this is required to avoid errors if the editor was removed inside another command
+			t.onExecCommand.listeners = [];
+
+			EditorManager.remove(t);
+			DOM.remove(e);
+		},
+
+		destroy : function(s) {
+			var t = this;
+
+			// One time is enough
+			if (t.destroyed)
+				return;
+
+			if (!s) {
+				tinymce.removeUnload(t.destroy);
+				tinyMCE.onBeforeUnload.remove(t._beforeUnload);
+
+				// Manual destroy
+				if (t.theme.destroy)
+					t.theme.destroy();
+
+				// Destroy controls, selection and dom
+				t.controlManager.destroy();
+				t.selection.destroy();
+				t.dom.destroy();
+
+				// Remove all events
+
+				// Don't clear the window or document if content editable
+				// is enabled since other instances might still be present
+				if (!t.settings.content_editable) {
+					Event.clear(t.getWin());
+					Event.clear(t.getDoc());
+				}
+
+				Event.clear(t.getBody());
+				Event.clear(t.formElement);
+			}
+
+			if (t.formElement) {
+				t.formElement.submit = t.formElement._mceOldSubmit;
+				t.formElement._mceOldSubmit = null;
+			}
+
+			t.contentAreaContainer = t.formElement = t.container = t.settings.content_element = t.bodyElement = t.contentDocument = t.contentWindow = null;
+
+			if (t.selection)
+				t.selection = t.selection.win = t.selection.dom = t.selection.dom.doc = null;
+
+			t.destroyed = 1;
+		},
+
+		// Internal functions
+
+		_addEvents : function() {
+			// 'focus', 'blur', 'dblclick', 'beforedeactivate', submit, reset
+			var t = this, i, s = t.settings, lo = {
+				mouseup : 'onMouseUp',
+				mousedown : 'onMouseDown',
+				click : 'onClick',
+				keyup : 'onKeyUp',
+				keydown : 'onKeyDown',
+				keypress : 'onKeyPress',
+				submit : 'onSubmit',
+				reset : 'onReset',
+				contextmenu : 'onContextMenu',
+				dblclick : 'onDblClick',
+				paste : 'onPaste' // Doesn't work in all browsers yet
+			};
+
+			function eventHandler(e, o) {
+				var ty = e.type;
+
+				// Don't fire events when it's removed
+				if (t.removed)
+					return;
+
+				// Generic event handler
+				if (t.onEvent.dispatch(t, e, o) !== false) {
+					// Specific event handler
+					t[lo[e.fakeType || e.type]].dispatch(t, e, o);
+				}
+			};
+
+			// Add DOM events
+			each(lo, function(v, k) {
+				switch (k) {
+					case 'contextmenu':
+						if (tinymce.isOpera) {
+							// Fake contextmenu on Opera
+							Event.add(t.getBody(), 'mousedown', function(e) {
+								if (e.ctrlKey) {
+									e.fakeType = 'contextmenu';
+									eventHandler(e);
+								}
+							});
+						} else
+							Event.add(t.getBody(), k, eventHandler);
+						break;
+
+					case 'paste':
+						Event.add(t.getBody(), k, function(e) {
+							var tx, h, el, r;
+
+							// Get plain text data
+							if (e.clipboardData)
+								tx = e.clipboardData.getData('text/plain');
+							else if (tinymce.isIE)
+								tx = t.getWin().clipboardData.getData('Text');
+
+							// Get HTML data
+							/*if (tinymce.isIE) {
+								el = DOM.add(DOM.doc.body, 'div', {style : 'visibility:hidden;overflow:hidden;position:absolute;width:1px;height:1px'});
+								r = DOM.doc.body.createTextRange();
+								r.moveToElementText(el);
+								r.execCommand('Paste');
+								h = el.innerHTML;
+								DOM.remove(el);
+							}*/
+
+							eventHandler(e, {text : tx, html : h});
+						});
+						break;
+
+					case 'submit':
+					case 'reset':
+						Event.add(t.getElement().form || DOM.getParent(t.id, 'form'), k, eventHandler);
+						break;
+
+					default:
+						Event.add(s.content_editable ? t.getBody() : t.getDoc(), k, eventHandler);
+				}
+			});
+
+			Event.add(s.content_editable ? t.getBody() : (isGecko ? t.getDoc() : t.getWin()), 'focus', function(e) {
+				t.focus(true);
+			});
+
+			
+			// Fixes bug where a specified document_base_uri could result in broken images
+			// This will also fix drag drop of images in Gecko
+			if (tinymce.isGecko) {
+				// Convert all images to absolute URLs
+/*				t.onSetContent.add(function(ed, o) {
+					each(ed.dom.select('img'), function(e) {
+						var v;
+
+						if (v = e.getAttribute('mce_src'))
+							e.src = t.documentBaseURI.toAbsolute(v);
+					})
+				});*/
+
+				Event.add(t.getDoc(), 'DOMNodeInserted', function(e) {
+					var v;
+
+					e = e.target;
+
+					if (e.nodeType === 1 && e.nodeName === 'IMG' && (v = e.getAttribute('mce_src')))
+						e.src = t.documentBaseURI.toAbsolute(v);
+				});
+			}
+
+			// Set various midas options in Gecko
+			if (isGecko) {
+				function setOpts() {
+					var t = this, d = t.getDoc(), s = t.settings;
+
+					if (isGecko && !s.readonly) {
+						if (t._isHidden()) {
+							try {
+								if (!s.content_editable)
+									d.designMode = 'On';
+							} catch (ex) {
+								// Fails if it's hidden
+							}
+						}
+
+						try {
+							// Try new Gecko method
+							d.execCommand("styleWithCSS", 0, false);
+						} catch (ex) {
+							// Use old method
+							if (!t._isHidden())
+								try {d.execCommand("useCSS", 0, true);} catch (ex) {}
+						}
+
+						if (!s.table_inline_editing)
+							try {d.execCommand('enableInlineTableEditing', false, false);} catch (ex) {}
+
+						if (!s.object_resizing)
+							try {d.execCommand('enableObjectResizing', false, false);} catch (ex) {}
+					}
+				};
+
+				t.onBeforeExecCommand.add(setOpts);
+				t.onMouseDown.add(setOpts);
+			}
+
+			// Add node change handlers
+			t.onMouseUp.add(t.nodeChanged);
+			t.onClick.add(t.nodeChanged);
+			t.onKeyUp.add(function(ed, e) {
+				var c = e.keyCode;
+
+				if ((c >= 33 && c <= 36) || (c >= 37 && c <= 40) || c == 13 || c == 45 || c == 46 || c == 8 || (tinymce.isMac && c >= 91 && c <= 93) || e.ctrlKey)
+					t.nodeChanged();
+			});
+
+			// Add reset handler
+			t.onReset.add(function() {
+				t.setContent(t.startContent, {format : 'raw'});
+			});
+
+			if (t.getParam('tab_focus')) {
+				function tabCancel(ed, e) {
+					if (e.keyCode === 9)
+						return Event.cancel(e);
+				};
+
+				function tabHandler(ed, e) {
+					var x, i, f, el, v;
+
+					function find(d) {
+						f = DOM.getParent(ed.id, 'form');
+						el = f.elements;
+
+						if (f) {
+							each(el, function(e, i) {
+								if (e.id == ed.id) {
+									x = i;
+									return false;
+								}
+							});
+
+							if (d > 0) {
+								for (i = x + 1; i < el.length; i++) {
+									if (el[i].type != 'hidden')
+										return el[i];
+								}
+							} else {
+								for (i = x - 1; i >= 0; i--) {
+									if (el[i].type != 'hidden')
+										return el[i];
+								}
+							}
+						}
+
+						return null;
+					};
+
+					if (e.keyCode === 9) {
+						v = explode(ed.getParam('tab_focus'));
+
+						if (v.length == 1) {
+							v[1] = v[0];
+							v[0] = ':prev';
+						}
+
+						// Find element to focus
+						if (e.shiftKey) {
+							if (v[0] == ':prev')
+								el = find(-1);
+							else
+								el = DOM.get(v[0]);
+						} else {
+							if (v[1] == ':next')
+								el = find(1);
+							else
+								el = DOM.get(v[1]);
+						}
+
+						if (el) {
+							if (ed = EditorManager.get(el.id || el.name))
+								ed.focus();
+							else
+								window.setTimeout(function() {window.focus();el.focus();}, 10);
+
+							return Event.cancel(e);
+						}
+					}
+				};
+
+				t.onKeyUp.add(tabCancel);
+
+				if (isGecko) {
+					t.onKeyPress.add(tabHandler);
+					t.onKeyDown.add(tabCancel);
+				} else
+					t.onKeyDown.add(tabHandler);
+			}
+
+			// Add shortcuts
+			if (s.custom_shortcuts) {
+				if (s.custom_undo_redo_keyboard_shortcuts) {
+					t.addShortcut('ctrl+z', t.getLang('undo_desc'), 'Undo');
+					t.addShortcut('ctrl+y', t.getLang('redo_desc'), 'Redo');
+				}
+
+				// Add default shortcuts for gecko
+				if (isGecko) {
+					t.addShortcut('ctrl+b', t.getLang('bold_desc'), 'Bold');
+					t.addShortcut('ctrl+i', t.getLang('italic_desc'), 'Italic');
+					t.addShortcut('ctrl+u', t.getLang('underline_desc'), 'Underline');
+				}
+
+				// BlockFormat shortcuts keys
+				for (i=1; i<=6; i++)
+					t.addShortcut('ctrl+' + i, '', ['FormatBlock', false, '<h' + i + '>']);
+
+				t.addShortcut('ctrl+7', '', ['FormatBlock', false, '<p>']);
+				t.addShortcut('ctrl+8', '', ['FormatBlock', false, '<div>']);
+				t.addShortcut('ctrl+9', '', ['FormatBlock', false, '<address>']);
+
+				function find(e) {
+					var v = null;
+
+					if (!e.altKey && !e.ctrlKey && !e.metaKey)
+						return v;
+
+					each(t.shortcuts, function(o) {
+						if (o.ctrl != e.ctrlKey && (!tinymce.isMac || o.ctrl == e.metaKey))
+							return;
+
+						if (o.alt != e.altKey)
+							return;
+
+						if (o.shift != e.shiftKey)
+							return;
+
+						if (e.keyCode == o.keyCode || (e.charCode && e.charCode == o.charCode)) {
+							v = o;
+							return false;
+						}
+					});
+
+					return v;
+				};
+
+				t.onKeyUp.add(function(ed, e) {
+					var o = find(e);
+
+					if (o)
+						return Event.cancel(e);
+				});
+
+				t.onKeyPress.add(function(ed, e) {
+					var o = find(e);
+
+					if (o)
+						return Event.cancel(e);
+				});
+
+				t.onKeyDown.add(function(ed, e) {
+					var o = find(e);
+
+					if (o) {
+						o.func.call(o.scope);
+						return Event.cancel(e);
+					}
+				});
+			}
+
+			if (tinymce.isIE) {
+				// Fix so resize will only update the width and height attributes not the styles of an image
+				// It will also block mceItemNoResize items
+				Event.add(t.getDoc(), 'controlselect', function(e) {
+					var re = t.resizeInfo, cb;
+
+					e = e.target;
+
+					// Don't do this action for non image elements
+					if (e.nodeName !== 'IMG')
+						return;
+
+					if (re)
+						Event.remove(re.node, re.ev, re.cb);
+
+					if (!t.dom.hasClass(e, 'mceItemNoResize')) {
+						ev = 'resizeend';
+						cb = Event.add(e, ev, function(e) {
+							var v;
+
+							e = e.target;
+
+							if (v = t.dom.getStyle(e, 'width')) {
+								t.dom.setAttrib(e, 'width', v.replace(/[^0-9%]+/g, ''));
+								t.dom.setStyle(e, 'width', '');
+							}
+
+							if (v = t.dom.getStyle(e, 'height')) {
+								t.dom.setAttrib(e, 'height', v.replace(/[^0-9%]+/g, ''));
+								t.dom.setStyle(e, 'height', '');
+							}
+						});
+					} else {
+						ev = 'resizestart';
+						cb = Event.add(e, 'resizestart', Event.cancel, Event);
+					}
+
+					re = t.resizeInfo = {
+						node : e,
+						ev : ev,
+						cb : cb
+					};
+				});
+
+				t.onKeyDown.add(function(ed, e) {
+					switch (e.keyCode) {
+						case 8:
+							// Fix IE control + backspace browser bug
+							if (t.selection.getRng().item) {
+								t.selection.getRng().item(0).removeNode();
+								return Event.cancel(e);
+							}
+					}
+				});
+			}
+
+			if (tinymce.isOpera) {
+				t.onClick.add(function(ed, e) {
+					Event.prevent(e);
+				});
+			}
+
+			// Add custom undo/redo handlers
+			if (s.custom_undo_redo) {
+				function addUndo() {
+					t.undoManager.typing = 0;
+					t.undoManager.add();
+				};
+
+				// Add undo level on editor blur
+				if (tinymce.isIE) {
+					Event.add(t.getWin(), 'blur', function(e) {
+						var n;
+
+						// Check added for fullscreen bug
+						if (t.selection) {
+							n = t.selection.getNode();
+
+							// Add undo level is selection was lost to another document
+							if (!t.removed && n.ownerDocument && n.ownerDocument != t.getDoc())
+								addUndo();
+						}
+					});
+				} else {
+					Event.add(t.getDoc(), 'blur', function() {
+						if (t.selection && !t.removed)
+							addUndo();
+					});
+				}
+
+				t.onMouseDown.add(addUndo);
+
+				t.onKeyUp.add(function(ed, e) {
+					if ((e.keyCode >= 33 && e.keyCode <= 36) || (e.keyCode >= 37 && e.keyCode <= 40) || e.keyCode == 13 || e.keyCode == 45 || e.ctrlKey) {
+						t.undoManager.typing = 0;
+						t.undoManager.add();
+					}
+				});
+
+				t.onKeyDown.add(function(ed, e) {
+					// Is caracter positon keys
+					if ((e.keyCode >= 33 && e.keyCode <= 36) || (e.keyCode >= 37 && e.keyCode <= 40) || e.keyCode == 13 || e.keyCode == 45) {
+						if (t.undoManager.typing) {
+							t.undoManager.add();
+							t.undoManager.typing = 0;
+						}
+
+						return;
+					}
+
+					if (!t.undoManager.typing) {
+						t.undoManager.add();
+						t.undoManager.typing = 1;
+					}
+				});
+			}
+		},
+
+		_convertInlineElements : function() {
+			var t = this, s = t.settings, dom = t.dom, v, e, na, st, sp;
+
+			function convert(ed, o) {
+				if (!s.inline_styles)
+					return;
+
+				if (o.get) {
+					each(t.dom.select('table,u,strike', o.node), function(n) {
+						switch (n.nodeName) {
+							case 'TABLE':
+								if (v = dom.getAttrib(n, 'height')) {
+									dom.setStyle(n, 'height', v);
+									dom.setAttrib(n, 'height', '');
+								}
+								break;
+
+							case 'U':
+							case 'STRIKE':
+								//sp = dom.create('span', {style : dom.getAttrib(n, 'style')});
+								n.style.textDecoration = n.nodeName == 'U' ? 'underline' : 'line-through';
+								dom.setAttrib(n, 'mce_style', '');
+								dom.setAttrib(n, 'mce_name', 'span');
+								break;
+						}
+					});
+				} else if (o.set) {
+					each(t.dom.select('table,span', o.node).reverse(), function(n) {
+						if (n.nodeName == 'TABLE') {
+							if (v = dom.getStyle(n, 'height'))
+								dom.setAttrib(n, 'height', v.replace(/[^0-9%]+/g, ''));
+						} else {
+							// Convert spans to elements
+							if (n.style.textDecoration == 'underline')
+								na = 'u';
+							else if (n.style.textDecoration == 'line-through')
+								na = 'strike';
+							else
+								na = '';
+
+							if (na) {
+								n.style.textDecoration = '';
+								dom.setAttrib(n, 'mce_style', '');
+
+								e = dom.create(na, {
+									style : dom.getAttrib(n, 'style')
+								});
+
+								dom.replace(e, n, 1);
+							}
+						}
+					});
+				}
+			};
+
+			t.onPreProcess.add(convert);
+
+			if (!s.cleanup_on_startup) {
+				t.onSetContent.add(function(ed, o) {
+					if (o.initial)
+						convert(t, {node : t.getBody(), set : 1});
+				});
+			}
+		},
+
+		_convertFonts : function() {
+			var t = this, s = t.settings, dom = t.dom, fz, fzn, sl, cl;
+
+			// No need
+			if (!s.inline_styles)
+				return;
+
+			// Font pt values and font size names
+			fz = [8, 10, 12, 14, 18, 24, 36];
+			fzn = ['xx-small', 'x-small','small','medium','large','x-large', 'xx-large'];
+
+			if (sl = s.font_size_style_values)
+				sl = explode(sl);
+
+			if (cl = s.font_size_classes)
+				cl = explode(cl);
+
+			function convertToFonts(no) {
+				var n, f, nl, x, i, v, st;
+
+				// Convert spans to fonts on non WebKit browsers
+				if (tinymce.isWebKit || !s.inline_styles)
+					return;
+
+				nl = t.dom.select('span', no);
+				for (x = nl.length - 1; x >= 0; x--) {
+					n = nl[x];
+
+					f = dom.create('font', {
+						color : dom.toHex(dom.getStyle(n, 'color')),
+						face : dom.getStyle(n, 'fontFamily'),
+						style : dom.getAttrib(n, 'style'),
+						'class' : dom.getAttrib(n, 'class')
+					});
+
+					// Clear color and font family
+					st = f.style;
+					if (st.color || st.fontFamily) {
+						st.color = st.fontFamily = '';
+						dom.setAttrib(f, 'mce_style', ''); // Remove cached style data
+					}
+
+					if (sl) {
+						i = inArray(sl, dom.getStyle(n, 'fontSize'));
+
+						if (i != -1) {
+							dom.setAttrib(f, 'size', '' + (i + 1 || 1));
+							//f.style.fontSize = '';
+						}
+					} else if (cl) {
+						i = inArray(cl, dom.getAttrib(n, 'class'));
+						v = dom.getStyle(n, 'fontSize');
+
+						if (i == -1 && v.indexOf('pt') > 0)
+							i = inArray(fz, parseInt(v));
+
+						if (i == -1)
+							i = inArray(fzn, v);
+
+						if (i != -1) {
+							dom.setAttrib(f, 'size', '' + (i + 1 || 1));
+							f.style.fontSize = '';
+						}
+					}
+
+					if (f.color || f.face || f.size) {
+						f.style.fontFamily = '';
+						dom.setAttrib(f, 'mce_style', '');
+						dom.replace(f, n, 1);
+					}
+
+					f = n = null;
+				}
+			};
+
+			// Run on setup
+			t.onSetContent.add(function(ed, o) {
+				convertToFonts(ed.getBody());
+			});
+
+			// Run on cleanup
+			t.onPreProcess.add(function(ed, o) {
+				var n, sp, nl, x;
+
+				// Keep unit tests happy
+				if (!s.inline_styles)
+					return;
+
+				if (o.get) {
+					nl = t.dom.select('font', o.node);
+					for (x = nl.length - 1; x >= 0; x--) {
+						n = nl[x];
+
+						sp = dom.create('span', {
+							style : dom.getAttrib(n, 'style'),
+							'class' : dom.getAttrib(n, 'class')
+						});
+
+						dom.setStyles(sp, {
+							fontFamily : dom.getAttrib(n, 'face'),
+							color : dom.getAttrib(n, 'color'),
+							backgroundColor : n.style.backgroundColor
+						});
+
+						if (n.size) {
+							if (sl)
+								dom.setStyle(sp, 'fontSize', sl[parseInt(n.size) - 1]);
+							else
+								dom.setAttrib(sp, 'class', cl[parseInt(n.size) - 1]);
+						}
+
+						dom.setAttrib(sp, 'mce_style', '');
+						dom.replace(sp, n, 1);
+					}
+				}
+			});
+		},
+
+		_isHidden : function() {
+			var s;
+
+			if (!isGecko)
+				return 0;
+
+			// Weird, wheres that cursor selection?
+			s = this.selection.getSel();
+			return (!s || !s.rangeCount || s.rangeCount == 0);
+		},
+
+		// Fix for bug #1867292
+		_fixNesting : function(s) {
+			var d = [], i;
+
+			s = s.replace(/<(\/)?([^\s>]+)[^>]*?>/g, function(a, b, c) {
+				var e;
+
+				// Handle end element
+				if (b === '/') {
+					if (!d.length)
+						return '';
+
+					if (c !== d[d.length - 1].tag) {
+						for (i=d.length - 1; i>=0; i--) {
+							if (d[i].tag === c) {
+								d[i].close = 1;
+								break;
+							}
+						}
+
+						return '';
+					} else {
+						d.pop();
+
+						if (d.length && d[d.length - 1].close) {
+							a = a + '</' + d[d.length - 1].tag + '>';
+							d.pop();
+						}
+					}
+				} else {
+					// Ignore these
+					if (/^(br|hr|input|meta|img|link|param)$/i.test(c))
+						return a;
+
+					// Ignore closed ones
+					if (/\/>$/.test(a))
+						return a;
+
+					d.push({tag : c}); // Push start element
+				}
+
+				return a;
+			});
+
+			// End all open tags
+			for (i=d.length - 1; i>=0; i--)
+				s += '</' + d[i].tag + '>';
+
+			return s;
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/EditorCommands.js */
+
+(function() {
+	var each = tinymce.each, isIE = tinymce.isIE, isGecko = tinymce.isGecko, isOpera = tinymce.isOpera, isWebKit = tinymce.isWebKit;
+
+	tinymce.create('tinymce.EditorCommands', {
+		EditorCommands : function(ed) {
+			this.editor = ed;
+		},
+
+		execCommand : function(cmd, ui, val) {
+			var t = this, ed = t.editor, f;
+
+			switch (cmd) {
+				case 'Cut':
+				case 'Copy':
+				case 'Paste':
+					try {
+						ed.getDoc().execCommand(cmd, ui, val);
+					} catch (ex) {
+						if (isGecko) {
+							ed.windowManager.confirm(ed.getLang('clipboard_msg'), function(s) {
+								if (s)
+									window.open('http://www.mozilla.org/editor/midasdemo/securityprefs.html', 'mceExternal');
+							});
+						} else
+							ed.windowManager.alert(ed.getLang('clipboard_no_support'));
+					}
+
+					return true;
+
+				// Ignore these
+				case 'mceResetDesignMode':
+				case 'mceBeginUndoLevel':
+					return true;
+
+				// Ignore these
+				case 'unlink':
+					t.UnLink();
+					return true;
+
+				// Bundle these together
+				case 'JustifyLeft':
+				case 'JustifyCenter':
+				case 'JustifyRight':
+				case 'JustifyFull':
+					t.mceJustify(cmd, cmd.substring(7).toLowerCase());
+					return true;
+
+				case 'mceEndUndoLevel':
+				case 'mceAddUndoLevel':
+					ed.undoManager.add();
+					return true;
+
+				default:
+					f = this[cmd];
+
+					if (f) {
+						f.call(this, ui, val);
+						return true;
+					}
+			}
+
+			return false;
+		},
+
+		Indent : function() {
+			var ed = this.editor, d = ed.dom, s = ed.selection, e, iv, iu;
+
+			// Setup indent level
+			iv = ed.settings.indentation;
+			iu = /[a-z%]+$/i.exec(iv);
+			iv = parseInt(iv);
+
+			if (ed.settings.inline_styles && (!this.queryStateInsertUnorderedList() && !this.queryStateInsertOrderedList())) {
+				each(this._getSelectedBlocks(), function(e) {
+					d.setStyle(e, 'paddingLeft', (parseInt(e.style.paddingLeft || 0) + iv) + iu);
+				});
+
+				return;
+			}
+
+			ed.getDoc().execCommand('Indent', false, null);
+
+			if (isIE) {
+				d.getParent(s.getNode(), function(n) {
+					if (n.nodeName == 'BLOCKQUOTE') {
+						n.dir = n.style.cssText = '';
+					}
+				});
+			}
+		},
+
+		Outdent : function() {
+			var ed = this.editor, d = ed.dom, s = ed.selection, e, v, iv, iu;
+
+			// Setup indent level
+			iv = ed.settings.indentation;
+			iu = /[a-z%]+$/i.exec(iv);
+			iv = parseInt(iv);
+
+			if (ed.settings.inline_styles && (!this.queryStateInsertUnorderedList() && !this.queryStateInsertOrderedList())) {
+				each(this._getSelectedBlocks(), function(e) {
+					v = Math.max(0, parseInt(e.style.paddingLeft || 0) - iv);
+					d.setStyle(e, 'paddingLeft', v ? v + iu : '');
+				});
+
+				return;
+			}
+
+			ed.getDoc().execCommand('Outdent', false, null);
+		},
+
+		mceSetAttribute : function(u, v) {
+			var ed = this.editor, d = ed.dom, e;
+
+			if (e = d.getParent(ed.selection.getNode(), d.isBlock))
+				d.setAttrib(e, v.name, v.value);
+		},
+
+		mceSetContent : function(u, v) {
+			this.editor.setContent(v);
+		},
+
+		mceToggleVisualAid : function() {
+			var ed = this.editor;
+
+			ed.hasVisual = !ed.hasVisual;
+			ed.addVisual();
+		},
+
+		mceReplaceContent : function(u, v) {
+			var s = this.editor.selection;
+
+			s.setContent(v.replace(/\{\$selection\}/g, s.getContent({format : 'text'})));
+		},
+
+		mceInsertLink : function(u, v) {
+			var ed = this.editor, s = ed.selection, e = ed.dom.getParent(s.getNode(), 'A');
+
+			if (tinymce.is(v, 'string'))
+				v = {href : v};
+
+			function set(e) {
+				each(v, function(v, k) {
+					ed.dom.setAttrib(e, k, v);
+				});
+			};
+
+			if (!e) {
+				ed.execCommand('CreateLink', false, 'javascript:mctmp(0);');
+				each(ed.dom.select('a'), function(e) {
+					if (e.href == 'javascript:mctmp(0);')
+						set(e);
+				});
+			} else {
+				if (v.href)
+					set(e);
+				else
+					ed.dom.remove(e, 1);
+			}
+		},
+
+		UnLink : function() {
+			var ed = this.editor, s = ed.selection;
+
+			if (s.isCollapsed())
+				s.select(s.getNode());
+
+			ed.getDoc().execCommand('unlink', false, null);
+			s.collapse(0);
+		},
+
+		FontName : function(u, v) {
+			var t = this, ed = t.editor, s = ed.selection, e;
+
+			if (!v) {
+				if (s.isCollapsed())
+					s.select(s.getNode());
+
+				t.RemoveFormat();
+			} else
+				ed.getDoc().execCommand('FontName', false, v);
+		},
+
+		FontSize : function(u, v) {
+			var ed = this.editor, s = ed.settings, fz = tinymce.explode(s.font_size_style_values), fzc = tinymce.explode(s.font_size_classes), h, bm;
+
+			// Remove style sizes
+			each(ed.dom.select('font'), function(e) {
+				e.style.fontSize = '';
+			});
+
+			// Let the browser add new size it will remove unneded ones in some browsers
+			ed.getDoc().execCommand('FontSize', false, v);
+
+			// Add style values
+			if (s.inline_styles) {
+				each(ed.dom.select('font'), function(e) {
+					// Try remove redundant font elements
+					if (e.parentNode.nodeName == 'FONT' && e.size == e.parentNode.size) {
+						if (!bm)
+							bm = ed.selection.getBookmark();
+
+						ed.dom.remove(e, 1);
+						return;
+					}
+
+					// Setup font size based on font size value
+					if (v = e.size) {
+						if (fzc && fzc.length > 0)
+							ed.dom.setAttrib(e, 'class', fzc[parseInt(v) - 1]);
+						else
+							ed.dom.setStyle(e, 'fontSize', fz[parseInt(v) - 1]);
+					}
+				});
+			}
+
+			ed.selection.moveToBookmark(bm);
+		},
+
+		queryCommandValue : function(c) {
+			var f = this['queryValue' + c];
+
+			if (f)
+				return f.call(this, c);
+
+			return false;
+		},
+
+		queryCommandState : function(cmd) {
+			var f;
+
+			switch (cmd) {
+				// Bundle these together
+				case 'JustifyLeft':
+				case 'JustifyCenter':
+				case 'JustifyRight':
+				case 'JustifyFull':
+					return this.queryStateJustify(cmd, cmd.substring(7).toLowerCase());
+
+				default:
+					if (f = this['queryState' + cmd])
+						return f.call(this, cmd);
+			}
+
+			return -1;
+		},
+
+		_queryState : function(c) {
+			try {
+				return this.editor.getDoc().queryCommandState(c);
+			} catch (ex) {
+				// Ignore exception
+			}
+		},
+
+		_queryVal : function(c) {
+			try {
+				return this.editor.getDoc().queryCommandValue(c);
+			} catch (ex) {
+				// Ignore exception
+			}
+		},
+
+		queryValueFontSize : function() {
+			var ed = this.editor, v = 0, p;
+
+			if (isOpera || isWebKit) {
+				if (p = ed.dom.getParent(ed.selection.getNode(), 'FONT'))
+					v = p.size;
+
+				return v;
+			}
+
+			return this._queryVal('FontSize');
+		},
+
+		queryValueFontName : function() {
+			var ed = this.editor, v = 0, p;
+
+			if (p = ed.dom.getParent(ed.selection.getNode(), 'FONT'))
+				v = p.face;
+
+			if (!v)
+				v = this._queryVal('FontName');
+
+			return v;
+		},
+
+		mceJustify : function(c, v) {
+			var ed = this.editor, se = ed.selection, n = se.getNode(), nn = n.nodeName, bl, nb, dom = ed.dom, rm;
+
+			if (ed.settings.inline_styles && this.queryStateJustify(c, v))
+				rm = 1;
+
+			bl = dom.getParent(n, ed.dom.isBlock);
+
+			if (nn == 'IMG') {
+				if (v == 'full')
+					return;
+
+				if (rm) {
+					if (v == 'center')
+						dom.setStyle(bl || n.parentNode, 'textAlign', '');
+
+					dom.setStyle(n, 'float', '');
+					this.mceRepaint();
+					return;
+				}
+
+				if (v == 'center') {
+					// Do not change table elements
+					if (bl && /^(TD|TH)$/.test(bl.nodeName))
+						bl = 0;
+
+					if (!bl || bl.childNodes.length > 1) {
+						nb = dom.create('p');
+						nb.appendChild(n.cloneNode(false));
+
+						if (bl)
+							dom.insertAfter(nb, bl);
+						else
+							dom.insertAfter(nb, n);
+
+						dom.remove(n);
+						n = nb.firstChild;
+						bl = nb;
+					}
+
+					dom.setStyle(bl, 'textAlign', v);
+					dom.setStyle(n, 'float', '');
+				} else {
+					dom.setStyle(n, 'float', v);
+					dom.setStyle(bl || n.parentNode, 'textAlign', '');
+				}
+
+				this.mceRepaint();
+				return;
+			}
+
+			// Handle the alignment outselfs, less quirks in all browsers
+			if (ed.settings.inline_styles && ed.settings.forced_root_block) {
+				if (rm)
+					v = '';
+
+				each(this._getSelectedBlocks(dom.getParent(se.getStart(), dom.isBlock), dom.getParent(se.getEnd(), dom.isBlock)), function(e) {
+					dom.setAttrib(e, 'align', '');
+					dom.setStyle(e, 'textAlign', v == 'full' ? 'justify' : v);
+				});
+
+				return;
+			} else if (!rm)
+				ed.getDoc().execCommand(c, false, null);
+
+			if (ed.settings.inline_styles) {
+				if (rm) {
+					dom.getParent(ed.selection.getNode(), function(n) {
+						if (n.style && n.style.textAlign)
+							dom.setStyle(n, 'textAlign', '');
+					});
+
+					return;
+				}
+
+				each(dom.select('*'), function(n) {
+					var v = n.align;
+
+					if (v) {
+						if (v == 'full')
+							v = 'justify';
+
+						dom.setStyle(n, 'textAlign', v);
+						dom.setAttrib(n, 'align', '');
+					}
+				});
+			}
+		},
+
+		mceSetCSSClass : function(u, v) {
+			this.mceSetStyleInfo(0, {command : 'setattrib', name : 'class', value : v});
+		},
+
+		getSelectedElement : function() {
+			var t = this, ed = t.editor, dom = ed.dom, se = ed.selection, r = se.getRng(), r1, r2, sc, ec, so, eo, e, sp, ep, re;
+
+			if (se.isCollapsed() || r.item)
+				return se.getNode();
+
+			// Setup regexp
+			re = ed.settings.merge_styles_invalid_parents;
+			if (tinymce.is(re, 'string'))
+				re = new RegExp(re, 'i');
+
+			if (isIE) {
+				r1 = r.duplicate();
+				r1.collapse(true);
+				sc = r1.parentElement();
+
+				r2 = r.duplicate();
+				r2.collapse(false);
+				ec = r2.parentElement();
+
+				if (sc != ec) {
+					r1.move('character', 1);
+					sc = r1.parentElement();
+				}
+
+				if (sc == ec) {
+					r1 = r.duplicate();
+					r1.moveToElementText(sc);
+
+					if (r1.compareEndPoints('StartToStart', r) == 0 && r1.compareEndPoints('EndToEnd', r) == 0)
+						return re && re.test(sc.nodeName) ? null : sc;
+				}
+			} else {
+				function getParent(n) {
+					return dom.getParent(n, function(n) {return n.nodeType == 1;});
+				};
+
+				sc = r.startContainer;
+				ec = r.endContainer;
+				so = r.startOffset;
+				eo = r.endOffset;
+
+				if (!r.collapsed) {
+					if (sc == ec) {
+						if (so - eo < 2) {
+							if (sc.hasChildNodes()) {
+								sp = sc.childNodes[so];
+								return re && re.test(sp.nodeName) ? null : sp;
+							}
+						}
+					}
+				}
+
+				if (sc.nodeType != 3 || ec.nodeType != 3)
+					return null;
+
+				if (so == 0) {
+					sp = getParent(sc);
+
+					if (sp && sp.firstChild != sc)
+						sp = null;
+				}
+
+				if (so == sc.nodeValue.length) {
+					e = sc.nextSibling;
+
+					if (e && e.nodeType == 1)
+						sp = sc.nextSibling;
+				}
+
+				if (eo == 0) {
+					e = ec.previousSibling;
+
+					if (e && e.nodeType == 1)
+						ep = e;
+				}
+
+				if (eo == ec.nodeValue.length) {
+					ep = getParent(ec);
+
+					if (ep && ep.lastChild != ec)
+						ep = null;
+				}
+
+				// Same element
+				if (sp == ep)
+					return re && sp && re.test(sp.nodeName) ? null : sp;
+			}
+
+			return null;
+		},
+
+		InsertHorizontalRule : function() {
+			// Fix for Gecko <hr size="1" /> issue and IE bug rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");
+			if (isGecko || isIE)
+				this.editor.selection.setContent('<hr />');
+			else
+				this.editor.getDoc().execCommand('InsertHorizontalRule', false, '');
+		},
+
+		RemoveFormat : function() {
+			var t = this, ed = t.editor, s = ed.selection, b;
+
+			// Safari breaks tables
+			if (isWebKit)
+				s.setContent(s.getContent({format : 'raw'}).replace(/(<(span|b|i|strong|em|strike) [^>]+>|<(span|b|i|strong|em|strike)>|<\/(span|b|i|strong|em|strike)>|)/g, ''), {format : 'raw'});
+			else
+				ed.getDoc().execCommand('RemoveFormat', false, null);
+
+			t.mceSetStyleInfo(0, {command : 'removeformat'});
+			ed.addVisual();
+		},
+
+		mceSetStyleInfo : function(u, v) {
+			var t = this, ed = t.editor, d = ed.getDoc(), dom = ed.dom, e, b, s = ed.selection, nn = v.wrapper || 'span', b = s.getBookmark(), re;
+
+			function set(n, e) {
+				if (n.nodeType == 1) {
+					switch (v.command) {
+						case 'setattrib':
+							return dom.setAttrib(n, v.name, v.value);
+
+						case 'setstyle':
+							return dom.setStyle(n, v.name, v.value);
+
+						case 'removeformat':
+							return dom.setAttrib(n, 'class', '');
+					}
+				}
+			};
+
+			// Setup regexp
+			re = ed.settings.merge_styles_invalid_parents;
+			if (tinymce.is(re, 'string'))
+				re = new RegExp(re, 'i');
+
+			// Set style info on selected element
+			if ((e = t.getSelectedElement()) && !ed.settings.force_span_wrappers)
+				set(e, 1);
+			else {
+				// Generate wrappers and set styles on them
+				d.execCommand('FontName', false, '__');
+				each(isWebKit ? dom.select('span') : dom.select('font'), function(n) {
+					var sp, e;
+
+					if (dom.getAttrib(n, 'face') == '__' || n.style.fontFamily === '__') {
+						sp = dom.create(nn, {mce_new : '1'});
+
+						set(sp);
+
+						each (n.childNodes, function(n) {
+							sp.appendChild(n.cloneNode(true));
+						});
+
+						dom.replace(sp, n);
+					}
+				});
+			}
+
+			// Remove wrappers inside new ones
+			each(dom.select(nn).reverse(), function(n) {
+				var p = n.parentNode;
+
+				// Check if it's an old span in a new wrapper
+				if (!dom.getAttrib(n, 'mce_new')) {
+					// Find new wrapper
+					p = dom.getParent(n, function(n) {
+						return n.nodeType == 1 && dom.getAttrib(n, 'mce_new');
+					});
+
+					if (p)
+						dom.remove(n, 1);
+				}
+			});
+
+			// Merge wrappers with parent wrappers
+			each(dom.select(nn).reverse(), function(n) {
+				var p = n.parentNode;
+
+				if (!p || !dom.getAttrib(n, 'mce_new'))
+					return;
+
+				if (ed.settings.force_span_wrappers && p.nodeName != 'SPAN')
+					return;
+
+				// Has parent of the same type and only child
+				if (p.nodeName == nn.toUpperCase() && p.childNodes.length == 1)
+					return dom.remove(p, 1);
+
+				// Has parent that is more suitable to have the class and only child
+				if (n.nodeType == 1 && (!re || !re.test(p.nodeName)) && p.childNodes.length == 1) {
+					set(p); // Set style info on parent instead
+					dom.setAttrib(n, 'class', '');
+				}
+			});
+
+			// Remove empty wrappers
+			each(dom.select(nn).reverse(), function(n) {
+				if (dom.getAttrib(n, 'mce_new') || (dom.getAttribs(n).length <= 1 && n.className === '')) {
+					if (!dom.getAttrib(n, 'class') && !dom.getAttrib(n, 'style'))
+						return dom.remove(n, 1);
+
+					dom.setAttrib(n, 'mce_new', ''); // Remove mce_new marker
+				}
+			});
+
+			s.moveToBookmark(b);
+		},
+
+		queryStateJustify : function(c, v) {
+			var ed = this.editor, n = ed.selection.getNode(), dom = ed.dom;
+
+			if (n && n.nodeName == 'IMG') {
+				if (dom.getStyle(n, 'float') == v)
+					return 1;
+
+				return n.parentNode.style.textAlign == v;
+			}
+
+			n = dom.getParent(ed.selection.getStart(), function(n) {
+				return n.nodeType == 1 && n.style.textAlign;
+			});
+
+			if (v == 'full')
+				v = 'justify';
+
+			if (ed.settings.inline_styles)
+				return (n && n.style.textAlign == v);
+
+			return this._queryState(c);
+		},
+
+		HiliteColor : function(ui, val) {
+			var t = this, ed = t.editor, d = ed.getDoc();
+
+			function set(s) {
+				if (!isGecko)
+					return;
+
+				try {
+					// Try new Gecko method
+					d.execCommand("styleWithCSS", 0, s);
+				} catch (ex) {
+					// Use old
+					d.execCommand("useCSS", 0, !s);
+				}
+			};
+
+			if (isGecko || isOpera) {
+				set(true);
+				d.execCommand('hilitecolor', false, val);
+				set(false);
+			} else
+				d.execCommand('BackColor', false, val);
+		},
+
+		Undo : function() {
+			var ed = this.editor;
+
+			if (ed.settings.custom_undo_redo) {
+				ed.undoManager.undo();
+				ed.nodeChanged();
+			} else
+				ed.getDoc().execCommand('Undo', false, null);
+		},
+
+		Redo : function() {
+			var ed = this.editor;
+
+			if (ed.settings.custom_undo_redo) {
+				ed.undoManager.redo();
+				ed.nodeChanged();
+			} else
+				ed.getDoc().execCommand('Redo', false, null);
+		},
+
+		FormatBlock : function(ui, val) {
+			var t = this, ed = t.editor, s = ed.selection, dom = ed.dom, bl, nb, b;
+
+			function isBlock(n) {
+				return /^(P|DIV|H[1-6]|ADDRESS|BLOCKQUOTE|PRE)$/.test(n.nodeName);
+			};
+
+			bl = dom.getParent(s.getNode(), function(n) {
+				return isBlock(n);
+			});
+
+			// IE has an issue where it removes the parent div if you change format on the paragrah in <div><p>Content</p></div>
+			// FF and Opera doesn't change parent DIV elements if you switch format
+			if (bl) {
+				if ((isIE && isBlock(bl.parentNode)) || bl.nodeName == 'DIV') {
+					// Rename block element
+					nb = ed.dom.create(val);
+
+					each(dom.getAttribs(bl), function(v) {
+						dom.setAttrib(nb, v.nodeName, dom.getAttrib(bl, v.nodeName));
+					});
+
+					b = s.getBookmark();
+					dom.replace(nb, bl, 1);
+					s.moveToBookmark(b);
+					ed.nodeChanged();
+					return;
+				}
+			}
+
+			val = ed.settings.forced_root_block ? (val || '<p>') : val;
+
+			if (val.indexOf('<') == -1)
+				val = '<' + val + '>';
+
+			if (tinymce.isGecko)
+				val = val.replace(/<(div|blockquote|code|dt|dd|dl|samp)>/gi, '$1');
+
+			ed.getDoc().execCommand('FormatBlock', false, val);
+		},
+
+		mceCleanup : function() {
+			var ed = this.editor, s = ed.selection, b = s.getBookmark();
+			ed.setContent(ed.getContent());
+			s.moveToBookmark(b);
+		},
+
+		mceRemoveNode : function(ui, val) {
+			var ed = this.editor, s = ed.selection, b, n = val || s.getNode();
+
+			// Make sure that the body node isn't removed
+			if (n == ed.getBody())
+				return;
+
+			b = s.getBookmark();
+			ed.dom.remove(n, 1);
+			s.moveToBookmark(b);
+			ed.nodeChanged();
+		},
+
+		mceSelectNodeDepth : function(ui, val) {
+			var ed = this.editor, s = ed.selection, c = 0;
+
+			ed.dom.getParent(s.getNode(), function(n) {
+				if (n.nodeType == 1 && c++ == val) {
+					s.select(n);
+					ed.nodeChanged();
+					return false;
+				}
+			}, ed.getBody());
+		},
+
+		mceSelectNode : function(u, v) {
+			this.editor.selection.select(v);
+		},
+
+		mceInsertContent : function(ui, val) {
+			this.editor.selection.setContent(val);
+		},
+
+		mceInsertRawHTML : function(ui, val) {
+			var ed = this.editor;
+
+			ed.selection.setContent('tiny_mce_marker');
+			ed.setContent(ed.getContent().replace(/tiny_mce_marker/g, val));
+		},
+
+		mceRepaint : function() {
+			var s, b, e = this.editor;
+
+			if (tinymce.isGecko) {
+				try {
+					s = e.selection;
+					b = s.getBookmark(true);
+
+					if (s.getSel())
+						s.getSel().selectAllChildren(e.getBody());
+
+					s.collapse(true);
+					s.moveToBookmark(b);
+				} catch (ex) {
+					// Ignore
+				}
+			}
+		},
+
+		queryStateUnderline : function() {
+			var ed = this.editor, n = ed.selection.getNode();
+
+			if (n && n.nodeName == 'A')
+				return false;
+
+			return this._queryState('Underline');
+		},
+
+		queryStateOutdent : function() {
+			var ed = this.editor, n;
+
+			if (ed.settings.inline_styles) {
+				if ((n = ed.dom.getParent(ed.selection.getStart(), ed.dom.isBlock)) && parseInt(n.style.paddingLeft) > 0)
+					return true;
+
+				if ((n = ed.dom.getParent(ed.selection.getEnd(), ed.dom.isBlock)) && parseInt(n.style.paddingLeft) > 0)
+					return true;
+			} else
+				return !!ed.dom.getParent(ed.selection.getNode(), 'BLOCKQUOTE');
+
+			return this.queryStateInsertUnorderedList() || this.queryStateInsertOrderedList();
+		},
+
+		queryStateInsertUnorderedList : function() {
+			return this.editor.dom.getParent(this.editor.selection.getNode(), 'UL');
+		},
+
+		queryStateInsertOrderedList : function() {
+			return this.editor.dom.getParent(this.editor.selection.getNode(), 'OL');
+		},
+
+		queryStatemceBlockQuote : function() {
+			return !!this.editor.dom.getParent(this.editor.selection.getStart(), function(n) {return n.nodeName === 'BLOCKQUOTE';});
+		},
+
+		mceBlockQuote : function() {
+			var t = this, ed = t.editor, s = ed.selection, dom = ed.dom, sb, eb, n, bm, bq, r, bq2, i, nl;
+
+			function getBQ(e) {
+				return dom.getParent(e, function(n) {return n.nodeName === 'BLOCKQUOTE';});
+			};
+
+			// Get start/end block
+			sb = dom.getParent(s.getStart(), dom.isBlock);
+			eb = dom.getParent(s.getEnd(), dom.isBlock);
+
+			// Remove blockquote(s)
+			if (bq = getBQ(sb)) {
+				if (sb != eb || sb.childNodes.length > 1 || (sb.childNodes.length == 1 && sb.firstChild.nodeName != 'BR'))
+					bm = s.getBookmark();
+
+				// Move all elements after the end block into new bq
+				if (getBQ(eb)) {
+					bq2 = bq.cloneNode(false);
+
+					while (n = eb.nextSibling)
+						bq2.appendChild(n.parentNode.removeChild(n));
+				}
+
+				// Add new bq after
+				if (bq2)
+					dom.insertAfter(bq2, bq);
+
+				// Move all selected blocks after the current bq
+				nl = t._getSelectedBlocks(sb, eb);
+				for (i = nl.length - 1; i >= 0; i--) {
+					dom.insertAfter(nl[i], bq);
+				}
+
+				// Empty bq, then remove it
+				if (/^\s*$/.test(bq.innerHTML))
+					dom.remove(bq, 1); // Keep children so boomark restoration works correctly
+
+				// Empty bq, then remote it
+				if (bq2 && /^\s*$/.test(bq2.innerHTML))
+					dom.remove(bq2, 1); // Keep children so boomark restoration works correctly
+
+				if (!bm) {
+					// Move caret inside empty block element
+					if (!isIE) {
+						r = ed.getDoc().createRange();
+						r.setStart(sb, 0);
+						r.setEnd(sb, 0);
+						s.setRng(r);
+					} else {
+						s.select(sb);
+						s.collapse(0);
+
+						// IE misses the empty block some times element so we must move back the caret
+						if (dom.getParent(s.getStart(), dom.isBlock) != sb) {
+							r = s.getRng();
+							r.move('character', -1);
+							r.select();
+						}
+					}
+				} else
+					t.editor.selection.moveToBookmark(bm);
+
+				return;
+			}
+
+			// Since IE can start with a totally empty document we need to add the first bq and paragraph
+			if (isIE && !sb && !eb) {
+				t.editor.getDoc().execCommand('Indent');
+				n = getBQ(s.getNode());
+				n.style.margin = n.dir = ''; // IE adds margin and dir to bq
+				return;
+			}
+
+			if (!sb || !eb)
+				return;
+
+			// If empty paragraph node then do not use bookmark
+			if (sb != eb || sb.childNodes.length > 1 || (sb.childNodes.length == 1 && sb.firstChild.nodeName != 'BR'))
+				bm = s.getBookmark();
+
+			// Move selected block elements into a bq
+			each(t._getSelectedBlocks(getBQ(s.getStart()), getBQ(s.getEnd())), function(e) {
+				// Found existing BQ add to this one
+				if (e.nodeName == 'BLOCKQUOTE' && !bq) {
+					bq = e;
+					return;
+				}
+
+				// No BQ found, create one
+				if (!bq) {
+					bq = dom.create('blockquote');
+					e.parentNode.insertBefore(bq, e);
+				}
+
+				// Add children from existing BQ
+				if (e.nodeName == 'BLOCKQUOTE' && bq) {
+					n = e.firstChild;
+
+					while (n) {
+						bq.appendChild(n.cloneNode(true));
+						n = n.nextSibling;
+					}
+
+					dom.remove(e);
+					return;
+				}
+
+				// Add non BQ element to BQ
+				bq.appendChild(dom.remove(e));
+			});
+
+			if (!bm) {
+				// Move caret inside empty block element
+				if (!isIE) {
+					r = ed.getDoc().createRange();
+					r.setStart(sb, 0);
+					r.setEnd(sb, 0);
+					s.setRng(r);
+				} else {
+					s.select(sb);
+					s.collapse(1);
+				}
+			} else
+				s.moveToBookmark(bm);
+		},
+/*
+		_mceBlockQuote : function() {
+			var t = this, s = t.editor.selection, b = s.getBookmark(), bq, dom = t.editor.dom;
+
+			function findBQ(e) {
+				return dom.getParent(e, function(n) {return n.nodeName === 'BLOCKQUOTE';});
+			};
+
+			// Remove blockquote(s)
+			if (findBQ(s.getStart())) {
+				each(t._getSelectedBlocks(findBQ(s.getStart()), findBQ(s.getEnd())), function(e) {
+					// Found BQ lets remove it
+					if (e.nodeName == 'BLOCKQUOTE')
+						dom.remove(e, 1);
+				});
+
+				t.editor.selection.moveToBookmark(b);
+				return;
+			}
+
+			each(t._getSelectedBlocks(findBQ(s.getStart()), findBQ(s.getEnd())), function(e) {
+				var n;
+
+				// Found existing BQ add to this one
+				if (e.nodeName == 'BLOCKQUOTE' && !bq) {
+					bq = e;
+					return;
+				}
+
+				// No BQ found, create one
+				if (!bq) {
+					bq = dom.create('blockquote');
+					e.parentNode.insertBefore(bq, e);
+				}
+
+				// Add children from existing BQ
+				if (e.nodeName == 'BLOCKQUOTE' && bq) {
+					n = e.firstChild;
+
+					while (n) {
+						bq.appendChild(n.cloneNode(true));
+						n = n.nextSibling;
+					}
+
+					dom.remove(e);
+
+					return;
+				}
+
+				// Add non BQ element to BQ
+				bq.appendChild(dom.remove(e));
+			});
+
+			t.editor.selection.moveToBookmark(b);
+		},
+*/
+		_getSelectedBlocks : function(st, en) {
+			var ed = this.editor, dom = ed.dom, s = ed.selection, sb, eb, n, bl = [];
+
+			sb = dom.getParent(st || s.getStart(), dom.isBlock);
+			eb = dom.getParent(en || s.getEnd(), dom.isBlock);
+
+			if (sb)
+				bl.push(sb);
+
+			if (sb && eb && sb != eb) {
+				n = sb;
+
+				while ((n = n.nextSibling) && n != eb) {
+					if (dom.isBlock(n))
+						bl.push(n);
+				}
+			}
+
+			if (eb && sb != eb)
+				bl.push(eb);
+
+			return bl;
+		}
+	});
+})();
+
+
+/* file:jscripts/tiny_mce/classes/UndoManager.js */
+
+tinymce.create('tinymce.UndoManager', {
+	index : 0,
+	data : null,
+	typing : 0,
+
+	UndoManager : function(ed) {
+		var t = this, Dispatcher = tinymce.util.Dispatcher;
+
+		t.editor = ed;
+		t.data = [];
+		t.onAdd = new Dispatcher(this);
+		t.onUndo = new Dispatcher(this);
+		t.onRedo = new Dispatcher(this);
+	},
+
+	add : function(l) {
+		var t = this, i, ed = t.editor, b, s = ed.settings, la;
+
+		l = l || {};
+		l.content = l.content || ed.getContent({format : 'raw', no_events : 1});
+
+		// Add undo level if needed
+		l.content = l.content.replace(/^\s*|\s*$/g, '');
+		la = t.data[t.index > 0 && (t.index == 0 || t.index == t.data.length) ? t.index - 1 : t.index];
+		if (!l.initial && la && l.content == la.content)
+			return null;
+
+		// Time to compress
+		if (s.custom_undo_redo_levels) {
+			if (t.data.length > s.custom_undo_redo_levels) {
+				for (i = 0; i < t.data.length - 1; i++)
+					t.data[i] = t.data[i + 1];
+
+				t.data.length--;
+				t.index = t.data.length;
+			}
+		}
+
+		if (s.custom_undo_redo_restore_selection && !l.initial)
+			l.bookmark = b = l.bookmark || ed.selection.getBookmark();
+
+		if (t.index < t.data.length)
+			t.index++;
+
+		// Only initial marked undo levels should be allowed as first item
+		// This to workaround a bug with Firefox and the blur event
+		if (t.data.length === 0 && !l.initial)
+			return null;
+
+		// Add level
+		t.data.length = t.index + 1;
+		t.data[t.index++] = l;
+
+		if (l.initial)
+			t.index = 0;
+
+		// Set initial bookmark use first real undo level
+		if (t.data.length == 2 && t.data[0].initial)
+			t.data[0].bookmark = b;
+
+		t.onAdd.dispatch(t, l);
+		ed.isNotDirty = 0;
+
+		//console.dir(t.data);
+
+		return l;
+	},
+
+	undo : function() {
+		var t = this, ed = t.editor, l = l, i;
+
+		if (t.typing) {
+			t.add();
+			t.typing = 0;
+		}
+
+		if (t.index > 0) {
+			// If undo on last index then take snapshot
+			if (t.index == t.data.length && t.index > 1) {
+				i = t.index;
+				t.typing = 0;
+
+				if (!t.add())
+					t.index = i;
+
+				--t.index;
+			}
+
+			l = t.data[--t.index];
+			ed.setContent(l.content, {format : 'raw'});
+			ed.selection.moveToBookmark(l.bookmark);
+
+			t.onUndo.dispatch(t, l);
+		}
+
+		return l;
+	},
+
+	redo : function() {
+		var t = this, ed = t.editor, l = null;
+
+		if (t.index < t.data.length - 1) {
+			l = t.data[++t.index];
+			ed.setContent(l.content, {format : 'raw'});
+			ed.selection.moveToBookmark(l.bookmark);
+
+			t.onRedo.dispatch(t, l);
+		}
+
+		return l;
+	},
+
+	clear : function() {
+		var t = this;
+
+		t.data = [];
+		t.index = 0;
+		t.typing = 0;
+		t.add({initial : true});
+	},
+
+	hasUndo : function() {
+		return this.index != 0 || this.typing;
+	},
+
+	hasRedo : function() {
+		return this.index < this.data.length - 1;
+	}
+
+	});
+/* file:jscripts/tiny_mce/classes/ForceBlocks.js */
+
+(function() {
+	// Shorten names
+	var Event, isIE, isGecko, isOpera, each, extend;
+
+	Event = tinymce.dom.Event;
+	isIE = tinymce.isIE;
+	isGecko = tinymce.isGecko;
+	isOpera = tinymce.isOpera;
+	each = tinymce.each;
+	extend = tinymce.extend;
+
+	tinymce.create('tinymce.ForceBlocks', {
+		ForceBlocks : function(ed) {
+			var t = this, s = ed.settings, elm;
+
+			t.editor = ed;
+			t.dom = ed.dom;
+			elm = (s.forced_root_block || 'p').toLowerCase();
+			s.element = elm.toUpperCase();
+
+			ed.onPreInit.add(t.setup, t);
+
+			t.reOpera = new RegExp('(\\u00a0|&#160;|&nbsp;)<\/' + elm + '>', 'gi');
+			t.rePadd = new RegExp('<p( )([^>]+)><\\\/p>|<p( )([^>]+)\\\/>|<p( )([^>]+)>\\s+<\\\/p>|<p><\\\/p>|<p\\\/>|<p>\\s+<\\\/p>'.replace(/p/g, elm), 'gi');
+			t.reNbsp2BR1 = new RegExp('<p( )([^>]+)>[\\s\\u00a0]+<\\\/p>|<p>[\\s\\u00a0]+<\\\/p>'.replace(/p/g, elm), 'gi');
+			t.reNbsp2BR2 = new RegExp('<p( )([^>]+)>(&nbsp;|&#160;)<\\\/p>|<p>(&nbsp;|&#160;)<\\\/p>'.replace(/p/g, elm), 'gi');
+			t.reBR2Nbsp = new RegExp('<p( )([^>]+)>\\s*<br \\\/>\\s*<\\\/p>|<p>\\s*<br \\\/>\\s*<\\\/p>'.replace(/p/g, elm), 'gi');
+			t.reTrailBr = new RegExp('\\s*<br \\/>\\s*<\\\/p>'.replace(/p/g, elm), 'gi');
+
+			function padd(ed, o) {
+				if (isOpera)
+					o.content = o.content.replace(t.reOpera, '</' + elm + '>');
+
+				o.content = o.content.replace(t.rePadd, '<' + elm + '$1$2$3$4$5$6>\u00a0</' + elm + '>');
+
+				if (!isIE && !isOpera && o.set) {
+					// Use &nbsp; instead of BR in padded paragraphs
+					o.content = o.content.replace(t.reNbsp2BR1, '<' + elm + '$1$2><br /></' + elm + '>');
+					o.content = o.content.replace(t.reNbsp2BR2, '<' + elm + '$1$2><br /></' + elm + '>');
+				} else {
+					o.content = o.content.replace(t.reBR2Nbsp, '<' + elm + '$1$2>\u00a0</' + elm + '>');
+					o.content = o.content.replace(t.reTrailBr, '</' + elm + '>');
+				}
+			};
+
+			ed.onBeforeSetContent.add(padd);
+			ed.onPostProcess.add(padd);
+
+			if (s.forced_root_block) {
+				ed.onInit.add(t.forceRoots, t);
+				ed.onSetContent.add(t.forceRoots, t);
+				ed.onBeforeGetContent.add(t.forceRoots, t);
+			}
+		},
+
+		setup : function() {
+			var t = this, ed = t.editor, s = ed.settings;
+
+			// Force root blocks when typing and when getting output
+			if (s.forced_root_block) {
+				ed.onKeyUp.add(t.forceRoots, t);
+				ed.onPreProcess.add(t.forceRoots, t);
+			}
+
+			if (s.force_br_newlines) {
+				// Force IE to produce BRs on enter
+				if (isIE) {
+					ed.onKeyPress.add(function(ed, e) {
+						var n, s = ed.selection;
+
+						if (e.keyCode == 13 && s.getNode().nodeName != 'LI') {
+							s.setContent('<br id="__" /> ', {format : 'raw'});
+							n = ed.dom.get('__');
+							n.removeAttribute('id');
+							s.select(n);
+							s.collapse();
+							return Event.cancel(e);
+						}
+					});
+				}
+
+				return;
+			}
+
+			if (!isIE && s.force_p_newlines) {
+/*				ed.onPreProcess.add(function(ed, o) {
+					each(ed.dom.select('br', o.node), function(n) {
+						var p = n.parentNode;
+
+						// Replace <p><br /></p> with <p>&nbsp;</p>
+						if (p && p.nodeName == 'p' && (p.childNodes.length == 1 || p.lastChild == n)) {
+							p.replaceChild(ed.getDoc().createTextNode('\u00a0'), n);
+						}
+					});
+				});*/
+
+				ed.onKeyPress.add(function(ed, e) {
+					if (e.keyCode == 13 && !e.shiftKey) {
+						if (!t.insertPara(e))
+							Event.cancel(e);
+					}
+				});
+
+				if (isGecko) {
+					ed.onKeyDown.add(function(ed, e) {
+						if ((e.keyCode == 8 || e.keyCode == 46) && !e.shiftKey)
+							t.backspaceDelete(e, e.keyCode == 8);
+					});
+				}
+			}
+
+			function ren(rn, na) {
+				var ne = ed.dom.create(na);
+
+				each(rn.attributes, function(a) {
+					if (a.specified && a.nodeValue)
+						ne.setAttribute(a.nodeName.toLowerCase(), a.nodeValue);
+				});
+
+				each(rn.childNodes, function(n) {
+					ne.appendChild(n.cloneNode(true));
+				});
+
+				rn.parentNode.replaceChild(ne, rn);
+
+				return ne;
+			};
+
+			// Replaces IE:s auto generated paragraphs with the specified element name
+			if (isIE && s.element != 'P') {
+				ed.onKeyPress.add(function(ed, e) {
+					t.lastElm = ed.selection.getNode().nodeName;
+				});
+
+				ed.onKeyUp.add(function(ed, e) {
+					var bl, sel = ed.selection, n = sel.getNode(), b = ed.getBody();
+
+					if (b.childNodes.length === 1 && n.nodeName == 'P') {
+						n = ren(n, s.element);
+						sel.select(n);
+						sel.collapse();
+						ed.nodeChanged();
+					} else if (e.keyCode == 13 && !e.shiftKey && t.lastElm != 'P') {
+						bl = ed.dom.getParent(n, 'P');
+
+						if (bl) {
+							ren(bl, s.element);
+							ed.nodeChanged();
+						}
+					}
+				});
+			}
+		},
+
+		find : function(n, t, s) {
+			var ed = this.editor, w = ed.getDoc().createTreeWalker(n, 4, null, false), c = -1;
+
+			while (n = w.nextNode()) {
+				c++;
+
+				// Index by node
+				if (t == 0 && n == s)
+					return c;
+
+				// Node by index
+				if (t == 1 && c == s)
+					return n;
+			}
+
+			return -1;
+		},
+
+		forceRoots : function(ed, e) {
+			var t = this, ed = t.editor, b = ed.getBody(), d = ed.getDoc(), se = ed.selection, s = se.getSel(), r = se.getRng(), si = -2, ei, so, eo, tr, c = -0xFFFFFF;
+			var nx, bl, bp, sp, le, nl = b.childNodes, i;
+
+			// Fix for bug #1863847
+			if (e && e.keyCode == 13)
+				return true;
+
+			// Wrap non blocks into blocks
+			for (i = nl.length - 1; i >= 0; i--) {
+				nx = nl[i];
+
+				// Is text or non block element
+				if (nx.nodeType == 3 || (!t.dom.isBlock(nx) && nx.nodeType != 8)) {
+					if (!bl) {
+						// Create new block but ignore whitespace
+						if (nx.nodeType != 3 || /[^\s]/g.test(nx.nodeValue)) {
+							// Store selection
+							if (si == -2 && r) {
+								if (!isIE) {
+									// If element is inside body, might not be the case in contentEdiable mode
+									if (ed.dom.getParent(r.startContainer, function(e) {return e === b;})) {
+										so = r.startOffset;
+										eo = r.endOffset;
+										si = t.find(b, 0, r.startContainer);
+										ei = t.find(b, 0, r.endContainer);
+									}
+								} else {
+									tr = d.body.createTextRange();
+									tr.moveToElementText(b);
+									tr.collapse(1);
+									bp = tr.move('character', c) * -1;
+
+									tr = r.duplicate();
+									tr.collapse(1);
+									sp = tr.move('character', c) * -1;
+
+									tr = r.duplicate();
+									tr.collapse(0);
+									le = (tr.move('character', c) * -1) - sp;
+
+									si = sp - bp;
+									ei = le;
+								}
+							}
+
+							bl = ed.dom.create(ed.settings.forced_root_block);
+							bl.appendChild(nx.cloneNode(1));
+							nx.parentNode.replaceChild(bl, nx);
+						}
+					} else {
+						if (bl.hasChildNodes())
+							bl.insertBefore(nx, bl.firstChild);
+						else
+							bl.appendChild(nx);
+					}
+				} else
+					bl = null; // Time to create new block
+			}
+
+			// Restore selection
+			if (si != -2) {
+				if (!isIE) {
+					bl = b.getElementsByTagName(ed.settings.element)[0];
+					r = d.createRange();
+
+					// Select last location or generated block
+					if (si != -1)
+						r.setStart(t.find(b, 1, si), so);
+					else
+						r.setStart(bl, 0);
+
+					// Select last location or generated block
+					if (ei != -1)
+						r.setEnd(t.find(b, 1, ei), eo);
+					else
+						r.setEnd(bl, 0);
+
+					if (s) {
+						s.removeAllRanges();
+						s.addRange(r);
+					}
+				} else {
+					try {
+						r = s.createRange();
+						r.moveToElementText(b);
+						r.collapse(1);
+						r.moveStart('character', si);
+						r.moveEnd('character', ei);
+						r.select();
+					} catch (ex) {
+						// Ignore
+					}
+				}
+			}
+		},
+
+		getParentBlock : function(n) {
+			var d = this.dom;
+
+			return d.getParent(n, d.isBlock);
+		},
+
+		insertPara : function(e) {
+			var t = this, ed = t.editor, dom = ed.dom, d = ed.getDoc(), se = ed.settings, s = ed.selection.getSel(), r = s.getRangeAt(0), b = d.body;
+			var rb, ra, dir, sn, so, en, eo, sb, eb, bn, bef, aft, sc, ec, n, vp = dom.getViewPort(ed.getWin()), y, ch;
+
+			function isEmpty(n) {
+				n = n.innerHTML;
+				n = n.replace(/<(img|hr|table)/gi, '-'); // Keep these convert them to - chars
+				n = n.replace(/<[^>]+>/g, ''); // Remove all tags
+
+				return n.replace(/[ \t\r\n]+/g, '') == '';
+			};
+
+			// If root blocks are forced then use Operas default behavior since it's really good
+// Removed due to bug: #1853816
+//			if (se.forced_root_block && isOpera)
+//				return true;
+
+			// Setup before range
+			rb = d.createRange();
+
+			// If is before the first block element and in body, then move it into first block element
+			rb.setStart(s.anchorNode, s.anchorOffset);
+			rb.collapse(true);
+
+			// Setup after range
+			ra = d.createRange();
+
+			// If is before the first block element and in body, then move it into first block element
+			ra.setStart(s.focusNode, s.focusOffset);
+			ra.collapse(true);
+
+			// Setup start/end points
+			dir = rb.compareBoundaryPoints(rb.START_TO_END, ra) < 0;
+			sn = dir ? s.anchorNode : s.focusNode;
+			so = dir ? s.anchorOffset : s.focusOffset;
+			en = dir ? s.focusNode : s.anchorNode;
+			eo = dir ? s.focusOffset : s.anchorOffset;
+
+			// If selection is in empty table cell
+			if (sn === en && /^(TD|TH)$/.test(sn.nodeName)) {
+				dom.remove(sn.firstChild); // Remove BR
+
+				// Create two new block elements
+				ed.dom.add(sn, se.element, null, '<br />');
+				aft = ed.dom.add(sn, se.element, null, '<br />');
+
+				// Move caret into the last one
+				r = d.createRange();
+				r.selectNodeContents(aft);
+				r.collapse(1);
+				ed.selection.setRng(r);
+
+				return false;
+			}
+
+			// If the caret is in an invalid location in FF we need to move it into the first block
+			if (sn == b && en == b && b.firstChild && ed.dom.isBlock(b.firstChild)) {
+				sn = en = sn.firstChild;
+				so = eo = 0;
+				rb = d.createRange();
+				rb.setStart(sn, 0);
+				ra = d.createRange();
+				ra.setStart(en, 0);
+			}
+
+			// Never use body as start or end node
+			sn = sn.nodeName == "HTML" ? d.body : sn; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes
+			sn = sn.nodeName == "BODY" ? sn.firstChild : sn;
+			en = en.nodeName == "HTML" ? d.body : en; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes
+			en = en.nodeName == "BODY" ? en.firstChild : en;
+
+			// Get start and end blocks
+			sb = t.getParentBlock(sn);
+			eb = t.getParentBlock(en);
+			bn = sb ? sb.nodeName : se.element; // Get block name to create
+
+			// Return inside list use default browser behavior
+			if (t.dom.getParent(sb, function(n) { return /OL|UL|PRE/.test(n.nodeName); }))
+				return true;
+
+			// If caption or absolute layers then always generate new blocks within
+			if (sb && (sb.nodeName == 'CAPTION' || /absolute|relative|static/gi.test(sb.style.position))) {
+				bn = se.element;
+				sb = null;
+			}
+
+			// If caption or absolute layers then always generate new blocks within
+			if (eb && (eb.nodeName == 'CAPTION' || /absolute|relative|static/gi.test(eb.style.position))) {
+				bn = se.element;
+				eb = null;
+			}
+
+			// Use P instead
+			if (/(TD|TABLE|TH|CAPTION)/.test(bn) || (sb && bn == "DIV" && /left|right/gi.test(sb.style.cssFloat))) {
+				bn = se.element;
+				sb = eb = null;
+			}
+
+			// Setup new before and after blocks
+			bef = (sb && sb.nodeName == bn) ? sb.cloneNode(0) : ed.dom.create(bn);
+			aft = (eb && eb.nodeName == bn) ? eb.cloneNode(0) : ed.dom.create(bn);
+
+			// Remove id from after clone
+			aft.removeAttribute('id');
+
+			// Is header and cursor is at the end, then force paragraph under
+			if (/^(H[1-6])$/.test(bn) && sn.nodeValue && so == sn.nodeValue.length)
+				aft = ed.dom.create(se.element);
+
+			// Find start chop node
+			n = sc = sn;
+			do {
+				if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName))
+					break;
+
+				sc = n;
+			} while ((n = n.previousSibling ? n.previousSibling : n.parentNode));
+
+			// Find end chop node
+			n = ec = en;
+			do {
+				if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName))
+					break;
+
+				ec = n;
+			} while ((n = n.nextSibling ? n.nextSibling : n.parentNode));
+
+			// Place first chop part into before block element
+			if (sc.nodeName == bn)
+				rb.setStart(sc, 0);
+			else
+				rb.setStartBefore(sc);
+
+			rb.setEnd(sn, so);
+			bef.appendChild(rb.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari
+
+			// Place secnd chop part within new block element
+			try {
+				ra.setEndAfter(ec);
+			} catch(ex) {
+				//console.debug(s.focusNode, s.focusOffset);
+			}
+
+			ra.setStart(en, eo);
+			aft.appendChild(ra.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari
+
+			// Create range around everything
+			r = d.createRange();
+			if (!sc.previousSibling && sc.parentNode.nodeName == bn) {
+				r.setStartBefore(sc.parentNode);
+			} else {
+				if (rb.startContainer.nodeName == bn && rb.startOffset == 0)
+					r.setStartBefore(rb.startContainer);
+				else
+					r.setStart(rb.startContainer, rb.startOffset);
+			}
+
+			if (!ec.nextSibling && ec.parentNode.nodeName == bn)
+				r.setEndAfter(ec.parentNode);
+			else
+				r.setEnd(ra.endContainer, ra.endOffset);
+
+			// Delete and replace it with new block elements
+			r.deleteContents();
+
+			if (isOpera)
+				ed.getWin().scrollTo(0, vp.y);
+
+			// Never wrap blocks in blocks
+			if (bef.firstChild && bef.firstChild.nodeName == bn)
+				bef.innerHTML = bef.firstChild.innerHTML;
+
+			if (aft.firstChild && aft.firstChild.nodeName == bn)
+				aft.innerHTML = aft.firstChild.innerHTML;
+
+			// Padd empty blocks
+			if (isEmpty(bef))
+				bef.innerHTML = '<br />';
+
+			if (isEmpty(aft))
+				aft.innerHTML = isOpera ? '&nbsp;' : '<br />'; // Extra space for Opera so that the caret can move there
+
+			// Opera needs this one backwards for older versions
+			if (isOpera && parseFloat(opera.version()) < 9.5) {
+				r.insertNode(bef);
+				r.insertNode(aft);
+			} else {
+				r.insertNode(aft);
+				r.insertNode(bef);
+			}
+
+			// Normalize
+			aft.normalize();
+			bef.normalize();
+
+			function first(n) {
+				return d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false).nextNode() || n;
+			};
+
+			// Move cursor and scroll into view
+			r = d.createRange();
+			r.selectNodeContents(isGecko ? first(aft) : aft);
+			r.collapse(1);
+			s.removeAllRanges();
+			s.addRange(r);
+
+			// scrollIntoView seems to scroll the parent window in most browsers now including FF 3.0b4 so it's time to stop using it and do it our selfs
+			y = ed.dom.getPos(aft).y;
+			ch = aft.clientHeight;
+
+			// Is element within viewport
+			if (y < vp.y || y + ch > vp.y + vp.h) {
+				ed.getWin().scrollTo(0, y < vp.y ? y : y - vp.h + 25); // Needs to be hardcoded to roughly one line of text if a huge text block is broken into two blocks
+				//console.debug('SCROLL!', 'vp.y: ' + vp.y, 'y' + y, 'vp.h' + vp.h, 'clientHeight' + aft.clientHeight, 'yyy: ' + (y < vp.y ? y : y - vp.h + aft.clientHeight));
+			}
+
+			return false;
+		},
+
+		backspaceDelete : function(e, bs) {
+			var t = this, ed = t.editor, b = ed.getBody(), n, se = ed.selection, r = se.getRng(), sc = r.startContainer, n, w, tn;
+
+			// The caret sometimes gets stuck in Gecko if you delete empty paragraphs
+			// This workaround removes the element by hand and moves the caret to the previous element
+			if (sc && ed.dom.isBlock(sc) && !/^(TD|TH)$/.test(sc.nodeName) && bs) {
+				if (sc.childNodes.length == 0 || (sc.childNodes.length == 1 && sc.firstChild.nodeName == 'BR')) {
+					// Find previous block element
+					n = sc;
+					while ((n = n.previousSibling) && !ed.dom.isBlock(n)) ;
+
+					if (n) {
+						if (sc != b.firstChild) {
+							// Find last text node
+							w = ed.dom.doc.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);
+							while (tn = w.nextNode())
+								n = tn;
+
+							// Place caret at the end of last text node
+							r = ed.getDoc().createRange();
+							r.setStart(n, n.nodeValue ? n.nodeValue.length : 0);
+							r.setEnd(n, n.nodeValue ? n.nodeValue.length : 0);
+							se.setRng(r);
+
+							// Remove the target container
+							ed.dom.remove(sc);
+						}
+
+						return Event.cancel(e);
+					}
+				}
+			}
+
+			// Gecko generates BR elements here and there, we don't like those so lets remove them
+			function handler(e) {
+				var pr;
+
+				e = e.target;
+
+				// A new BR was created in a block element, remove it
+				if (e && e.parentNode && e.nodeName == 'BR' && (n = t.getParentBlock(e))) {
+					pr = e.previousSibling;
+
+					Event.remove(b, 'DOMNodeInserted', handler);
+
+					// Is there whitespace at the end of the node before then we might need the pesky BR
+					// to place the caret at a correct location see bug: #2013943
+					if (pr && pr.nodeType == 3 && /\s+$/.test(pr.nodeValue))
+						return;
+
+					// Only remove BR elements that got inserted in the middle of the text
+					if (e.previousSibling || e.nextSibling)
+						ed.dom.remove(e);
+				}
+			};
+
+			// Listen for new nodes
+			Event._add(b, 'DOMNodeInserted', handler);
+
+			// Remove listener
+			window.setTimeout(function() {
+				Event._remove(b, 'DOMNodeInserted', handler);
+			}, 1);
+		}
+	});
+})();
+
+/* file:jscripts/tiny_mce/classes/ControlManager.js */
+
+(function() {
+	// Shorten names
+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, extend = tinymce.extend;
+
+	tinymce.create('tinymce.ControlManager', {
+		ControlManager : function(ed, s) {
+			var t = this, i;
+
+			s = s || {};
+			t.editor = ed;
+			t.controls = {};
+			t.onAdd = new tinymce.util.Dispatcher(t);
+			t.onPostRender = new tinymce.util.Dispatcher(t);
+			t.prefix = s.prefix || ed.id + '_';
+			t._cls = {};
+
+			t.onPostRender.add(function() {
+				each(t.controls, function(c) {
+					c.postRender();
+				});
+			});
+		},
+
+		get : function(id) {
+			return this.controls[this.prefix + id] || this.controls[id];
+		},
+
+		setActive : function(id, s) {
+			var c = null;
+
+			if (c = this.get(id))
+				c.setActive(s);
+
+			return c;
+		},
+
+		setDisabled : function(id, s) {
+			var c = null;
+
+			if (c = this.get(id))
+				c.setDisabled(s);
+
+			return c;
+		},
+
+		add : function(c) {
+			var t = this;
+
+			if (c) {
+				t.controls[c.id] = c;
+				t.onAdd.dispatch(c, t);
+			}
+
+			return c;
+		},
+
+		createControl : function(n) {
+			var c, t = this, ed = t.editor;
+
+			each(ed.plugins, function(p) {
+				if (p.createControl) {
+					c = p.createControl(n, t);
+
+					if (c)
+						return false;
+				}
+			});
+
+			switch (n) {
+				case "|":
+				case "separator":
+					return t.createSeparator();
+			}
+
+			if (!c && ed.buttons && (c = ed.buttons[n]))
+				return t.createButton(n, c);
+
+			return t.add(c);
+		},
+
+		createDropMenu : function(id, s, cc) {
+			var t = this, ed = t.editor, c, bm, v, cls;
+
+			s = extend({
+				'class' : 'mceDropDown',
+				constrain : ed.settings.constrain_menus
+			}, s);
+
+			s['class'] = s['class'] + ' ' + ed.getParam('skin') + 'Skin';
+			if (v = ed.getParam('skin_variant'))
+				s['class'] += ' ' + ed.getParam('skin') + 'Skin' + v.substring(0, 1).toUpperCase() + v.substring(1);
+
+			id = t.prefix + id;
+			cls = cc || t._cls.dropmenu || tinymce.ui.DropMenu;
+			c = t.controls[id] = new cls(id, s);
+			c.onAddItem.add(function(c, o) {
+				var s = o.settings;
+
+				s.title = ed.getLang(s.title, s.title);
+
+				if (!s.onclick) {
+					s.onclick = function(v) {
+						ed.execCommand(s.cmd, s.ui || false, s.value);
+					};
+				}
+			});
+
+			ed.onRemove.add(function() {
+				c.destroy();
+			});
+
+			// Fix for bug #1897785, #1898007
+			if (tinymce.isIE) {
+				c.onShowMenu.add(function() {
+					bm = ed.selection.getBookmark(1);
+				});
+
+				c.onHideMenu.add(function() {
+					if (bm)
+						ed.selection.moveToBookmark(bm);
+				});
+			}
+
+			return t.add(c);
+		},
+
+		createListBox : function(id, s, cc) {
+			var t = this, ed = t.editor, cmd, c, cls;
+
+			if (t.get(id))
+				return null;
+
+			s.title = ed.translate(s.title);
+			s.scope = s.scope || ed;
+
+			if (!s.onselect) {
+				s.onselect = function(v) {
+					ed.execCommand(s.cmd, s.ui || false, v || s.value);
+				};
+			}
+
+			s = extend({
+				title : s.title,
+				'class' : 'mce_' + id,
+				scope : s.scope,
+				control_manager : t
+			}, s);
+
+			id = t.prefix + id;
+
+			if (ed.settings.use_native_selects)
+				c = new tinymce.ui.NativeListBox(id, s);
+			else {
+				cls = cc || t._cls.listbox || tinymce.ui.ListBox;
+				c = new cls(id, s);
+			}
+
+			t.controls[id] = c;
+
+			// Fix focus problem in Safari
+			if (tinymce.isWebKit) {
+				c.onPostRender.add(function(c, n) {
+					// Store bookmark on mousedown
+					Event.add(n, 'mousedown', function() {
+						ed.bookmark = ed.selection.getBookmark('simple');
+					});
+
+					// Restore on focus, since it might be lost
+					Event.add(n, 'focus', function() {
+						ed.selection.moveToBookmark(ed.bookmark);
+						ed.bookmark = null;
+					});
+				});
+			}
+
+			if (c.hideMenu)
+				ed.onMouseDown.add(c.hideMenu, c);
+
+			return t.add(c);
+		},
+
+		createButton : function(id, s, cc) {
+			var t = this, ed = t.editor, o, c, cls;
+
+			if (t.get(id))
+				return null;
+
+			s.title = ed.translate(s.title);
+			s.label = ed.translate(s.label);
+			s.scope = s.scope || ed;
+
+			if (!s.onclick && !s.menu_button) {
+				s.onclick = function() {
+					ed.execCommand(s.cmd, s.ui || false, s.value);
+				};
+			}
+
+			s = extend({
+				title : s.title,
+				'class' : 'mce_' + id,
+				unavailable_prefix : ed.getLang('unavailable', ''),
+				scope : s.scope,
+				control_manager : t
+			}, s);
+
+			id = t.prefix + id;
+
+			if (s.menu_button) {
+				cls = cc || t._cls.menubutton || tinymce.ui.MenuButton;
+				c = new cls(id, s);
+				ed.onMouseDown.add(c.hideMenu, c);
+			} else {
+				cls = t._cls.button || tinymce.ui.Button;
+				c = new cls(id, s);
+			}
+
+			return t.add(c);
+		},
+
+		createMenuButton : function(id, s) {
+			s = s || {};
+			s.menu_button = 1;
+
+			return this.createButton(id, s);
+		},
+
+		createSplitButton : function(id, s, cc) {
+			var t = this, ed = t.editor, cmd, c, cls;
+
+			if (t.get(id))
+				return null;
+
+			s.title = ed.translate(s.title);
+			s.scope = s.scope || ed;
+
+			if (!s.onclick) {
+				s.onclick = function(v) {
+					ed.execCommand(s.cmd, s.ui || false, v || s.value);
+				};
+			}
+
+			if (!s.onselect) {
+				s.onselect = function(v) {
+					ed.execCommand(s.cmd, s.ui || false, v || s.value);
+				};
+			}
+
+			s = extend({
+				title : s.title,
+				'class' : 'mce_' + id,
+				scope : s.scope,
+				control_manager : t
+			}, s);
+
+			id = t.prefix + id;
+			cls = cc || t._cls.splitbutton || tinymce.ui.SplitButton;
+			c = t.add(new cls(id, s));
+			ed.onMouseDown.add(c.hideMenu, c);
+
+			return c;
+		},
+
+		createColorSplitButton : function(id, s, cc) {
+			var t = this, ed = t.editor, cmd, c, cls, bm;
+
+			if (t.get(id))
+				return null;
+
+			s.title = ed.translate(s.title);
+			s.scope = s.scope || ed;
+
+			if (!s.onclick) {
+				s.onclick = function(v) {
+					ed.execCommand(s.cmd, s.ui || false, v || s.value);
+				};
+			}
+
+			if (!s.onselect) {
+				s.onselect = function(v) {
+					ed.execCommand(s.cmd, s.ui || false, v || s.value);
+				};
+			}
+
+			s = extend({
+				title : s.title,
+				'class' : 'mce_' + id,
+				'menu_class' : ed.getParam('skin') + 'Skin',
+				scope : s.scope,
+				more_colors_title : ed.getLang('more_colors')
+			}, s);
+
+			id = t.prefix + id;
+			cls = cc || t._cls.colorsplitbutton || tinymce.ui.ColorSplitButton;
+			c = new cls(id, s);
+			ed.onMouseDown.add(c.hideMenu, c);
+
+			// Remove the menu element when the editor is removed
+			ed.onRemove.add(function() {
+				c.destroy();
+			});
+
+			// Fix for bug #1897785, #1898007
+			if (tinymce.isIE) {
+				c.onShowMenu.add(function() {
+					bm = ed.selection.getBookmark(1);
+				});
+
+				c.onHideMenu.add(function() {
+					if (bm) {
+						ed.selection.moveToBookmark(bm);
+						bm = 0;
+					}
+				});
+			}
+
+			return t.add(c);
+		},
+
+		createToolbar : function(id, s, cc) {
+			var c, t = this, cls;
+
+			id = t.prefix + id;
+			cls = cc || t._cls.toolbar || tinymce.ui.Toolbar;
+			c = new cls(id, s);
+
+			if (t.get(id))
+				return null;
+
+			return t.add(c);
+		},
+
+		createSeparator : function(cc) {
+			var cls = cc || this._cls.separator || tinymce.ui.Separator;
+
+			return new cls();
+		},
+
+		setControlType : function(n, c) {
+			return this._cls[n.toLowerCase()] = c;
+		},
+
+		destroy : function() {
+			each(this.controls, function(c) {
+				c.destroy();
+			});
+
+			this.controls = null;
+		}
+
+		});
+})();
+
+/* file:jscripts/tiny_mce/classes/WindowManager.js */
+
+(function() {
+	var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each, isIE = tinymce.isIE, isOpera = tinymce.isOpera;
+
+	tinymce.create('tinymce.WindowManager', {
+		WindowManager : function(ed) {
+			var t = this;
+
+			t.editor = ed;
+			t.onOpen = new Dispatcher(t);
+			t.onClose = new Dispatcher(t);
+			t.params = {};
+			t.features = {};
+		},
+
+		open : function(s, p) {
+			var t = this, f = '', x, y, mo = t.editor.settings.dialog_type == 'modal', w, sw, sh, vp = tinymce.DOM.getViewPort(), u;
+
+			// Default some options
+			s = s || {};
+			p = p || {};
+			sw = isOpera ? vp.w : screen.width; // Opera uses windows inside the Opera window
+			sh = isOpera ? vp.h : screen.height;
+			s.name = s.name || 'mc_' + new Date().getTime();
+			s.width = parseInt(s.width || 320);
+			s.height = parseInt(s.height || 240);
+			s.resizable = true;
+			s.left = s.left || parseInt(sw / 2.0) - (s.width / 2.0);
+			s.top = s.top || parseInt(sh / 2.0) - (s.height / 2.0);
+			p.inline = false;
+			p.mce_width = s.width;
+			p.mce_height = s.height;
+			p.mce_auto_focus = s.auto_focus;
+
+			if (mo) {
+				if (isIE) {
+					s.center = true;
+					s.help = false;
+					s.dialogWidth = s.width + 'px';
+					s.dialogHeight = s.height + 'px';
+					s.scroll = s.scrollbars || false;
+				}
+			}
+
+			// Build features string
+			each(s, function(v, k) {
+				if (tinymce.is(v, 'boolean'))
+					v = v ? 'yes' : 'no';
+
+				if (!/^(name|url)$/.test(k)) {
+					if (isIE && mo)
+						f += (f ? ';' : '') + k + ':' + v;
+					else
+						f += (f ? ',' : '') + k + '=' + v;
+				}
+			});
+
+			t.features = s;
+			t.params = p;
+			t.onOpen.dispatch(t, s, p);
+
+			u = s.url || s.file;
+			if (tinymce.relaxedDomain)
+				u += (u.indexOf('?') == -1 ? '?' : '&') + 'mce_rdomain=' + tinymce.relaxedDomain;
+
+			u = tinymce._addVer(u);
+
+			try {
+				if (isIE && mo) {
+					w = 1;
+					window.showModalDialog(u, window, f);
+				} else
+					w = window.open(u, s.name, f);
+			} catch (ex) {
+				// Ignore
+			}
+
+			if (!w)
+				alert(t.editor.getLang('popup_blocked'));
+		},
+
+		close : function(w) {
+			w.close();
+			this.onClose.dispatch(this);
+		},
+
+		createInstance : function(cl, a, b, c, d, e) {
+			var f = tinymce.resolve(cl);
+
+			return new f(a, b, c, d, e);
+		},
+
+		confirm : function(t, cb, s, w) {
+			w = w || window;
+
+			cb.call(s || this, w.confirm(this._decode(this.editor.getLang(t, t))));
+		},
+
+		alert : function(tx, cb, s, w) {
+			var t = this;
+
+			w = w || window;
+			w.alert(t._decode(t.editor.getLang(tx, tx)));
+
+			if (cb)
+				cb.call(s || t);
+		},
+
+		// Internal functions
+
+		_decode : function(s) {
+			return tinymce.DOM.decode(s).replace(/\\n/g, '\n');
+		}
+
+		});
 }());
\ No newline at end of file
diff --git a/webapp/web/js/tiny_mce/utils/editable_selects.js b/webapp/web/js/tiny_mce/utils/editable_selects.js
index fff496392..c1bfa739e 100755
--- a/webapp/web/js/tiny_mce/utils/editable_selects.js
+++ b/webapp/web/js/tiny_mce/utils/editable_selects.js
@@ -1,69 +1,69 @@
-/**
- * $Id: editable_selects.js 867 2008-06-09 20:33:40Z spocke $
- *
- * Makes select boxes editable.
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-var TinyMCE_EditableSelects = {
-	editSelectElm : null,
-
-	init : function() {
-		var nl = document.getElementsByTagName("select"), i, d = document, o;
-
-		for (i=0; i<nl.length; i++) {
-			if (nl[i].className.indexOf('mceEditableSelect') != -1) {
-				o = new Option('(value)', '__mce_add_custom__');
-
-				o.className = 'mceAddSelectValue';
-
-				nl[i].options[nl[i].options.length] = o;
-				nl[i].onchange = TinyMCE_EditableSelects.onChangeEditableSelect;
-			}
-		}
-	},
-
-	onChangeEditableSelect : function(e) {
-		var d = document, ne, se = window.event ? window.event.srcElement : e.target;
-
-		if (se.options[se.selectedIndex].value == '__mce_add_custom__') {
-			ne = d.createElement("input");
-			ne.id = se.id + "_custom";
-			ne.name = se.name + "_custom";
-			ne.type = "text";
-
-			ne.style.width = se.offsetWidth + 'px';
-			se.parentNode.insertBefore(ne, se);
-			se.style.display = 'none';
-			ne.focus();
-			ne.onblur = TinyMCE_EditableSelects.onBlurEditableSelectInput;
-			ne.onkeydown = TinyMCE_EditableSelects.onKeyDown;
-			TinyMCE_EditableSelects.editSelectElm = se;
-		}
-	},
-
-	onBlurEditableSelectInput : function() {
-		var se = TinyMCE_EditableSelects.editSelectElm;
-
-		if (se) {
-			if (se.previousSibling.value != '') {
-				addSelectValue(document.forms[0], se.id, se.previousSibling.value, se.previousSibling.value);
-				selectByValue(document.forms[0], se.id, se.previousSibling.value);
-			} else
-				selectByValue(document.forms[0], se.id, '');
-
-			se.style.display = 'inline';
-			se.parentNode.removeChild(se.previousSibling);
-			TinyMCE_EditableSelects.editSelectElm = null;
-		}
-	},
-
-	onKeyDown : function(e) {
-		e = e || window.event;
-
-		if (e.keyCode == 13)
-			TinyMCE_EditableSelects.onBlurEditableSelectInput();
-	}
-};
+/**
+ * $Id: editable_selects.js 867 2008-06-09 20:33:40Z spocke $
+ *
+ * Makes select boxes editable.
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+var TinyMCE_EditableSelects = {
+	editSelectElm : null,
+
+	init : function() {
+		var nl = document.getElementsByTagName("select"), i, d = document, o;
+
+		for (i=0; i<nl.length; i++) {
+			if (nl[i].className.indexOf('mceEditableSelect') != -1) {
+				o = new Option('(value)', '__mce_add_custom__');
+
+				o.className = 'mceAddSelectValue';
+
+				nl[i].options[nl[i].options.length] = o;
+				nl[i].onchange = TinyMCE_EditableSelects.onChangeEditableSelect;
+			}
+		}
+	},
+
+	onChangeEditableSelect : function(e) {
+		var d = document, ne, se = window.event ? window.event.srcElement : e.target;
+
+		if (se.options[se.selectedIndex].value == '__mce_add_custom__') {
+			ne = d.createElement("input");
+			ne.id = se.id + "_custom";
+			ne.name = se.name + "_custom";
+			ne.type = "text";
+
+			ne.style.width = se.offsetWidth + 'px';
+			se.parentNode.insertBefore(ne, se);
+			se.style.display = 'none';
+			ne.focus();
+			ne.onblur = TinyMCE_EditableSelects.onBlurEditableSelectInput;
+			ne.onkeydown = TinyMCE_EditableSelects.onKeyDown;
+			TinyMCE_EditableSelects.editSelectElm = se;
+		}
+	},
+
+	onBlurEditableSelectInput : function() {
+		var se = TinyMCE_EditableSelects.editSelectElm;
+
+		if (se) {
+			if (se.previousSibling.value != '') {
+				addSelectValue(document.forms[0], se.id, se.previousSibling.value, se.previousSibling.value);
+				selectByValue(document.forms[0], se.id, se.previousSibling.value);
+			} else
+				selectByValue(document.forms[0], se.id, '');
+
+			se.style.display = 'inline';
+			se.parentNode.removeChild(se.previousSibling);
+			TinyMCE_EditableSelects.editSelectElm = null;
+		}
+	},
+
+	onKeyDown : function(e) {
+		e = e || window.event;
+
+		if (e.keyCode == 13)
+			TinyMCE_EditableSelects.onBlurEditableSelectInput();
+	}
+};
diff --git a/webapp/web/js/tiny_mce/utils/form_utils.js b/webapp/web/js/tiny_mce/utils/form_utils.js
index c1f140904..6d79d0a03 100755
--- a/webapp/web/js/tiny_mce/utils/form_utils.js
+++ b/webapp/web/js/tiny_mce/utils/form_utils.js
@@ -1,199 +1,199 @@
-/**
- * $Id: form_utils.js 673 2008-03-06 13:26:20Z spocke $
- *
- * Various form utilitiy functions.
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-var themeBaseURL = tinyMCEPopup.editor.baseURI.toAbsolute('themes/' + tinyMCEPopup.getParam("theme"));
-
-function getColorPickerHTML(id, target_form_element) {
-	var h = "";
-
-	h += '<a id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';
-	h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '"></span></a>';
-
-	return h;
-}
-
-function updateColor(img_id, form_element_id) {
-	document.getElementById(img_id).style.backgroundColor = document.forms[0].elements[form_element_id].value;
-}
-
-function setBrowserDisabled(id, state) {
-	var img = document.getElementById(id);
-	var lnk = document.getElementById(id + "_link");
-
-	if (lnk) {
-		if (state) {
-			lnk.setAttribute("realhref", lnk.getAttribute("href"));
-			lnk.removeAttribute("href");
-			tinyMCEPopup.dom.addClass(img, 'disabled');
-		} else {
-			if (lnk.getAttribute("realhref"))
-				lnk.setAttribute("href", lnk.getAttribute("realhref"));
-
-			tinyMCEPopup.dom.removeClass(img, 'disabled');
-		}
-	}
-}
-
-function getBrowserHTML(id, target_form_element, type, prefix) {
-	var option = prefix + "_" + type + "_browser_callback", cb, html;
-
-	cb = tinyMCEPopup.getParam(option, tinyMCEPopup.getParam("file_browser_callback"));
-
-	if (!cb)
-		return "";
-
-	html = "";
-	html += '<a id="' + id + '_link" href="javascript:openBrowser(\'' + id + '\',\'' + target_form_element + '\', \'' + type + '\',\'' + option + '\');" onmousedown="return false;" class="browse">';
-	html += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '"></span></a>';
-
-	return html;
-}
-
-function openBrowser(img_id, target_form_element, type, option) {
-	var img = document.getElementById(img_id);
-
-	if (img.className != "mceButtonDisabled")
-		tinyMCEPopup.openBrowser(target_form_element, type, option);
-}
-
-function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
-	if (!form_obj || !form_obj.elements[field_name])
-		return;
-
-	var sel = form_obj.elements[field_name];
-
-	var found = false;
-	for (var i=0; i<sel.options.length; i++) {
-		var option = sel.options[i];
-
-		if (option.value == value || (ignore_case && option.value.toLowerCase() == value.toLowerCase())) {
-			option.selected = true;
-			found = true;
-		} else
-			option.selected = false;
-	}
-
-	if (!found && add_custom && value != '') {
-		var option = new Option(value, value);
-		option.selected = true;
-		sel.options[sel.options.length] = option;
-		sel.selectedIndex = sel.options.length - 1;
-	}
-
-	return found;
-}
-
-function getSelectValue(form_obj, field_name) {
-	var elm = form_obj.elements[field_name];
-
-	if (elm == null || elm.options == null)
-		return "";
-
-	return elm.options[elm.selectedIndex].value;
-}
-
-function addSelectValue(form_obj, field_name, name, value) {
-	var s = form_obj.elements[field_name];
-	var o = new Option(name, value);
-	s.options[s.options.length] = o;
-}
-
-function addClassesToList(list_id, specific_option) {
-	// Setup class droplist
-	var styleSelectElm = document.getElementById(list_id);
-	var styles = tinyMCEPopup.getParam('theme_advanced_styles', false);
-	styles = tinyMCEPopup.getParam(specific_option, styles);
-
-	if (styles) {
-		var stylesAr = styles.split(';');
-
-		for (var i=0; i<stylesAr.length; i++) {
-			if (stylesAr != "") {
-				var key, value;
-
-				key = stylesAr[i].split('=')[0];
-				value = stylesAr[i].split('=')[1];
-
-				styleSelectElm.options[styleSelectElm.length] = new Option(key, value);
-			}
-		}
-	} else {
-		tinymce.each(tinyMCEPopup.editor.dom.getClasses(), function(o) {
-			styleSelectElm.options[styleSelectElm.length] = new Option(o.title || o['class'], o['class']);
-		});
-	}
-}
-
-function isVisible(element_id) {
-	var elm = document.getElementById(element_id);
-
-	return elm && elm.style.display != "none";
-}
-
-function convertRGBToHex(col) {
-	var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");
-
-	var rgb = col.replace(re, "$1,$2,$3").split(',');
-	if (rgb.length == 3) {
-		r = parseInt(rgb[0]).toString(16);
-		g = parseInt(rgb[1]).toString(16);
-		b = parseInt(rgb[2]).toString(16);
-
-		r = r.length == 1 ? '0' + r : r;
-		g = g.length == 1 ? '0' + g : g;
-		b = b.length == 1 ? '0' + b : b;
-
-		return "#" + r + g + b;
-	}
-
-	return col;
-}
-
-function convertHexToRGB(col) {
-	if (col.indexOf('#') != -1) {
-		col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');
-
-		r = parseInt(col.substring(0, 2), 16);
-		g = parseInt(col.substring(2, 4), 16);
-		b = parseInt(col.substring(4, 6), 16);
-
-		return "rgb(" + r + "," + g + "," + b + ")";
-	}
-
-	return col;
-}
-
-function trimSize(size) {
-	return size.replace(/([0-9\.]+)px|(%|in|cm|mm|em|ex|pt|pc)/, '$1$2');
-}
-
-function getCSSSize(size) {
-	size = trimSize(size);
-
-	if (size == "")
-		return "";
-
-	// Add px
-	if (/^[0-9]+$/.test(size))
-		size += 'px';
-
-	return size;
-}
-
-function getStyle(elm, attrib, style) {
-	var val = tinyMCEPopup.dom.getAttrib(elm, attrib);
-
-	if (val != '')
-		return '' + val;
-
-	if (typeof(style) == 'undefined')
-		style = attrib;
-
-	return tinyMCEPopup.dom.getStyle(elm, style);
-}
+/**
+ * $Id: form_utils.js 673 2008-03-06 13:26:20Z spocke $
+ *
+ * Various form utilitiy functions.
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+var themeBaseURL = tinyMCEPopup.editor.baseURI.toAbsolute('themes/' + tinyMCEPopup.getParam("theme"));
+
+function getColorPickerHTML(id, target_form_element) {
+	var h = "";
+
+	h += '<a id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';
+	h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '"></span></a>';
+
+	return h;
+}
+
+function updateColor(img_id, form_element_id) {
+	document.getElementById(img_id).style.backgroundColor = document.forms[0].elements[form_element_id].value;
+}
+
+function setBrowserDisabled(id, state) {
+	var img = document.getElementById(id);
+	var lnk = document.getElementById(id + "_link");
+
+	if (lnk) {
+		if (state) {
+			lnk.setAttribute("realhref", lnk.getAttribute("href"));
+			lnk.removeAttribute("href");
+			tinyMCEPopup.dom.addClass(img, 'disabled');
+		} else {
+			if (lnk.getAttribute("realhref"))
+				lnk.setAttribute("href", lnk.getAttribute("realhref"));
+
+			tinyMCEPopup.dom.removeClass(img, 'disabled');
+		}
+	}
+}
+
+function getBrowserHTML(id, target_form_element, type, prefix) {
+	var option = prefix + "_" + type + "_browser_callback", cb, html;
+
+	cb = tinyMCEPopup.getParam(option, tinyMCEPopup.getParam("file_browser_callback"));
+
+	if (!cb)
+		return "";
+
+	html = "";
+	html += '<a id="' + id + '_link" href="javascript:openBrowser(\'' + id + '\',\'' + target_form_element + '\', \'' + type + '\',\'' + option + '\');" onmousedown="return false;" class="browse">';
+	html += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '"></span></a>';
+
+	return html;
+}
+
+function openBrowser(img_id, target_form_element, type, option) {
+	var img = document.getElementById(img_id);
+
+	if (img.className != "mceButtonDisabled")
+		tinyMCEPopup.openBrowser(target_form_element, type, option);
+}
+
+function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {
+	if (!form_obj || !form_obj.elements[field_name])
+		return;
+
+	var sel = form_obj.elements[field_name];
+
+	var found = false;
+	for (var i=0; i<sel.options.length; i++) {
+		var option = sel.options[i];
+
+		if (option.value == value || (ignore_case && option.value.toLowerCase() == value.toLowerCase())) {
+			option.selected = true;
+			found = true;
+		} else
+			option.selected = false;
+	}
+
+	if (!found && add_custom && value != '') {
+		var option = new Option(value, value);
+		option.selected = true;
+		sel.options[sel.options.length] = option;
+		sel.selectedIndex = sel.options.length - 1;
+	}
+
+	return found;
+}
+
+function getSelectValue(form_obj, field_name) {
+	var elm = form_obj.elements[field_name];
+
+	if (elm == null || elm.options == null)
+		return "";
+
+	return elm.options[elm.selectedIndex].value;
+}
+
+function addSelectValue(form_obj, field_name, name, value) {
+	var s = form_obj.elements[field_name];
+	var o = new Option(name, value);
+	s.options[s.options.length] = o;
+}
+
+function addClassesToList(list_id, specific_option) {
+	// Setup class droplist
+	var styleSelectElm = document.getElementById(list_id);
+	var styles = tinyMCEPopup.getParam('theme_advanced_styles', false);
+	styles = tinyMCEPopup.getParam(specific_option, styles);
+
+	if (styles) {
+		var stylesAr = styles.split(';');
+
+		for (var i=0; i<stylesAr.length; i++) {
+			if (stylesAr != "") {
+				var key, value;
+
+				key = stylesAr[i].split('=')[0];
+				value = stylesAr[i].split('=')[1];
+
+				styleSelectElm.options[styleSelectElm.length] = new Option(key, value);
+			}
+		}
+	} else {
+		tinymce.each(tinyMCEPopup.editor.dom.getClasses(), function(o) {
+			styleSelectElm.options[styleSelectElm.length] = new Option(o.title || o['class'], o['class']);
+		});
+	}
+}
+
+function isVisible(element_id) {
+	var elm = document.getElementById(element_id);
+
+	return elm && elm.style.display != "none";
+}
+
+function convertRGBToHex(col) {
+	var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");
+
+	var rgb = col.replace(re, "$1,$2,$3").split(',');
+	if (rgb.length == 3) {
+		r = parseInt(rgb[0]).toString(16);
+		g = parseInt(rgb[1]).toString(16);
+		b = parseInt(rgb[2]).toString(16);
+
+		r = r.length == 1 ? '0' + r : r;
+		g = g.length == 1 ? '0' + g : g;
+		b = b.length == 1 ? '0' + b : b;
+
+		return "#" + r + g + b;
+	}
+
+	return col;
+}
+
+function convertHexToRGB(col) {
+	if (col.indexOf('#') != -1) {
+		col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');
+
+		r = parseInt(col.substring(0, 2), 16);
+		g = parseInt(col.substring(2, 4), 16);
+		b = parseInt(col.substring(4, 6), 16);
+
+		return "rgb(" + r + "," + g + "," + b + ")";
+	}
+
+	return col;
+}
+
+function trimSize(size) {
+	return size.replace(/([0-9\.]+)px|(%|in|cm|mm|em|ex|pt|pc)/, '$1$2');
+}
+
+function getCSSSize(size) {
+	size = trimSize(size);
+
+	if (size == "")
+		return "";
+
+	// Add px
+	if (/^[0-9]+$/.test(size))
+		size += 'px';
+
+	return size;
+}
+
+function getStyle(elm, attrib, style) {
+	var val = tinyMCEPopup.dom.getAttrib(elm, attrib);
+
+	if (val != '')
+		return '' + val;
+
+	if (typeof(style) == 'undefined')
+		style = attrib;
+
+	return tinyMCEPopup.dom.getStyle(elm, style);
+}
diff --git a/webapp/web/js/tiny_mce/utils/mctabs.js b/webapp/web/js/tiny_mce/utils/mctabs.js
index 284501ee9..135180643 100755
--- a/webapp/web/js/tiny_mce/utils/mctabs.js
+++ b/webapp/web/js/tiny_mce/utils/mctabs.js
@@ -1,76 +1,76 @@
-/**
- * $Id: mctabs.js 758 2008-03-30 13:53:29Z spocke $
- *
- * Moxiecode DHTML Tabs script.
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-function MCTabs() {
-	this.settings = [];
-};
-
-MCTabs.prototype.init = function(settings) {
-	this.settings = settings;
-};
-
-MCTabs.prototype.getParam = function(name, default_value) {
-	var value = null;
-
-	value = (typeof(this.settings[name]) == "undefined") ? default_value : this.settings[name];
-
-	// Fix bool values
-	if (value == "true" || value == "false")
-		return (value == "true");
-
-	return value;
-};
-
-MCTabs.prototype.displayTab = function(tab_id, panel_id) {
-	var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i;
-
-	panelElm= document.getElementById(panel_id);
-	panelContainerElm = panelElm ? panelElm.parentNode : null;
-	tabElm = document.getElementById(tab_id);
-	tabContainerElm = tabElm ? tabElm.parentNode : null;
-	selectionClass = this.getParam('selection_class', 'current');
-
-	if (tabElm && tabContainerElm) {
-		nodes = tabContainerElm.childNodes;
-
-		// Hide all other tabs
-		for (i = 0; i < nodes.length; i++) {
-			if (nodes[i].nodeName == "LI")
-				nodes[i].className = '';
-		}
-
-		// Show selected tab
-		tabElm.className = 'current';
-	}
-
-	if (panelElm && panelContainerElm) {
-		nodes = panelContainerElm.childNodes;
-
-		// Hide all other panels
-		for (i = 0; i < nodes.length; i++) {
-			if (nodes[i].nodeName == "DIV")
-				nodes[i].className = 'panel';
-		}
-
-		// Show selected panel
-		panelElm.className = 'current';
-	}
-};
-
-MCTabs.prototype.getAnchor = function() {
-	var pos, url = document.location.href;
-
-	if ((pos = url.lastIndexOf('#')) != -1)
-		return url.substring(pos + 1);
-
-	return "";
-};
-
-// Global instance
-var mcTabs = new MCTabs();
+/**
+ * $Id: mctabs.js 758 2008-03-30 13:53:29Z spocke $
+ *
+ * Moxiecode DHTML Tabs script.
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+function MCTabs() {
+	this.settings = [];
+};
+
+MCTabs.prototype.init = function(settings) {
+	this.settings = settings;
+};
+
+MCTabs.prototype.getParam = function(name, default_value) {
+	var value = null;
+
+	value = (typeof(this.settings[name]) == "undefined") ? default_value : this.settings[name];
+
+	// Fix bool values
+	if (value == "true" || value == "false")
+		return (value == "true");
+
+	return value;
+};
+
+MCTabs.prototype.displayTab = function(tab_id, panel_id) {
+	var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i;
+
+	panelElm= document.getElementById(panel_id);
+	panelContainerElm = panelElm ? panelElm.parentNode : null;
+	tabElm = document.getElementById(tab_id);
+	tabContainerElm = tabElm ? tabElm.parentNode : null;
+	selectionClass = this.getParam('selection_class', 'current');
+
+	if (tabElm && tabContainerElm) {
+		nodes = tabContainerElm.childNodes;
+
+		// Hide all other tabs
+		for (i = 0; i < nodes.length; i++) {
+			if (nodes[i].nodeName == "LI")
+				nodes[i].className = '';
+		}
+
+		// Show selected tab
+		tabElm.className = 'current';
+	}
+
+	if (panelElm && panelContainerElm) {
+		nodes = panelContainerElm.childNodes;
+
+		// Hide all other panels
+		for (i = 0; i < nodes.length; i++) {
+			if (nodes[i].nodeName == "DIV")
+				nodes[i].className = 'panel';
+		}
+
+		// Show selected panel
+		panelElm.className = 'current';
+	}
+};
+
+MCTabs.prototype.getAnchor = function() {
+	var pos, url = document.location.href;
+
+	if ((pos = url.lastIndexOf('#')) != -1)
+		return url.substring(pos + 1);
+
+	return "";
+};
+
+// Global instance
+var mcTabs = new MCTabs();
diff --git a/webapp/web/js/tiny_mce/utils/validate.js b/webapp/web/js/tiny_mce/utils/validate.js
index cde4c9798..3fcd63936 100755
--- a/webapp/web/js/tiny_mce/utils/validate.js
+++ b/webapp/web/js/tiny_mce/utils/validate.js
@@ -1,219 +1,219 @@
-/**
- * $Id: validate.js 758 2008-03-30 13:53:29Z spocke $
- *
- * Various form validation methods.
- *
- * @author Moxiecode
- * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
- */
-
-/**
-	// String validation:
-
-	if (!Validator.isEmail('myemail'))
-		alert('Invalid email.');
-
-	// Form validation:
-
-	var f = document.forms['myform'];
-
-	if (!Validator.isEmail(f.myemail))
-		alert('Invalid email.');
-*/
-
-var Validator = {
-	isEmail : function(s) {
-		return this.test(s, '^[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+@[-!#$%&\'*+\\/0-9=?A-Z^_`a-z{|}~]+\.[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+$');
-	},
-
-	isAbsUrl : function(s) {
-		return this.test(s, '^(news|telnet|nttp|file|http|ftp|https)://[-A-Za-z0-9\\.]+\\/?.*$');
-	},
-
-	isSize : function(s) {
-		return this.test(s, '^[0-9]+(%|in|cm|mm|em|ex|pt|pc|px)?$');
-	},
-
-	isId : function(s) {
-		return this.test(s, '^[A-Za-z_]([A-Za-z0-9_])*$');
-	},
-
-	isEmpty : function(s) {
-		var nl, i;
-
-		if (s.nodeName == 'SELECT' && s.selectedIndex < 1)
-			return true;
-
-		if (s.type == 'checkbox' && !s.checked)
-			return true;
-
-		if (s.type == 'radio') {
-			for (i=0, nl = s.form.elements; i<nl.length; i++) {
-				if (nl[i].type == "radio" && nl[i].name == s.name && nl[i].checked)
-					return false;
-			}
-
-			return true;
-		}
-
-		return new RegExp('^\\s*$').test(s.nodeType == 1 ? s.value : s);
-	},
-
-	isNumber : function(s, d) {
-		return !isNaN(s.nodeType == 1 ? s.value : s) && (!d || !this.test(s, '^-?[0-9]*\\.[0-9]*$'));
-	},
-
-	test : function(s, p) {
-		s = s.nodeType == 1 ? s.value : s;
-
-		return s == '' || new RegExp(p).test(s);
-	}
-};
-
-var AutoValidator = {
-	settings : {
-		id_cls : 'id',
-		int_cls : 'int',
-		url_cls : 'url',
-		number_cls : 'number',
-		email_cls : 'email',
-		size_cls : 'size',
-		required_cls : 'required',
-		invalid_cls : 'invalid',
-		min_cls : 'min',
-		max_cls : 'max'
-	},
-
-	init : function(s) {
-		var n;
-
-		for (n in s)
-			this.settings[n] = s[n];
-	},
-
-	validate : function(f) {
-		var i, nl, s = this.settings, c = 0;
-
-		nl = this.tags(f, 'label');
-		for (i=0; i<nl.length; i++)
-			this.removeClass(nl[i], s.invalid_cls);
-
-		c += this.validateElms(f, 'input');
-		c += this.validateElms(f, 'select');
-		c += this.validateElms(f, 'textarea');
-
-		return c == 3;
-	},
-
-	invalidate : function(n) {
-		this.mark(n.form, n);
-	},
-
-	reset : function(e) {
-		var t = ['label', 'input', 'select', 'textarea'];
-		var i, j, nl, s = this.settings;
-
-		if (e == null)
-			return;
-
-		for (i=0; i<t.length; i++) {
-			nl = this.tags(e.form ? e.form : e, t[i]);
-			for (j=0; j<nl.length; j++)
-				this.removeClass(nl[j], s.invalid_cls);
-		}
-	},
-
-	validateElms : function(f, e) {
-		var nl, i, n, s = this.settings, st = true, va = Validator, v;
-
-		nl = this.tags(f, e);
-		for (i=0; i<nl.length; i++) {
-			n = nl[i];
-
-			this.removeClass(n, s.invalid_cls);
-
-			if (this.hasClass(n, s.required_cls) && va.isEmpty(n))
-				st = this.mark(f, n);
-
-			if (this.hasClass(n, s.number_cls) && !va.isNumber(n))
-				st = this.mark(f, n);
-
-			if (this.hasClass(n, s.int_cls) && !va.isNumber(n, true))
-				st = this.mark(f, n);
-
-			if (this.hasClass(n, s.url_cls) && !va.isAbsUrl(n))
-				st = this.mark(f, n);
-
-			if (this.hasClass(n, s.email_cls) && !va.isEmail(n))
-				st = this.mark(f, n);
-
-			if (this.hasClass(n, s.size_cls) && !va.isSize(n))
-				st = this.mark(f, n);
-
-			if (this.hasClass(n, s.id_cls) && !va.isId(n))
-				st = this.mark(f, n);
-
-			if (this.hasClass(n, s.min_cls, true)) {
-				v = this.getNum(n, s.min_cls);
-
-				if (isNaN(v) || parseInt(n.value) < parseInt(v))
-					st = this.mark(f, n);
-			}
-
-			if (this.hasClass(n, s.max_cls, true)) {
-				v = this.getNum(n, s.max_cls);
-
-				if (isNaN(v) || parseInt(n.value) > parseInt(v))
-					st = this.mark(f, n);
-			}
-		}
-
-		return st;
-	},
-
-	hasClass : function(n, c, d) {
-		return new RegExp('\\b' + c + (d ? '[0-9]+' : '') + '\\b', 'g').test(n.className);
-	},
-
-	getNum : function(n, c) {
-		c = n.className.match(new RegExp('\\b' + c + '([0-9]+)\\b', 'g'))[0];
-		c = c.replace(/[^0-9]/g, '');
-
-		return c;
-	},
-
-	addClass : function(n, c, b) {
-		var o = this.removeClass(n, c);
-		n.className = b ? c + (o != '' ? (' ' + o) : '') : (o != '' ? (o + ' ') : '') + c;
-	},
-
-	removeClass : function(n, c) {
-		c = n.className.replace(new RegExp("(^|\\s+)" + c + "(\\s+|$)"), ' ');
-		return n.className = c != ' ' ? c : '';
-	},
-
-	tags : function(f, s) {
-		return f.getElementsByTagName(s);
-	},
-
-	mark : function(f, n) {
-		var s = this.settings;
-
-		this.addClass(n, s.invalid_cls);
-		this.markLabels(f, n, s.invalid_cls);
-
-		return false;
-	},
-
-	markLabels : function(f, n, ic) {
-		var nl, i;
-
-		nl = this.tags(f, "label");
-		for (i=0; i<nl.length; i++) {
-			if (nl[i].getAttribute("for") == n.id || nl[i].htmlFor == n.id)
-				this.addClass(nl[i], ic);
-		}
-
-		return null;
-	}
-};
+/**
+ * $Id: validate.js 758 2008-03-30 13:53:29Z spocke $
+ *
+ * Various form validation methods.
+ *
+ * @author Moxiecode
+ * @copyright Copyright © 2004-2008, Moxiecode Systems AB, All rights reserved.
+ */
+
+/**
+	// String validation:
+
+	if (!Validator.isEmail('myemail'))
+		alert('Invalid email.');
+
+	// Form validation:
+
+	var f = document.forms['myform'];
+
+	if (!Validator.isEmail(f.myemail))
+		alert('Invalid email.');
+*/
+
+var Validator = {
+	isEmail : function(s) {
+		return this.test(s, '^[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+@[-!#$%&\'*+\\/0-9=?A-Z^_`a-z{|}~]+\.[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+$');
+	},
+
+	isAbsUrl : function(s) {
+		return this.test(s, '^(news|telnet|nttp|file|http|ftp|https)://[-A-Za-z0-9\\.]+\\/?.*$');
+	},
+
+	isSize : function(s) {
+		return this.test(s, '^[0-9]+(%|in|cm|mm|em|ex|pt|pc|px)?$');
+	},
+
+	isId : function(s) {
+		return this.test(s, '^[A-Za-z_]([A-Za-z0-9_])*$');
+	},
+
+	isEmpty : function(s) {
+		var nl, i;
+
+		if (s.nodeName == 'SELECT' && s.selectedIndex < 1)
+			return true;
+
+		if (s.type == 'checkbox' && !s.checked)
+			return true;
+
+		if (s.type == 'radio') {
+			for (i=0, nl = s.form.elements; i<nl.length; i++) {
+				if (nl[i].type == "radio" && nl[i].name == s.name && nl[i].checked)
+					return false;
+			}
+
+			return true;
+		}
+
+		return new RegExp('^\\s*$').test(s.nodeType == 1 ? s.value : s);
+	},
+
+	isNumber : function(s, d) {
+		return !isNaN(s.nodeType == 1 ? s.value : s) && (!d || !this.test(s, '^-?[0-9]*\\.[0-9]*$'));
+	},
+
+	test : function(s, p) {
+		s = s.nodeType == 1 ? s.value : s;
+
+		return s == '' || new RegExp(p).test(s);
+	}
+};
+
+var AutoValidator = {
+	settings : {
+		id_cls : 'id',
+		int_cls : 'int',
+		url_cls : 'url',
+		number_cls : 'number',
+		email_cls : 'email',
+		size_cls : 'size',
+		required_cls : 'required',
+		invalid_cls : 'invalid',
+		min_cls : 'min',
+		max_cls : 'max'
+	},
+
+	init : function(s) {
+		var n;
+
+		for (n in s)
+			this.settings[n] = s[n];
+	},
+
+	validate : function(f) {
+		var i, nl, s = this.settings, c = 0;
+
+		nl = this.tags(f, 'label');
+		for (i=0; i<nl.length; i++)
+			this.removeClass(nl[i], s.invalid_cls);
+
+		c += this.validateElms(f, 'input');
+		c += this.validateElms(f, 'select');
+		c += this.validateElms(f, 'textarea');
+
+		return c == 3;
+	},
+
+	invalidate : function(n) {
+		this.mark(n.form, n);
+	},
+
+	reset : function(e) {
+		var t = ['label', 'input', 'select', 'textarea'];
+		var i, j, nl, s = this.settings;
+
+		if (e == null)
+			return;
+
+		for (i=0; i<t.length; i++) {
+			nl = this.tags(e.form ? e.form : e, t[i]);
+			for (j=0; j<nl.length; j++)
+				this.removeClass(nl[j], s.invalid_cls);
+		}
+	},
+
+	validateElms : function(f, e) {
+		var nl, i, n, s = this.settings, st = true, va = Validator, v;
+
+		nl = this.tags(f, e);
+		for (i=0; i<nl.length; i++) {
+			n = nl[i];
+
+			this.removeClass(n, s.invalid_cls);
+
+			if (this.hasClass(n, s.required_cls) && va.isEmpty(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.number_cls) && !va.isNumber(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.int_cls) && !va.isNumber(n, true))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.url_cls) && !va.isAbsUrl(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.email_cls) && !va.isEmail(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.size_cls) && !va.isSize(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.id_cls) && !va.isId(n))
+				st = this.mark(f, n);
+
+			if (this.hasClass(n, s.min_cls, true)) {
+				v = this.getNum(n, s.min_cls);
+
+				if (isNaN(v) || parseInt(n.value) < parseInt(v))
+					st = this.mark(f, n);
+			}
+
+			if (this.hasClass(n, s.max_cls, true)) {
+				v = this.getNum(n, s.max_cls);
+
+				if (isNaN(v) || parseInt(n.value) > parseInt(v))
+					st = this.mark(f, n);
+			}
+		}
+
+		return st;
+	},
+
+	hasClass : function(n, c, d) {
+		return new RegExp('\\b' + c + (d ? '[0-9]+' : '') + '\\b', 'g').test(n.className);
+	},
+
+	getNum : function(n, c) {
+		c = n.className.match(new RegExp('\\b' + c + '([0-9]+)\\b', 'g'))[0];
+		c = c.replace(/[^0-9]/g, '');
+
+		return c;
+	},
+
+	addClass : function(n, c, b) {
+		var o = this.removeClass(n, c);
+		n.className = b ? c + (o != '' ? (' ' + o) : '') : (o != '' ? (o + ' ') : '') + c;
+	},
+
+	removeClass : function(n, c) {
+		c = n.className.replace(new RegExp("(^|\\s+)" + c + "(\\s+|$)"), ' ');
+		return n.className = c != ' ' ? c : '';
+	},
+
+	tags : function(f, s) {
+		return f.getElementsByTagName(s);
+	},
+
+	mark : function(f, n) {
+		var s = this.settings;
+
+		this.addClass(n, s.invalid_cls);
+		this.markLabels(f, n, s.invalid_cls);
+
+		return false;
+	},
+
+	markLabels : function(f, n, ic) {
+		var nl, i;
+
+		nl = this.tags(f, "label");
+		for (i=0; i<nl.length; i++) {
+			if (nl[i].getAttribute("for") == n.id || nl[i].htmlFor == n.id)
+				this.addClass(nl[i], ic);
+		}
+
+		return null;
+	}
+};
diff --git a/webapp/web/js/vitro.js b/webapp/web/js/vitro.js
index 5910ceb88..e57e85ce2 100755
--- a/webapp/web/js/vitro.js
+++ b/webapp/web/js/vitro.js
@@ -1,461 +1,461 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 
-/**
-   These are utility functions for Vitro js pages.
-   Much of this is based on the util.js of the DWR package.
-
-   @author Brian Caruso
-*/
-
-var vitroJsLoaded = true; //just indicates that this file was loaded.
-
-    // public method for url encoding
-
-//from http://www.kanolife.com/escape/2006/03/escape-and-unescape-javascript.html
-function encodeUrl(pstrString) {
-  if (pstrString == "") {
-    return "";
-  }
-    //TODO: needs to be updated to UTF-8, javascript escape() only does ascii
-    return escape(pstrString);
-//  var iPos = 0;
-//  var strOut = "";
-//  var strChar;
-//  var strString = escape(pstrString);
-//  while (iPos < strString.length) {
-//    strChar = strString.substr(iPos, 1);
-//    if (strChar == "%") {
-//      strNextChar = strString.substr(iPos + 1, 1);
-//      if (strNextChar == "u") {
-//        strOut += strString.substr(iPos, 6);
-//        iPos += 6;
-//      }
-//      else {
-//        strOut += "%u00" +
-//                  strString.substr(iPos + 1, 2);
-//        iPos += 3;
-//      }
-//    }
-//    else {
-//      strOut += strChar;
-//      iPos++;
-//    }
-//  }
-//  return strOut;
-}
-
-/**
-   @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 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");}
-*/
-function addRows(ele, data, cellFuncs, rowFunc) {
-  var frag = document.createDocumentFragment();
-  if (DWRUtil._isArray(data))    {
-    for (var i = 0; i < data.length; i++) {
-      frag.appendChild( makeRow( data[i], cellFuncs, rowFunc) );
-    }
-  } else if (typeof data == "object") {
-    for (var row in data) {
-      frag.appendChild( makeRow(row, cellFuncs, rowFunc) );
-    }
-  }
-  ele.appendChild(frag);
-}
-
-function makeRow( row, cellFuncs, rowFunc){
-  if( rowFunc != null ){ 
-    var tr = rowFunc(row); 
-  }  else { 
-    var tr = document.createElement("tr"); 
-  }
-
-  for(var j=0; j < cellFuncs.length; j++) {
-    var func = cellFuncs[j]
-      var td
-      var reply = func(row)
-      if (DWRUtil._isHTMLElement(reply, "td")) {
-        td = reply;
-      } else if (DWRUtil._isHTMLElement(reply, "a")) {
-        td = document.createElement("td");
-        td.appendChild( reply );
-      } else {
-        td = document.createElement("td");
-        td.innerHTML = reply;
-      }
-    tr.appendChild(td);
-  }
-  return tr;
-}
-
-/** added this from the DWRUtil.js */
-isDate = function(data) {     
-    return (data && data.toUTCString) ? true : false; 
-};
-
-/** returns the summed colspan of the cells of the row.  */
-function trColspan( tr ){
-  var allCells = tr.cells;
-  var colspan = 0;
-  for( var i = 0; i < allCells.length ; i++ ){
-    if( allCells[i].colSpan > 1 ){
-      colspan += allCells.colSpan;
-    }else{
-      colspan++;
-    }
-  }
-  return colspan;
-}
-/** returns the max colSpan of the table's tr's */
-function tableMaxColspan( table ){
-  var rows = table.rows;
-  var max = 0;
-  var tmp = 0;
-  for(var i=0; i<rows.length; i++){
-    tmp = trColspan(rows[i]);
-    if( tmp > max ){ max = tmp; }
-  }
-  return max;
-}
-
-function isValidDate(ele) {
-  var str = ele.value;
-  var date = iso8601toDate( str );
-  var valid = (isDate( date ) ) ?  true : false;
-  if( !valid ) { alert("Date is invalid" );}
-  return valid;
-}
-
-/** returns local time YYYY-MM-DD format string from Java Date or Js Date */
-function date2iso8601( jdate ){
-  if(jdate == null || !jdate.toUTCString ) return "0000-01-01";
-  if(jdate == null ) return "0000-01-01";
-  var str = "";
-  var jsDate = new Date( jdate.getTime() );
-  year = jsDate.getFullYear();
-  month = jsDate.getMonth() + 1;//zero based: jan=0, feb=1, etc.
-  day = jsDate.getDate();
-  var monthS=month.toString(), dayS=day.toString();
-  if( monthS.length == 1 ) { monthS = "0" + monthS; }
-  if( dayS.length == 1 )  { dayS = "0" + dayS; }
-  return year + "-" + monthS + "-" + dayS;
-}
-
-function setDateValue(ele, date, date2StrFunc){  
-  if( date == null || ! isDate(date)) { return; }
-  if( date2StrFunc == null ) { date2StrFunc = date2iso8601; }
-  ele = $(ele);
-  DWRUtil.setValue(ele, date2StrFunc( date ));  
-}
-
-/* removes all children and if it can, removes options */
-function clear(ele){
-    while (ele && ele.childNodes && ele.childNodes.length > 0) {ele.removeChild(ele.firstChild);}
-    if( ele != null && ele.options ){    // Empty the list
-      ele.options.length = 0;
-    }
-}
-
-function hideElementById(eleId){
-  var ele = $(eleId);
-  if( ele != null ){  ele.style.display="none"; } 
-}
-
-function makeEntLinkElement(entityURI, text){
-  link = document.createElement("a");
-  link.href = "entityEdit?uri=" + encodeUrl(entityURI);
-  link.innerHTML = text;
-  //DWRUtil.setValue(link, "test" + text);
-  return link;
-}
-
-function makePropLinkElement(propURI, text){
-  link = document.createElement("a");
-  link.href="propertyEdit?uri="+encodeUrl(propURI);
-  link.innerHTML = text;
-  return link;
-}
-
-/** returns date obj if str can be parsed, null otherwise.
-    Bad day values will rollover into the next month: 2000-02-30
-    will parse as 2000-03-02.
-    @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"; 
-  }
-  parts = str.split("-");
-  if( parts.length != 3 ) { return "bad split, use -"; }
-  yearPart = parts[0], monthPart = parts[1], dayPart = parts[2];
-
-  year = parseInt(yearPart);
-  if( isNaN(year) ) { return "year not a number"; }
-  month = parseInt(monthPart);
-  if( isNaN(month) ) { return "month not a number"; }
-  day = parseInt(dayPart);
-  if( isNaN(day) ) { return "day not a number"; }
-
-  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?  
-}
-
-/** use with Date.getYear() which is broken to get the correct year.
-    Found on quirksmode.org
-    ex of usage:
-    var today = new Date();
-    Year = takeYear(today);
-*/
-function takeYear(theDate){
-	x = theDate.getYear();
-	var y = x % 100;
-	y += (y < 38) ? 2000 : 1900; //why 38? the 32bit epoch ends in 2038
-	return y;
-}
-
-/*
-bdc34
-addEvent() from http://www.sitepoint.com/article/structural-markup-javascript
-Simon Willison, "Enhancing Structural Markup with JavaScript" December 10th 2003
-Author of code as cited by Willison: Scott Andrew, license unknown.
-ex: addEvent(window, 'load', functionToRunOnWindowLoad);
-*/
-
-function addEvent(obj, evType, fn){
- if (obj.addEventListener){
-   obj.addEventListener(evType, fn, true);
-   return true;
- } else if (obj.attachEvent){
-   var r = obj.attachEvent("on"+evType, fn);
-   return r;
- } else {
-   return false;
- }
-}
-
-// @name      The Fade Anything Technique
-// @namespace http://www.axentric.com/aside/fat/
-// @version   1.0-RC1
-// @author    Adam Michela
-var Fat = {
-	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;
-		b = b.toString(16); if (b.length == 1) b = '0' + b;
-		return "#" + r + g + b;
-	},
-	fade_all : function ()
-	{
-		var a = document.getElementsByTagName("*");
-		for (var i = 0; i < a.length; i++) 
-		{
-			var o = a[i];
-			var r = /fade-?(\w{3,6})?/.exec(o.className);
-			if (r)
-			{
-				if (!r[1]) r[1] = "";
-				if (o.id) Fat.fade_element(o.id,null,null,"#"+r[1]);
-			}
-		}
-	},
-	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)
-		{
-			r = Math.floor(rf * ((frames-frame)/frames) + rt * (frame/frames));
-			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; 
-		}
-		setTimeout("Fat.set_bgcolor('"+id+"','"+to+"')", delay);
-	},
-	set_bgcolor : function (id, c)
-	{
-		var o = document.getElementById(id);
-		o.style.backgroundColor = c;
-	},
-	get_bgcolor : function (id)
-	{
-		var o = document.getElementById(id);
-		while(o)
-		{
-			var c;
-			if (window.getComputedStyle) c = window.getComputedStyle(o,null).getPropertyValue("background-color");
-			if (o.currentStyle) c = o.currentStyle.backgroundColor;
-			if ((c != "" && c != "transparent") || o.tagName == "BODY") { break; }
-			o = o.parentNode;
-		}
-		if (c == undefined || c == "" || c == "transparent") c = "#FFFFFF";
-		var rgb = c.match(/rgb\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)/);
-		if (rgb) c = this.make_hex(parseInt(rgb[1]),parseInt(rgb[2]),parseInt(rgb[3]));
-		return c;
-	}
-}
-
-// window.onload = function () 
-// 	{
-// 	Fat.fade_all();
-// 	}
-//end of Adam Michela's code
-
-
-/* from javascript & DHTML cookbook, Goodman, 2003, O'Reilly */
-
-/* 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" 
-style="overflow:visible"></iframe>
-...
-<body ... onload = "adjustIFrameSize('myFrame');">
- */
-
-// function adjustIFrameSize(id) {
-//     var myIframe = document.getElementById(id);
-//     if (myIframe) {
-//         if (myIframe .contentDocument && myIframe.contentDocument.body.offsetHeight) {
-//             // W3C DOM (and Mozilla) syntax
-//             myIframe.height = myIframe.contentDocument.body.offsetHeight;    
-//         } else if (myIframe.Document && myIframe.Document.body.scrollHeight) {
-//             // IE DOM syntax
-//             myIframe.height = myIframe.Document.body.scrollHeight;
-//         }
-//     }
-// }
-
-function adjustIFrameSize(id) {
-    var myIframe = document.getElementById(id);
-    if (myIframe) {
-        if (myIframe.contentDocument && myIframe.contentDocument.body.offsetHeight) {
-            // W3C DOM (and Mozilla) syntax
-            myIframe.height = myIframe.contentDocument.body.offsetHeight;    
-        } else if (myIframe.Document && myIframe.Document.body.scrollHeight) {
-            // IE DOM syntax
-            myIframe.height = myIframe.Document.body.scrollHeight;
-        }
-        // bind onload events to iframe
-        if (myIframe.addEventListener) {
-            myIframe.addEventListener("load", resizeIframe, false);
-        } else {
-            myIframe.attachEvent("onload", resizeIframe);
-        }
-   }
-}
-
-function toggleDisabled(ele){
-  ele = $(ele);
-  if(ele == null) {return;}
-  ele.disabled = !ele.disabled ;
-}
-
-function resizeIframe(evt) {
-    evt = (evt) ? evt : event;
-    var target = (evt.target) ? evt.target : evt.srcElement;
-    // 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;    
-        }
-    }
-    if (target) {
-        adjustIFrameSize(target.id);
-    }
-}
-/* end of code from Goodman */
-
-
-/*******************************
-Stuff a selectList with values.
-valueFunc is a function that takes one parameter, an object,
-and returns a value for use in the select option value.
-textFun is a function that takes one parameter, an object,
-and returns a value for use in the select option text.
-
-This is based on the code in DWRUtil but lacks the error checking.
- */
-addOptions = function(ele, data, valueFunc, textFunc) {
-  var orig = ele;
-  ele = $(ele);
-  if (ele == null) {
-    DWRUtil.debug("addOptions() can't find an element with id: " + orig + ".");
-    return;
-  }
-  var useOptions = DWRUtil._isHTMLElement(ele, "select");  
-  if (data == null) return;
-
-  var text;
-  var value;
-  var opt;
-  for (var i = 0; i < data.length; i++) {
-    if ( valueFunc != null ){
-      if ( textFunc != null) {
-        text = textFunc(data[i]);
-        value = valueFunc(data[i]);
-      }
-      else {
-        value = valueFunc(data[i]);
-        text = value;
-      }
-    }
-    else
-      {
-        text = textFunc(data[i]);
-        value = text;
-      }
-    if (text || value) {
-      opt = new Option(text, value);
-      ele.options[ele.options.length] = opt;
-    }
-  }
-}
-
-/*
- returns a string like "http://somehost.edu/vivo/"
-*/
-getURLandContext = function(){
-    if( document == null ) return "could not get document object.";
-    var full = document.URL;
-    var skip_httpSlashes = 7;
-    var index = full.indexOf("/",skip_httpSlashes) + 1;
-    if( index == -1 ) { // something like http://somehost.edu:8080
-      return full + "/";
-    }
-    index = full.indexOf("/",index) + 1;
-    if( index == -1 ){ // something like http://somehost.edu:8080/
-      return full;
-    }
-    // something like http://somehost.edu:8080/vivo/junk/junk.jsp?2kl3j4=23k
-    return full.slice(0,index);
-}
+/**
+   These are utility functions for Vitro js pages.
+   Much of this is based on the util.js of the DWR package.
+
+   @author Brian Caruso
+*/
+
+var vitroJsLoaded = true; //just indicates that this file was loaded.
+
+    // public method for url encoding
+
+//from http://www.kanolife.com/escape/2006/03/escape-and-unescape-javascript.html
+function encodeUrl(pstrString) {
+  if (pstrString == "") {
+    return "";
+  }
+    //TODO: needs to be updated to UTF-8, javascript escape() only does ascii
+    return escape(pstrString);
+//  var iPos = 0;
+//  var strOut = "";
+//  var strChar;
+//  var strString = escape(pstrString);
+//  while (iPos < strString.length) {
+//    strChar = strString.substr(iPos, 1);
+//    if (strChar == "%") {
+//      strNextChar = strString.substr(iPos + 1, 1);
+//      if (strNextChar == "u") {
+//        strOut += strString.substr(iPos, 6);
+//        iPos += 6;
+//      }
+//      else {
+//        strOut += "%u00" +
+//                  strString.substr(iPos + 1, 2);
+//        iPos += 3;
+//      }
+//    }
+//    else {
+//      strOut += strChar;
+//      iPos++;
+//    }
+//  }
+//  return strOut;
+}
+
+/**
+   @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 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");}
+*/
+function addRows(ele, data, cellFuncs, rowFunc) {
+  var frag = document.createDocumentFragment();
+  if (DWRUtil._isArray(data))    {
+    for (var i = 0; i < data.length; i++) {
+      frag.appendChild( makeRow( data[i], cellFuncs, rowFunc) );
+    }
+  } else if (typeof data == "object") {
+    for (var row in data) {
+      frag.appendChild( makeRow(row, cellFuncs, rowFunc) );
+    }
+  }
+  ele.appendChild(frag);
+}
+
+function makeRow( row, cellFuncs, rowFunc){
+  if( rowFunc != null ){ 
+    var tr = rowFunc(row); 
+  }  else { 
+    var tr = document.createElement("tr"); 
+  }
+
+  for(var j=0; j < cellFuncs.length; j++) {
+    var func = cellFuncs[j]
+      var td
+      var reply = func(row)
+      if (DWRUtil._isHTMLElement(reply, "td")) {
+        td = reply;
+      } else if (DWRUtil._isHTMLElement(reply, "a")) {
+        td = document.createElement("td");
+        td.appendChild( reply );
+      } else {
+        td = document.createElement("td");
+        td.innerHTML = reply;
+      }
+    tr.appendChild(td);
+  }
+  return tr;
+}
+
+/** added this from the DWRUtil.js */
+isDate = function(data) {     
+    return (data && data.toUTCString) ? true : false; 
+};
+
+/** returns the summed colspan of the cells of the row.  */
+function trColspan( tr ){
+  var allCells = tr.cells;
+  var colspan = 0;
+  for( var i = 0; i < allCells.length ; i++ ){
+    if( allCells[i].colSpan > 1 ){
+      colspan += allCells.colSpan;
+    }else{
+      colspan++;
+    }
+  }
+  return colspan;
+}
+/** returns the max colSpan of the table's tr's */
+function tableMaxColspan( table ){
+  var rows = table.rows;
+  var max = 0;
+  var tmp = 0;
+  for(var i=0; i<rows.length; i++){
+    tmp = trColspan(rows[i]);
+    if( tmp > max ){ max = tmp; }
+  }
+  return max;
+}
+
+function isValidDate(ele) {
+  var str = ele.value;
+  var date = iso8601toDate( str );
+  var valid = (isDate( date ) ) ?  true : false;
+  if( !valid ) { alert("Date is invalid" );}
+  return valid;
+}
+
+/** returns local time YYYY-MM-DD format string from Java Date or Js Date */
+function date2iso8601( jdate ){
+  if(jdate == null || !jdate.toUTCString ) return "0000-01-01";
+  if(jdate == null ) return "0000-01-01";
+  var str = "";
+  var jsDate = new Date( jdate.getTime() );
+  year = jsDate.getFullYear();
+  month = jsDate.getMonth() + 1;//zero based: jan=0, feb=1, etc.
+  day = jsDate.getDate();
+  var monthS=month.toString(), dayS=day.toString();
+  if( monthS.length == 1 ) { monthS = "0" + monthS; }
+  if( dayS.length == 1 )  { dayS = "0" + dayS; }
+  return year + "-" + monthS + "-" + dayS;
+}
+
+function setDateValue(ele, date, date2StrFunc){  
+  if( date == null || ! isDate(date)) { return; }
+  if( date2StrFunc == null ) { date2StrFunc = date2iso8601; }
+  ele = $(ele);
+  DWRUtil.setValue(ele, date2StrFunc( date ));  
+}
+
+/* removes all children and if it can, removes options */
+function clear(ele){
+    while (ele && ele.childNodes && ele.childNodes.length > 0) {ele.removeChild(ele.firstChild);}
+    if( ele != null && ele.options ){    // Empty the list
+      ele.options.length = 0;
+    }
+}
+
+function hideElementById(eleId){
+  var ele = $(eleId);
+  if( ele != null ){  ele.style.display="none"; } 
+}
+
+function makeEntLinkElement(entityURI, text){
+  link = document.createElement("a");
+  link.href = "entityEdit?uri=" + encodeUrl(entityURI);
+  link.innerHTML = text;
+  //DWRUtil.setValue(link, "test" + text);
+  return link;
+}
+
+function makePropLinkElement(propURI, text){
+  link = document.createElement("a");
+  link.href="propertyEdit?uri="+encodeUrl(propURI);
+  link.innerHTML = text;
+  return link;
+}
+
+/** returns date obj if str can be parsed, null otherwise.
+    Bad day values will rollover into the next month: 2000-02-30
+    will parse as 2000-03-02.
+    @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"; 
+  }
+  parts = str.split("-");
+  if( parts.length != 3 ) { return "bad split, use -"; }
+  yearPart = parts[0], monthPart = parts[1], dayPart = parts[2];
+
+  year = parseInt(yearPart);
+  if( isNaN(year) ) { return "year not a number"; }
+  month = parseInt(monthPart);
+  if( isNaN(month) ) { return "month not a number"; }
+  day = parseInt(dayPart);
+  if( isNaN(day) ) { return "day not a number"; }
+
+  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?  
+}
+
+/** use with Date.getYear() which is broken to get the correct year.
+    Found on quirksmode.org
+    ex of usage:
+    var today = new Date();
+    Year = takeYear(today);
+*/
+function takeYear(theDate){
+	x = theDate.getYear();
+	var y = x % 100;
+	y += (y < 38) ? 2000 : 1900; //why 38? the 32bit epoch ends in 2038
+	return y;
+}
+
+/*
+bdc34
+addEvent() from http://www.sitepoint.com/article/structural-markup-javascript
+Simon Willison, "Enhancing Structural Markup with JavaScript" December 10th 2003
+Author of code as cited by Willison: Scott Andrew, license unknown.
+ex: addEvent(window, 'load', functionToRunOnWindowLoad);
+*/
+
+function addEvent(obj, evType, fn){
+ if (obj.addEventListener){
+   obj.addEventListener(evType, fn, true);
+   return true;
+ } else if (obj.attachEvent){
+   var r = obj.attachEvent("on"+evType, fn);
+   return r;
+ } else {
+   return false;
+ }
+}
+
+// @name      The Fade Anything Technique
+// @namespace http://www.axentric.com/aside/fat/
+// @version   1.0-RC1
+// @author    Adam Michela
+var Fat = {
+	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;
+		b = b.toString(16); if (b.length == 1) b = '0' + b;
+		return "#" + r + g + b;
+	},
+	fade_all : function ()
+	{
+		var a = document.getElementsByTagName("*");
+		for (var i = 0; i < a.length; i++) 
+		{
+			var o = a[i];
+			var r = /fade-?(\w{3,6})?/.exec(o.className);
+			if (r)
+			{
+				if (!r[1]) r[1] = "";
+				if (o.id) Fat.fade_element(o.id,null,null,"#"+r[1]);
+			}
+		}
+	},
+	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)
+		{
+			r = Math.floor(rf * ((frames-frame)/frames) + rt * (frame/frames));
+			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; 
+		}
+		setTimeout("Fat.set_bgcolor('"+id+"','"+to+"')", delay);
+	},
+	set_bgcolor : function (id, c)
+	{
+		var o = document.getElementById(id);
+		o.style.backgroundColor = c;
+	},
+	get_bgcolor : function (id)
+	{
+		var o = document.getElementById(id);
+		while(o)
+		{
+			var c;
+			if (window.getComputedStyle) c = window.getComputedStyle(o,null).getPropertyValue("background-color");
+			if (o.currentStyle) c = o.currentStyle.backgroundColor;
+			if ((c != "" && c != "transparent") || o.tagName == "BODY") { break; }
+			o = o.parentNode;
+		}
+		if (c == undefined || c == "" || c == "transparent") c = "#FFFFFF";
+		var rgb = c.match(/rgb\s*\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*\)/);
+		if (rgb) c = this.make_hex(parseInt(rgb[1]),parseInt(rgb[2]),parseInt(rgb[3]));
+		return c;
+	}
+}
+
+// window.onload = function () 
+// 	{
+// 	Fat.fade_all();
+// 	}
+//end of Adam Michela's code
+
+
+/* from javascript & DHTML cookbook, Goodman, 2003, O'Reilly */
+
+/* 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" 
+style="overflow:visible"></iframe>
+...
+<body ... onload = "adjustIFrameSize('myFrame');">
+ */
+
+// function adjustIFrameSize(id) {
+//     var myIframe = document.getElementById(id);
+//     if (myIframe) {
+//         if (myIframe .contentDocument && myIframe.contentDocument.body.offsetHeight) {
+//             // W3C DOM (and Mozilla) syntax
+//             myIframe.height = myIframe.contentDocument.body.offsetHeight;    
+//         } else if (myIframe.Document && myIframe.Document.body.scrollHeight) {
+//             // IE DOM syntax
+//             myIframe.height = myIframe.Document.body.scrollHeight;
+//         }
+//     }
+// }
+
+function adjustIFrameSize(id) {
+    var myIframe = document.getElementById(id);
+    if (myIframe) {
+        if (myIframe.contentDocument && myIframe.contentDocument.body.offsetHeight) {
+            // W3C DOM (and Mozilla) syntax
+            myIframe.height = myIframe.contentDocument.body.offsetHeight;    
+        } else if (myIframe.Document && myIframe.Document.body.scrollHeight) {
+            // IE DOM syntax
+            myIframe.height = myIframe.Document.body.scrollHeight;
+        }
+        // bind onload events to iframe
+        if (myIframe.addEventListener) {
+            myIframe.addEventListener("load", resizeIframe, false);
+        } else {
+            myIframe.attachEvent("onload", resizeIframe);
+        }
+   }
+}
+
+function toggleDisabled(ele){
+  ele = $(ele);
+  if(ele == null) {return;}
+  ele.disabled = !ele.disabled ;
+}
+
+function resizeIframe(evt) {
+    evt = (evt) ? evt : event;
+    var target = (evt.target) ? evt.target : evt.srcElement;
+    // 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;    
+        }
+    }
+    if (target) {
+        adjustIFrameSize(target.id);
+    }
+}
+/* end of code from Goodman */
+
+
+/*******************************
+Stuff a selectList with values.
+valueFunc is a function that takes one parameter, an object,
+and returns a value for use in the select option value.
+textFun is a function that takes one parameter, an object,
+and returns a value for use in the select option text.
+
+This is based on the code in DWRUtil but lacks the error checking.
+ */
+addOptions = function(ele, data, valueFunc, textFunc) {
+  var orig = ele;
+  ele = $(ele);
+  if (ele == null) {
+    DWRUtil.debug("addOptions() can't find an element with id: " + orig + ".");
+    return;
+  }
+  var useOptions = DWRUtil._isHTMLElement(ele, "select");  
+  if (data == null) return;
+
+  var text;
+  var value;
+  var opt;
+  for (var i = 0; i < data.length; i++) {
+    if ( valueFunc != null ){
+      if ( textFunc != null) {
+        text = textFunc(data[i]);
+        value = valueFunc(data[i]);
+      }
+      else {
+        value = valueFunc(data[i]);
+        text = value;
+      }
+    }
+    else
+      {
+        text = textFunc(data[i]);
+        value = text;
+      }
+    if (text || value) {
+      opt = new Option(text, value);
+      ele.options[ele.options.length] = opt;
+    }
+  }
+}
+
+/*
+ returns a string like "http://somehost.edu/vivo/"
+*/
+getURLandContext = function(){
+    if( document == null ) return "could not get document object.";
+    var full = document.URL;
+    var skip_httpSlashes = 7;
+    var index = full.indexOf("/",skip_httpSlashes) + 1;
+    if( index == -1 ) { // something like http://somehost.edu:8080
+      return full + "/";
+    }
+    index = full.indexOf("/",index) + 1;
+    if( index == -1 ){ // something like http://somehost.edu:8080/
+      return full;
+    }
+    // something like http://somehost.edu:8080/vivo/junk/junk.jsp?2kl3j4=23k
+    return full.slice(0,index);
+}
diff --git a/webapp/web/js/vitroUtils.js b/webapp/web/js/vitroUtils.js
index cb3925dc5..ee9f88e08 100644
--- a/webapp/web/js/vitroUtils.js
+++ b/webapp/web/js/vitroUtils.js
@@ -1,115 +1,115 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-$(document).ready(function(){
-
-    // Use jQuery() instead of $() alias, because dwr/util.js, loaded on back end editing 
-    // pages, overwrites $.
-    // fade out welcome-message when user logs in
-    $.extend(this, i18nStrings);
-    
-    jQuery('section#welcome-message').css('display', 'block').delay(2000).fadeOut(1500);
-    
-    // fade in flash-message when user logs out
-    jQuery('section#flash-message').css('display', 'none').fadeIn(1500);
-    
-    /////////////////////////////
-     // Home search fiter
-     // Toggle filter select list
-     var $searchFilterList = $('#filter-search-nav');
-     var $isFilterOpen = false;
-
-     console.log("Filter is open = " + $isFilterOpen);
-
-     $('a.filter-search').click(function(e) {
-         e.preventDefault();
-
-         if (!$isFilterOpen) {
-
-            console.log("Filter is closed = " + $isFilterOpen);
-
-             //Change button filter state to selected
-             //$(this).css('background','url(../../themes/vivo-cornell/images/filteredSearchActive.gif) no-repeat right top');
-             $(this).removeClass('filter-default');
-             $(this).addClass('filter-active');
-
-             //Reveal filter select list
-             $searchFilterList.css('display','block');
-
-             $isFilterOpen = true;
-
-             console.log("open");
-         } else {
-             //Change button filter state to default
-             //$('a.filter-search').css('background','url(../../themes/vivo-cornell/images/filteredSearch.gif) no-repeat right top');
-             $(this).removeClass('filter-active');
-             $(this).addClass('filter-default');
-
-             //Hide filter select list
-             $searchFilterList.css('display','none');
-
-             $isFilterOpen = false;
-
-             console.log("closed");
-         }
-    });
-
-     // Collect users' selection
-
-       $('#filter-search-nav li').each(function(index){
-           $(this).click(function(ev){
-               ev.preventDefault();
-
-               if ($(this).text() == i18nStrings.allCapitalized) {
-                  //Selected filter feedback
-                  $('.search-filter-selected').text('');
-                  $('input[name="classgroup"]').val('');
-                  console.log("ALL");
-               } else {
-
-                     $('.search-filter-selected').text($(this).text()).fadeIn('slow');
-                     $('input[name="classgroup"]').val($(this).children("a").attr("title"));
-               }
-
-               //Hide filter select list
-               $searchFilterList.css('display','none');
-
-               //Change button filter state to default
-               //$('a.filter-search').css('background','url(../../themes/vivo-cornell/images/filteredSearch.gif) no-repeat right top');
-               $('a.filter-search').removeClass('filter-active');
-               $('a.filter-search').addClass('filter-default');
-
-               $isFilterOpen = false;
-           });
-
-       });
-
-       //When focus, hide filter select list and change filter button state to default
-       $('input.search-homepage').focus(function(){
-
-           $('input.search-homepage').attr("value","");
-           $('input.search-homepage').css({
-               'text-align' : 'left',
-               'opacity' : 1
-           });
-
-           if (!$isFilterOpen) {
-
-               $isFilterOpen = false;
-
-           }else {
-
-                //Hide filter select list
-                    $('#filter-search-nav').hide();
-
-                    //Change button filter state to default
-                    //$('a.filter-search').css('background','url(../../themes/vivo-cornell/images/filteredSearch.gif) no-repeat right top');
-                    $('a.filter-search').removeClass('filter-active');
-                    $('a.filter-search').addClass('filter-default');
-
-                    $isFilterOpen = false;
-
-             }
-
-           console.log("HIDE input value ") ;
-       });
-});
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+$(document).ready(function(){
+
+    // Use jQuery() instead of $() alias, because dwr/util.js, loaded on back end editing 
+    // pages, overwrites $.
+    // fade out welcome-message when user logs in
+    $.extend(this, i18nStrings);
+    
+    jQuery('section#welcome-message').css('display', 'block').delay(2000).fadeOut(1500);
+    
+    // fade in flash-message when user logs out
+    jQuery('section#flash-message').css('display', 'none').fadeIn(1500);
+    
+    /////////////////////////////
+     // Home search fiter
+     // Toggle filter select list
+     var $searchFilterList = $('#filter-search-nav');
+     var $isFilterOpen = false;
+
+     console.log("Filter is open = " + $isFilterOpen);
+
+     $('a.filter-search').click(function(e) {
+         e.preventDefault();
+
+         if (!$isFilterOpen) {
+
+            console.log("Filter is closed = " + $isFilterOpen);
+
+             //Change button filter state to selected
+             //$(this).css('background','url(../../themes/vivo-cornell/images/filteredSearchActive.gif) no-repeat right top');
+             $(this).removeClass('filter-default');
+             $(this).addClass('filter-active');
+
+             //Reveal filter select list
+             $searchFilterList.css('display','block');
+
+             $isFilterOpen = true;
+
+             console.log("open");
+         } else {
+             //Change button filter state to default
+             //$('a.filter-search').css('background','url(../../themes/vivo-cornell/images/filteredSearch.gif) no-repeat right top');
+             $(this).removeClass('filter-active');
+             $(this).addClass('filter-default');
+
+             //Hide filter select list
+             $searchFilterList.css('display','none');
+
+             $isFilterOpen = false;
+
+             console.log("closed");
+         }
+    });
+
+     // Collect users' selection
+
+       $('#filter-search-nav li').each(function(index){
+           $(this).click(function(ev){
+               ev.preventDefault();
+
+               if ($(this).text() == i18nStrings.allCapitalized) {
+                  //Selected filter feedback
+                  $('.search-filter-selected').text('');
+                  $('input[name="classgroup"]').val('');
+                  console.log("ALL");
+               } else {
+
+                     $('.search-filter-selected').text($(this).text()).fadeIn('slow');
+                     $('input[name="classgroup"]').val($(this).children("a").attr("title"));
+               }
+
+               //Hide filter select list
+               $searchFilterList.css('display','none');
+
+               //Change button filter state to default
+               //$('a.filter-search').css('background','url(../../themes/vivo-cornell/images/filteredSearch.gif) no-repeat right top');
+               $('a.filter-search').removeClass('filter-active');
+               $('a.filter-search').addClass('filter-default');
+
+               $isFilterOpen = false;
+           });
+
+       });
+
+       //When focus, hide filter select list and change filter button state to default
+       $('input.search-homepage').focus(function(){
+
+           $('input.search-homepage').attr("value","");
+           $('input.search-homepage').css({
+               'text-align' : 'left',
+               'opacity' : 1
+           });
+
+           if (!$isFilterOpen) {
+
+               $isFilterOpen = false;
+
+           }else {
+
+                //Hide filter select list
+                    $('#filter-search-nav').hide();
+
+                    //Change button filter state to default
+                    //$('a.filter-search').css('background','url(../../themes/vivo-cornell/images/filteredSearch.gif) no-repeat right top');
+                    $('a.filter-search').removeClass('filter-active');
+                    $('a.filter-search').addClass('filter-default');
+
+                    $isFilterOpen = false;
+
+             }
+
+           console.log("HIDE input value ") ;
+       });
+});
diff --git a/webapp/web/src/flash.js b/webapp/web/src/flash.js
index 35a7e04ff..4e85e5f09 100644
--- a/webapp/web/src/flash.js
+++ b/webapp/web/src/flash.js
@@ -8,1237 +8,1237 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.flash");
-
-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 
-		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 
-		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. 
-		This object provides methods to determine the current version of the Flash
-		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 
-		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 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 
-		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 
-		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 
-		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 
-		(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, 
-		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()".
-		Strengths: the most cross browser, cross platform pre-Flash 8 method
-		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
-		boundary. We use the first method, the Flash 6 method, on all platforms
-		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, 
-																	 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
-		called after you are finished adding your callbacks. Calling loaded()
-		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 
-		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 
-		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
-		work; for example, Flash 8 communication doesn't work in Internet
-		Explorer due to bugs in Flash, and Flash 6 communication does not work
-		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 
-		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:		
-		
-		* 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.
-		The Flash side needs to have more sophisticated serialization/
-		deserialization mechanisms like JavaScript currently has. The
-		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
-*/
-
-dojo.flash = {
-	flash6_version: null,
-	flash8_version: null,
-	ready: false,
-	_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		
-		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 
-			// 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){
-			return false;
-		}else if (this.flash8_version != null && dojo.flash.info.commVersion == 8){
-			// if we have a flash 8 version of this SWF, and this browser supports
-			// communicating using Flash 8 features...
-			return true;
-		}else{
-			return false;
-		}
-	},
-	
-	/** 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. 
-			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(){
-		//dojo.debug("dojo.flash.loaded");
-		dojo.flash.ready = true;
-		if(dojo.flash._loadedListeners.length > 0){
-			for(var i = 0;i < dojo.flash._loadedListeners.length; i++){
-				dojo.flash._loadedListeners[i].call(null);
-			}
-		}
-	},
-	
-	/** 
-			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(){
-	 //dojo.debug("installing");
-	 if(dojo.flash._installingListeners.length > 0){
-			for(var i = 0; i < dojo.flash._installingListeners.length; i++){
-				dojo.flash._installingListeners[i].call(null);
-			}
-		}
-	},
-	
-	/** Initializes dojo.flash. */
-	_initialize: function(){
-		//dojo.debug("dojo.flash._initialize");
-		// see if we need to rev or install Flash on this platform
-		var installer = new dojo.flash.Install();
-		dojo.flash.installer = installer;
-
-		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();
-		}
-	}
-};
-
-
-/** 
-		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. 
-		
-		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. 
-*/
-dojo.flash.Info = function(){
-	// 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"\>');
-		document.writeln('Function VBGetSwfVer(i)');
-		document.writeln('  on error resume next');
-		document.writeln('  Dim swControl, swVersion');
-		document.writeln('  swVersion = 0');
-		document.writeln('  set swControl = CreateObject("ShockwaveFlash.ShockwaveFlash." + CStr(i))');
-		document.writeln('  if (IsObject(swControl)) then');
-		document.writeln('    swVersion = swControl.GetVariable("$version")');
-		document.writeln('  end if');
-		document.writeln('  VBGetSwfVer = swVersion');
-		document.writeln('End Function');
-		document.writeln('</script\>');
-	}
-	
-	this._detectVersion();
-	this._detectCommunicationVersion();
-}
-
-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. 
-	*/
-	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. 
-			-1 - For some reason neither method is supported, and no communication
-			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;
-		}else{
-			return false;
-		}
-	},
-	
-	_detectVersion: function(){
-		var versionStr;
-		
-		// 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);		
-			}
-				
-			if(versionStr == -1 ){
-				this.capable = false; 
-				return;
-			}else if(versionStr != 0){
-				var versionArray;
-				if(dojo.render.html.ie){
-					var tempArray = versionStr.split(" ");
-					var tempString = tempArray[1];
-					versionArray = tempString.split(",");
-				}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 
-			information. Internet Explorer uses a corresponding Visual Basic
-			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"] || 
-				 navigator.plugins["Shockwave Flash"]){
-				var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
-				var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
-				var descArray = flashDescription.split(" ");
-				var tempArrayMajor = descArray[2].split(".");
-				var versionMajor = tempArrayMajor[0];
-				var versionMinor = tempArrayMajor[1];
-				if(descArray[3] != ""){
-					var tempArrayMinor = descArray[3].split("r");
-				}else{
-					var tempArrayMinor = descArray[4].split("r");
-				}
-				var versionRevision = tempArrayMinor[1] > 0 ? tempArrayMinor[1] : 0;
-				var version = versionMajor + "." + versionMinor + "." 
-											+ versionRevision;
-											
-				return version;
-			}
-		}
-		
-		return -1;
-	},
-	
-	/** 
-			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. 
-	*/
-	_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){
-			this.commVersion = 8;
-		}else{
-			this.commVersion = 6;
-		}
-	}
-};
-
-/** A class that is used to write out the Flash object into the page. */
-dojo.flash.Embed = function(visible){
-	this._visible = visible;
-}
-
-dojo.flash.Embed.prototype = {
-	/** 
-			The width of this Flash applet. The default is the minimal width
-			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. 
-	*/
-	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. 
-			@param flashVer The Flash version to write.
-			@param doExpressInstall Whether to write out Express Install
-			information. Optional value; defaults to false.
-	*/
-	write: function(flashVer, doExpressInstall){
-		//dojo.debug("write");
-		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; ");
-		containerStyle.append("height: " + this.height + "px; ");
-		if(this._visible == false){
-			containerStyle.append("position: absolute; ");
-			containerStyle.append("z-index: 10000; ");
-			containerStyle.append("top: -1000px; ");
-			containerStyle.append("left: -1000px; ");
-		}
-		containerStyle = containerStyle.toString();
-
-		// figure out the SWF file to get and how to write out the correct HTML
-		// for this Flash version
-		var objectHTML;
-		var swfloc;
-		// Flash 6
-		if(flashVer == 6){
-			swfloc = dojo.flash.flash6_version;
-			var dojoPath = djConfig.baseRelativePath;
-			swfloc = swfloc + "?baseRelativePath=" + escape(dojoPath);
-			
-			objectHTML = 
-						  '<embed id="' + this.id + '" src="' + swfloc + '" '
-						+ '    quality="high" bgcolor="#ffffff" '
-						+ '    width="' + this.width + '" height="' + this.height + '" '
-						+ '    name="' + this.id + '" '
-						+ '    align="middle" allowScriptAccess="sameDomain" '
-						+ '    type="application/x-shockwave-flash" swLiveConnect="true" '
-						+ '    pluginspage="http://www.macromedia.com/go/getflashplayer">';
-		}else{ // Flash 8
-			swfloc = dojo.flash.flash8_version;
-			var swflocObject = swfloc;
-			var swflocEmbed = swfloc;
-			var dojoPath = djConfig.baseRelativePath;
-			if(doExpressInstall){
-				// the location to redirect to after installing
-				var redirectURL = escape(window.location);
-				document.title = document.title.slice(0, 47) + " - Flash Player Installation";
-				var docTitle = escape(document.title);
-				swflocObject += "?MMredirectURL=" + redirectURL
-				                + "&MMplayerType=ActiveX"
-				                + "&MMdoctitle=" + docTitle
-								+ "&baseRelativePath=" + escape(dojoPath);
-				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" '
-				  + 'width="' + this.width + '" '
-				  + 'height="' + this.height + '" '
-				  + 'id="' + this.id + '" '
-				  + 'align="middle"> '
-				  + '<param name="allowScriptAccess" value="sameDomain" /> '
-				  + '<param name="movie" value="' + swflocObject + '" /> '
-				  + '<param name="quality" value="high" /> '
-				  + '<param name="bgcolor" value="#ffffff" /> '
-				  + '<embed src="' + swflocEmbed + '" '
-				  + 'quality="high" '
-				  + 'bgcolor="#ffffff" '
-				  + 'width="' + this.width + '" '
-				  + 'height="' + this.height + '" '
-				  + 'id="' + this.id + '" '
-				  + 'name="' + this.id + '" '
-				  + 'swLiveConnect="true" '
-				  + 'align="middle" '
-				  + 'allowScriptAccess="sameDomain" '
-				  + 'type="application/x-shockwave-flash" '+ "&baseRelativePath=" + escape(dojoPath);
-				  + 'pluginspage="http://www.macromedia.com/go/getflashplayer" />'
-				+ '</object>';
-		}
-
-		// now write everything out
-		objectHTML = '<div id="' + this.id + 'Container" style="' + containerStyle + '"> '
-						+ 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");
-		if(visible == true){
-			container.style.visibility = "visible";
-		}else{
-			container.style.position = "absolute";
-			container.style.x = "-1000px";
-			container.style.y = "-1000px";
-			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
-		// HTML element not the BODY element
-		if(!dojo.render.html.ie && document.compatMode == "CSS1Compat"){
-			browserWidth = document.body.parentNode.clientWidth;
-			browserHeight = document.body.parentNode.clientHeight;
-		}else if(dojo.render.html.ie && document.compatMode == "CSS1Compat"){
-			// IE 6 in standards compliant mode has to be calculated
-			// differently
-			browserWidth = document.documentElement.clientWidth;
-			browserHeight = document.documentElement.clientHeight;
-		}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;
-		var scrolledByHeight = window.scrollY;
-		// compute these values differently for IE;
-		// IE has two possibilities; it is either in standards
-		// compatibility mode or it is not
-		if(typeof scrolledByWidth == "undefined"){
-			if(document.compatMode == "CSS1Compat"){ // standards mode
-				scrolledByWidth = document.documentElement.scrollLeft;
-				scrolledByHeight = document.documentElement.scrollTop;
-			}else{ // Pre IE6 non-standards mode
-				scrolledByWidth = document.body.scrollLeft;
-				scrolledByHeight = document.body.scrollTop;
-			}
-		}
-
-		// compute the centered position    
-		var x = scrolledByWidth + (browserWidth - elementWidth) / 2;
-		var y = scrolledByHeight + (browserHeight - elementHeight) / 2; 
-
-		// set the centered position
-		var container = dojo.byId(this.id + "Container");
-		container.style.top = y + "px";
-		container.style.left = x + "px";
-	}
-};
-
-
-/** 
-		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 
-		specific way in which this communication occurs,
-		presenting a common interface to JavaScript irrespective of the underlying
-		Flash version.
-*/
-dojo.flash.Communicator = function(){
-	if(dojo.flash.useFlash6()){
-		this._writeFlash6();
-	}else if (dojo.flash.useFlash8()){
-		this._writeFlash8();
-	}
-}
-
-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
-		// within the Dojo system
-		document.writeln('<script language="JavaScript">');
-		document.writeln('  function ' + id + '_DoFSCommand(command, args){ ');
-		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\> ');
-			document.writeln('on error resume next ');
-			document.writeln('Sub ' + id + '_FSCommand(ByVal command, ByVal args)');
-			document.writeln(' call ' + id + '_DoFSCommand(command, args)');
-			document.writeln('end sub');
-			document.writeln('</SCRIPT\> ');
-		}
-	},
-	
-	_writeFlash8: function(){
-		// 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);
-		// Flash 8 on Mac/Firefox precedes all commands with the string "FSCommand:";
-		// strip it off if it is present
-		if(command != null && !dojo.lang.isUndefined(command)
-			&& /^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
-			this._fscommandCall(command, args);
-		}else if(command == "fscommandReady"){ // see if fscommands are ready
-			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();
-		for(var i = 0; i < numArgs; i++){
-			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
-		// eval it so that the method gets run against an instance
-		var runMe;
-		if(functionName.indexOf(".") == -1){ // global function
-			runMe = window[functionName];
-		}else{
-			// 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. 
-	*/
-	_call: function(functionName, args){
-		// we do JavaScript to Flash method calls by setting a Flash variable
-		// "_functionName" with the function name; "_numArgs" with the number
-		// of arguments; and "_0", "_1", etc for each numbered argument. Flash
-		// reads these, executes the function call, and returns the result
-		// in "_returnResult"
-		var plugin = dojo.flash.obj.get();
-		plugin.SetVariable("_functionName", functionName);
-		plugin.SetVariable("_numArgs", args.length);
-		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 
-			// 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. 
-	*/
-	_addExternalInterfaceCallback: function(methodName){
-		var wrapperCall = function(){
-			// some browsers don't like us changing values in the 'arguments' array, so
-			// make a fresh copy of it
-			var methodArgs = new Array(arguments.length);
-			for(var i = 0; i < arguments.length; i++){
-				methodArgs[i] = arguments[i];
-			}
-			return dojo.flash.comm._execFlash(methodName, methodArgs);
-		};
-		
-		dojo.flash.comm[methodName] = wrapperCall;
-	},
-	
-	/** 
-			Encodes our data to get around ExternalInterface bugs.
-			Flash 8 communication.
-	*/
-	_encodeData: function(data){
-		// double encode all entity values, or they will be mis-decoded
-		// 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.
-	*/
-	_decodeData: function(data){
-		if(data == null || typeof data == "undefined"){
-			return data;
-		}
-		
-		// certain XMLish characters break Flash's wire serialization for
-		// 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);
-		for(var i = 0; i < numSegments; i++){
-			var startCut = i * 1024;
-			var endCut = i * 1024 + 1024;
-			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 
-			// 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
-			plugin.CallFunction('<invoke name="chunkArgumentData" '
-														+ 'returntype="javascript">'
-														+ '<arguments>'
-														+ '<string>' + piece + '</string>'
-														+ '<number>' + argIndex + '</number>'
-														+ '</arguments>'
-														+ '</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 = 
-					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
-			// plugin
-			if(piece == '""' || piece == "''"){
-				piece = "";
-			}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.
-*/
-dojo.flash.Install = function(){
-}
-
-dojo.flash.Install.prototype = {
-	/** 
-			Determines if installation or revving of the current plugin is 
-			needed. 
-	*/
-	needed: function(){
-		// do we even have flash?
-		if(dojo.flash.info.capable == false){
-			return true;
-		}
-
-		// are we on the Mac? Safari needs Flash version 8 to do Flash 8
-		// communication, while Firefox/Mac needs Flash 8 to fix bugs it has
-		// with Flash 6 communication
-		if(dojo.render.os.mac == true && !dojo.flash.info.isVersionOrAbove(8, 0, 0)){
-			return true;
-		}
-
-		// other platforms need at least Flash 6 or above
-		if(!dojo.flash.info.isVersionOrAbove(6, 0, 0)){
-			return true;
-		}
-
-		// otherwise we don't need installation
-		return false;
-	},
-
-	/** Performs installation or revving of the Flash plugin. */
-	install: function(){
-		//dojo.debug("install");
-		// 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
-			// the user to install things
-			var installObj = new dojo.flash.Embed(false);
-			installObj.write(8); // write out HTML for Flash 8 version+
-		}else if(dojo.flash.info.isVersionOrAbove(6, 0, 65)){ // Express Install
-			//dojo.debug("Express install");
-			var installObj = new dojo.flash.Embed(false);
-			installObj.write(8, true); // write out HTML for Flash 8 version+
-			installObj.setVisible(true);
-			installObj.center();
-		}else{ // older Flash install than version 6r65
-			alert("This content requires a more recent version of the Macromedia "
-						+" Flash Player.");
-			window.location.href = "http://www.macromedia.com/go/getflashplayer";
-		}
-	},
-	
-	/** 
-			Called when the Express Install is either finished, failed, or was
-			rejected by the user.
-	*/
-	_onInstallStatus: function(msg){
-		if (msg == "Download.Complete"){
-			// Installation is complete.
-			dojo.flash._initialize();
-		}else if(msg == "Download.Cancelled"){
-			alert("This content requires a more recent version of the Macromedia "
-						+" Flash Player.");
-			window.location.href = "http://www.macromedia.com/go/getflashplayer";
-		}else if (msg == "Download.Failed"){
-			// The end user failed to download the installer due to a network failure
-			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.");
-		}	
-	}
-}
-
-// find out if Flash is installed
-dojo.flash.info = new dojo.flash.Info();
-
-// vim:ts=4:noet:tw=0:
+dojo.provide("dojo.flash");
+
+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 
+		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 
+		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. 
+		This object provides methods to determine the current version of the Flash
+		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 
+		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 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 
+		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 
+		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 
+		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 
+		(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, 
+		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()".
+		Strengths: the most cross browser, cross platform pre-Flash 8 method
+		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
+		boundary. We use the first method, the Flash 6 method, on all platforms
+		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, 
+																	 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
+		called after you are finished adding your callbacks. Calling loaded()
+		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 
+		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 
+		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
+		work; for example, Flash 8 communication doesn't work in Internet
+		Explorer due to bugs in Flash, and Flash 6 communication does not work
+		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 
+		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:		
+		
+		* 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.
+		The Flash side needs to have more sophisticated serialization/
+		deserialization mechanisms like JavaScript currently has. The
+		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
+*/
+
+dojo.flash = {
+	flash6_version: null,
+	flash8_version: null,
+	ready: false,
+	_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		
+		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 
+			// 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){
+			return false;
+		}else if (this.flash8_version != null && dojo.flash.info.commVersion == 8){
+			// if we have a flash 8 version of this SWF, and this browser supports
+			// communicating using Flash 8 features...
+			return true;
+		}else{
+			return false;
+		}
+	},
+	
+	/** 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. 
+			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(){
+		//dojo.debug("dojo.flash.loaded");
+		dojo.flash.ready = true;
+		if(dojo.flash._loadedListeners.length > 0){
+			for(var i = 0;i < dojo.flash._loadedListeners.length; i++){
+				dojo.flash._loadedListeners[i].call(null);
+			}
+		}
+	},
+	
+	/** 
+			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(){
+	 //dojo.debug("installing");
+	 if(dojo.flash._installingListeners.length > 0){
+			for(var i = 0; i < dojo.flash._installingListeners.length; i++){
+				dojo.flash._installingListeners[i].call(null);
+			}
+		}
+	},
+	
+	/** Initializes dojo.flash. */
+	_initialize: function(){
+		//dojo.debug("dojo.flash._initialize");
+		// see if we need to rev or install Flash on this platform
+		var installer = new dojo.flash.Install();
+		dojo.flash.installer = installer;
+
+		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();
+		}
+	}
+};
+
+
+/** 
+		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. 
+		
+		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. 
+*/
+dojo.flash.Info = function(){
+	// 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"\>');
+		document.writeln('Function VBGetSwfVer(i)');
+		document.writeln('  on error resume next');
+		document.writeln('  Dim swControl, swVersion');
+		document.writeln('  swVersion = 0');
+		document.writeln('  set swControl = CreateObject("ShockwaveFlash.ShockwaveFlash." + CStr(i))');
+		document.writeln('  if (IsObject(swControl)) then');
+		document.writeln('    swVersion = swControl.GetVariable("$version")');
+		document.writeln('  end if');
+		document.writeln('  VBGetSwfVer = swVersion');
+		document.writeln('End Function');
+		document.writeln('</script\>');
+	}
+	
+	this._detectVersion();
+	this._detectCommunicationVersion();
+}
+
+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. 
+	*/
+	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. 
+			-1 - For some reason neither method is supported, and no communication
+			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;
+		}else{
+			return false;
+		}
+	},
+	
+	_detectVersion: function(){
+		var versionStr;
+		
+		// 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);		
+			}
+				
+			if(versionStr == -1 ){
+				this.capable = false; 
+				return;
+			}else if(versionStr != 0){
+				var versionArray;
+				if(dojo.render.html.ie){
+					var tempArray = versionStr.split(" ");
+					var tempString = tempArray[1];
+					versionArray = tempString.split(",");
+				}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 
+			information. Internet Explorer uses a corresponding Visual Basic
+			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"] || 
+				 navigator.plugins["Shockwave Flash"]){
+				var swVer2 = navigator.plugins["Shockwave Flash 2.0"] ? " 2.0" : "";
+				var flashDescription = navigator.plugins["Shockwave Flash" + swVer2].description;
+				var descArray = flashDescription.split(" ");
+				var tempArrayMajor = descArray[2].split(".");
+				var versionMajor = tempArrayMajor[0];
+				var versionMinor = tempArrayMajor[1];
+				if(descArray[3] != ""){
+					var tempArrayMinor = descArray[3].split("r");
+				}else{
+					var tempArrayMinor = descArray[4].split("r");
+				}
+				var versionRevision = tempArrayMinor[1] > 0 ? tempArrayMinor[1] : 0;
+				var version = versionMajor + "." + versionMinor + "." 
+											+ versionRevision;
+											
+				return version;
+			}
+		}
+		
+		return -1;
+	},
+	
+	/** 
+			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. 
+	*/
+	_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){
+			this.commVersion = 8;
+		}else{
+			this.commVersion = 6;
+		}
+	}
+};
+
+/** A class that is used to write out the Flash object into the page. */
+dojo.flash.Embed = function(visible){
+	this._visible = visible;
+}
+
+dojo.flash.Embed.prototype = {
+	/** 
+			The width of this Flash applet. The default is the minimal width
+			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. 
+	*/
+	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. 
+			@param flashVer The Flash version to write.
+			@param doExpressInstall Whether to write out Express Install
+			information. Optional value; defaults to false.
+	*/
+	write: function(flashVer, doExpressInstall){
+		//dojo.debug("write");
+		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; ");
+		containerStyle.append("height: " + this.height + "px; ");
+		if(this._visible == false){
+			containerStyle.append("position: absolute; ");
+			containerStyle.append("z-index: 10000; ");
+			containerStyle.append("top: -1000px; ");
+			containerStyle.append("left: -1000px; ");
+		}
+		containerStyle = containerStyle.toString();
+
+		// figure out the SWF file to get and how to write out the correct HTML
+		// for this Flash version
+		var objectHTML;
+		var swfloc;
+		// Flash 6
+		if(flashVer == 6){
+			swfloc = dojo.flash.flash6_version;
+			var dojoPath = djConfig.baseRelativePath;
+			swfloc = swfloc + "?baseRelativePath=" + escape(dojoPath);
+			
+			objectHTML = 
+						  '<embed id="' + this.id + '" src="' + swfloc + '" '
+						+ '    quality="high" bgcolor="#ffffff" '
+						+ '    width="' + this.width + '" height="' + this.height + '" '
+						+ '    name="' + this.id + '" '
+						+ '    align="middle" allowScriptAccess="sameDomain" '
+						+ '    type="application/x-shockwave-flash" swLiveConnect="true" '
+						+ '    pluginspage="http://www.macromedia.com/go/getflashplayer">';
+		}else{ // Flash 8
+			swfloc = dojo.flash.flash8_version;
+			var swflocObject = swfloc;
+			var swflocEmbed = swfloc;
+			var dojoPath = djConfig.baseRelativePath;
+			if(doExpressInstall){
+				// the location to redirect to after installing
+				var redirectURL = escape(window.location);
+				document.title = document.title.slice(0, 47) + " - Flash Player Installation";
+				var docTitle = escape(document.title);
+				swflocObject += "?MMredirectURL=" + redirectURL
+				                + "&MMplayerType=ActiveX"
+				                + "&MMdoctitle=" + docTitle
+								+ "&baseRelativePath=" + escape(dojoPath);
+				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" '
+				  + 'width="' + this.width + '" '
+				  + 'height="' + this.height + '" '
+				  + 'id="' + this.id + '" '
+				  + 'align="middle"> '
+				  + '<param name="allowScriptAccess" value="sameDomain" /> '
+				  + '<param name="movie" value="' + swflocObject + '" /> '
+				  + '<param name="quality" value="high" /> '
+				  + '<param name="bgcolor" value="#ffffff" /> '
+				  + '<embed src="' + swflocEmbed + '" '
+				  + 'quality="high" '
+				  + 'bgcolor="#ffffff" '
+				  + 'width="' + this.width + '" '
+				  + 'height="' + this.height + '" '
+				  + 'id="' + this.id + '" '
+				  + 'name="' + this.id + '" '
+				  + 'swLiveConnect="true" '
+				  + 'align="middle" '
+				  + 'allowScriptAccess="sameDomain" '
+				  + 'type="application/x-shockwave-flash" '+ "&baseRelativePath=" + escape(dojoPath);
+				  + 'pluginspage="http://www.macromedia.com/go/getflashplayer" />'
+				+ '</object>';
+		}
+
+		// now write everything out
+		objectHTML = '<div id="' + this.id + 'Container" style="' + containerStyle + '"> '
+						+ 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");
+		if(visible == true){
+			container.style.visibility = "visible";
+		}else{
+			container.style.position = "absolute";
+			container.style.x = "-1000px";
+			container.style.y = "-1000px";
+			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
+		// HTML element not the BODY element
+		if(!dojo.render.html.ie && document.compatMode == "CSS1Compat"){
+			browserWidth = document.body.parentNode.clientWidth;
+			browserHeight = document.body.parentNode.clientHeight;
+		}else if(dojo.render.html.ie && document.compatMode == "CSS1Compat"){
+			// IE 6 in standards compliant mode has to be calculated
+			// differently
+			browserWidth = document.documentElement.clientWidth;
+			browserHeight = document.documentElement.clientHeight;
+		}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;
+		var scrolledByHeight = window.scrollY;
+		// compute these values differently for IE;
+		// IE has two possibilities; it is either in standards
+		// compatibility mode or it is not
+		if(typeof scrolledByWidth == "undefined"){
+			if(document.compatMode == "CSS1Compat"){ // standards mode
+				scrolledByWidth = document.documentElement.scrollLeft;
+				scrolledByHeight = document.documentElement.scrollTop;
+			}else{ // Pre IE6 non-standards mode
+				scrolledByWidth = document.body.scrollLeft;
+				scrolledByHeight = document.body.scrollTop;
+			}
+		}
+
+		// compute the centered position    
+		var x = scrolledByWidth + (browserWidth - elementWidth) / 2;
+		var y = scrolledByHeight + (browserHeight - elementHeight) / 2; 
+
+		// set the centered position
+		var container = dojo.byId(this.id + "Container");
+		container.style.top = y + "px";
+		container.style.left = x + "px";
+	}
+};
+
+
+/** 
+		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 
+		specific way in which this communication occurs,
+		presenting a common interface to JavaScript irrespective of the underlying
+		Flash version.
+*/
+dojo.flash.Communicator = function(){
+	if(dojo.flash.useFlash6()){
+		this._writeFlash6();
+	}else if (dojo.flash.useFlash8()){
+		this._writeFlash8();
+	}
+}
+
+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
+		// within the Dojo system
+		document.writeln('<script language="JavaScript">');
+		document.writeln('  function ' + id + '_DoFSCommand(command, args){ ');
+		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\> ');
+			document.writeln('on error resume next ');
+			document.writeln('Sub ' + id + '_FSCommand(ByVal command, ByVal args)');
+			document.writeln(' call ' + id + '_DoFSCommand(command, args)');
+			document.writeln('end sub');
+			document.writeln('</SCRIPT\> ');
+		}
+	},
+	
+	_writeFlash8: function(){
+		// 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);
+		// Flash 8 on Mac/Firefox precedes all commands with the string "FSCommand:";
+		// strip it off if it is present
+		if(command != null && !dojo.lang.isUndefined(command)
+			&& /^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
+			this._fscommandCall(command, args);
+		}else if(command == "fscommandReady"){ // see if fscommands are ready
+			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();
+		for(var i = 0; i < numArgs; i++){
+			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
+		// eval it so that the method gets run against an instance
+		var runMe;
+		if(functionName.indexOf(".") == -1){ // global function
+			runMe = window[functionName];
+		}else{
+			// 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. 
+	*/
+	_call: function(functionName, args){
+		// we do JavaScript to Flash method calls by setting a Flash variable
+		// "_functionName" with the function name; "_numArgs" with the number
+		// of arguments; and "_0", "_1", etc for each numbered argument. Flash
+		// reads these, executes the function call, and returns the result
+		// in "_returnResult"
+		var plugin = dojo.flash.obj.get();
+		plugin.SetVariable("_functionName", functionName);
+		plugin.SetVariable("_numArgs", args.length);
+		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 
+			// 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. 
+	*/
+	_addExternalInterfaceCallback: function(methodName){
+		var wrapperCall = function(){
+			// some browsers don't like us changing values in the 'arguments' array, so
+			// make a fresh copy of it
+			var methodArgs = new Array(arguments.length);
+			for(var i = 0; i < arguments.length; i++){
+				methodArgs[i] = arguments[i];
+			}
+			return dojo.flash.comm._execFlash(methodName, methodArgs);
+		};
+		
+		dojo.flash.comm[methodName] = wrapperCall;
+	},
+	
+	/** 
+			Encodes our data to get around ExternalInterface bugs.
+			Flash 8 communication.
+	*/
+	_encodeData: function(data){
+		// double encode all entity values, or they will be mis-decoded
+		// 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.
+	*/
+	_decodeData: function(data){
+		if(data == null || typeof data == "undefined"){
+			return data;
+		}
+		
+		// certain XMLish characters break Flash's wire serialization for
+		// 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);
+		for(var i = 0; i < numSegments; i++){
+			var startCut = i * 1024;
+			var endCut = i * 1024 + 1024;
+			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 
+			// 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
+			plugin.CallFunction('<invoke name="chunkArgumentData" '
+														+ 'returntype="javascript">'
+														+ '<arguments>'
+														+ '<string>' + piece + '</string>'
+														+ '<number>' + argIndex + '</number>'
+														+ '</arguments>'
+														+ '</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 = 
+					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
+			// plugin
+			if(piece == '""' || piece == "''"){
+				piece = "";
+			}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.
+*/
+dojo.flash.Install = function(){
+}
+
+dojo.flash.Install.prototype = {
+	/** 
+			Determines if installation or revving of the current plugin is 
+			needed. 
+	*/
+	needed: function(){
+		// do we even have flash?
+		if(dojo.flash.info.capable == false){
+			return true;
+		}
+
+		// are we on the Mac? Safari needs Flash version 8 to do Flash 8
+		// communication, while Firefox/Mac needs Flash 8 to fix bugs it has
+		// with Flash 6 communication
+		if(dojo.render.os.mac == true && !dojo.flash.info.isVersionOrAbove(8, 0, 0)){
+			return true;
+		}
+
+		// other platforms need at least Flash 6 or above
+		if(!dojo.flash.info.isVersionOrAbove(6, 0, 0)){
+			return true;
+		}
+
+		// otherwise we don't need installation
+		return false;
+	},
+
+	/** Performs installation or revving of the Flash plugin. */
+	install: function(){
+		//dojo.debug("install");
+		// 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
+			// the user to install things
+			var installObj = new dojo.flash.Embed(false);
+			installObj.write(8); // write out HTML for Flash 8 version+
+		}else if(dojo.flash.info.isVersionOrAbove(6, 0, 65)){ // Express Install
+			//dojo.debug("Express install");
+			var installObj = new dojo.flash.Embed(false);
+			installObj.write(8, true); // write out HTML for Flash 8 version+
+			installObj.setVisible(true);
+			installObj.center();
+		}else{ // older Flash install than version 6r65
+			alert("This content requires a more recent version of the Macromedia "
+						+" Flash Player.");
+			window.location.href = "http://www.macromedia.com/go/getflashplayer";
+		}
+	},
+	
+	/** 
+			Called when the Express Install is either finished, failed, or was
+			rejected by the user.
+	*/
+	_onInstallStatus: function(msg){
+		if (msg == "Download.Complete"){
+			// Installation is complete.
+			dojo.flash._initialize();
+		}else if(msg == "Download.Cancelled"){
+			alert("This content requires a more recent version of the Macromedia "
+						+" Flash Player.");
+			window.location.href = "http://www.macromedia.com/go/getflashplayer";
+		}else if (msg == "Download.Failed"){
+			// The end user failed to download the installer due to a network failure
+			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.");
+		}	
+	}
+}
+
+// find out if Flash is installed
+dojo.flash.info = new dojo.flash.Info();
+
+// vim:ts=4:noet:tw=0:
diff --git a/webapp/web/src/flash/flash6/DojoExternalInterface.as b/webapp/web/src/flash/flash6/DojoExternalInterface.as
index a11e3f90d..b8470c55f 100644
--- a/webapp/web/src/flash/flash6/DojoExternalInterface.as
+++ b/webapp/web/src/flash/flash6/DojoExternalInterface.as
@@ -8,207 +8,207 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-/** 
-		An implementation of Flash 8's ExternalInterface that works with Flash 6
-		and which is source-compatible with Flash 8. 
-		
-		@author Brad Neuberg, bkn3@columbia.edu 
-*/
-
-class DojoExternalInterface{
-	public static var available:Boolean;
-	public static var dojoPath = "";
-	
-	public static var _fscommandReady = false;
-	public static var _callbacks = new Array();
-
-	public static function initialize(){ 
-		//getURL("javascript:dojo.debug('FLASH:DojoExternalInterface initialize')");
-		// FIXME: Set available variable by testing for capabilities
-		DojoExternalInterface.available = true;
-		
-		// extract the dojo base path
-		DojoExternalInterface.dojoPath = DojoExternalInterface.getDojoPath();
-		//getURL("javascript:dojo.debug('FLASH:dojoPath="+DojoExternalInterface.dojoPath+"')");
-		
-		// Sometimes, on IE, the fscommand infrastructure can take a few hundred
-		// milliseconds the first time a page loads. Set a timer to keep checking
-		// to make sure we can issue fscommands; otherwise, our calls to fscommand
-		// for setCallback() and loaded() will just "disappear"
-		_root.fscommandReady = false;
-		var fsChecker = function(){
-			// issue a test fscommand
-			fscommand("fscommandReady");
-			
-			// JavaScript should set _root.fscommandReady if it got the call
-			if(_root.fscommandReady == "true"){
-				DojoExternalInterface._fscommandReady = true;
-				clearInterval(_root.fsTimer);
-			}
-		};
-		_root.fsTimer = setInterval(fsChecker, 100);
-	}
-	
-	public static function addCallback(methodName:String, instance:Object, 
-											method:Function) : Boolean{
-		// A variable that indicates whether the call below succeeded
-		_root._succeeded = null;
-		
-		// Callbacks are registered with the JavaScript side as follows.
-		// On the Flash side, we maintain a lookup table that associates
-		// the methodName with the actual instance and method that are
-		// associated with this method.
-		// Using fscommand, we send over the action "addCallback", with the
-		// argument being the methodName to add, such as "foobar".
-		// The JavaScript takes these values and registers the existence of
-		// this callback point.
-		
-		// precede the method name with a _ character in case it starts
-		// with a number
-		_callbacks["_" + methodName] = {_instance: instance, _method: method};
-		_callbacks[_callbacks.length] = methodName;
-		
-		// The API for ExternalInterface says we have to make sure the call
-		// succeeded; check to see if there is a value 
-		// for _succeeded, which is set by the JavaScript side
-		if(_root._succeeded == null){
-			return false;
-		}else{
-			return true;
-		}
-	}
-	
-	public static function call(methodName:String, 
-								resultsCallback:Function) : Void{
-		// FIXME: support full JSON serialization
-		
-		// First, we pack up all of the arguments to this call and set them
-		// as Flash variables, which the JavaScript side will unpack using
-		// plugin.GetVariable(). We set the number of arguments as "_numArgs",
-		// and add each argument as a variable, such as "_1", "_2", etc., starting
-		// from 0.
-		// We then execute an fscommand with the action "call" and the
-		// argument being the method name. JavaScript takes the method name,
-		// retrieves the arguments using GetVariable, executes the method,
-		// and then places the return result in a Flash variable
-		// named "_returnResult".
-		_root._numArgs = arguments.length - 2;
-		for(var i = 2; i < arguments.length; i++){
-			var argIndex = i - 2;
-			_root["_" + argIndex] = arguments[i];
-		}
-		
-		_root._returnResult = undefined;
-		fscommand("call", methodName);
-		
-		// immediately return if the caller is not waiting for return results
-		if(resultsCallback == undefined || resultsCallback == null){
-			return;
-		}
-		
-		// check at regular intervals for return results	
-		var resultsChecker = function(){
-			if(_root._returnResult != undefined){
-				clearInterval(_root._callbackID);
-				resultsCallback.call(null, _root._returnResult);
-			}
-		};	
-		_root._callbackID = setInterval(resultsChecker, 100);
-	}
-	
-	/** 
-			Called by Flash to indicate to JavaScript that we are ready to have
-			our Flash functions called. Calling loaded()
-			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.
-	*/
-	public static function loaded(){
-		//getURL("javascript:dojo.debug('FLASH:loaded')");
-		
-		// one more step: see if fscommands are ready to be executed; if not,
-		// set an interval that will keep running until fscommands are ready;
-		// make sure the gateway is loaded as well
-		var execLoaded = function(){
-			if(DojoExternalInterface._fscommandReady == true){
-				clearInterval(_root.loadedInterval);
-				
-				// initialize the small Flash file that helps gateway JS to Flash
-				// calls
-				DojoExternalInterface._initializeFlashRunner();
-			}	
-		};
-		
-		if(_fscommandReady == true){
-			execLoaded();
-		}else{
-			_root.loadedInterval = setInterval(execLoaded, 50);
-		}
-	}
-	
-	/** 
-			Handles and executes a JavaScript to Flash method call. Used by
-			initializeFlashRunner. 
-	*/
-	public static function _handleJSCall(){
-		// get our parameters
-		var numArgs = parseInt(_root._numArgs);
-		var jsArgs = new Array();
-		for(var i = 0; i < numArgs; i++){
-			var currentValue = _root["_" + i];
-			jsArgs.push(currentValue);
-		}
-		
-		// get our function name
-		var functionName = _root._functionName;
-		
-		// now get the actual instance and method object to execute on,
-		// using our lookup table that was constructed by calls to
-		// addCallback on initialization
-		var instance = _callbacks["_" + functionName]._instance;
-		var method = _callbacks["_" + functionName]._method;
-		
-		// execute it
-		var results = method.apply(instance, jsArgs);
-		
-		// return the results
-		_root._returnResult = results;
-	}
-	
-	/** Called by the flash6_gateway.swf to indicate that it is loaded. */
-	public static function _gatewayReady(){
-		for(var i = 0; i < _callbacks.length; i++){
-			fscommand("addCallback", _callbacks[i]);
-		}
-		call("dojo.flash.loaded");
-	}
-	
-	/** 
-			When JavaScript wants to communicate with Flash it simply sets
-			the Flash variable "_execute" to true; this method creates the
-			internal Movie Clip, called the Flash Runner, that makes this
-			magic happen.
-	*/
-	public static function _initializeFlashRunner(){
-		// figure out where our Flash movie is
-		var swfLoc = DojoExternalInterface.dojoPath + "flash6_gateway.swf";
-		
-		// load our gateway helper file
-		_root.createEmptyMovieClip("_flashRunner", 5000);
-		_root._flashRunner._lockroot = true;
-		_root._flashRunner.loadMovie(swfLoc);
-	}
-	
-	private static function getDojoPath(){
-		var url = _root._url;
-		var start = url.indexOf("baseRelativePath=") + "baseRelativePath=".length;
-		var path = url.substring(start);
-		var end = path.indexOf("&");
-		if(end != -1){
-			path = path.substring(0, end);
-		}
-		return path;
-	}
-}
-
-// vim:ts=4:noet:tw=0:
+/** 
+		An implementation of Flash 8's ExternalInterface that works with Flash 6
+		and which is source-compatible with Flash 8. 
+		
+		@author Brad Neuberg, bkn3@columbia.edu 
+*/
+
+class DojoExternalInterface{
+	public static var available:Boolean;
+	public static var dojoPath = "";
+	
+	public static var _fscommandReady = false;
+	public static var _callbacks = new Array();
+
+	public static function initialize(){ 
+		//getURL("javascript:dojo.debug('FLASH:DojoExternalInterface initialize')");
+		// FIXME: Set available variable by testing for capabilities
+		DojoExternalInterface.available = true;
+		
+		// extract the dojo base path
+		DojoExternalInterface.dojoPath = DojoExternalInterface.getDojoPath();
+		//getURL("javascript:dojo.debug('FLASH:dojoPath="+DojoExternalInterface.dojoPath+"')");
+		
+		// Sometimes, on IE, the fscommand infrastructure can take a few hundred
+		// milliseconds the first time a page loads. Set a timer to keep checking
+		// to make sure we can issue fscommands; otherwise, our calls to fscommand
+		// for setCallback() and loaded() will just "disappear"
+		_root.fscommandReady = false;
+		var fsChecker = function(){
+			// issue a test fscommand
+			fscommand("fscommandReady");
+			
+			// JavaScript should set _root.fscommandReady if it got the call
+			if(_root.fscommandReady == "true"){
+				DojoExternalInterface._fscommandReady = true;
+				clearInterval(_root.fsTimer);
+			}
+		};
+		_root.fsTimer = setInterval(fsChecker, 100);
+	}
+	
+	public static function addCallback(methodName:String, instance:Object, 
+											method:Function) : Boolean{
+		// A variable that indicates whether the call below succeeded
+		_root._succeeded = null;
+		
+		// Callbacks are registered with the JavaScript side as follows.
+		// On the Flash side, we maintain a lookup table that associates
+		// the methodName with the actual instance and method that are
+		// associated with this method.
+		// Using fscommand, we send over the action "addCallback", with the
+		// argument being the methodName to add, such as "foobar".
+		// The JavaScript takes these values and registers the existence of
+		// this callback point.
+		
+		// precede the method name with a _ character in case it starts
+		// with a number
+		_callbacks["_" + methodName] = {_instance: instance, _method: method};
+		_callbacks[_callbacks.length] = methodName;
+		
+		// The API for ExternalInterface says we have to make sure the call
+		// succeeded; check to see if there is a value 
+		// for _succeeded, which is set by the JavaScript side
+		if(_root._succeeded == null){
+			return false;
+		}else{
+			return true;
+		}
+	}
+	
+	public static function call(methodName:String, 
+								resultsCallback:Function) : Void{
+		// FIXME: support full JSON serialization
+		
+		// First, we pack up all of the arguments to this call and set them
+		// as Flash variables, which the JavaScript side will unpack using
+		// plugin.GetVariable(). We set the number of arguments as "_numArgs",
+		// and add each argument as a variable, such as "_1", "_2", etc., starting
+		// from 0.
+		// We then execute an fscommand with the action "call" and the
+		// argument being the method name. JavaScript takes the method name,
+		// retrieves the arguments using GetVariable, executes the method,
+		// and then places the return result in a Flash variable
+		// named "_returnResult".
+		_root._numArgs = arguments.length - 2;
+		for(var i = 2; i < arguments.length; i++){
+			var argIndex = i - 2;
+			_root["_" + argIndex] = arguments[i];
+		}
+		
+		_root._returnResult = undefined;
+		fscommand("call", methodName);
+		
+		// immediately return if the caller is not waiting for return results
+		if(resultsCallback == undefined || resultsCallback == null){
+			return;
+		}
+		
+		// check at regular intervals for return results	
+		var resultsChecker = function(){
+			if(_root._returnResult != undefined){
+				clearInterval(_root._callbackID);
+				resultsCallback.call(null, _root._returnResult);
+			}
+		};	
+		_root._callbackID = setInterval(resultsChecker, 100);
+	}
+	
+	/** 
+			Called by Flash to indicate to JavaScript that we are ready to have
+			our Flash functions called. Calling loaded()
+			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.
+	*/
+	public static function loaded(){
+		//getURL("javascript:dojo.debug('FLASH:loaded')");
+		
+		// one more step: see if fscommands are ready to be executed; if not,
+		// set an interval that will keep running until fscommands are ready;
+		// make sure the gateway is loaded as well
+		var execLoaded = function(){
+			if(DojoExternalInterface._fscommandReady == true){
+				clearInterval(_root.loadedInterval);
+				
+				// initialize the small Flash file that helps gateway JS to Flash
+				// calls
+				DojoExternalInterface._initializeFlashRunner();
+			}	
+		};
+		
+		if(_fscommandReady == true){
+			execLoaded();
+		}else{
+			_root.loadedInterval = setInterval(execLoaded, 50);
+		}
+	}
+	
+	/** 
+			Handles and executes a JavaScript to Flash method call. Used by
+			initializeFlashRunner. 
+	*/
+	public static function _handleJSCall(){
+		// get our parameters
+		var numArgs = parseInt(_root._numArgs);
+		var jsArgs = new Array();
+		for(var i = 0; i < numArgs; i++){
+			var currentValue = _root["_" + i];
+			jsArgs.push(currentValue);
+		}
+		
+		// get our function name
+		var functionName = _root._functionName;
+		
+		// now get the actual instance and method object to execute on,
+		// using our lookup table that was constructed by calls to
+		// addCallback on initialization
+		var instance = _callbacks["_" + functionName]._instance;
+		var method = _callbacks["_" + functionName]._method;
+		
+		// execute it
+		var results = method.apply(instance, jsArgs);
+		
+		// return the results
+		_root._returnResult = results;
+	}
+	
+	/** Called by the flash6_gateway.swf to indicate that it is loaded. */
+	public static function _gatewayReady(){
+		for(var i = 0; i < _callbacks.length; i++){
+			fscommand("addCallback", _callbacks[i]);
+		}
+		call("dojo.flash.loaded");
+	}
+	
+	/** 
+			When JavaScript wants to communicate with Flash it simply sets
+			the Flash variable "_execute" to true; this method creates the
+			internal Movie Clip, called the Flash Runner, that makes this
+			magic happen.
+	*/
+	public static function _initializeFlashRunner(){
+		// figure out where our Flash movie is
+		var swfLoc = DojoExternalInterface.dojoPath + "flash6_gateway.swf";
+		
+		// load our gateway helper file
+		_root.createEmptyMovieClip("_flashRunner", 5000);
+		_root._flashRunner._lockroot = true;
+		_root._flashRunner.loadMovie(swfLoc);
+	}
+	
+	private static function getDojoPath(){
+		var url = _root._url;
+		var start = url.indexOf("baseRelativePath=") + "baseRelativePath=".length;
+		var path = url.substring(start);
+		var end = path.indexOf("&");
+		if(end != -1){
+			path = path.substring(0, end);
+		}
+		return path;
+	}
+}
+
+// vim:ts=4:noet:tw=0:
diff --git a/webapp/web/src/flash/flash8/DojoExternalInterface.as b/webapp/web/src/flash/flash8/DojoExternalInterface.as
index 9e3865dba..af787ef8d 100644
--- a/webapp/web/src/flash/flash8/DojoExternalInterface.as
+++ b/webapp/web/src/flash/flash8/DojoExternalInterface.as
@@ -8,227 +8,227 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-/**
-	A wrapper around Flash 8's ExternalInterface; DojoExternalInterface is needed so that we
-	can do a Flash 6 implementation of ExternalInterface, and be able
-	to support having a single codebase that uses DojoExternalInterface
-	across Flash versions rather than having two seperate source bases,
-	where one uses ExternalInterface and the other uses DojoExternalInterface.
-	
-	DojoExternalInterface class does a variety of optimizations to bypass ExternalInterface's
-	unbelievably bad performance so that we can have good performance
-	on Safari; see the blog post
-	http://codinginparadise.org/weblog/2006/02/how-to-speed-up-flash-8s.html
-	for details.
-	
-	@author Brad Neuberg, bkn3@columbia.edu
-*/
-import flash.external.ExternalInterface;
-
-class DojoExternalInterface{
-	public static var available:Boolean;
-	public static var dojoPath = "";
-	
-	private static var flashMethods:Array = new Array();
-	private static var numArgs:Number;
-	private static var argData:Array;
-	private static var resultData = null;
-	
-	public static function initialize(){
-		// extract the dojo base path
-		DojoExternalInterface.dojoPath = DojoExternalInterface.getDojoPath();
-		
-		// see if we need to do an express install
-		var install:ExpressInstall = new ExpressInstall();
-		if(install.needsUpdate){
-			install.init();
-		}
-		
-		// register our callback functions
-		ExternalInterface.addCallback("startExec", DojoExternalInterface, startExec);
-		ExternalInterface.addCallback("setNumberArguments", DojoExternalInterface,
-																	setNumberArguments);
-		ExternalInterface.addCallback("chunkArgumentData", DojoExternalInterface,
-																	chunkArgumentData);
-		ExternalInterface.addCallback("exec", DojoExternalInterface, exec);
-		ExternalInterface.addCallback("getReturnLength", DojoExternalInterface,
-																	getReturnLength);
-		ExternalInterface.addCallback("chunkReturnData", DojoExternalInterface,
-																	chunkReturnData);
-		ExternalInterface.addCallback("endExec", DojoExternalInterface, endExec);
-		
-		// set whether communication is available
-		DojoExternalInterface.available = ExternalInterface.available;
-		DojoExternalInterface.call("loaded");
-	}
-	
-	public static function addCallback(methodName:String, instance:Object, 
-										 								 method:Function) : Boolean{
-		// register DojoExternalInterface methodName with it's instance
-		DojoExternalInterface.flashMethods[methodName] = instance;
-		
-		// tell JavaScript about DojoExternalInterface new method so we can create a proxy
-		ExternalInterface.call("dojo.flash.comm._addExternalInterfaceCallback", 
-													 methodName);
-													 
-		return true;
-	}
-	
-	public static function call(methodName:String,
-								resultsCallback:Function) : Void{
-		// we might have any number of optional arguments, so we have to 
-		// pass them in dynamically; strip out the results callback
-		var parameters = new Array();
-		for(var i = 0; i < arguments.length; i++){
-			if(i != 1){ // skip the callback
-				parameters.push(arguments[i]);
-			}
-		}
-		
-		var results = ExternalInterface.call.apply(ExternalInterface, parameters);
-		
-		// immediately give the results back, since ExternalInterface is
-		// synchronous
-		if(resultsCallback != null && typeof resultsCallback != "undefined"){
-			resultsCallback.call(null, results);
-		}
-	}
-	
-	/** 
-			Called by Flash to indicate to JavaScript that we are ready to have
-			our Flash functions called. Calling loaded()
-			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.
-	*/
-	public static function loaded(){
-		DojoExternalInterface.call("dojo.flash.loaded");
-	}
-	
-	public static function startExec():Void{
-		DojoExternalInterface.numArgs = null;
-		DojoExternalInterface.argData = null;
-		DojoExternalInterface.resultData = null;
-	}
-	
-	public static function setNumberArguments(numArgs):Void{
-		DojoExternalInterface.numArgs = numArgs;
-		DojoExternalInterface.argData = new Array(DojoExternalInterface.numArgs);
-	}
-	
-	public static function chunkArgumentData(value, argIndex:Number):Void{
-		//getURL("javascript:dojo.debug('FLASH: chunkArgumentData, value="+value+", argIndex="+argIndex+"')");
-		var currentValue = DojoExternalInterface.argData[argIndex];
-		if(currentValue == null || typeof currentValue == "undefined"){
-			DojoExternalInterface.argData[argIndex] = value;
-		}else{
-			DojoExternalInterface.argData[argIndex] += value;
-		}
-	}
-	
-	public static function exec(methodName):Void{
-		// decode all of the arguments that were passed in
-		for(var i = 0; i < DojoExternalInterface.argData.length; i++){
-			DojoExternalInterface.argData[i] = 
-				DojoExternalInterface.decodeData(DojoExternalInterface.argData[i]);
-		}
-		
-		var instance = DojoExternalInterface.flashMethods[methodName];
-		DojoExternalInterface.resultData = instance[methodName].apply(
-																			instance, DojoExternalInterface.argData);
-		// encode the result data
-		DojoExternalInterface.resultData = 
-			DojoExternalInterface.encodeData(DojoExternalInterface.resultData);
-			
-		//getURL("javascript:dojo.debug('FLASH: encoded result data="+DojoExternalInterface.resultData+"')");
-	}
-	
-	public static function getReturnLength():Number{
-	 if(DojoExternalInterface.resultData == null || 
-	 					typeof DojoExternalInterface.resultData == "undefined"){
-	 	return 0;
-	 }
-	 var segments = Math.ceil(DojoExternalInterface.resultData.length / 1024);
-	 return segments;
-	}
-	
-	public static function chunkReturnData(segment:Number):String{
-		var numSegments = DojoExternalInterface.getReturnLength();
-		var startCut = segment * 1024;
-		var endCut = segment * 1024 + 1024;
-		if(segment == (numSegments - 1)){
-			endCut = segment * 1024 + DojoExternalInterface.resultData.length;
-		}
-			
-		var piece = DojoExternalInterface.resultData.substring(startCut, endCut);
-		
-		//getURL("javascript:dojo.debug('FLASH: chunking return piece="+piece+"')");
-		
-		return piece;
-	}
-	
-	public static function endExec():Void{
-	}
-	
-	private static function decodeData(data):String{
-		// we have to use custom encodings for certain characters when passing
-		// them over; for example, passing a backslash over as //// from JavaScript
-		// to Flash doesn't work
-		data = DojoExternalInterface.replaceStr(data, "&custom_backslash;", "\\");
-		
-		data = DojoExternalInterface.replaceStr(data, "\\\'", "\'");
-		data = DojoExternalInterface.replaceStr(data, "\\\"", "\"");
-		
-		return data;
-	}
-	
-	private static function encodeData(data){
-		//getURL("javascript:dojo.debug('inside flash, data before="+data+"')");
-
-		// double encode all entity values, or they will be mis-decoded
-		// by Flash when returned
-		data = DojoExternalInterface.replaceStr(data, "&", "&amp;");
-		
-		// certain XMLish characters break Flash's wire serialization for
-		// ExternalInterface; encode these 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 = DojoExternalInterface.replaceStr(data, '<', '&custom_lt;');
-		data = DojoExternalInterface.replaceStr(data, '>', '&custom_gt;');
-		
-		// encode control characters and JavaScript delimiters
-		data = DojoExternalInterface.replaceStr(data, "\n", "\\n");
-		data = DojoExternalInterface.replaceStr(data, "\r", "\\r");
-		data = DojoExternalInterface.replaceStr(data, "\f", "\\f");
-		data = DojoExternalInterface.replaceStr(data, "'", "\\'");
-		data = DojoExternalInterface.replaceStr(data, '"', '\"');
-		
-		//getURL("javascript:dojo.debug('inside flash, data after="+data+"')");
-		return data;
-	}
-	
-	/** 
-			Flash ActionScript has no String.replace method or support for
-			Regular Expressions! We roll our own very simple one.
-	*/
-	private static function replaceStr(inputStr:String, replaceThis:String, 
-																		 withThis:String):String {
-		var splitStr = inputStr.split(replaceThis)
-		inputStr = splitStr.join(withThis)
-		return inputStr;
-	}
-	
-	private static function getDojoPath(){
-		var url = _root._url;
-		var start = url.indexOf("baseRelativePath=") + "baseRelativePath=".length;
-		var path = url.substring(start);
-		var end = path.indexOf("&");
-		if(end != -1){
-			path = path.substring(0, end);
-		}
-		return path;
-	}
-}
-
-// vim:ts=4:noet:tw=0:
+/**
+	A wrapper around Flash 8's ExternalInterface; DojoExternalInterface is needed so that we
+	can do a Flash 6 implementation of ExternalInterface, and be able
+	to support having a single codebase that uses DojoExternalInterface
+	across Flash versions rather than having two seperate source bases,
+	where one uses ExternalInterface and the other uses DojoExternalInterface.
+	
+	DojoExternalInterface class does a variety of optimizations to bypass ExternalInterface's
+	unbelievably bad performance so that we can have good performance
+	on Safari; see the blog post
+	http://codinginparadise.org/weblog/2006/02/how-to-speed-up-flash-8s.html
+	for details.
+	
+	@author Brad Neuberg, bkn3@columbia.edu
+*/
+import flash.external.ExternalInterface;
+
+class DojoExternalInterface{
+	public static var available:Boolean;
+	public static var dojoPath = "";
+	
+	private static var flashMethods:Array = new Array();
+	private static var numArgs:Number;
+	private static var argData:Array;
+	private static var resultData = null;
+	
+	public static function initialize(){
+		// extract the dojo base path
+		DojoExternalInterface.dojoPath = DojoExternalInterface.getDojoPath();
+		
+		// see if we need to do an express install
+		var install:ExpressInstall = new ExpressInstall();
+		if(install.needsUpdate){
+			install.init();
+		}
+		
+		// register our callback functions
+		ExternalInterface.addCallback("startExec", DojoExternalInterface, startExec);
+		ExternalInterface.addCallback("setNumberArguments", DojoExternalInterface,
+																	setNumberArguments);
+		ExternalInterface.addCallback("chunkArgumentData", DojoExternalInterface,
+																	chunkArgumentData);
+		ExternalInterface.addCallback("exec", DojoExternalInterface, exec);
+		ExternalInterface.addCallback("getReturnLength", DojoExternalInterface,
+																	getReturnLength);
+		ExternalInterface.addCallback("chunkReturnData", DojoExternalInterface,
+																	chunkReturnData);
+		ExternalInterface.addCallback("endExec", DojoExternalInterface, endExec);
+		
+		// set whether communication is available
+		DojoExternalInterface.available = ExternalInterface.available;
+		DojoExternalInterface.call("loaded");
+	}
+	
+	public static function addCallback(methodName:String, instance:Object, 
+										 								 method:Function) : Boolean{
+		// register DojoExternalInterface methodName with it's instance
+		DojoExternalInterface.flashMethods[methodName] = instance;
+		
+		// tell JavaScript about DojoExternalInterface new method so we can create a proxy
+		ExternalInterface.call("dojo.flash.comm._addExternalInterfaceCallback", 
+													 methodName);
+													 
+		return true;
+	}
+	
+	public static function call(methodName:String,
+								resultsCallback:Function) : Void{
+		// we might have any number of optional arguments, so we have to 
+		// pass them in dynamically; strip out the results callback
+		var parameters = new Array();
+		for(var i = 0; i < arguments.length; i++){
+			if(i != 1){ // skip the callback
+				parameters.push(arguments[i]);
+			}
+		}
+		
+		var results = ExternalInterface.call.apply(ExternalInterface, parameters);
+		
+		// immediately give the results back, since ExternalInterface is
+		// synchronous
+		if(resultsCallback != null && typeof resultsCallback != "undefined"){
+			resultsCallback.call(null, results);
+		}
+	}
+	
+	/** 
+			Called by Flash to indicate to JavaScript that we are ready to have
+			our Flash functions called. Calling loaded()
+			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.
+	*/
+	public static function loaded(){
+		DojoExternalInterface.call("dojo.flash.loaded");
+	}
+	
+	public static function startExec():Void{
+		DojoExternalInterface.numArgs = null;
+		DojoExternalInterface.argData = null;
+		DojoExternalInterface.resultData = null;
+	}
+	
+	public static function setNumberArguments(numArgs):Void{
+		DojoExternalInterface.numArgs = numArgs;
+		DojoExternalInterface.argData = new Array(DojoExternalInterface.numArgs);
+	}
+	
+	public static function chunkArgumentData(value, argIndex:Number):Void{
+		//getURL("javascript:dojo.debug('FLASH: chunkArgumentData, value="+value+", argIndex="+argIndex+"')");
+		var currentValue = DojoExternalInterface.argData[argIndex];
+		if(currentValue == null || typeof currentValue == "undefined"){
+			DojoExternalInterface.argData[argIndex] = value;
+		}else{
+			DojoExternalInterface.argData[argIndex] += value;
+		}
+	}
+	
+	public static function exec(methodName):Void{
+		// decode all of the arguments that were passed in
+		for(var i = 0; i < DojoExternalInterface.argData.length; i++){
+			DojoExternalInterface.argData[i] = 
+				DojoExternalInterface.decodeData(DojoExternalInterface.argData[i]);
+		}
+		
+		var instance = DojoExternalInterface.flashMethods[methodName];
+		DojoExternalInterface.resultData = instance[methodName].apply(
+																			instance, DojoExternalInterface.argData);
+		// encode the result data
+		DojoExternalInterface.resultData = 
+			DojoExternalInterface.encodeData(DojoExternalInterface.resultData);
+			
+		//getURL("javascript:dojo.debug('FLASH: encoded result data="+DojoExternalInterface.resultData+"')");
+	}
+	
+	public static function getReturnLength():Number{
+	 if(DojoExternalInterface.resultData == null || 
+	 					typeof DojoExternalInterface.resultData == "undefined"){
+	 	return 0;
+	 }
+	 var segments = Math.ceil(DojoExternalInterface.resultData.length / 1024);
+	 return segments;
+	}
+	
+	public static function chunkReturnData(segment:Number):String{
+		var numSegments = DojoExternalInterface.getReturnLength();
+		var startCut = segment * 1024;
+		var endCut = segment * 1024 + 1024;
+		if(segment == (numSegments - 1)){
+			endCut = segment * 1024 + DojoExternalInterface.resultData.length;
+		}
+			
+		var piece = DojoExternalInterface.resultData.substring(startCut, endCut);
+		
+		//getURL("javascript:dojo.debug('FLASH: chunking return piece="+piece+"')");
+		
+		return piece;
+	}
+	
+	public static function endExec():Void{
+	}
+	
+	private static function decodeData(data):String{
+		// we have to use custom encodings for certain characters when passing
+		// them over; for example, passing a backslash over as //// from JavaScript
+		// to Flash doesn't work
+		data = DojoExternalInterface.replaceStr(data, "&custom_backslash;", "\\");
+		
+		data = DojoExternalInterface.replaceStr(data, "\\\'", "\'");
+		data = DojoExternalInterface.replaceStr(data, "\\\"", "\"");
+		
+		return data;
+	}
+	
+	private static function encodeData(data){
+		//getURL("javascript:dojo.debug('inside flash, data before="+data+"')");
+
+		// double encode all entity values, or they will be mis-decoded
+		// by Flash when returned
+		data = DojoExternalInterface.replaceStr(data, "&", "&amp;");
+		
+		// certain XMLish characters break Flash's wire serialization for
+		// ExternalInterface; encode these 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 = DojoExternalInterface.replaceStr(data, '<', '&custom_lt;');
+		data = DojoExternalInterface.replaceStr(data, '>', '&custom_gt;');
+		
+		// encode control characters and JavaScript delimiters
+		data = DojoExternalInterface.replaceStr(data, "\n", "\\n");
+		data = DojoExternalInterface.replaceStr(data, "\r", "\\r");
+		data = DojoExternalInterface.replaceStr(data, "\f", "\\f");
+		data = DojoExternalInterface.replaceStr(data, "'", "\\'");
+		data = DojoExternalInterface.replaceStr(data, '"', '\"');
+		
+		//getURL("javascript:dojo.debug('inside flash, data after="+data+"')");
+		return data;
+	}
+	
+	/** 
+			Flash ActionScript has no String.replace method or support for
+			Regular Expressions! We roll our own very simple one.
+	*/
+	private static function replaceStr(inputStr:String, replaceThis:String, 
+																		 withThis:String):String {
+		var splitStr = inputStr.split(replaceThis)
+		inputStr = splitStr.join(withThis)
+		return inputStr;
+	}
+	
+	private static function getDojoPath(){
+		var url = _root._url;
+		var start = url.indexOf("baseRelativePath=") + "baseRelativePath=".length;
+		var path = url.substring(start);
+		var end = path.indexOf("&");
+		if(end != -1){
+			path = path.substring(0, end);
+		}
+		return path;
+	}
+}
+
+// vim:ts=4:noet:tw=0:
diff --git a/webapp/web/src/flash/flash8/ExpressInstall.as b/webapp/web/src/flash/flash8/ExpressInstall.as
index 5f823b752..e05458214 100644
--- a/webapp/web/src/flash/flash8/ExpressInstall.as
+++ b/webapp/web/src/flash/flash8/ExpressInstall.as
@@ -8,74 +8,74 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-/**
- * Based on the expressinstall.as class created by Geoff Stearns as part
- * of the FlashObject library.
- *
- * Use this file to invoke the Macromedia Flash Player Express Install functionality
- * This file is intended for use with the FlashObject embed script. You can download FlashObject 
- * and this file at the following URL: http://blog.deconcept.com/flashobject/
- *
- * Usage: 
- *          var ExpressInstall = new ExpressInstall();
- *          
- *          // test to see if install is needed:
- *          if (ExpressInstall.needsUpdate) { // returns true if update is needed
- *              ExpressInstall.init(); // starts the update
- *          }
- *
- *	NOTE: Your Flash movie must be at least 214px by 137px in order to use ExpressInstall.
- *
- */
-
-class ExpressInstall {
-	public var needsUpdate:Boolean;
-	private var updater:MovieClip;
-	private var hold:MovieClip;
-	
-	public function ExpressInstall(){
-		// does the user need to update?
-		this.needsUpdate = (_root.MMplayerType == undefined) ? false : true;	
-	}
-
-	public function init():Void{
-		this.loadUpdater();
-	}
-
-	public function loadUpdater():Void {
-		System.security.allowDomain("fpdownload.macromedia.com");
-
-		// hope that nothing is at a depth of 10000000, you can change this depth if needed, but you want
-		// it to be on top of your content if you have any stuff on the first frame
-		this.updater = _root.createEmptyMovieClip("expressInstallHolder", 10000000);
-
-		// register the callback so we know if they cancel or there is an error
-		var _self = this;
-		this.updater.installStatus = _self.onInstallStatus;
-		this.hold = this.updater.createEmptyMovieClip("hold", 1);
-
-		// can't use movieClipLoader because it has to work in 6.0.65
-		this.updater.onEnterFrame = function():Void {
-			if(typeof this.hold.startUpdate == 'function'){
-				_self.initUpdater();
-				this.onEnterFrame = null;
-			}
-		}
-
-		var cacheBuster:Number = Math.random();
-
-		this.hold.loadMovie("http://fpdownload.macromedia.com/pub/flashplayer/"
-												+"update/current/swf/autoUpdater.swf?"+ cacheBuster);
-	}
-
-	private function initUpdater():Void{
-		this.hold.redirectURL = _root.MMredirectURL;
-		this.hold.MMplayerType = _root.MMplayerType;
-		this.hold.MMdoctitle = _root.MMdoctitle;
-		this.hold.startUpdate();
-	}
-
-	public function onInstallStatus(msg):Void{
-		getURL("javascript:dojo.flash.install._onInstallStatus('"+msg+"')");
-	}
-}
+/**
+ * Based on the expressinstall.as class created by Geoff Stearns as part
+ * of the FlashObject library.
+ *
+ * Use this file to invoke the Macromedia Flash Player Express Install functionality
+ * This file is intended for use with the FlashObject embed script. You can download FlashObject 
+ * and this file at the following URL: http://blog.deconcept.com/flashobject/
+ *
+ * Usage: 
+ *          var ExpressInstall = new ExpressInstall();
+ *          
+ *          // test to see if install is needed:
+ *          if (ExpressInstall.needsUpdate) { // returns true if update is needed
+ *              ExpressInstall.init(); // starts the update
+ *          }
+ *
+ *	NOTE: Your Flash movie must be at least 214px by 137px in order to use ExpressInstall.
+ *
+ */
+
+class ExpressInstall {
+	public var needsUpdate:Boolean;
+	private var updater:MovieClip;
+	private var hold:MovieClip;
+	
+	public function ExpressInstall(){
+		// does the user need to update?
+		this.needsUpdate = (_root.MMplayerType == undefined) ? false : true;	
+	}
+
+	public function init():Void{
+		this.loadUpdater();
+	}
+
+	public function loadUpdater():Void {
+		System.security.allowDomain("fpdownload.macromedia.com");
+
+		// hope that nothing is at a depth of 10000000, you can change this depth if needed, but you want
+		// it to be on top of your content if you have any stuff on the first frame
+		this.updater = _root.createEmptyMovieClip("expressInstallHolder", 10000000);
+
+		// register the callback so we know if they cancel or there is an error
+		var _self = this;
+		this.updater.installStatus = _self.onInstallStatus;
+		this.hold = this.updater.createEmptyMovieClip("hold", 1);
+
+		// can't use movieClipLoader because it has to work in 6.0.65
+		this.updater.onEnterFrame = function():Void {
+			if(typeof this.hold.startUpdate == 'function'){
+				_self.initUpdater();
+				this.onEnterFrame = null;
+			}
+		}
+
+		var cacheBuster:Number = Math.random();
+
+		this.hold.loadMovie("http://fpdownload.macromedia.com/pub/flashplayer/"
+												+"update/current/swf/autoUpdater.swf?"+ cacheBuster);
+	}
+
+	private function initUpdater():Void{
+		this.hold.redirectURL = _root.MMredirectURL;
+		this.hold.MMplayerType = _root.MMplayerType;
+		this.hold.MMdoctitle = _root.MMdoctitle;
+		this.hold.startUpdate();
+	}
+
+	public function onInstallStatus(msg):Void{
+		getURL("javascript:dojo.flash.install._onInstallStatus('"+msg+"')");
+	}
+}
diff --git a/webapp/web/src/html/layout.js b/webapp/web/src/html/layout.js
index cb96e8d43..181e50074 100644
--- a/webapp/web/src/html/layout.js
+++ b/webapp/web/src/html/layout.js
@@ -8,114 +8,114 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.html.layout");
-
-dojo.require("dojo.lang");
-dojo.require("dojo.string");
-dojo.require("dojo.style");
-dojo.require("dojo.html");
-
-/**
- * Layout a bunch of child dom nodes within a parent dom node
- * Input is an array of objects like:
- * @ container - parent node
- * @ layoutPriority - "top-bottom" or "left-right"
- * @ children an array like [ {domNode: foo, layoutAlign: "bottom" }, {domNode: bar, layoutAlign: "client"} ]
- */
-dojo.html.layout = function(container, children, layoutPriority) {
-	dojo.html.addClass(container, "dojoLayoutContainer");
-
-	// Copy children array and remove elements w/out layout.
-	// Also record each child's position in the input array, for sorting purposes.
-	children = dojo.lang.filter(children, function(child, idx){
-		child.idx = idx;
-		return dojo.lang.inArray(["top","bottom","left","right","client","flood"], child.layoutAlign)
-	});
-
-	// Order the children according to layoutPriority.
-	// Multiple children w/the same layoutPriority will be sorted by their position in the input array.
-	if(layoutPriority && layoutPriority!="none"){
-		var rank = function(child){
-			switch(child.layoutAlign){
-				case "flood":
-					return 1;
-				case "left":
-				case "right":
-					return (layoutPriority=="left-right") ? 2 : 3;
-				case "top":
-				case "bottom":
-					return (layoutPriority=="left-right") ? 3 : 2;
-				default:
-					return 4;
-			}
-		};
-		children.sort(function(a,b){
-			return (rank(a)-rank(b)) || (a.idx - b.idx);
-		});
-	}
-
-	// remaining space (blank area where nothing has been written)
-	var f={
-		top: dojo.style.getPixelValue(container, "padding-top", true),
-		left: dojo.style.getPixelValue(container, "padding-left", true),
-		height: dojo.style.getContentHeight(container),
-		width: dojo.style.getContentWidth(container)
-	};
-
-	// set positions/sizes
-	dojo.lang.forEach(children, function(child){
-		var elm=child.domNode;
-		var pos=child.layoutAlign;
-		// set elem to upper left corner of unused space; may move it later
-		with(elm.style){
-			left = f.left+"px";
-			top = f.top+"px";
-			bottom = "auto";
-			right = "auto";
-		}
-		dojo.html.addClass(elm, "dojoAlign" + dojo.string.capitalize(pos));
-
-		// set size && adjust record of remaining space.
-		// note that setting the width of a <div> may affect it's height.
-		// TODO: same is true for widgets but need to implement API to support that
-		if ( (pos=="top")||(pos=="bottom") ) {
-			dojo.style.setOuterWidth(elm, f.width);
-			var h = dojo.style.getOuterHeight(elm);
-			f.height -= h;
-			if(pos=="top"){
-				f.top += h;
-			}else{
-				elm.style.top = f.top + f.height + "px";
-			}
-		}else if(pos=="left" || pos=="right"){
-			dojo.style.setOuterHeight(elm, f.height);
-			var w = dojo.style.getOuterWidth(elm);
-			f.width -= w;
-			if(pos=="left"){
-				f.left += w;
-			}else{
-				elm.style.left = f.left + f.width + "px";
-			}
-		} else if(pos=="flood" || pos=="client"){
-			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.)
-		if(child.onResized){
-			child.onResized();
-		}
-	});
-};
-
-// This is essential CSS to make layout work (it isn't "styling" CSS)
-// make sure that the position:absolute in dojoAlign* overrides other classes
-dojo.style.insertCssText(
-	".dojoLayoutContainer{ position: relative; display: block; }\n" +
-	"body .dojoAlignTop, body .dojoAlignBottom, body .dojoAlignLeft, body .dojoAlignRight { position: absolute; overflow: hidden; }\n" +
-	"body .dojoAlignClient { position: absolute }\n" +
-	".dojoAlignClient { overflow: auto; }\n"
-);
-
+dojo.provide("dojo.html.layout");
+
+dojo.require("dojo.lang");
+dojo.require("dojo.string");
+dojo.require("dojo.style");
+dojo.require("dojo.html");
+
+/**
+ * Layout a bunch of child dom nodes within a parent dom node
+ * Input is an array of objects like:
+ * @ container - parent node
+ * @ layoutPriority - "top-bottom" or "left-right"
+ * @ children an array like [ {domNode: foo, layoutAlign: "bottom" }, {domNode: bar, layoutAlign: "client"} ]
+ */
+dojo.html.layout = function(container, children, layoutPriority) {
+	dojo.html.addClass(container, "dojoLayoutContainer");
+
+	// Copy children array and remove elements w/out layout.
+	// Also record each child's position in the input array, for sorting purposes.
+	children = dojo.lang.filter(children, function(child, idx){
+		child.idx = idx;
+		return dojo.lang.inArray(["top","bottom","left","right","client","flood"], child.layoutAlign)
+	});
+
+	// Order the children according to layoutPriority.
+	// Multiple children w/the same layoutPriority will be sorted by their position in the input array.
+	if(layoutPriority && layoutPriority!="none"){
+		var rank = function(child){
+			switch(child.layoutAlign){
+				case "flood":
+					return 1;
+				case "left":
+				case "right":
+					return (layoutPriority=="left-right") ? 2 : 3;
+				case "top":
+				case "bottom":
+					return (layoutPriority=="left-right") ? 3 : 2;
+				default:
+					return 4;
+			}
+		};
+		children.sort(function(a,b){
+			return (rank(a)-rank(b)) || (a.idx - b.idx);
+		});
+	}
+
+	// remaining space (blank area where nothing has been written)
+	var f={
+		top: dojo.style.getPixelValue(container, "padding-top", true),
+		left: dojo.style.getPixelValue(container, "padding-left", true),
+		height: dojo.style.getContentHeight(container),
+		width: dojo.style.getContentWidth(container)
+	};
+
+	// set positions/sizes
+	dojo.lang.forEach(children, function(child){
+		var elm=child.domNode;
+		var pos=child.layoutAlign;
+		// set elem to upper left corner of unused space; may move it later
+		with(elm.style){
+			left = f.left+"px";
+			top = f.top+"px";
+			bottom = "auto";
+			right = "auto";
+		}
+		dojo.html.addClass(elm, "dojoAlign" + dojo.string.capitalize(pos));
+
+		// set size && adjust record of remaining space.
+		// note that setting the width of a <div> may affect it's height.
+		// TODO: same is true for widgets but need to implement API to support that
+		if ( (pos=="top")||(pos=="bottom") ) {
+			dojo.style.setOuterWidth(elm, f.width);
+			var h = dojo.style.getOuterHeight(elm);
+			f.height -= h;
+			if(pos=="top"){
+				f.top += h;
+			}else{
+				elm.style.top = f.top + f.height + "px";
+			}
+		}else if(pos=="left" || pos=="right"){
+			dojo.style.setOuterHeight(elm, f.height);
+			var w = dojo.style.getOuterWidth(elm);
+			f.width -= w;
+			if(pos=="left"){
+				f.left += w;
+			}else{
+				elm.style.left = f.left + f.width + "px";
+			}
+		} else if(pos=="flood" || pos=="client"){
+			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.)
+		if(child.onResized){
+			child.onResized();
+		}
+	});
+};
+
+// This is essential CSS to make layout work (it isn't "styling" CSS)
+// make sure that the position:absolute in dojoAlign* overrides other classes
+dojo.style.insertCssText(
+	".dojoLayoutContainer{ position: relative; display: block; }\n" +
+	"body .dojoAlignTop, body .dojoAlignBottom, body .dojoAlignLeft, body .dojoAlignRight { position: absolute; overflow: hidden; }\n" +
+	"body .dojoAlignClient { position: absolute }\n" +
+	".dojoAlignClient { overflow: auto; }\n"
+);
+
diff --git a/webapp/web/src/html/shadow.js b/webapp/web/src/html/shadow.js
index 051fc3092..abb99cdf2 100644
--- a/webapp/web/src/html/shadow.js
+++ b/webapp/web/src/html/shadow.js
@@ -8,72 +8,72 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.html.shadow");
-
-dojo.require("dojo.lang");
-dojo.require("dojo.uri");
-
-dojo.html.shadow = function(node) {
-	this.init(node);
-}
-
-dojo.lang.extend(dojo.html.shadow, {
-
-	shadowPng: dojo.uri.dojoUri("src/html/images/shadow"),
-	shadowThickness: 8,
-	shadowOffset: 15,
-
-	init: function(node){
-		this.node=node;
-
-		// make all the pieces of the shadow, and position/size them as much
-		// as possible (but a lot of the coordinates are set in sizeShadow
-		this.pieces={};
-		var x1 = -1 * this.shadowThickness;
-		var y0 = this.shadowOffset;
-		var y1 = this.shadowOffset + this.shadowThickness;
-		this._makePiece("tl", "top", y0, "left", x1);
-		this._makePiece("l", "top", y1, "left", x1, "scale");
-		this._makePiece("tr", "top", y0, "left", 0);
-		this._makePiece("r", "top", y1, "left", 0, "scale");
-		this._makePiece("bl", "top", 0, "left", x1);
-		this._makePiece("b", "top", 0, "left", 0, "crop");
-		this._makePiece("br", "top", 0, "left", 0);
-	},
-
-	_makePiece: function(name, vertAttach, vertCoord, horzAttach, horzCoord, sizing){
-		var img;
-		var url = this.shadowPng + name.toUpperCase() + ".png";
-		if(dojo.render.html.ie){
-			img=document.createElement("div");
-			img.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+url+"'"+
-			(sizing?", sizingMethod='"+sizing+"'":"") + ")";
-		}else{
-			img=document.createElement("img");
-			img.src=url;
-		}
-		img.style.position="absolute";
-		img.style[vertAttach]=vertCoord+"px";
-		img.style[horzAttach]=horzCoord+"px";
-		img.style.width=this.shadowThickness+"px";
-		img.style.height=this.shadowThickness+"px";
-		this.pieces[name]=img;
-		this.node.appendChild(img);
-	},
-
-	size: function(width, height){
-		var sideHeight = height - (this.shadowOffset+this.shadowThickness+1);
-		with(this.pieces){
-			l.style.height = sideHeight+"px";
-			r.style.height = sideHeight+"px";
-			b.style.width = (width-1)+"px";
-			bl.style.top = (height-1)+"px";
-			b.style.top = (height-1)+"px";
-			br.style.top = (height-1)+"px";
-			tr.style.left = (width-1)+"px";
-			r.style.left = (width-1)+"px";
-			br.style.left = (width-1)+"px";
-		}
-	}
-});
-
+dojo.provide("dojo.html.shadow");
+
+dojo.require("dojo.lang");
+dojo.require("dojo.uri");
+
+dojo.html.shadow = function(node) {
+	this.init(node);
+}
+
+dojo.lang.extend(dojo.html.shadow, {
+
+	shadowPng: dojo.uri.dojoUri("src/html/images/shadow"),
+	shadowThickness: 8,
+	shadowOffset: 15,
+
+	init: function(node){
+		this.node=node;
+
+		// make all the pieces of the shadow, and position/size them as much
+		// as possible (but a lot of the coordinates are set in sizeShadow
+		this.pieces={};
+		var x1 = -1 * this.shadowThickness;
+		var y0 = this.shadowOffset;
+		var y1 = this.shadowOffset + this.shadowThickness;
+		this._makePiece("tl", "top", y0, "left", x1);
+		this._makePiece("l", "top", y1, "left", x1, "scale");
+		this._makePiece("tr", "top", y0, "left", 0);
+		this._makePiece("r", "top", y1, "left", 0, "scale");
+		this._makePiece("bl", "top", 0, "left", x1);
+		this._makePiece("b", "top", 0, "left", 0, "crop");
+		this._makePiece("br", "top", 0, "left", 0);
+	},
+
+	_makePiece: function(name, vertAttach, vertCoord, horzAttach, horzCoord, sizing){
+		var img;
+		var url = this.shadowPng + name.toUpperCase() + ".png";
+		if(dojo.render.html.ie){
+			img=document.createElement("div");
+			img.style.filter="progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+url+"'"+
+			(sizing?", sizingMethod='"+sizing+"'":"") + ")";
+		}else{
+			img=document.createElement("img");
+			img.src=url;
+		}
+		img.style.position="absolute";
+		img.style[vertAttach]=vertCoord+"px";
+		img.style[horzAttach]=horzCoord+"px";
+		img.style.width=this.shadowThickness+"px";
+		img.style.height=this.shadowThickness+"px";
+		this.pieces[name]=img;
+		this.node.appendChild(img);
+	},
+
+	size: function(width, height){
+		var sideHeight = height - (this.shadowOffset+this.shadowThickness+1);
+		with(this.pieces){
+			l.style.height = sideHeight+"px";
+			r.style.height = sideHeight+"px";
+			b.style.width = (width-1)+"px";
+			bl.style.top = (height-1)+"px";
+			b.style.top = (height-1)+"px";
+			br.style.top = (height-1)+"px";
+			tr.style.left = (width-1)+"px";
+			r.style.left = (width-1)+"px";
+			br.style.left = (width-1)+"px";
+		}
+	}
+});
+
diff --git a/webapp/web/src/widget/AccordionContainer.js b/webapp/web/src/widget/AccordionContainer.js
index 28428106f..4431427b4 100644
--- a/webapp/web/src/widget/AccordionContainer.js
+++ b/webapp/web/src/widget/AccordionContainer.js
@@ -8,64 +8,64 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.AccordionContainer");
-
-dojo.require("dojo.widget.*");
-dojo.require("dojo.widget.AccordionPane");
-
-dojo.widget.defineWidget(
-	"dojo.widget.AccordionContainer",
-	dojo.widget.HtmlWidget,
-	{
-		widgetType: "AccordionContainer",
-		isContainer: true,
-		labelNodeClass: "",
-		containerNodeClass: "",
-		allowCollapse: false,
-
-		addChild: function(widget, overrideContainerNode, pos, ref, insertIndex){
-			if (widget.widgetType != "AccordionPane") {
-				var wrapper=dojo.widget.createWidget("AccordionPane",{label: widget.label, open: widget.open, labelNodeClass: this.labelNodeClass, containerNodeClass: this.containerNodeClass, allowCollapse: this.allowCollapse });
-				wrapper.addChild(widget);
-				this.addWidgetAsDirectChild(wrapper);
-				this.registerChild(wrapper);
-				wrapper.setSizes();
-				return wrapper;
-			} else {
-				dojo.html.addClass(widget.containerNode, this.containerNodeClass);
-				dojo.html.addClass(widget.labelNode, this.labelNodeClass);
-				this.addWidgetAsDirectChild(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();
-		}
-	}
-);
-
-// These arguments can be specified for the children of a Accordion
-// Since any widget can be specified as a child, mix them
-// into the base widget class.  (This is a hack, but it's effective.)
-dojo.lang.extend(dojo.widget.Widget, {
-	label: "",
-	open: false
-});
-
+dojo.provide("dojo.widget.AccordionContainer");
+
+dojo.require("dojo.widget.*");
+dojo.require("dojo.widget.AccordionPane");
+
+dojo.widget.defineWidget(
+	"dojo.widget.AccordionContainer",
+	dojo.widget.HtmlWidget,
+	{
+		widgetType: "AccordionContainer",
+		isContainer: true,
+		labelNodeClass: "",
+		containerNodeClass: "",
+		allowCollapse: false,
+
+		addChild: function(widget, overrideContainerNode, pos, ref, insertIndex){
+			if (widget.widgetType != "AccordionPane") {
+				var wrapper=dojo.widget.createWidget("AccordionPane",{label: widget.label, open: widget.open, labelNodeClass: this.labelNodeClass, containerNodeClass: this.containerNodeClass, allowCollapse: this.allowCollapse });
+				wrapper.addChild(widget);
+				this.addWidgetAsDirectChild(wrapper);
+				this.registerChild(wrapper);
+				wrapper.setSizes();
+				return wrapper;
+			} else {
+				dojo.html.addClass(widget.containerNode, this.containerNodeClass);
+				dojo.html.addClass(widget.labelNode, this.labelNodeClass);
+				this.addWidgetAsDirectChild(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();
+		}
+	}
+);
+
+// These arguments can be specified for the children of a Accordion
+// Since any widget can be specified as a child, mix them
+// into the base widget class.  (This is a hack, but it's effective.)
+dojo.lang.extend(dojo.widget.Widget, {
+	label: "",
+	open: false
+});
+
diff --git a/webapp/web/src/widget/Button2.js b/webapp/web/src/widget/Button2.js
index 4bffcf183..5f7051f6c 100644
--- a/webapp/web/src/widget/Button2.js
+++ b/webapp/web/src/widget/Button2.js
@@ -8,26 +8,26 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.Button2");
-dojo.require("dojo.widget.Button");
-dojo.require("dojo.widget.*");
-
-dojo.widget.tags.addParseTreeHandler("dojo:button2");
-dojo.widget.tags.addParseTreeHandler("dojo:dropdownbutton2");
-dojo.widget.tags.addParseTreeHandler("dojo:combobutton2");
-
-dojo.deprecated("dojo.widget.Button2", "Use dojo.widget.Button instead", "0.4");
-
-dojo.requireAfterIf("html", "dojo.widget.html.Button2");
-
-dojo.widget.Button2 = function(){}
-dojo.inherits(dojo.widget.Button2, dojo.widget.Button);
-dojo.lang.extend(dojo.widget.Button2, { widgetType: "Button2" });
-
-dojo.widget.DropDownButton2 = function(){}
-dojo.inherits(dojo.widget.DropDownButton2, dojo.widget.DropDownButton);
-dojo.lang.extend(dojo.widget.DropDownButton2, { widgetType: "DropDownButton2" });
-
-dojo.widget.ComboButton2 = function(){}
-dojo.inherits(dojo.widget.ComboButton2, dojo.widget.ComboButton);
-dojo.lang.extend(dojo.widget.ComboButton2, { widgetType: "ComboButton2" });
+dojo.provide("dojo.widget.Button2");
+dojo.require("dojo.widget.Button");
+dojo.require("dojo.widget.*");
+
+dojo.widget.tags.addParseTreeHandler("dojo:button2");
+dojo.widget.tags.addParseTreeHandler("dojo:dropdownbutton2");
+dojo.widget.tags.addParseTreeHandler("dojo:combobutton2");
+
+dojo.deprecated("dojo.widget.Button2", "Use dojo.widget.Button instead", "0.4");
+
+dojo.requireAfterIf("html", "dojo.widget.html.Button2");
+
+dojo.widget.Button2 = function(){}
+dojo.inherits(dojo.widget.Button2, dojo.widget.Button);
+dojo.lang.extend(dojo.widget.Button2, { widgetType: "Button2" });
+
+dojo.widget.DropDownButton2 = function(){}
+dojo.inherits(dojo.widget.DropDownButton2, dojo.widget.DropDownButton);
+dojo.lang.extend(dojo.widget.DropDownButton2, { widgetType: "DropDownButton2" });
+
+dojo.widget.ComboButton2 = function(){}
+dojo.inherits(dojo.widget.ComboButton2, dojo.widget.ComboButton);
+dojo.lang.extend(dojo.widget.ComboButton2, { widgetType: "ComboButton2" });
diff --git a/webapp/web/src/widget/DebugConsole.js b/webapp/web/src/widget/DebugConsole.js
index 4255d5843..39155efd2 100644
--- a/webapp/web/src/widget/DebugConsole.js
+++ b/webapp/web/src/widget/DebugConsole.js
@@ -8,15 +8,15 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.DebugConsole");
-dojo.require("dojo.widget.Widget");
-
-dojo.widget.DebugConsole= function(){
-	dojo.widget.Widget.call(this);
-
-	this.widgetType = "DebugConsole";
-	this.isContainer = true;
-}
-dojo.inherits(dojo.widget.DebugConsole, dojo.widget.Widget);
-dojo.widget.tags.addParseTreeHandler("dojo:debugconsole");
-dojo.requireAfterIf("html", "dojo.widget.html.DebugConsole");
+dojo.provide("dojo.widget.DebugConsole");
+dojo.require("dojo.widget.Widget");
+
+dojo.widget.DebugConsole= function(){
+	dojo.widget.Widget.call(this);
+
+	this.widgetType = "DebugConsole";
+	this.isContainer = true;
+}
+dojo.inherits(dojo.widget.DebugConsole, dojo.widget.Widget);
+dojo.widget.tags.addParseTreeHandler("dojo:debugconsole");
+dojo.requireAfterIf("html", "dojo.widget.html.DebugConsole");
diff --git a/webapp/web/src/widget/FloatingPane.js b/webapp/web/src/widget/FloatingPane.js
index c1e0a523e..c207aa52c 100644
--- a/webapp/web/src/widget/FloatingPane.js
+++ b/webapp/web/src/widget/FloatingPane.js
@@ -8,298 +8,298 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.FloatingPane");
-dojo.provide("dojo.widget.html.FloatingPane");
-
-//
-// this widget provides a window-like floating pane
-//
-
-dojo.require("dojo.widget.*");
-dojo.require("dojo.widget.Manager");
-dojo.require("dojo.html");
-dojo.require("dojo.html.shadow");
-dojo.require("dojo.style");
-dojo.require("dojo.dom");
-dojo.require("dojo.html.layout");
-dojo.require("dojo.widget.ContentPane");
-dojo.require("dojo.dnd.HtmlDragMove");
-dojo.require("dojo.dnd.HtmlDragMoveSource");
-dojo.require("dojo.dnd.HtmlDragMoveObject");
-dojo.require("dojo.widget.ResizeHandle");
-
-dojo.widget.html.FloatingPane = function(){
-	dojo.widget.html.ContentPane.call(this);
-}
-
-dojo.inherits(dojo.widget.html.FloatingPane, dojo.widget.html.ContentPane);
-
-dojo.lang.extend(dojo.widget.html.FloatingPane, {
-	widgetType: "FloatingPane",
-
-	// Constructor arguments
-	title: '',
-	iconSrc: '',
-	hasShadow: false,
-	constrainToContainer: false,
-	taskBarId: "",
-	resizable: true,
-	titleBarDisplay: "fancy",
-
-	windowState: "normal",
-	displayCloseAction: false,
-	displayMinimizeAction: false,
-	displayMaximizeAction: false,
-
-	maxTaskBarConnectAttempts: 5,
-	taskBarConnectAttempts: 0,
-
-	templatePath: dojo.uri.dojoUri("src/widget/templates/HtmlFloatingPane.html"),
-	templateCssPath: dojo.uri.dojoUri("src/widget/templates/HtmlFloatingPane.css"),
-
-	drag: null,
-
-	fillInTemplate: function(args, frag){
-		// Copy style info from input node to output node
-		var source = this.getFragNodeRef(frag);
-		dojo.html.copyStyle(this.domNode, source);
-
-		// necessary for safari, khtml (for computing width/height)
-		document.body.appendChild(this.domNode);
-
-		// if display:none then state=minimized, otherwise state=normal
-		if(!this.isShowing()){
-			this.windowState="minimized";
-		}
-
-		// <img src=""> can hang IE!  better get rid of it
-		if(this.iconSrc==""){
-			dojo.dom.removeNode(this.titleBarIcon);
-		}else{
-			this.titleBarIcon.src = this.iconSrc.toString();// dojo.uri.Uri obj req. toString()
-		}
-
-		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.displayMaximizeAction && this.windowState!="maximized" ? "" : "none");
-			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);	
-			if (this.constrainToContainer) {
-				this.drag.constrainTo();
-			}
-			this.drag.setDragHandle(this.titleBar);
-
-			var self = this;
-
-			dojo.event.topic.subscribe("dragMove",
-				function (info){
-					if (info.source.domNode == self.domNode){
-						dojo.event.topic.publish('floatingPaneMove', { source: self } );
-					}
-				}
-			);
-
-		}
-
-		if(this.resizable){
-			this.resizeBar.style.display="";
-			var rh = dojo.widget.createWidget("ResizeHandle", {targetElmId: this.widgetId, id:this.widgetId+"_resize"});
-			this.resizeBar.appendChild(rh.domNode);
-		}
-
-		// add a drop shadow
-		if(this.hasShadow){
-			this.shadow=new dojo.html.shadow(this.domNode);
-		}
-
-		// Prevent IE bleed-through problem
-		this.bgIframe = new dojo.html.BackgroundIframe(this.domNode);
-
-		if( this.taskBarId ){
-			this.taskBarSetup();
-		}
-
-		if (dojo.hostenv.post_load_) {
-			this.setInitialWindowState();
-		} else {
-			dojo.addOnLoad(this, "setInitialWindowState");
-		}
-
-		// counteract body.appendChild above
-		document.body.removeChild(this.domNode);
-
-		dojo.widget.html.FloatingPane.superclass.fillInTemplate.call(this, args, frag);
-	},
-
-	postCreate: function(){
-		if(this.isShowing()){
-			this.width=-1;	// force resize
-			this.resizeTo(dojo.style.getOuterWidth(this.domNode), dojo.style.getOuterHeight(this.domNode));
-		}
-	},
-
-	maximizeWindow: function(evt) {
-		this.previous={
-			width: dojo.style.getOuterWidth(this.domNode) || this.width,
-			height: dojo.style.getOuterHeight(this.domNode) || this.height,
-			left: this.domNode.style.left,
-			top: this.domNode.style.top,
-			bottom: this.domNode.style.bottom,
-			right: this.domNode.style.right
-		};
-		this.domNode.style.left =
-			dojo.style.getPixelValue(this.domNode.parentNode, "padding-left", true) + "px";
-		this.domNode.style.top =
-			dojo.style.getPixelValue(this.domNode.parentNode, "padding-top", true) + "px";
-
-		if ((this.domNode.parentNode.nodeName.toLowerCase() == 'body')) {
-			this.resizeTo(
-				dojo.html.getViewportWidth()-dojo.style.getPaddingWidth(document.body),
-				dojo.html.getViewportHeight()-dojo.style.getPaddingHeight(document.body)
-			);
-		} else {
-			this.resizeTo(
-				dojo.style.getContentWidth(this.domNode.parentNode),
-				dojo.style.getContentHeight(this.domNode.parentNode)
-			);
-		}
-		this.maximizeAction.style.display="none";
-		this.restoreAction.style.display="";
-		this.windowState="maximized";
-	},
-
-	minimizeWindow: function(evt) {
-		this.hide();
-		this.windowState = "minimized";
-	},
-
-	restoreWindow: function(evt) {
-		if (this.windowState=="minimized") {
-			this.show() 
-		} else {
-			for(var attr in this.previous){
-				this.domNode.style[attr] = this.previous[attr];
-			}
-			this.resizeTo(this.previous.width, this.previous.height);
-			this.previous=null;
-
-			this.restoreAction.style.display="none";
-			this.maximizeAction.style.display=this.displayMaximizeAction ? "" : "none";
-		}
-
-		this.windowState="normal";
-	},
-
-	closeWindow: function(evt) {
-		dojo.dom.removeNode(this.domNode);
-		this.destroy();
-	},
-
-	onMouseDown: function(evt) {
-		this.bringToTop();
-	},
-
-	bringToTop: function() {
-		var floatingPanes= dojo.widget.manager.getWidgetsByType(this.widgetType);
-		var windows = [];
-		for (var x=0; x<floatingPanes.length; x++) {
-			if (this.widgetId != floatingPanes[x].widgetId) {
-					windows.push(floatingPanes[x]);
-			}
-		}
-
-		windows.sort(function(a,b) {
-			return a.domNode.style.zIndex - b.domNode.style.zIndex;
-		});
-		
-		windows.push(this);
-
-		var floatingPaneStartingZ = 100;
-		for (x=0; x<windows.length;x++) {
-			windows[x].domNode.style.zIndex = floatingPaneStartingZ + x;
-		}
-	},
-
-	setInitialWindowState: function() {
-		if (this.windowState == "maximized") {
-			this.maximizeWindow();
-			this.show();
-			return;
-		}
-
-		if (this.windowState=="normal") {
-			this.show();
-			return;
-		}
-
-		if (this.windowState=="minimized") {
-			this.hide();
-			return;
-		}
-
-		this.windowState="minimized";
-	},
-
-	// add icon to task bar, connected to me
-	taskBarSetup: function() {
-		var taskbar = dojo.widget.getWidgetById(this.taskBarId);
-		if (!taskbar){
-			if (this.taskBarConnectAttempts <  this.maxTaskBarConnectAttempts) {
-				dojo.lang.setTimeout(this, this.taskBarSetup, 50);
-				this.taskBarConnectAttempts++;
-			} else {
-				dojo.debug("Unable to connect to the taskBar");
-			}
-			return;
-		}
-		taskbar.addChild(this);
-	},
-
-	show: function(){
-		dojo.widget.html.FloatingPane.superclass.show.apply(this, arguments);
-		this.bringToTop();
-	},
-
-	onShow: function(){
-		dojo.widget.html.FloatingPane.superclass.onShow.call(this);
-		this.resizeTo(dojo.style.getOuterWidth(this.domNode), dojo.style.getOuterHeight(this.domNode));
-	},
-
-	// This is called when the user adjusts the size of the floating pane
-	resizeTo: function(w, h){
-		dojo.style.setOuterWidth(this.domNode, w);
-		dojo.style.setOuterHeight(this.domNode, h);
-
-		dojo.html.layout(this.domNode,
-			[
-			  {domNode: this.titleBar, layoutAlign: "top"},
-			  {domNode: this.resizeBar, layoutAlign: "bottom"},
-			  {domNode: this.containerNode, layoutAlign: "client"}
-			] );
-
-		// 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();
-	},
-
-	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)
-		// so it can be safely ignored...
-		// TODO: unless we are maximized.  then we should resize ourself.
-	}
-});
-
-dojo.widget.tags.addParseTreeHandler("dojo:FloatingPane");
+dojo.provide("dojo.widget.FloatingPane");
+dojo.provide("dojo.widget.html.FloatingPane");
+
+//
+// this widget provides a window-like floating pane
+//
+
+dojo.require("dojo.widget.*");
+dojo.require("dojo.widget.Manager");
+dojo.require("dojo.html");
+dojo.require("dojo.html.shadow");
+dojo.require("dojo.style");
+dojo.require("dojo.dom");
+dojo.require("dojo.html.layout");
+dojo.require("dojo.widget.ContentPane");
+dojo.require("dojo.dnd.HtmlDragMove");
+dojo.require("dojo.dnd.HtmlDragMoveSource");
+dojo.require("dojo.dnd.HtmlDragMoveObject");
+dojo.require("dojo.widget.ResizeHandle");
+
+dojo.widget.html.FloatingPane = function(){
+	dojo.widget.html.ContentPane.call(this);
+}
+
+dojo.inherits(dojo.widget.html.FloatingPane, dojo.widget.html.ContentPane);
+
+dojo.lang.extend(dojo.widget.html.FloatingPane, {
+	widgetType: "FloatingPane",
+
+	// Constructor arguments
+	title: '',
+	iconSrc: '',
+	hasShadow: false,
+	constrainToContainer: false,
+	taskBarId: "",
+	resizable: true,
+	titleBarDisplay: "fancy",
+
+	windowState: "normal",
+	displayCloseAction: false,
+	displayMinimizeAction: false,
+	displayMaximizeAction: false,
+
+	maxTaskBarConnectAttempts: 5,
+	taskBarConnectAttempts: 0,
+
+	templatePath: dojo.uri.dojoUri("src/widget/templates/HtmlFloatingPane.html"),
+	templateCssPath: dojo.uri.dojoUri("src/widget/templates/HtmlFloatingPane.css"),
+
+	drag: null,
+
+	fillInTemplate: function(args, frag){
+		// Copy style info from input node to output node
+		var source = this.getFragNodeRef(frag);
+		dojo.html.copyStyle(this.domNode, source);
+
+		// necessary for safari, khtml (for computing width/height)
+		document.body.appendChild(this.domNode);
+
+		// if display:none then state=minimized, otherwise state=normal
+		if(!this.isShowing()){
+			this.windowState="minimized";
+		}
+
+		// <img src=""> can hang IE!  better get rid of it
+		if(this.iconSrc==""){
+			dojo.dom.removeNode(this.titleBarIcon);
+		}else{
+			this.titleBarIcon.src = this.iconSrc.toString();// dojo.uri.Uri obj req. toString()
+		}
+
+		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.displayMaximizeAction && this.windowState!="maximized" ? "" : "none");
+			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);	
+			if (this.constrainToContainer) {
+				this.drag.constrainTo();
+			}
+			this.drag.setDragHandle(this.titleBar);
+
+			var self = this;
+
+			dojo.event.topic.subscribe("dragMove",
+				function (info){
+					if (info.source.domNode == self.domNode){
+						dojo.event.topic.publish('floatingPaneMove', { source: self } );
+					}
+				}
+			);
+
+		}
+
+		if(this.resizable){
+			this.resizeBar.style.display="";
+			var rh = dojo.widget.createWidget("ResizeHandle", {targetElmId: this.widgetId, id:this.widgetId+"_resize"});
+			this.resizeBar.appendChild(rh.domNode);
+		}
+
+		// add a drop shadow
+		if(this.hasShadow){
+			this.shadow=new dojo.html.shadow(this.domNode);
+		}
+
+		// Prevent IE bleed-through problem
+		this.bgIframe = new dojo.html.BackgroundIframe(this.domNode);
+
+		if( this.taskBarId ){
+			this.taskBarSetup();
+		}
+
+		if (dojo.hostenv.post_load_) {
+			this.setInitialWindowState();
+		} else {
+			dojo.addOnLoad(this, "setInitialWindowState");
+		}
+
+		// counteract body.appendChild above
+		document.body.removeChild(this.domNode);
+
+		dojo.widget.html.FloatingPane.superclass.fillInTemplate.call(this, args, frag);
+	},
+
+	postCreate: function(){
+		if(this.isShowing()){
+			this.width=-1;	// force resize
+			this.resizeTo(dojo.style.getOuterWidth(this.domNode), dojo.style.getOuterHeight(this.domNode));
+		}
+	},
+
+	maximizeWindow: function(evt) {
+		this.previous={
+			width: dojo.style.getOuterWidth(this.domNode) || this.width,
+			height: dojo.style.getOuterHeight(this.domNode) || this.height,
+			left: this.domNode.style.left,
+			top: this.domNode.style.top,
+			bottom: this.domNode.style.bottom,
+			right: this.domNode.style.right
+		};
+		this.domNode.style.left =
+			dojo.style.getPixelValue(this.domNode.parentNode, "padding-left", true) + "px";
+		this.domNode.style.top =
+			dojo.style.getPixelValue(this.domNode.parentNode, "padding-top", true) + "px";
+
+		if ((this.domNode.parentNode.nodeName.toLowerCase() == 'body')) {
+			this.resizeTo(
+				dojo.html.getViewportWidth()-dojo.style.getPaddingWidth(document.body),
+				dojo.html.getViewportHeight()-dojo.style.getPaddingHeight(document.body)
+			);
+		} else {
+			this.resizeTo(
+				dojo.style.getContentWidth(this.domNode.parentNode),
+				dojo.style.getContentHeight(this.domNode.parentNode)
+			);
+		}
+		this.maximizeAction.style.display="none";
+		this.restoreAction.style.display="";
+		this.windowState="maximized";
+	},
+
+	minimizeWindow: function(evt) {
+		this.hide();
+		this.windowState = "minimized";
+	},
+
+	restoreWindow: function(evt) {
+		if (this.windowState=="minimized") {
+			this.show() 
+		} else {
+			for(var attr in this.previous){
+				this.domNode.style[attr] = this.previous[attr];
+			}
+			this.resizeTo(this.previous.width, this.previous.height);
+			this.previous=null;
+
+			this.restoreAction.style.display="none";
+			this.maximizeAction.style.display=this.displayMaximizeAction ? "" : "none";
+		}
+
+		this.windowState="normal";
+	},
+
+	closeWindow: function(evt) {
+		dojo.dom.removeNode(this.domNode);
+		this.destroy();
+	},
+
+	onMouseDown: function(evt) {
+		this.bringToTop();
+	},
+
+	bringToTop: function() {
+		var floatingPanes= dojo.widget.manager.getWidgetsByType(this.widgetType);
+		var windows = [];
+		for (var x=0; x<floatingPanes.length; x++) {
+			if (this.widgetId != floatingPanes[x].widgetId) {
+					windows.push(floatingPanes[x]);
+			}
+		}
+
+		windows.sort(function(a,b) {
+			return a.domNode.style.zIndex - b.domNode.style.zIndex;
+		});
+		
+		windows.push(this);
+
+		var floatingPaneStartingZ = 100;
+		for (x=0; x<windows.length;x++) {
+			windows[x].domNode.style.zIndex = floatingPaneStartingZ + x;
+		}
+	},
+
+	setInitialWindowState: function() {
+		if (this.windowState == "maximized") {
+			this.maximizeWindow();
+			this.show();
+			return;
+		}
+
+		if (this.windowState=="normal") {
+			this.show();
+			return;
+		}
+
+		if (this.windowState=="minimized") {
+			this.hide();
+			return;
+		}
+
+		this.windowState="minimized";
+	},
+
+	// add icon to task bar, connected to me
+	taskBarSetup: function() {
+		var taskbar = dojo.widget.getWidgetById(this.taskBarId);
+		if (!taskbar){
+			if (this.taskBarConnectAttempts <  this.maxTaskBarConnectAttempts) {
+				dojo.lang.setTimeout(this, this.taskBarSetup, 50);
+				this.taskBarConnectAttempts++;
+			} else {
+				dojo.debug("Unable to connect to the taskBar");
+			}
+			return;
+		}
+		taskbar.addChild(this);
+	},
+
+	show: function(){
+		dojo.widget.html.FloatingPane.superclass.show.apply(this, arguments);
+		this.bringToTop();
+	},
+
+	onShow: function(){
+		dojo.widget.html.FloatingPane.superclass.onShow.call(this);
+		this.resizeTo(dojo.style.getOuterWidth(this.domNode), dojo.style.getOuterHeight(this.domNode));
+	},
+
+	// This is called when the user adjusts the size of the floating pane
+	resizeTo: function(w, h){
+		dojo.style.setOuterWidth(this.domNode, w);
+		dojo.style.setOuterHeight(this.domNode, h);
+
+		dojo.html.layout(this.domNode,
+			[
+			  {domNode: this.titleBar, layoutAlign: "top"},
+			  {domNode: this.resizeBar, layoutAlign: "bottom"},
+			  {domNode: this.containerNode, layoutAlign: "client"}
+			] );
+
+		// 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();
+	},
+
+	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)
+		// so it can be safely ignored...
+		// TODO: unless we are maximized.  then we should resize ourself.
+	}
+});
+
+dojo.widget.tags.addParseTreeHandler("dojo:FloatingPane");
diff --git a/webapp/web/src/widget/GoogleMap.js b/webapp/web/src/widget/GoogleMap.js
index 8032c8ad0..737efc839 100644
--- a/webapp/web/src/widget/GoogleMap.js
+++ b/webapp/web/src/widget/GoogleMap.js
@@ -8,37 +8,37 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.GoogleMap");
-dojo.provide("dojo.widget.GoogleMap.Controls");
-dojo.require("dojo.widget.*");
-dojo.widget.tags.addParseTreeHandler("dojo:googlemap");
-
-dojo.widget.GoogleMap=function(){
-	//	summary
-	//	base class for the Google Map widget
-	dojo.widget.Widget.call(this);
-	this.widgetType="GoogleMap";
-	this.isContainer=false;
-}
-dojo.inherits(dojo.widget.GoogleMap, dojo.widget.Widget);
-
-dojo.widget.GoogleMap.Controls={
-	LargeMap:"largemap",
-	SmallMap:"smallmap",
-	SmallZoom:"smallzoom",
-	Scale:"scale",
-	MapType:"maptype",
-	Overview:"overview",
-	get:function(s){
-		for(var p in this){
-			if(typeof(this[p])=="string"
-				&& this[p]==s
-			){
-				return p;
-			}
-		}
-		return null;
-	}
-};
-
-dojo.requireAfterIf("html", "dojo.widget.html.GoogleMap");
+dojo.provide("dojo.widget.GoogleMap");
+dojo.provide("dojo.widget.GoogleMap.Controls");
+dojo.require("dojo.widget.*");
+dojo.widget.tags.addParseTreeHandler("dojo:googlemap");
+
+dojo.widget.GoogleMap=function(){
+	//	summary
+	//	base class for the Google Map widget
+	dojo.widget.Widget.call(this);
+	this.widgetType="GoogleMap";
+	this.isContainer=false;
+}
+dojo.inherits(dojo.widget.GoogleMap, dojo.widget.Widget);
+
+dojo.widget.GoogleMap.Controls={
+	LargeMap:"largemap",
+	SmallMap:"smallmap",
+	SmallZoom:"smallzoom",
+	Scale:"scale",
+	MapType:"maptype",
+	Overview:"overview",
+	get:function(s){
+		for(var p in this){
+			if(typeof(this[p])=="string"
+				&& this[p]==s
+			){
+				return p;
+			}
+		}
+		return null;
+	}
+};
+
+dojo.requireAfterIf("html", "dojo.widget.html.GoogleMap");
diff --git a/webapp/web/src/widget/Select.js b/webapp/web/src/widget/Select.js
index 0037672df..6fc19687b 100644
--- a/webapp/web/src/widget/Select.js
+++ b/webapp/web/src/widget/Select.js
@@ -8,69 +8,69 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.Select");
-dojo.provide("dojo.widget.html.Select");
-
-dojo.require("dojo.widget.html.ComboBox");
-dojo.require("dojo.widget.*");
-dojo.require("dojo.widget.html.stabile");
-
-/*
- * The Select widget is an enhanced version of HTML's <select> tag.
- *
- * Similar features:
- *   - There is a drop down list of possible values.
- *   - You can only enter a value from the drop down list.  (You can't enter an arbitrary value.)
- *   - The value submitted with the form is the hidden value (ex: CA),
-       not the displayed value a.k.a. label (ex: California)
- *
- * Enhancements over plain HTML version:
- *   - If you type in some text then it will filter down the list of possible values in the drop down list.
- *   - List can be specified either as a static list or via a javascript function (that can get the list from a server)
- */
-
-dojo.widget.defineWidget(
-	"dojo.widget.html.Select",
-	dojo.widget.html.ComboBox,
-	{
-		widgetType: "Select",
-		forceValidOption: true,
-
-		setValue: function(value) {
-			this.comboBoxValue.value = value;
-			dojo.widget.html.stabile.setState(this.widgetId, this.getState(), true);
-		},
-
-		setLabel: function(value){
-			// FIXME, not sure what to do here!
-			this.comboBoxSelectionValue.value = value;
-			if (this.textInputNode.value != value) { // prevent mucking up of selection
-				this.textInputNode.value = value;
-			}
-		},	  
-
-		getLabel: function(){
-			return this.comboBoxSelectionValue.value;
-		},
-
-		getState: function() {
-			return {
-				value: this.getValue(),
-				label: this.getLabel()
-			};
-		},
-
-		onKeyUp: function(evt){
-			this.setLabel(this.textInputNode.value);
-		},
-
-		setState: function(state) {
-			this.setValue(state.value);
-			this.setLabel(state.label);
-		},
-
-		setAllValues: function(value1, value2){
-			this.setValue(value2);
-			this.setLabel(value1);
-		}
-	});
+dojo.provide("dojo.widget.Select");
+dojo.provide("dojo.widget.html.Select");
+
+dojo.require("dojo.widget.html.ComboBox");
+dojo.require("dojo.widget.*");
+dojo.require("dojo.widget.html.stabile");
+
+/*
+ * The Select widget is an enhanced version of HTML's <select> tag.
+ *
+ * Similar features:
+ *   - There is a drop down list of possible values.
+ *   - You can only enter a value from the drop down list.  (You can't enter an arbitrary value.)
+ *   - The value submitted with the form is the hidden value (ex: CA),
+       not the displayed value a.k.a. label (ex: California)
+ *
+ * Enhancements over plain HTML version:
+ *   - If you type in some text then it will filter down the list of possible values in the drop down list.
+ *   - List can be specified either as a static list or via a javascript function (that can get the list from a server)
+ */
+
+dojo.widget.defineWidget(
+	"dojo.widget.html.Select",
+	dojo.widget.html.ComboBox,
+	{
+		widgetType: "Select",
+		forceValidOption: true,
+
+		setValue: function(value) {
+			this.comboBoxValue.value = value;
+			dojo.widget.html.stabile.setState(this.widgetId, this.getState(), true);
+		},
+
+		setLabel: function(value){
+			// FIXME, not sure what to do here!
+			this.comboBoxSelectionValue.value = value;
+			if (this.textInputNode.value != value) { // prevent mucking up of selection
+				this.textInputNode.value = value;
+			}
+		},	  
+
+		getLabel: function(){
+			return this.comboBoxSelectionValue.value;
+		},
+
+		getState: function() {
+			return {
+				value: this.getValue(),
+				label: this.getLabel()
+			};
+		},
+
+		onKeyUp: function(evt){
+			this.setLabel(this.textInputNode.value);
+		},
+
+		setState: function(state) {
+			this.setValue(state.value);
+			this.setLabel(state.label);
+		},
+
+		setAllValues: function(value1, value2){
+			this.setValue(value2);
+			this.setLabel(value1);
+		}
+	});
diff --git a/webapp/web/src/widget/TabContainer.js b/webapp/web/src/widget/TabContainer.js
index ef64f0245..fedba7013 100644
--- a/webapp/web/src/widget/TabContainer.js
+++ b/webapp/web/src/widget/TabContainer.js
@@ -8,254 +8,254 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.TabContainer");
-dojo.provide("dojo.widget.html.TabContainer");
-dojo.provide("dojo.widget.Tab");
-
-dojo.require("dojo.lang.func");
-dojo.require("dojo.widget.*");
-dojo.require("dojo.widget.HtmlWidget");
-dojo.require("dojo.event.*");
-dojo.require("dojo.html");
-dojo.require("dojo.style");
-dojo.require("dojo.html.layout");
-
-//////////////////////////////////////////
-// TabContainer -- a set of Tabs
-//////////////////////////////////////////
-dojo.widget.html.TabContainer = function() {
-	dojo.widget.HtmlWidget.call(this);
-}
-
-dojo.inherits(dojo.widget.html.TabContainer, dojo.widget.HtmlWidget);
-
-dojo.lang.extend(dojo.widget.html.TabContainer, {
-	widgetType: "TabContainer",
-    isContainer: true,
-
-	// Constructor arguments
-	labelPosition: "top",
-	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,
-
-	templatePath: dojo.uri.dojoUri("src/widget/templates/HtmlTabContainer.html"),
-	templateCssPath: dojo.uri.dojoUri("src/widget/templates/HtmlTabContainer.css"),
-
-	selectedTab: "",		// initially selected tab (widgetId)
-
-	fillInTemplate: function(args, frag) {
-		// Copy style info from input node to output node
-		var source = this.getFragNodeRef(frag);
-		dojo.html.copyStyle(this.domNode, source);
-
-		dojo.widget.html.TabContainer.superclass.fillInTemplate.call(this, args, frag);
-	},
-
-	postCreate: function(args, frag) {
-		// Load all the tabs, creating a label for each one
-		for(var i=0; i<this.children.length; i++){
-			this._setupTab(this.children[i]);
-		}
-
-		if (this.closeButton=="pane") {
-			var div = document.createElement("div");
-			dojo.html.addClass(div, "dojoTabPanePaneClose");
-			var self = this;
-			dojo.event.connect(div, "onclick", function(){ self._runOnCloseTab(self.selectedTabWidget); });
-			dojo.event.connect(div, "onmouseover", function(){ dojo.html.addClass(div, "dojoTabPanePaneCloseHover"); });
-			dojo.event.connect(div, "onmouseout", function(){ dojo.html.removeClass(div, "dojoTabPanePaneCloseHover"); });
-			this.dojoTabLabels.appendChild(div);
-		}
-
-		if(this.doLayout){
-			dojo.html.addClass(this.dojoTabLabels, "dojoTabLabels-"+this.labelPosition);
-		} else {
-			dojo.html.addClass(this.dojoTabLabels, "dojoTabLabels-"+this.labelPosition+"-noLayout");
-		}
-
-        this._doSizing();
-
-		// Display the selected tab
-		if(this.selectedTabWidget){
-			this.selectTab(this.selectedTabWidget, true);
-		}
-	},
-
-	addChild: function(child, overrideContainerNode, pos, ref, insertIndex){
-		this._setupTab(child);
-		dojo.widget.html.TabContainer.superclass.addChild.call(this,child, overrideContainerNode, pos, ref, insertIndex);
-
-		// in case the tab labels have overflowed from one line to two lines
-		this._doSizing();
-	},
-
-	_setupTab: function(tab){
-		tab.domNode.style.display="none";
-
-		// Create label
-		tab.div = document.createElement("div");
-		dojo.widget.wai.setAttr(tab.div, "waiRole", "tab");
-		dojo.html.addClass(tab.div, "dojoTabPaneTab");
-		var span = document.createElement("span");
-		span.innerHTML = tab.label;
-		dojo.html.disableSelection(span);
-		if (this.closeButton=="tab") {
-			var img = document.createElement("div");
-			dojo.html.addClass(img, "dojoTabPaneTabClose");
-			var self = this;
-			dojo.event.connect(img, "onclick", function(evt){ self._runOnCloseTab(tab); dojo.event.browser.stopEvent(evt); });
-			dojo.event.connect(img, "onmouseover", function(){ dojo.html.addClass(img,"dojoTabPaneTabCloseHover"); });
-			dojo.event.connect(img, "onmouseout", function(){ dojo.html.removeClass(img,"dojoTabPaneTabCloseHover"); });
-			span.appendChild(img);
-		}
-		tab.div.appendChild(span);
-		this.dojoTabLabels.appendChild(tab.div);
-		
-		var self = this;
-		dojo.event.connect(tab.div, "onclick", function(){ self.selectTab(tab); });
-
-		if(!this.selectedTabWidget || this.selectedTab==tab.widgetId || tab.selected){
-    		this.selectedTabWidget = tab;
-        } else {
-            this._hideTab(tab);
-        }
-
-		dojo.html.addClass(tab.domNode, "dojoTabPane");
-		with(tab.domNode.style){
-			top = dojo.style.getPixelValue(this.containerNode, "padding-top", true);
-			left = dojo.style.getPixelValue(this.containerNode, "padding-left", true);
-		}
-	},
-
-	// Configure the content pane to take up all the space except for where the tab labels are
-	_doSizing: function(){
-		// position the labels and the container node
-		var labelAlign=this.labelPosition.replace(/-h/,"");
-		var children = [
-			{domNode: this.dojoTabLabels, layoutAlign: labelAlign},
-			{domNode: this.containerNode, layoutAlign: "client"}
-		];
-
-
-		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);
-		var ch=dojo.style.getContentHeight(this.containerNode);
-		dojo.lang.forEach(this.children, function(child){
-			//if (this.doLayout) {
-				if(child.selected){
-					child.resizeTo(cw, ch);
-				} 
-			//} else {
-			//	child.onResized();
-			//}
-		});
-		
-	},
-
-    removeChild: function(tab) {
-
-		// remove tab event handlers
-		dojo.event.disconnect(tab.div, "onclick", function () { });
-		if (this.closeButton=="tab") {
-			var img = tab.div.lastChild.lastChild;
-			if (img) {
-				dojo.html.removeClass(img, "dojoTabPaneTabClose", function () { });
-				dojo.event.disconnect(img, "onclick", function () { });
-				dojo.event.disconnect(img, "onmouseover", function () { });
-				dojo.event.disconnect(img, "onmouseout", function () { });
-			}
-		}
-
-        dojo.widget.html.TabContainer.superclass.removeChild.call(this, tab);
-
-        dojo.html.removeClass(tab.domNode, "dojoTabPane");
-        this.dojoTabLabels.removeChild(tab.div);
-        delete(tab.div);
-
-        if (this.selectedTabWidget === tab) {
-            this.selectedTabWidget = undefined;
-            if (this.children.length > 0) {
-                this.selectTab(this.children[0], true);
-            }
-        }
-
-		// in case the tab labels have overflowed from one line to two lines
-		this._doSizing();
-    },
-
-    selectTab: function(tab, _noRefresh) {
-		// Deselect old tab and select new one
-		if (this.selectedTabWidget) {
-			this._hideTab(this.selectedTabWidget);
-		}
-		this.selectedTabWidget = tab;
-		this._showTab(tab, _noRefresh);
-	},
-
-	_showTab: function(tab, _noRefresh) {
-		dojo.html.addClass(tab.div, "current");
-		tab.selected=true;
-		if ( this.useVisibility && !dojo.render.html.ie ) {
-			tab.domNode.style.visibility="visible";
-		} else {
-			// make sure we dont refresh onClose and on postCreate
-			// speeds up things a bit when using refreshOnShow and fixes #646
-			if(_noRefresh && tab.refreshOnShow){
-				var tmp = tab.refreshOnShow;
-				tab.refreshOnShow = false;
-				tab.show();
-				tab.refreshOnShow = tmp;
-			}else{
-				tab.show();
-			}
-
-			tab.resizeTo(
-				dojo.style.getContentWidth(this.containerNode),
-				dojo.style.getContentHeight(this.containerNode)
-			);
-		}
-	},
-
-	_hideTab: function(tab) {
-		dojo.html.removeClass(tab.div, "current");
-		tab.selected=false;
-		if( this.useVisibility ){
-			tab.domNode.style.visibility="hidden";
-		}else{
-			tab.hide();
-		}
-	},
-
-	_runOnCloseTab: function(tab) {
-		var onc = tab.extraArgs.onClose || tab.extraArgs.onclose;
-		var fcn = dojo.lang.isFunction(onc) ? onc : window[onc];
-		var remove = dojo.lang.isFunction(fcn) ? fcn(this,tab) : true;
-		if(remove) {
-			this.removeChild(tab);
-			// makes sure we can clean up executeScripts in ContentPane onUnLoad
-			tab.destroy();
-		}
-	},
-
-	onResized: function() {
-		this._doSizing();
-	}
-});
-dojo.widget.tags.addParseTreeHandler("dojo:TabContainer");
-
-// These arguments can be specified for the children of a TabContainer.
-// Since any widget can be specified as a TabContainer child, mix them
-// into the base widget class.  (This is a hack, but it's effective.)
-dojo.lang.extend(dojo.widget.Widget, {
-	label: "",
-	selected: false	// is this tab currently selected?
-});
+dojo.provide("dojo.widget.TabContainer");
+dojo.provide("dojo.widget.html.TabContainer");
+dojo.provide("dojo.widget.Tab");
+
+dojo.require("dojo.lang.func");
+dojo.require("dojo.widget.*");
+dojo.require("dojo.widget.HtmlWidget");
+dojo.require("dojo.event.*");
+dojo.require("dojo.html");
+dojo.require("dojo.style");
+dojo.require("dojo.html.layout");
+
+//////////////////////////////////////////
+// TabContainer -- a set of Tabs
+//////////////////////////////////////////
+dojo.widget.html.TabContainer = function() {
+	dojo.widget.HtmlWidget.call(this);
+}
+
+dojo.inherits(dojo.widget.html.TabContainer, dojo.widget.HtmlWidget);
+
+dojo.lang.extend(dojo.widget.html.TabContainer, {
+	widgetType: "TabContainer",
+    isContainer: true,
+
+	// Constructor arguments
+	labelPosition: "top",
+	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,
+
+	templatePath: dojo.uri.dojoUri("src/widget/templates/HtmlTabContainer.html"),
+	templateCssPath: dojo.uri.dojoUri("src/widget/templates/HtmlTabContainer.css"),
+
+	selectedTab: "",		// initially selected tab (widgetId)
+
+	fillInTemplate: function(args, frag) {
+		// Copy style info from input node to output node
+		var source = this.getFragNodeRef(frag);
+		dojo.html.copyStyle(this.domNode, source);
+
+		dojo.widget.html.TabContainer.superclass.fillInTemplate.call(this, args, frag);
+	},
+
+	postCreate: function(args, frag) {
+		// Load all the tabs, creating a label for each one
+		for(var i=0; i<this.children.length; i++){
+			this._setupTab(this.children[i]);
+		}
+
+		if (this.closeButton=="pane") {
+			var div = document.createElement("div");
+			dojo.html.addClass(div, "dojoTabPanePaneClose");
+			var self = this;
+			dojo.event.connect(div, "onclick", function(){ self._runOnCloseTab(self.selectedTabWidget); });
+			dojo.event.connect(div, "onmouseover", function(){ dojo.html.addClass(div, "dojoTabPanePaneCloseHover"); });
+			dojo.event.connect(div, "onmouseout", function(){ dojo.html.removeClass(div, "dojoTabPanePaneCloseHover"); });
+			this.dojoTabLabels.appendChild(div);
+		}
+
+		if(this.doLayout){
+			dojo.html.addClass(this.dojoTabLabels, "dojoTabLabels-"+this.labelPosition);
+		} else {
+			dojo.html.addClass(this.dojoTabLabels, "dojoTabLabels-"+this.labelPosition+"-noLayout");
+		}
+
+        this._doSizing();
+
+		// Display the selected tab
+		if(this.selectedTabWidget){
+			this.selectTab(this.selectedTabWidget, true);
+		}
+	},
+
+	addChild: function(child, overrideContainerNode, pos, ref, insertIndex){
+		this._setupTab(child);
+		dojo.widget.html.TabContainer.superclass.addChild.call(this,child, overrideContainerNode, pos, ref, insertIndex);
+
+		// in case the tab labels have overflowed from one line to two lines
+		this._doSizing();
+	},
+
+	_setupTab: function(tab){
+		tab.domNode.style.display="none";
+
+		// Create label
+		tab.div = document.createElement("div");
+		dojo.widget.wai.setAttr(tab.div, "waiRole", "tab");
+		dojo.html.addClass(tab.div, "dojoTabPaneTab");
+		var span = document.createElement("span");
+		span.innerHTML = tab.label;
+		dojo.html.disableSelection(span);
+		if (this.closeButton=="tab") {
+			var img = document.createElement("div");
+			dojo.html.addClass(img, "dojoTabPaneTabClose");
+			var self = this;
+			dojo.event.connect(img, "onclick", function(evt){ self._runOnCloseTab(tab); dojo.event.browser.stopEvent(evt); });
+			dojo.event.connect(img, "onmouseover", function(){ dojo.html.addClass(img,"dojoTabPaneTabCloseHover"); });
+			dojo.event.connect(img, "onmouseout", function(){ dojo.html.removeClass(img,"dojoTabPaneTabCloseHover"); });
+			span.appendChild(img);
+		}
+		tab.div.appendChild(span);
+		this.dojoTabLabels.appendChild(tab.div);
+		
+		var self = this;
+		dojo.event.connect(tab.div, "onclick", function(){ self.selectTab(tab); });
+
+		if(!this.selectedTabWidget || this.selectedTab==tab.widgetId || tab.selected){
+    		this.selectedTabWidget = tab;
+        } else {
+            this._hideTab(tab);
+        }
+
+		dojo.html.addClass(tab.domNode, "dojoTabPane");
+		with(tab.domNode.style){
+			top = dojo.style.getPixelValue(this.containerNode, "padding-top", true);
+			left = dojo.style.getPixelValue(this.containerNode, "padding-left", true);
+		}
+	},
+
+	// Configure the content pane to take up all the space except for where the tab labels are
+	_doSizing: function(){
+		// position the labels and the container node
+		var labelAlign=this.labelPosition.replace(/-h/,"");
+		var children = [
+			{domNode: this.dojoTabLabels, layoutAlign: labelAlign},
+			{domNode: this.containerNode, layoutAlign: "client"}
+		];
+
+
+		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);
+		var ch=dojo.style.getContentHeight(this.containerNode);
+		dojo.lang.forEach(this.children, function(child){
+			//if (this.doLayout) {
+				if(child.selected){
+					child.resizeTo(cw, ch);
+				} 
+			//} else {
+			//	child.onResized();
+			//}
+		});
+		
+	},
+
+    removeChild: function(tab) {
+
+		// remove tab event handlers
+		dojo.event.disconnect(tab.div, "onclick", function () { });
+		if (this.closeButton=="tab") {
+			var img = tab.div.lastChild.lastChild;
+			if (img) {
+				dojo.html.removeClass(img, "dojoTabPaneTabClose", function () { });
+				dojo.event.disconnect(img, "onclick", function () { });
+				dojo.event.disconnect(img, "onmouseover", function () { });
+				dojo.event.disconnect(img, "onmouseout", function () { });
+			}
+		}
+
+        dojo.widget.html.TabContainer.superclass.removeChild.call(this, tab);
+
+        dojo.html.removeClass(tab.domNode, "dojoTabPane");
+        this.dojoTabLabels.removeChild(tab.div);
+        delete(tab.div);
+
+        if (this.selectedTabWidget === tab) {
+            this.selectedTabWidget = undefined;
+            if (this.children.length > 0) {
+                this.selectTab(this.children[0], true);
+            }
+        }
+
+		// in case the tab labels have overflowed from one line to two lines
+		this._doSizing();
+    },
+
+    selectTab: function(tab, _noRefresh) {
+		// Deselect old tab and select new one
+		if (this.selectedTabWidget) {
+			this._hideTab(this.selectedTabWidget);
+		}
+		this.selectedTabWidget = tab;
+		this._showTab(tab, _noRefresh);
+	},
+
+	_showTab: function(tab, _noRefresh) {
+		dojo.html.addClass(tab.div, "current");
+		tab.selected=true;
+		if ( this.useVisibility && !dojo.render.html.ie ) {
+			tab.domNode.style.visibility="visible";
+		} else {
+			// make sure we dont refresh onClose and on postCreate
+			// speeds up things a bit when using refreshOnShow and fixes #646
+			if(_noRefresh && tab.refreshOnShow){
+				var tmp = tab.refreshOnShow;
+				tab.refreshOnShow = false;
+				tab.show();
+				tab.refreshOnShow = tmp;
+			}else{
+				tab.show();
+			}
+
+			tab.resizeTo(
+				dojo.style.getContentWidth(this.containerNode),
+				dojo.style.getContentHeight(this.containerNode)
+			);
+		}
+	},
+
+	_hideTab: function(tab) {
+		dojo.html.removeClass(tab.div, "current");
+		tab.selected=false;
+		if( this.useVisibility ){
+			tab.domNode.style.visibility="hidden";
+		}else{
+			tab.hide();
+		}
+	},
+
+	_runOnCloseTab: function(tab) {
+		var onc = tab.extraArgs.onClose || tab.extraArgs.onclose;
+		var fcn = dojo.lang.isFunction(onc) ? onc : window[onc];
+		var remove = dojo.lang.isFunction(fcn) ? fcn(this,tab) : true;
+		if(remove) {
+			this.removeChild(tab);
+			// makes sure we can clean up executeScripts in ContentPane onUnLoad
+			tab.destroy();
+		}
+	},
+
+	onResized: function() {
+		this._doSizing();
+	}
+});
+dojo.widget.tags.addParseTreeHandler("dojo:TabContainer");
+
+// These arguments can be specified for the children of a TabContainer.
+// Since any widget can be specified as a TabContainer child, mix them
+// into the base widget class.  (This is a hack, but it's effective.)
+dojo.lang.extend(dojo.widget.Widget, {
+	label: "",
+	selected: false	// is this tab currently selected?
+});
diff --git a/webapp/web/src/widget/TaskBar.js b/webapp/web/src/widget/TaskBar.js
index 0a2fdb36f..5db918364 100644
--- a/webapp/web/src/widget/TaskBar.js
+++ b/webapp/web/src/widget/TaskBar.js
@@ -8,25 +8,25 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.TaskBar");
-dojo.provide("dojo.widget.TaskBarItem");
-dojo.require("dojo.widget.Widget");
-
-dojo.widget.TaskBar = function(){
-	dojo.widget.Widget.call(this);
-
-	this.widgetType = "TaskBar";
-	this.isContainer = true;
-}
-dojo.inherits(dojo.widget.TaskBar, dojo.widget.Widget);
-dojo.widget.tags.addParseTreeHandler("dojo:taskbar");
-
-dojo.widget.TaskBarItem = function(){
-	dojo.widget.Widget.call(this);
-
-	this.widgetType = "TaskBarItem";
-}
-dojo.inherits(dojo.widget.TaskBarItem, dojo.widget.Widget);
-dojo.widget.tags.addParseTreeHandler("dojo:taskbaritem");
-
-dojo.requireAfterIf("html", "dojo.widget.html.TaskBar");
+dojo.provide("dojo.widget.TaskBar");
+dojo.provide("dojo.widget.TaskBarItem");
+dojo.require("dojo.widget.Widget");
+
+dojo.widget.TaskBar = function(){
+	dojo.widget.Widget.call(this);
+
+	this.widgetType = "TaskBar";
+	this.isContainer = true;
+}
+dojo.inherits(dojo.widget.TaskBar, dojo.widget.Widget);
+dojo.widget.tags.addParseTreeHandler("dojo:taskbar");
+
+dojo.widget.TaskBarItem = function(){
+	dojo.widget.Widget.call(this);
+
+	this.widgetType = "TaskBarItem";
+}
+dojo.inherits(dojo.widget.TaskBarItem, dojo.widget.Widget);
+dojo.widget.tags.addParseTreeHandler("dojo:taskbaritem");
+
+dojo.requireAfterIf("html", "dojo.widget.html.TaskBar");
diff --git a/webapp/web/src/widget/Toggler.js b/webapp/web/src/widget/Toggler.js
index c3e3f15d2..845225efc 100644
--- a/webapp/web/src/widget/Toggler.js
+++ b/webapp/web/src/widget/Toggler.js
@@ -8,33 +8,33 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.Toggler");
-dojo.require("dojo.widget.*");
-dojo.require("dojo.event.*");
-
-// clicking on this node shows/hides another widget
-
-dojo.widget.Toggler = function(){
-	dojo.widget.DomWidget.call(this);
-}
-
-dojo.inherits(dojo.widget.Toggler, dojo.widget.DomWidget);
-
-dojo.lang.extend(dojo.widget.Toggler, {
-	widgetType: "Toggler",
-	
-	// 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; }
-		pane.explodeSrc = this.domNode;
-		pane.toggleShowing();
-	}
-});
-dojo.widget.tags.addParseTreeHandler("dojo:toggler");
+dojo.provide("dojo.widget.Toggler");
+dojo.require("dojo.widget.*");
+dojo.require("dojo.event.*");
+
+// clicking on this node shows/hides another widget
+
+dojo.widget.Toggler = function(){
+	dojo.widget.DomWidget.call(this);
+}
+
+dojo.inherits(dojo.widget.Toggler, dojo.widget.DomWidget);
+
+dojo.lang.extend(dojo.widget.Toggler, {
+	widgetType: "Toggler",
+	
+	// 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; }
+		pane.explodeSrc = this.domNode;
+		pane.toggleShowing();
+	}
+});
+dojo.widget.tags.addParseTreeHandler("dojo:toggler");
diff --git a/webapp/web/src/widget/Tooltip.js b/webapp/web/src/widget/Tooltip.js
index 648265b4c..a3ddb1dca 100644
--- a/webapp/web/src/widget/Tooltip.js
+++ b/webapp/web/src/widget/Tooltip.js
@@ -8,7 +8,7 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.Tooltip");
-dojo.require("dojo.widget.Widget");
-
-dojo.requireAfterIf("html", "dojo.widget.html.Tooltip");
+dojo.provide("dojo.widget.Tooltip");
+dojo.require("dojo.widget.Widget");
+
+dojo.requireAfterIf("html", "dojo.widget.html.Tooltip");
diff --git a/webapp/web/src/widget/TreeNode.js b/webapp/web/src/widget/TreeNode.js
index b327d9e0c..c7e83e485 100644
--- a/webapp/web/src/widget/TreeNode.js
+++ b/webapp/web/src/widget/TreeNode.js
@@ -8,527 +8,527 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-
-dojo.provide("dojo.widget.TreeNode");
-
-dojo.require("dojo.event.*");
-dojo.require("dojo.io.*");
-
-// make it a tag
-dojo.widget.tags.addParseTreeHandler("dojo:TreeNode");
-
-
-// # //////////
-
-dojo.widget.TreeNode = function() {
-	dojo.widget.HtmlWidget.call(this);
-
-	this.actionsDisabled = [];
-}
-
-dojo.inherits(dojo.widget.TreeNode, dojo.widget.HtmlWidget);
-
-dojo.lang.extend(dojo.widget.TreeNode, {
-	widgetType: "TreeNode",
-
-	loadStates: {
-		UNCHECKED: "UNCHECKED",
-    	LOADING: "LOADING",
-    	LOADED: "LOADED"
-	},
-
-
-	actions: {
-		MOVE: "MOVE",
-    	REMOVE: "REMOVE",
-    	EDIT: "EDIT",
-    	ADDCHILD: "ADDCHILD"
-	},
-
-	isContainer: true,
-
-	lockLevel: 0, // lock ++ unlock --, so nested locking works fine
-
-
-	templateString: ('<div class="dojoTreeNode"> '
-		+ '<span treeNode="${this.widgetId}" class="dojoTreeNodeLabel" dojoAttachPoint="labelNode"> '
-		+ '		<span dojoAttachPoint="titleNode" dojoAttachEvent="onClick: onTitleClick" class="dojoTreeNodeLabelTitle">${this.title}</span> '
-		+ '</span> '
-		+ '<span class="dojoTreeNodeAfterLabel" dojoAttachPoint="afterLabelNode">${this.afterLabel}</span> '
-		+ '<div dojoAttachPoint="containerNode" style="display:none"></div> '
-		+ '</div>').replace(/(>|<)\s+/g, '$1'), // strip whitespaces between nodes
-
-
-	childIconSrc: "",
-	childIconFolderSrc: dojo.uri.dojoUri("src/widget/templates/images/Tree/closed.gif"), // for under root parent item child icon,
-	childIconDocumentSrc: dojo.uri.dojoUri("src/widget/templates/images/Tree/document.gif"), // for under root parent item child icon,
-
-	childIcon: null,
-	isTreeNode: true,
-
-	objectId: "", // the widget represents an object
-
-	afterLabel: "",
-	afterLabelNode: null, // node to the left of labelNode
-
-	// an icon left from childIcon: imgs[-2].
-	// if +/- for folders, blank for leaves
-	expandIcon: null,
-
-	title: "",
-	object: "", // node may have object attached, settable from HTML
-	isFolder: false,
-
-	labelNode: null, // the item label
-	titleNode: null, // the item title
-	imgs: null, // an array of icons imgs
-
-	expandLevel: "", // expand to level
-
-	tree: null,
-
-	depth: 0,
-
-	isExpanded: false,
-
-	state: null,  // after creation will change to loadStates: "loaded/loading/unchecked"
-	domNodeInitialized: false,  // domnode is initialized with icons etc
-
-
-	isFirstNode: function() {
-		return this.getParentIndex() == 0 ? true: false;
-	},
-
-	isLastNode: function() {
-		return this.getParentIndex() == this.parent.children.length-1 ? true : false;
-	},
-
-	lock: function(){ return this.tree.lock.apply(this, arguments) },
-	unlock: function(){ return this.tree.unlock.apply(this, arguments) },
-	isLocked: function(){ return this.tree.isLocked.apply(this, arguments) },
-	cleanLock: function(){ return this.tree.cleanLock.apply(this, arguments) },
-
-	actionIsDisabled: function(action) {
-		var _this = this;
-
-		var disabled = false;
-
-		if (this.tree.strictFolders && action == this.actions.ADDCHILD && !this.isFolder) {
-			disabled = true;
-		}
-
-		if (dojo.lang.inArray(_this.actionsDisabled, action)) {
-			disabled = true;
-		}
-
-		if (this.isLocked()) {
-			disabled = true;
-		}
-
-		return disabled;
-	},
-
-	getInfo: function() {
-		// No title here (title may be widget)
-		var info = {
-			widgetId: this.widgetId,
-			objectId: this.objectId,
-			index: this.getParentIndex(),
-			isFolder: this.isFolder
-		}
-
-		return info;
-	},
-
-	initialize: function(args, frag){
-
-		//dojo.debug(this.title)
-
-		this.state = this.loadStates.UNCHECKED;
-
-		for(var i=0; i<this.actionsDisabled.length; i++) {
-			this.actionsDisabled[i] = this.actionsDisabled[i].toUpperCase();
-		}
-
-		this.expandLevel = parseInt(this.expandLevel);
-
-	},
-
-
-	/**
-	 * Change visible node depth by appending/prepending with blankImgs
-	 * @param depthDiff Integer positive => move right, negative => move left
-	*/
-	adjustDepth: function(depthDiff) {
-
-		for(var i=0; i<this.children.length; i++) {
-			this.children[i].adjustDepth(depthDiff);
-		}
-
-		this.depth += depthDiff;
-
-		if (depthDiff>0) {
-			for(var i=0; i<depthDiff; i++) {
-				var img = this.tree.makeBlankImg();
-				this.imgs.unshift(img);
-				//dojo.debugShallow(this.domNode);
-				dojo.dom.insertBefore(this.imgs[0], this.domNode.firstChild);
-
-			}
-		}
-		if (depthDiff<0) {
-			for(var i=0; i<-depthDiff;i++) {
-				this.imgs.shift();
-				dojo.dom.removeNode(this.domNode.firstChild);
-			}
-		}
-
-	},
-
-
-	markLoading: function() {
-		this._markLoadingSavedIcon = this.expandIcon.src;
-		this.expandIcon.src = this.tree.expandIconSrcLoading;
-	},
-
-	// if icon is "Loading" then
-	unMarkLoading: function() {
-		if (!this._markLoadingSavedIcon) return;
-
-		var im = new Image();
-		im.src = this.tree.expandIconSrcLoading;
-
-		//dojo.debug("Unmark "+this.expandIcon.src+" : "+im.src);
-		if (this.expandIcon.src == im.src) {
-			this.expandIcon.src = this._markLoadingSavedIcon;
-		}
-		this._markLoadingSavedIcon = null;
-	},
-
-
-	setFolder: function() {
-		dojo.event.connect(this.expandIcon, 'onclick', this, 'onTreeClick');
-		this.expandIcon.src = this.isExpanded ? this.tree.expandIconSrcMinus : this.tree.expandIconSrcPlus;
-		this.isFolder = true;
-	},
-
-
-	createDOMNode: function(tree, depth){
-
-		this.tree = tree;
-		this.depth = depth;
-
-
-		//
-		// add the tree icons
-		//
-
-		this.imgs = [];
-
-		for(var i=0; i<this.depth+1; i++){
-
-			var img = this.tree.makeBlankImg();
-
-			this.domNode.insertBefore(img, this.labelNode);
-
-			this.imgs.push(img);
-		}
-
-
-		this.expandIcon = this.imgs[this.imgs.length-1];
-
-
-		this.childIcon = this.tree.makeBlankImg();
-
-		// add to images before the title
-		this.imgs.push(this.childIcon);
-
-		dojo.dom.insertBefore(this.childIcon, this.titleNode);
-
-		// node with children(from source html) becomes folder on build stage.
-		if (this.children.length || this.isFolder) {
-			this.setFolder();
-		}
-		else {
-			// leaves are always loaded
-			//dojo.debug("Set "+this+" state to loaded");
-			this.state = this.loadStates.LOADED;
-		}
-
-		dojo.event.connect(this.childIcon, 'onclick', this, 'onIconClick');
-
-
-		//
-		// create the child rows
-		//
-
-
-		for(var i=0; i<this.children.length; i++){
-			this.children[i].parent = this;
-
-			var node = this.children[i].createDOMNode(this.tree, this.depth+1);
-
-			this.containerNode.appendChild(node);
-		}
-
-
-		if (this.children.length) {
-			this.state = this.loadStates.LOADED;
-		}
-
-		this.updateIcons();
-
-		this.domNodeInitialized = true;
-
-		dojo.event.topic.publish(this.tree.eventNames.createDOMNode, { source: this } );
-
-		return this.domNode;
-	},
-
-	onTreeClick: function(e){
-		dojo.event.topic.publish(this.tree.eventNames.treeClick, { source: this, event: e });
-	},
-
-	onIconClick: function(e){
-		dojo.event.topic.publish(this.tree.eventNames.iconClick, { source: this, event: e });
-	},
-
-	onTitleClick: function(e){
-		dojo.event.topic.publish(this.tree.eventNames.titleClick, { source: this, event: e });
-	},
-
-	markSelected: function() {
-		dojo.html.addClass(this.titleNode, 'dojoTreeNodeLabelSelected');
-	},
-
-
-	unMarkSelected: function() {
-		//dojo.debug('unmark')
-		dojo.html.removeClass(this.titleNode, 'dojoTreeNodeLabelSelected');
-	},
-
-	updateExpandIcon: function() {
-		if (this.isFolder){
-			this.expandIcon.src = this.isExpanded ? this.tree.expandIconSrcMinus : this.tree.expandIconSrcPlus;
-		} else {
-			this.expandIcon.src = this.tree.blankIconSrc;
-		}
-	},
-
-	/* set the grid under the expand icon */
-	updateExpandGrid: function() {
-
-		if (this.tree.showGrid){
-			if (this.depth){
-				this.setGridImage(-2, this.isLastNode() ? this.tree.gridIconSrcL : this.tree.gridIconSrcT);
-			}else{
-				if (this.isFirstNode()){
-					this.setGridImage(-2, this.isLastNode() ? this.tree.gridIconSrcX : this.tree.gridIconSrcY);
-				}else{
-					this.setGridImage(-2, this.isLastNode() ? this.tree.gridIconSrcL : this.tree.gridIconSrcT);
-				}
-			}
-		}else{
-			this.setGridImage(-2, this.tree.blankIconSrc);
-		}
-
-	},
-
-	/* set the grid under the child icon */
-	updateChildGrid: function() {
-
-		if ((this.depth || this.tree.showRootGrid) && this.tree.showGrid){
-			this.setGridImage(-1, (this.children.length && this.isExpanded) ? this.tree.gridIconSrcP : this.tree.gridIconSrcC);
-		}else{
-			if (this.tree.showGrid && !this.tree.showRootGrid){
-				this.setGridImage(-1, (this.children.length && this.isExpanded) ? this.tree.gridIconSrcZ : this.tree.blankIconSrc);
-			}else{
-				this.setGridImage(-1, this.tree.blankIconSrc);
-			}
-		}
-
-
-	},
-
-	updateParentGrid: function() {
-		var parent = this.parent;
-
-		//dojo.debug("updateParentGrid "+this);
-
-		for(var i=0; i<this.depth; i++){
-
-			//dojo.debug("Parent "+parent);
-
-			var idx = this.imgs.length-(3+i);
-			var img = (this.tree.showGrid && !parent.isLastNode()) ? this.tree.gridIconSrcV : this.tree.blankIconSrc;
-
-			//dojo.debug("Image "+img+" for "+idx);
-
-			this.setGridImage(idx, img);
-
-			parent = parent.parent;
-		}
-	},
-
-	updateExpandGridColumn: function() {
-		if (!this.tree.showGrid) return;
-
-		var _this = this;
-
-		var icon = this.isLastNode() ? this.tree.blankIconSrc : this.tree.gridIconSrcV;
-
-		dojo.lang.forEach(_this.getDescendants(),
-			function(node) { node.setGridImage(_this.depth, icon); }
-		);
-
-		this.updateExpandGrid();
-	},
-
-	updateIcons: function(){
-
-
-		//dojo.profile.start("updateIcons")
-
-		//dojo.debug("Update icons for "+this)
-		//dojo.debug(this.isFolder)
-
-		this.imgs[0].style.display = this.tree.showRootGrid ? 'inline' : 'none';
-
-
-		//
-		// set the expand icon
-		//
-
-
-		//
-		// set the child icon
-		//
-		this.buildChildIcon();
-
-		this.updateExpandGrid();
-		this.updateChildGrid();
-		this.updateParentGrid();
-
-
-
-		dojo.profile.stop("updateIcons")
-
-	},
-
-	buildChildIcon: function() {
-		// IE (others?) tries to download whatever is on src attribute so setting "url()" like before isnt a good idea
-		// Only results in a 404
-		if(this.childIconSrc){
-			this.childIcon.src = this.childIconSrc;
-		}
-		this.childIcon.style.display = this.childIconSrc ? 'inline' : 'none';
-	},
-
-	setGridImage: function(idx, src){
-
-		if (idx < 0){
-			idx = this.imgs.length + idx;
-		}
-
-		//if (idx >= this.imgs.length-2) return;
-		this.imgs[idx].style.backgroundImage = 'url(' + src + ')';
-	},
-
-
-	updateIconTree: function(){
-		this.tree.updateIconTree.call(this);
-	},
-
-
-
-
-	expand: function(){
-		if (this.isExpanded) return;
-
-		if (this.children.length) {
-			this.showChildren();
-		}
-
-		this.isExpanded = true;
-
-		this.updateExpandIcon();
-
-		dojo.event.topic.publish(this.tree.eventNames.expand, {source: this} );
-	},
-
-	collapse: function(){
-		if (!this.isExpanded) return;
-
-		this.hideChildren();
-		this.isExpanded = false;
-
-		this.updateExpandIcon();
-
-		dojo.event.topic.publish(this.tree.eventNames.collapse, {source: this} );
-	},
-
-	hideChildren: function(){
-		this.tree.toggleObj.hide(
-			this.containerNode, this.toggleDuration, this.explodeSrc, dojo.lang.hitch(this, "onHide")
-		);
-
-		/* if dnd is in action, recalculate changed coordinates */
-		if(dojo.exists(dojo, 'dnd.dragManager.dragObjects') && dojo.dnd.dragManager.dragObjects.length) {
-			dojo.dnd.dragManager.cacheTargetLocations();
-		}
-	},
-
-	showChildren: function(){
-		this.tree.toggleObj.show(
-			this.containerNode, this.toggleDuration, this.explodeSrc, dojo.lang.hitch(this, "onShow")
-		);
-
-		/* if dnd is in action, recalculate changed coordinates */
-		if(dojo.exists(dojo, 'dnd.dragManager.dragObjects') && dojo.dnd.dragManager.dragObjects.length) {
-			dojo.dnd.dragManager.cacheTargetLocations();
-		}
-	},
-
-	addChild: function(){
-		return this.tree.addChild.apply(this, arguments);
-	},
-
-	doAddChild: function(){
-		return this.tree.doAddChild.apply(this, arguments);
-	},
-
-
-
-	/* Edit current node : change properties and update contents */
-	edit: function(props) {
-		dojo.lang.mixin(this, props);
-		if (props.title) {
-			this.titleNode.innerHTML = this.title;
-		}
-
-		if (props.afterLabel) {
-			this.afterLabelNode.innerHTML = this.afterLabel;
-		}
-
-		if (props.childIconSrc) {
-			this.buildChildIcon();
-		}
-
-
-	},
-
-
-	removeNode: function(){ return this.tree.removeNode.apply(this, arguments) },
-	doRemoveNode: function(){ return this.tree.doRemoveNode.apply(this, arguments) },
-
-
-	toString: function() {
-		return "["+this.widgetType+" Tree:"+this.tree+" ID:"+this.widgetId+" Title:"+this.title+"]";
-
-	}
-
-});
-
-
-
-
+
+dojo.provide("dojo.widget.TreeNode");
+
+dojo.require("dojo.event.*");
+dojo.require("dojo.io.*");
+
+// make it a tag
+dojo.widget.tags.addParseTreeHandler("dojo:TreeNode");
+
+
+// # //////////
+
+dojo.widget.TreeNode = function() {
+	dojo.widget.HtmlWidget.call(this);
+
+	this.actionsDisabled = [];
+}
+
+dojo.inherits(dojo.widget.TreeNode, dojo.widget.HtmlWidget);
+
+dojo.lang.extend(dojo.widget.TreeNode, {
+	widgetType: "TreeNode",
+
+	loadStates: {
+		UNCHECKED: "UNCHECKED",
+    	LOADING: "LOADING",
+    	LOADED: "LOADED"
+	},
+
+
+	actions: {
+		MOVE: "MOVE",
+    	REMOVE: "REMOVE",
+    	EDIT: "EDIT",
+    	ADDCHILD: "ADDCHILD"
+	},
+
+	isContainer: true,
+
+	lockLevel: 0, // lock ++ unlock --, so nested locking works fine
+
+
+	templateString: ('<div class="dojoTreeNode"> '
+		+ '<span treeNode="${this.widgetId}" class="dojoTreeNodeLabel" dojoAttachPoint="labelNode"> '
+		+ '		<span dojoAttachPoint="titleNode" dojoAttachEvent="onClick: onTitleClick" class="dojoTreeNodeLabelTitle">${this.title}</span> '
+		+ '</span> '
+		+ '<span class="dojoTreeNodeAfterLabel" dojoAttachPoint="afterLabelNode">${this.afterLabel}</span> '
+		+ '<div dojoAttachPoint="containerNode" style="display:none"></div> '
+		+ '</div>').replace(/(>|<)\s+/g, '$1'), // strip whitespaces between nodes
+
+
+	childIconSrc: "",
+	childIconFolderSrc: dojo.uri.dojoUri("src/widget/templates/images/Tree/closed.gif"), // for under root parent item child icon,
+	childIconDocumentSrc: dojo.uri.dojoUri("src/widget/templates/images/Tree/document.gif"), // for under root parent item child icon,
+
+	childIcon: null,
+	isTreeNode: true,
+
+	objectId: "", // the widget represents an object
+
+	afterLabel: "",
+	afterLabelNode: null, // node to the left of labelNode
+
+	// an icon left from childIcon: imgs[-2].
+	// if +/- for folders, blank for leaves
+	expandIcon: null,
+
+	title: "",
+	object: "", // node may have object attached, settable from HTML
+	isFolder: false,
+
+	labelNode: null, // the item label
+	titleNode: null, // the item title
+	imgs: null, // an array of icons imgs
+
+	expandLevel: "", // expand to level
+
+	tree: null,
+
+	depth: 0,
+
+	isExpanded: false,
+
+	state: null,  // after creation will change to loadStates: "loaded/loading/unchecked"
+	domNodeInitialized: false,  // domnode is initialized with icons etc
+
+
+	isFirstNode: function() {
+		return this.getParentIndex() == 0 ? true: false;
+	},
+
+	isLastNode: function() {
+		return this.getParentIndex() == this.parent.children.length-1 ? true : false;
+	},
+
+	lock: function(){ return this.tree.lock.apply(this, arguments) },
+	unlock: function(){ return this.tree.unlock.apply(this, arguments) },
+	isLocked: function(){ return this.tree.isLocked.apply(this, arguments) },
+	cleanLock: function(){ return this.tree.cleanLock.apply(this, arguments) },
+
+	actionIsDisabled: function(action) {
+		var _this = this;
+
+		var disabled = false;
+
+		if (this.tree.strictFolders && action == this.actions.ADDCHILD && !this.isFolder) {
+			disabled = true;
+		}
+
+		if (dojo.lang.inArray(_this.actionsDisabled, action)) {
+			disabled = true;
+		}
+
+		if (this.isLocked()) {
+			disabled = true;
+		}
+
+		return disabled;
+	},
+
+	getInfo: function() {
+		// No title here (title may be widget)
+		var info = {
+			widgetId: this.widgetId,
+			objectId: this.objectId,
+			index: this.getParentIndex(),
+			isFolder: this.isFolder
+		}
+
+		return info;
+	},
+
+	initialize: function(args, frag){
+
+		//dojo.debug(this.title)
+
+		this.state = this.loadStates.UNCHECKED;
+
+		for(var i=0; i<this.actionsDisabled.length; i++) {
+			this.actionsDisabled[i] = this.actionsDisabled[i].toUpperCase();
+		}
+
+		this.expandLevel = parseInt(this.expandLevel);
+
+	},
+
+
+	/**
+	 * Change visible node depth by appending/prepending with blankImgs
+	 * @param depthDiff Integer positive => move right, negative => move left
+	*/
+	adjustDepth: function(depthDiff) {
+
+		for(var i=0; i<this.children.length; i++) {
+			this.children[i].adjustDepth(depthDiff);
+		}
+
+		this.depth += depthDiff;
+
+		if (depthDiff>0) {
+			for(var i=0; i<depthDiff; i++) {
+				var img = this.tree.makeBlankImg();
+				this.imgs.unshift(img);
+				//dojo.debugShallow(this.domNode);
+				dojo.dom.insertBefore(this.imgs[0], this.domNode.firstChild);
+
+			}
+		}
+		if (depthDiff<0) {
+			for(var i=0; i<-depthDiff;i++) {
+				this.imgs.shift();
+				dojo.dom.removeNode(this.domNode.firstChild);
+			}
+		}
+
+	},
+
+
+	markLoading: function() {
+		this._markLoadingSavedIcon = this.expandIcon.src;
+		this.expandIcon.src = this.tree.expandIconSrcLoading;
+	},
+
+	// if icon is "Loading" then
+	unMarkLoading: function() {
+		if (!this._markLoadingSavedIcon) return;
+
+		var im = new Image();
+		im.src = this.tree.expandIconSrcLoading;
+
+		//dojo.debug("Unmark "+this.expandIcon.src+" : "+im.src);
+		if (this.expandIcon.src == im.src) {
+			this.expandIcon.src = this._markLoadingSavedIcon;
+		}
+		this._markLoadingSavedIcon = null;
+	},
+
+
+	setFolder: function() {
+		dojo.event.connect(this.expandIcon, 'onclick', this, 'onTreeClick');
+		this.expandIcon.src = this.isExpanded ? this.tree.expandIconSrcMinus : this.tree.expandIconSrcPlus;
+		this.isFolder = true;
+	},
+
+
+	createDOMNode: function(tree, depth){
+
+		this.tree = tree;
+		this.depth = depth;
+
+
+		//
+		// add the tree icons
+		//
+
+		this.imgs = [];
+
+		for(var i=0; i<this.depth+1; i++){
+
+			var img = this.tree.makeBlankImg();
+
+			this.domNode.insertBefore(img, this.labelNode);
+
+			this.imgs.push(img);
+		}
+
+
+		this.expandIcon = this.imgs[this.imgs.length-1];
+
+
+		this.childIcon = this.tree.makeBlankImg();
+
+		// add to images before the title
+		this.imgs.push(this.childIcon);
+
+		dojo.dom.insertBefore(this.childIcon, this.titleNode);
+
+		// node with children(from source html) becomes folder on build stage.
+		if (this.children.length || this.isFolder) {
+			this.setFolder();
+		}
+		else {
+			// leaves are always loaded
+			//dojo.debug("Set "+this+" state to loaded");
+			this.state = this.loadStates.LOADED;
+		}
+
+		dojo.event.connect(this.childIcon, 'onclick', this, 'onIconClick');
+
+
+		//
+		// create the child rows
+		//
+
+
+		for(var i=0; i<this.children.length; i++){
+			this.children[i].parent = this;
+
+			var node = this.children[i].createDOMNode(this.tree, this.depth+1);
+
+			this.containerNode.appendChild(node);
+		}
+
+
+		if (this.children.length) {
+			this.state = this.loadStates.LOADED;
+		}
+
+		this.updateIcons();
+
+		this.domNodeInitialized = true;
+
+		dojo.event.topic.publish(this.tree.eventNames.createDOMNode, { source: this } );
+
+		return this.domNode;
+	},
+
+	onTreeClick: function(e){
+		dojo.event.topic.publish(this.tree.eventNames.treeClick, { source: this, event: e });
+	},
+
+	onIconClick: function(e){
+		dojo.event.topic.publish(this.tree.eventNames.iconClick, { source: this, event: e });
+	},
+
+	onTitleClick: function(e){
+		dojo.event.topic.publish(this.tree.eventNames.titleClick, { source: this, event: e });
+	},
+
+	markSelected: function() {
+		dojo.html.addClass(this.titleNode, 'dojoTreeNodeLabelSelected');
+	},
+
+
+	unMarkSelected: function() {
+		//dojo.debug('unmark')
+		dojo.html.removeClass(this.titleNode, 'dojoTreeNodeLabelSelected');
+	},
+
+	updateExpandIcon: function() {
+		if (this.isFolder){
+			this.expandIcon.src = this.isExpanded ? this.tree.expandIconSrcMinus : this.tree.expandIconSrcPlus;
+		} else {
+			this.expandIcon.src = this.tree.blankIconSrc;
+		}
+	},
+
+	/* set the grid under the expand icon */
+	updateExpandGrid: function() {
+
+		if (this.tree.showGrid){
+			if (this.depth){
+				this.setGridImage(-2, this.isLastNode() ? this.tree.gridIconSrcL : this.tree.gridIconSrcT);
+			}else{
+				if (this.isFirstNode()){
+					this.setGridImage(-2, this.isLastNode() ? this.tree.gridIconSrcX : this.tree.gridIconSrcY);
+				}else{
+					this.setGridImage(-2, this.isLastNode() ? this.tree.gridIconSrcL : this.tree.gridIconSrcT);
+				}
+			}
+		}else{
+			this.setGridImage(-2, this.tree.blankIconSrc);
+		}
+
+	},
+
+	/* set the grid under the child icon */
+	updateChildGrid: function() {
+
+		if ((this.depth || this.tree.showRootGrid) && this.tree.showGrid){
+			this.setGridImage(-1, (this.children.length && this.isExpanded) ? this.tree.gridIconSrcP : this.tree.gridIconSrcC);
+		}else{
+			if (this.tree.showGrid && !this.tree.showRootGrid){
+				this.setGridImage(-1, (this.children.length && this.isExpanded) ? this.tree.gridIconSrcZ : this.tree.blankIconSrc);
+			}else{
+				this.setGridImage(-1, this.tree.blankIconSrc);
+			}
+		}
+
+
+	},
+
+	updateParentGrid: function() {
+		var parent = this.parent;
+
+		//dojo.debug("updateParentGrid "+this);
+
+		for(var i=0; i<this.depth; i++){
+
+			//dojo.debug("Parent "+parent);
+
+			var idx = this.imgs.length-(3+i);
+			var img = (this.tree.showGrid && !parent.isLastNode()) ? this.tree.gridIconSrcV : this.tree.blankIconSrc;
+
+			//dojo.debug("Image "+img+" for "+idx);
+
+			this.setGridImage(idx, img);
+
+			parent = parent.parent;
+		}
+	},
+
+	updateExpandGridColumn: function() {
+		if (!this.tree.showGrid) return;
+
+		var _this = this;
+
+		var icon = this.isLastNode() ? this.tree.blankIconSrc : this.tree.gridIconSrcV;
+
+		dojo.lang.forEach(_this.getDescendants(),
+			function(node) { node.setGridImage(_this.depth, icon); }
+		);
+
+		this.updateExpandGrid();
+	},
+
+	updateIcons: function(){
+
+
+		//dojo.profile.start("updateIcons")
+
+		//dojo.debug("Update icons for "+this)
+		//dojo.debug(this.isFolder)
+
+		this.imgs[0].style.display = this.tree.showRootGrid ? 'inline' : 'none';
+
+
+		//
+		// set the expand icon
+		//
+
+
+		//
+		// set the child icon
+		//
+		this.buildChildIcon();
+
+		this.updateExpandGrid();
+		this.updateChildGrid();
+		this.updateParentGrid();
+
+
+
+		dojo.profile.stop("updateIcons")
+
+	},
+
+	buildChildIcon: function() {
+		// IE (others?) tries to download whatever is on src attribute so setting "url()" like before isnt a good idea
+		// Only results in a 404
+		if(this.childIconSrc){
+			this.childIcon.src = this.childIconSrc;
+		}
+		this.childIcon.style.display = this.childIconSrc ? 'inline' : 'none';
+	},
+
+	setGridImage: function(idx, src){
+
+		if (idx < 0){
+			idx = this.imgs.length + idx;
+		}
+
+		//if (idx >= this.imgs.length-2) return;
+		this.imgs[idx].style.backgroundImage = 'url(' + src + ')';
+	},
+
+
+	updateIconTree: function(){
+		this.tree.updateIconTree.call(this);
+	},
+
+
+
+
+	expand: function(){
+		if (this.isExpanded) return;
+
+		if (this.children.length) {
+			this.showChildren();
+		}
+
+		this.isExpanded = true;
+
+		this.updateExpandIcon();
+
+		dojo.event.topic.publish(this.tree.eventNames.expand, {source: this} );
+	},
+
+	collapse: function(){
+		if (!this.isExpanded) return;
+
+		this.hideChildren();
+		this.isExpanded = false;
+
+		this.updateExpandIcon();
+
+		dojo.event.topic.publish(this.tree.eventNames.collapse, {source: this} );
+	},
+
+	hideChildren: function(){
+		this.tree.toggleObj.hide(
+			this.containerNode, this.toggleDuration, this.explodeSrc, dojo.lang.hitch(this, "onHide")
+		);
+
+		/* if dnd is in action, recalculate changed coordinates */
+		if(dojo.exists(dojo, 'dnd.dragManager.dragObjects') && dojo.dnd.dragManager.dragObjects.length) {
+			dojo.dnd.dragManager.cacheTargetLocations();
+		}
+	},
+
+	showChildren: function(){
+		this.tree.toggleObj.show(
+			this.containerNode, this.toggleDuration, this.explodeSrc, dojo.lang.hitch(this, "onShow")
+		);
+
+		/* if dnd is in action, recalculate changed coordinates */
+		if(dojo.exists(dojo, 'dnd.dragManager.dragObjects') && dojo.dnd.dragManager.dragObjects.length) {
+			dojo.dnd.dragManager.cacheTargetLocations();
+		}
+	},
+
+	addChild: function(){
+		return this.tree.addChild.apply(this, arguments);
+	},
+
+	doAddChild: function(){
+		return this.tree.doAddChild.apply(this, arguments);
+	},
+
+
+
+	/* Edit current node : change properties and update contents */
+	edit: function(props) {
+		dojo.lang.mixin(this, props);
+		if (props.title) {
+			this.titleNode.innerHTML = this.title;
+		}
+
+		if (props.afterLabel) {
+			this.afterLabelNode.innerHTML = this.afterLabel;
+		}
+
+		if (props.childIconSrc) {
+			this.buildChildIcon();
+		}
+
+
+	},
+
+
+	removeNode: function(){ return this.tree.removeNode.apply(this, arguments) },
+	doRemoveNode: function(){ return this.tree.doRemoveNode.apply(this, arguments) },
+
+
+	toString: function() {
+		return "["+this.widgetType+" Tree:"+this.tree+" ID:"+this.widgetId+" Title:"+this.title+"]";
+
+	}
+
+});
+
+
+
+
diff --git a/webapp/web/src/widget/YahooMap.js b/webapp/web/src/widget/YahooMap.js
index bf8175dc2..dac5bf753 100644
--- a/webapp/web/src/widget/YahooMap.js
+++ b/webapp/web/src/widget/YahooMap.js
@@ -8,20 +8,20 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.YahooMap");
-dojo.provide("dojo.widget.YahooMap.Controls");
-dojo.require("dojo.widget.*");
-
-dojo.widget.defineWidget(
-	"dojo.widget.YahooMap",
-	dojo.widget.Widget,
-	{ isContainer: false }
-);
-
-dojo.widget.YahooMap.Controls={
-	MapType:"maptype",
-	Pan:"pan",
-	ZoomLong:"zoomlong",
-	ZoomShort:"zoomshort"
-};
-dojo.requireAfterIf("html", "dojo.widget.html.YahooMap");
+dojo.provide("dojo.widget.YahooMap");
+dojo.provide("dojo.widget.YahooMap.Controls");
+dojo.require("dojo.widget.*");
+
+dojo.widget.defineWidget(
+	"dojo.widget.YahooMap",
+	dojo.widget.Widget,
+	{ isContainer: false }
+);
+
+dojo.widget.YahooMap.Controls={
+	MapType:"maptype",
+	Pan:"pan",
+	ZoomLong:"zoomlong",
+	ZoomShort:"zoomshort"
+};
+dojo.requireAfterIf("html", "dojo.widget.html.YahooMap");
diff --git a/webapp/web/src/widget/html/AccordionPane.js b/webapp/web/src/widget/html/AccordionPane.js
index 07db076c7..72987c9f7 100644
--- a/webapp/web/src/widget/html/AccordionPane.js
+++ b/webapp/web/src/widget/html/AccordionPane.js
@@ -8,91 +8,91 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.html.AccordionPane");
-dojo.require("dojo.widget.TitlePane");
-
-dojo.widget.html.AccordionPane = function(){
-
-	dojo.widget.html.TitlePane.call(this);
-	this.widgetType = "AccordionPane";
-
-	this.open=false;
-	this.allowCollapse=true;
-	this.label="";
-	this.open=false;
-
-	this.labelNodeClass="";
-	this.containerNodeClass="";
-}
-
-dojo.inherits(dojo.widget.html.AccordionPane, dojo.widget.html.TitlePane);
-
-dojo.lang.extend(dojo.widget.html.AccordionPane, {
-        postCreate: function() {
-                dojo.widget.html.AccordionPane.superclass.postCreate.call(this);
-		this.domNode.widgetType=this.widgetType;
-		this.setSizes();
-		dojo.html.addClass(this.labelNode, this.labelNodeClass);
-		dojo.html.disableSelection(this.labelNode);
-		dojo.html.addClass(this.containerNode, this.containerNodeClass);
-        },
-
-	collapse: function() {
-		//dojo.fx.html.wipeOut(this.containerNode,250);
-		//var anim = dojo.fx.html.wipe(this.containerNode, 1000, this.containerNode.offsetHeight, 0, null, true);
-		this.containerNode.style.display="none";
-		this.open=false;
-	},
-
-	expand: function() {
-		//dojo.fx.html.wipeIn(this.containerNode,250);
-		this.containerNode.style.display="block";
-		//var anim = dojo.fx.html.wipe(this.containerNode, 1000, 0, this.containerNode.scrollHeight, null, true);
-		this.open=true;
-	},
-
-	getCollapsedHeight: function() {
-		return dojo.style.getOuterHeight(this.labelNode)+1;
-	},
-
-	setSizes: function() {
-		var siblings = this.domNode.parentNode.childNodes;
-		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]) {
-					var ap = dojo.widget.byNode(siblings[x]);
-					this.siblingWidgets.push(ap);
-					height -= ap.getCollapsedHeight();
-				}
-			}
-		}
-	
-		for (var x=0; x<this.siblingWidgets.length; x++) {
-			dojo.style.setOuterHeight(this.siblingWidgets[x].containerNode,height);
-		}
-
-		dojo.style.setOuterHeight(this.containerNode,height);
-	},
-
-	onLabelClick: function() {
-		this.setSizes();
-		if (!this.open) { 
-			for (var x=0; x<this.siblingWidgets.length;x++) {
-				if (this.siblingWidgets[x].open) {
-					this.siblingWidgets[x].collapse();
-				}
-			}
-			this.expand();
-		} else {
-			if (this.allowCollapse) {
-				this.collapse();
-			}
-		}
-	}
-});
-
-dojo.widget.tags.addParseTreeHandler("dojo:AccordionPane");
+dojo.provide("dojo.widget.html.AccordionPane");
+dojo.require("dojo.widget.TitlePane");
+
+dojo.widget.html.AccordionPane = function(){
+
+	dojo.widget.html.TitlePane.call(this);
+	this.widgetType = "AccordionPane";
+
+	this.open=false;
+	this.allowCollapse=true;
+	this.label="";
+	this.open=false;
+
+	this.labelNodeClass="";
+	this.containerNodeClass="";
+}
+
+dojo.inherits(dojo.widget.html.AccordionPane, dojo.widget.html.TitlePane);
+
+dojo.lang.extend(dojo.widget.html.AccordionPane, {
+        postCreate: function() {
+                dojo.widget.html.AccordionPane.superclass.postCreate.call(this);
+		this.domNode.widgetType=this.widgetType;
+		this.setSizes();
+		dojo.html.addClass(this.labelNode, this.labelNodeClass);
+		dojo.html.disableSelection(this.labelNode);
+		dojo.html.addClass(this.containerNode, this.containerNodeClass);
+        },
+
+	collapse: function() {
+		//dojo.fx.html.wipeOut(this.containerNode,250);
+		//var anim = dojo.fx.html.wipe(this.containerNode, 1000, this.containerNode.offsetHeight, 0, null, true);
+		this.containerNode.style.display="none";
+		this.open=false;
+	},
+
+	expand: function() {
+		//dojo.fx.html.wipeIn(this.containerNode,250);
+		this.containerNode.style.display="block";
+		//var anim = dojo.fx.html.wipe(this.containerNode, 1000, 0, this.containerNode.scrollHeight, null, true);
+		this.open=true;
+	},
+
+	getCollapsedHeight: function() {
+		return dojo.style.getOuterHeight(this.labelNode)+1;
+	},
+
+	setSizes: function() {
+		var siblings = this.domNode.parentNode.childNodes;
+		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]) {
+					var ap = dojo.widget.byNode(siblings[x]);
+					this.siblingWidgets.push(ap);
+					height -= ap.getCollapsedHeight();
+				}
+			}
+		}
+	
+		for (var x=0; x<this.siblingWidgets.length; x++) {
+			dojo.style.setOuterHeight(this.siblingWidgets[x].containerNode,height);
+		}
+
+		dojo.style.setOuterHeight(this.containerNode,height);
+	},
+
+	onLabelClick: function() {
+		this.setSizes();
+		if (!this.open) { 
+			for (var x=0; x<this.siblingWidgets.length;x++) {
+				if (this.siblingWidgets[x].open) {
+					this.siblingWidgets[x].collapse();
+				}
+			}
+			this.expand();
+		} else {
+			if (this.allowCollapse) {
+				this.collapse();
+			}
+		}
+	}
+});
+
+dojo.widget.tags.addParseTreeHandler("dojo:AccordionPane");
diff --git a/webapp/web/src/widget/html/Button2.js b/webapp/web/src/widget/html/Button2.js
index 307ea8475..9ed59a695 100644
--- a/webapp/web/src/widget/html/Button2.js
+++ b/webapp/web/src/widget/html/Button2.js
@@ -8,18 +8,18 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-// this is a stub that will be removed in 0.4, see ../Button2.html for details
-
-dojo.provide("dojo.widget.html.Button2");
-
-dojo.widget.html.Button2 = function(){}
-dojo.inherits(dojo.widget.html.Button2, dojo.widget.html.Button);
-dojo.lang.extend(dojo.widget.html.Button2, { widgetType: "Button2" });
-
-dojo.widget.html.DropDownButton2 = function(){}
-dojo.inherits(dojo.widget.html.DropDownButton2, dojo.widget.html.DropDownButton);
-dojo.lang.extend(dojo.widget.html.DropDownButton2, { widgetType: "DropDownButton2" });
-
-dojo.widget.html.ComboButton2 = function(){}
-dojo.inherits(dojo.widget.html.ComboButton2, dojo.widget.html.ComboButton);
+// this is a stub that will be removed in 0.4, see ../Button2.html for details
+
+dojo.provide("dojo.widget.html.Button2");
+
+dojo.widget.html.Button2 = function(){}
+dojo.inherits(dojo.widget.html.Button2, dojo.widget.html.Button);
+dojo.lang.extend(dojo.widget.html.Button2, { widgetType: "Button2" });
+
+dojo.widget.html.DropDownButton2 = function(){}
+dojo.inherits(dojo.widget.html.DropDownButton2, dojo.widget.html.DropDownButton);
+dojo.lang.extend(dojo.widget.html.DropDownButton2, { widgetType: "DropDownButton2" });
+
+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
diff --git a/webapp/web/src/widget/html/DebugConsole.js b/webapp/web/src/widget/html/DebugConsole.js
index a4d13d5c2..8ed117235 100644
--- a/webapp/web/src/widget/html/DebugConsole.js
+++ b/webapp/web/src/widget/html/DebugConsole.js
@@ -8,24 +8,24 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.html.DebugConsole");
-
-dojo.require("dojo.widget.*");
-dojo.require("dojo.widget.FloatingPane");
-
-dojo.widget.html.DebugConsole= function(){
-
-	dojo.widget.html.FloatingPane.call(this);
-	dojo.widget.DebugConsole.call(this);
-}
-
-dojo.inherits(dojo.widget.html.DebugConsole, dojo.widget.html.FloatingPane);
-
-dojo.lang.extend(dojo.widget.html.DebugConsole, {
-	fillInTemplate: function() {
-		dojo.widget.html.DebugConsole.superclass.fillInTemplate.apply(this, arguments);
-		this.containerNode.id = "debugConsoleClientPane";
-		djConfig.isDebug = true;
-		djConfig.debugContainerId = this.containerNode.id;
-	}
-});
+dojo.provide("dojo.widget.html.DebugConsole");
+
+dojo.require("dojo.widget.*");
+dojo.require("dojo.widget.FloatingPane");
+
+dojo.widget.html.DebugConsole= function(){
+
+	dojo.widget.html.FloatingPane.call(this);
+	dojo.widget.DebugConsole.call(this);
+}
+
+dojo.inherits(dojo.widget.html.DebugConsole, dojo.widget.html.FloatingPane);
+
+dojo.lang.extend(dojo.widget.html.DebugConsole, {
+	fillInTemplate: function() {
+		dojo.widget.html.DebugConsole.superclass.fillInTemplate.apply(this, arguments);
+		this.containerNode.id = "debugConsoleClientPane";
+		djConfig.isDebug = true;
+		djConfig.debugContainerId = this.containerNode.id;
+	}
+});
diff --git a/webapp/web/src/widget/html/DropdownButton.js b/webapp/web/src/widget/html/DropdownButton.js
index a3b3e8a0f..4afef155b 100644
--- a/webapp/web/src/widget/html/DropdownButton.js
+++ b/webapp/web/src/widget/html/DropdownButton.js
@@ -8,181 +8,181 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-/* TODO:
- * - make the dropdown "smart" so it can't get cutoff on bottom of page, sides of page, etc.
- */
-
-dojo.provide("dojo.widget.html.DropdownButton");
-
-dojo.require("dojo.event.*");
-dojo.require("dojo.widget.*");
-dojo.require("dojo.widget.HtmlWidget");
-dojo.require("dojo.uri.Uri");
-dojo.require("dojo.dom");
-dojo.require("dojo.style");
-dojo.require("dojo.html");
-
-dojo.widget.html.DropdownButton = function() {
-	// mix in the button properties
-	dojo.widget.DropdownButton.call(this);
-	dojo.widget.HtmlWidget.call(this);
-}
-
-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"),
-	templateCssPath: dojo.uri.dojoUri("src/widget/templates/HtmlButtonTemplate.css"),
-
-	// attach points
-	button: null,
-	table: null,
-	labelCell: null,
-	borderCell: null,
-	arrowCell: null,
-	arrow: null,
-
-	fillInTemplate: function(args, frag) {
-		// input data (containing the anchor for the button itself, plus the
-		// thing to display when you push the down arrow)
-		var input = frag["dojo:"+this.widgetType.toLowerCase()]["nodeRef"];
-
-		// Recursively expand widgets inside of the <dojo:dropdownButton>
-		var parser = new dojo.xml.Parse();
-		var frag = parser.parseElement(input, null, true);
-		var ary = dojo.widget.getParser().createComponents(frag);
-
-		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");
-			this.domNode.setAttribute("disabled", "true");
-		}
-
-		dojo.html.disableSelection(this.a);
-		this.a.style["text-decoration"]="none";
-		this.labelCell.appendChild(this.a);
-
-		this.arrow.src =
-			dojo.uri.dojoUri("src/widget/templates/images/dropdownButtonsArrow" +
-			(this.disabled ? "-disabled" : "") + ".gif");
-
-		// Attach menu to body so that it appears above other buttons
-		this.menu.style.position="absolute";
-		this.menu.style.display="none";
-		this.menu.style["z-index"] = 99;
-		document.body.appendChild(this.menu);
-	},
-
-	postCreate: function() {
-		if ( dojo.render.html.ie ) {
-			// Compensate for IE's weird padding of button content, which seems to be relative
-			// to the length of the content
-			var contentWidth = dojo.style.getOuterWidth(this.table);
-			this.labelCell.style["left"] = "-" + (contentWidth / 10) + "px";
-			this.arrowCell.style["left"] = (contentWidth / 10) + "px";
-		}
-
-		// Make menu at least as wide as the button
-		var buttonWidth = dojo.style.getOuterWidth(this.button);
-		var menuWidth = dojo.style.getOuterWidth(this.menu);
-		if ( buttonWidth > menuWidth ) {
-			dojo.style.setOuterWidth(this.menu, buttonWidth);
-		}
-	},
-
-	// If someone clicks anywhere else on the screen (including another menu),
-	// then close this menu.
-	onCanvasMouseDown: function(e) {
-		if( !dojo.dom.isDescendantOf(e.target, this.button) &&
-			!dojo.dom.isDescendantOf(e.target, this.menu) ) {
-			this.hideMenu();
-		}
-	},
-
-	eventWasOverArrow: function(e) {
-		// want to use dojo.html.overElement() but also need to detect clicks
-		// on the area between the arrow and the edge of the button
-		var eventX = e.clientX;
-		var borderX = dojo.style.totalOffsetLeft(this.borderCell);
-		return (eventX > borderX );
-	},
-
-	onMouseOver: function(e) {
-		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");
-	},
-
-	onClick: function(e) {
-		if ( this.eventWasOverArrow(e) ) {
-			this._onClickArrow();
-		} else {
-			this._onClickButton();
-		}
-	},
-
-	// Action when the user presses the button
-	_onClickButton: function(e) {
-		if ( this.a ) {
-			if ( this.a.click ) {
-				this.a.click();
-			} else if ( this.a.href ) {
-				location.href = this.a.href;
-			}
-		}
-	},
-
-	// Action when user presses the arrow
-	_onClickArrow: function() {
-		if ( this.menu.style.display == "none" ) {
-			this.showMenu();
-		} else {
-			this.hideMenu();
-		}
-	},
-	
-	showMenu: function() {
-		if ( this.disabled )
-			return;
-
-		// Position it accordingly, relative to screen root (since
-		// it's attached to document.body)
-		this.menu.style.left = dojo.style.totalOffsetLeft(this.button) + "px";
-		this.menu.style.top = dojo.style.totalOffsetTop(this.button) + dojo.style.getOuterHeight(this.button) + "px";
-
-		// Display the menu; do this funky code below to stop the menu from extending
-		// all the way to the right edge of the screen.
-		// TODO: retest simple display="" to confirm that it doesn't work.
-		try {
-			this.menu.style.display="table";	// mozilla
-		} catch(e) {
-			this.menu.style.display="block";	// IE
-		}
-
-		// 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.)
-		dojo.event.connect(this.menu, "onclick", this, "hideMenu");
-	},
-
-	hideMenu: function() {
-		this.menu.style.display = "none";
-		dojo.event.disconnect(document.documentElement, "onmousedown", this, "onCanvasMouseDown");
-		dojo.event.disconnect(this.menu, "onclick", this, "hideMenu");
-	}
-});
-
-
+/* TODO:
+ * - make the dropdown "smart" so it can't get cutoff on bottom of page, sides of page, etc.
+ */
+
+dojo.provide("dojo.widget.html.DropdownButton");
+
+dojo.require("dojo.event.*");
+dojo.require("dojo.widget.*");
+dojo.require("dojo.widget.HtmlWidget");
+dojo.require("dojo.uri.Uri");
+dojo.require("dojo.dom");
+dojo.require("dojo.style");
+dojo.require("dojo.html");
+
+dojo.widget.html.DropdownButton = function() {
+	// mix in the button properties
+	dojo.widget.DropdownButton.call(this);
+	dojo.widget.HtmlWidget.call(this);
+}
+
+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"),
+	templateCssPath: dojo.uri.dojoUri("src/widget/templates/HtmlButtonTemplate.css"),
+
+	// attach points
+	button: null,
+	table: null,
+	labelCell: null,
+	borderCell: null,
+	arrowCell: null,
+	arrow: null,
+
+	fillInTemplate: function(args, frag) {
+		// input data (containing the anchor for the button itself, plus the
+		// thing to display when you push the down arrow)
+		var input = frag["dojo:"+this.widgetType.toLowerCase()]["nodeRef"];
+
+		// Recursively expand widgets inside of the <dojo:dropdownButton>
+		var parser = new dojo.xml.Parse();
+		var frag = parser.parseElement(input, null, true);
+		var ary = dojo.widget.getParser().createComponents(frag);
+
+		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");
+			this.domNode.setAttribute("disabled", "true");
+		}
+
+		dojo.html.disableSelection(this.a);
+		this.a.style["text-decoration"]="none";
+		this.labelCell.appendChild(this.a);
+
+		this.arrow.src =
+			dojo.uri.dojoUri("src/widget/templates/images/dropdownButtonsArrow" +
+			(this.disabled ? "-disabled" : "") + ".gif");
+
+		// Attach menu to body so that it appears above other buttons
+		this.menu.style.position="absolute";
+		this.menu.style.display="none";
+		this.menu.style["z-index"] = 99;
+		document.body.appendChild(this.menu);
+	},
+
+	postCreate: function() {
+		if ( dojo.render.html.ie ) {
+			// Compensate for IE's weird padding of button content, which seems to be relative
+			// to the length of the content
+			var contentWidth = dojo.style.getOuterWidth(this.table);
+			this.labelCell.style["left"] = "-" + (contentWidth / 10) + "px";
+			this.arrowCell.style["left"] = (contentWidth / 10) + "px";
+		}
+
+		// Make menu at least as wide as the button
+		var buttonWidth = dojo.style.getOuterWidth(this.button);
+		var menuWidth = dojo.style.getOuterWidth(this.menu);
+		if ( buttonWidth > menuWidth ) {
+			dojo.style.setOuterWidth(this.menu, buttonWidth);
+		}
+	},
+
+	// If someone clicks anywhere else on the screen (including another menu),
+	// then close this menu.
+	onCanvasMouseDown: function(e) {
+		if( !dojo.dom.isDescendantOf(e.target, this.button) &&
+			!dojo.dom.isDescendantOf(e.target, this.menu) ) {
+			this.hideMenu();
+		}
+	},
+
+	eventWasOverArrow: function(e) {
+		// want to use dojo.html.overElement() but also need to detect clicks
+		// on the area between the arrow and the edge of the button
+		var eventX = e.clientX;
+		var borderX = dojo.style.totalOffsetLeft(this.borderCell);
+		return (eventX > borderX );
+	},
+
+	onMouseOver: function(e) {
+		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");
+	},
+
+	onClick: function(e) {
+		if ( this.eventWasOverArrow(e) ) {
+			this._onClickArrow();
+		} else {
+			this._onClickButton();
+		}
+	},
+
+	// Action when the user presses the button
+	_onClickButton: function(e) {
+		if ( this.a ) {
+			if ( this.a.click ) {
+				this.a.click();
+			} else if ( this.a.href ) {
+				location.href = this.a.href;
+			}
+		}
+	},
+
+	// Action when user presses the arrow
+	_onClickArrow: function() {
+		if ( this.menu.style.display == "none" ) {
+			this.showMenu();
+		} else {
+			this.hideMenu();
+		}
+	},
+	
+	showMenu: function() {
+		if ( this.disabled )
+			return;
+
+		// Position it accordingly, relative to screen root (since
+		// it's attached to document.body)
+		this.menu.style.left = dojo.style.totalOffsetLeft(this.button) + "px";
+		this.menu.style.top = dojo.style.totalOffsetTop(this.button) + dojo.style.getOuterHeight(this.button) + "px";
+
+		// Display the menu; do this funky code below to stop the menu from extending
+		// all the way to the right edge of the screen.
+		// TODO: retest simple display="" to confirm that it doesn't work.
+		try {
+			this.menu.style.display="table";	// mozilla
+		} catch(e) {
+			this.menu.style.display="block";	// IE
+		}
+
+		// 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.)
+		dojo.event.connect(this.menu, "onclick", this, "hideMenu");
+	},
+
+	hideMenu: function() {
+		this.menu.style.display = "none";
+		dojo.event.disconnect(document.documentElement, "onmousedown", this, "onCanvasMouseDown");
+		dojo.event.disconnect(this.menu, "onclick", this, "hideMenu");
+	}
+});
+
+
diff --git a/webapp/web/src/widget/html/GoogleMap.js b/webapp/web/src/widget/html/GoogleMap.js
index 1cbc69c2e..d575d8ace 100644
--- a/webapp/web/src/widget/html/GoogleMap.js
+++ b/webapp/web/src/widget/html/GoogleMap.js
@@ -8,191 +8,191 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.html.GoogleMap");
-dojo.require("dojo.event.*");
-dojo.require("dojo.html");
-dojo.require("dojo.math");
-dojo.require("dojo.uri.Uri");
-dojo.require("dojo.widget.HtmlWidget");
-dojo.require("dojo.widget.GoogleMap");
-
-(function(){
-	var gkey = djConfig["gMapKey"]||djConfig["googleMapKey"];
-
-	//	the Google API key mechanism sucks.  We're hardcoding here for love and affection but I don't like it.
-	var uri=new dojo.uri.Uri(window.location.href);
-	if(uri.host=="www.dojotoolkit.org"){
-		gkey="ABQIAAAACUNdgv_7FGOmUslbm9l6_hRqjp7ri2mNiOEYqetD3xnFHpt5rBSjszDd1sdufPyQKUTyCf_YxoIxvw";
-	}
-	else if(uri.host=="blog.dojotoolkit.org"){
-		gkey="ABQIAAAACUNdgv_7FGOmUslbm9l6_hSkep6Av1xaMhVn3yCLkorJeXeLARQ6fammI_P3qSGleTJhoI5_1JmP_Q";
-	}
-	else if(uri.host=="archive.dojotoolkit.org"){
-		gkey="ABQIAAAACUNdgv_7FGOmUslbm9l6_hTaQpDt0dyGLIHbXMPTzg1kWeAfwRTwZNyrUfbfxYE9yIvRivEjcXoDTg";
-	}
-	else if(uri.host=="dojotoolkit.org"){
-		gkey="ABQIAAAACUNdgv_7FGOmUslbm9l6_hSaOaO_TgJ5c3mtQFnk5JO2zD5dZBRZk-ieqVs7BORREYNzAERmcJoEjQ";
-	}
-
-	if(!dojo.hostenv.post_load_){
-		var tag = "<scr"+"ipt src='http://maps.google.com/maps?file=api&amp;v=2&amp;key="+gkey+"'></scri"+"pt>";
-		if(!dj_global["GMap2"]){ // prevent multi-inclusion
-			document.write(tag);
-		}
-	}else{
-		dojo.debug("cannot initialize map system after the page has been loaded! Please either manually include the script block provided by Google in your page or require() the GoogleMap widget before onload has fired");
-	}
-})();
-
-dojo.widget.html.GoogleMap=function(){
-	dojo.widget.HtmlWidget.call(this);
-	dojo.widget.GoogleMap.call(this);
-
-	var gm=dojo.widget.GoogleMap;
-
-	this.map=null;
-	this.data=[];
-	this.datasrc="";
-	// FIXME: this is pehraps the stupidest way to specify this enum I can think of
-	this.controls=[gm.Controls.LargeMap,gm.Controls.Scale,gm.Controls.MapType];
-};
-dojo.inherits(dojo.widget.html.GoogleMap, dojo.widget.HtmlWidget);
-
-dojo.lang.extend(dojo.widget.html.GoogleMap, {
-	templatePath:null,
-	templateCssPath:null,
-
-	setControls:function(){
-		var c=dojo.widget.GoogleMap.Controls;
-		for(var i=0; i<this.controls.length; i++){
-			var type=this.controls[i];
-			switch(type){
-				case c.LargeMap:{
-					this.map.addControl(new GLargeMapControl());
-					break;
-				}
-				case c.SmallMap:{
-					this.map.addControl(new GSmallMapControl());
-					break;
-				}
-				case c.SmallZoom:{
-					this.map.addControl(new GSmallZoomControl());
-					break;
-				}
-				case c.Scale:{
-					this.map.addControl(new GScaleControl());
-					break;
-				}
-				case c.MapType:{
-					this.map.addControl(new GMapTypeControl());
-					break;
-				}
-				case c.Overview:{
-					this.map.addControl(new GOverviewMapControl());
-					break;
-				}
-				default:{
-					break;
-				}
-			}
-		}
-	},
-	
-	findCenter:function(bounds){
-		var clat=(bounds.getNorthEast().lat()+bounds.getSouthWest().lat())/2;
-		var clng=(bounds.getNorthEast().lng()+bounds.getSouthWest().lng())/2;
-		return (new GLatLng(clat,clng));
-	},
-
-	createPinpoint:function(pt,overlay){
-		var m=new GMarker(pt);
-		if(overlay){
-			GEvent.addListener(m,"click",function(){
-				m.openInfoWindowHtml("<div>"+overlay+"</div>");
-			});
-		}
-		return m;
-	},
-
-	parse:function(table){
-		this.data=[];
-
-		//	get the column indices
-		var h=table.getElementsByTagName("thead")[0];
-		if(!h){
-			return;
-		}
-
-		var a=[];
-		var cols=h.getElementsByTagName("td");
-		if(cols.length==0){
-			cols=h.getElementsByTagName("th");
-		}
-		for(var i=0; i<cols.length; i++){
-			var c=cols[i].innerHTML.toLowerCase();
-			if(c=="long") c="lng";
-			a.push(c);
-		}
-		
-		//	parse the data
-		var b=table.getElementsByTagName("tbody")[0];
-		if(!b){
-			return;
-		}
-		for(var i=0; i<b.childNodes.length; i++){
-			if(!(b.childNodes[i].nodeName&&b.childNodes[i].nodeName.toLowerCase()=="tr")){
-				continue;
-			}
-			var cells=b.childNodes[i].getElementsByTagName("td");
-			var o={};
-			for(var j=0; j<a.length; j++){
-				var col=a[j];
-				if(col=="lat"||col=="lng"){
-					o[col]=parseFloat(cells[j].innerHTML);					
-				}else{
-					o[col]=cells[j].innerHTML;
-				}
-			}
-			this.data.push(o);
-		}
-	},
-	render:function(){
-		var bounds=new GLatLngBounds();
-		var d=this.data;
-		var pts=[];
-		for(var i=0; i<d.length; i++){
-			bounds.extend(new GLatLng(d[i].lat,d[i].lng));
-		}
-
-		this.map.setCenter(this.findCenter(bounds), this.map.getBoundsZoomLevel(bounds));
-
-		for(var i=0; i<this.data.length; i++){
-			var p=new GLatLng(this.data[i].lat,this.data[i].lng);
-			var d=this.data[i].description||null;
-			var m=this.createPinpoint(p,d);
-			this.map.addOverlay(m);
-		}
-	},
-	
-
-	initialize:function(args, frag){
-		if(!GMap2){
-			dojo.raise("dojo.widget.GoogleMap: The Google Map script must be included (with a proper API key) in order to use this widget.");
-		}
-		if(this.datasrc){
-			this.parse(dojo.byId(this.datasrc));
-		}
-		else if(this.domNode.getElementsByTagName("table")[0]){
-			this.parse(this.domNode.getElementsByTagName("table")[0]);
-		}
-	},
-	postCreate:function(){
-		//	clean the domNode before creating the map.
-		while(this.domNode.childNodes.length>0){
-			this.domNode.removeChild(this.domNode.childNodes[0]);
-		}
-		this.map=new GMap2(this.domNode);
-		this.render();
-		this.setControls();
-	}
-});
+dojo.provide("dojo.widget.html.GoogleMap");
+dojo.require("dojo.event.*");
+dojo.require("dojo.html");
+dojo.require("dojo.math");
+dojo.require("dojo.uri.Uri");
+dojo.require("dojo.widget.HtmlWidget");
+dojo.require("dojo.widget.GoogleMap");
+
+(function(){
+	var gkey = djConfig["gMapKey"]||djConfig["googleMapKey"];
+
+	//	the Google API key mechanism sucks.  We're hardcoding here for love and affection but I don't like it.
+	var uri=new dojo.uri.Uri(window.location.href);
+	if(uri.host=="www.dojotoolkit.org"){
+		gkey="ABQIAAAACUNdgv_7FGOmUslbm9l6_hRqjp7ri2mNiOEYqetD3xnFHpt5rBSjszDd1sdufPyQKUTyCf_YxoIxvw";
+	}
+	else if(uri.host=="blog.dojotoolkit.org"){
+		gkey="ABQIAAAACUNdgv_7FGOmUslbm9l6_hSkep6Av1xaMhVn3yCLkorJeXeLARQ6fammI_P3qSGleTJhoI5_1JmP_Q";
+	}
+	else if(uri.host=="archive.dojotoolkit.org"){
+		gkey="ABQIAAAACUNdgv_7FGOmUslbm9l6_hTaQpDt0dyGLIHbXMPTzg1kWeAfwRTwZNyrUfbfxYE9yIvRivEjcXoDTg";
+	}
+	else if(uri.host=="dojotoolkit.org"){
+		gkey="ABQIAAAACUNdgv_7FGOmUslbm9l6_hSaOaO_TgJ5c3mtQFnk5JO2zD5dZBRZk-ieqVs7BORREYNzAERmcJoEjQ";
+	}
+
+	if(!dojo.hostenv.post_load_){
+		var tag = "<scr"+"ipt src='http://maps.google.com/maps?file=api&amp;v=2&amp;key="+gkey+"'></scri"+"pt>";
+		if(!dj_global["GMap2"]){ // prevent multi-inclusion
+			document.write(tag);
+		}
+	}else{
+		dojo.debug("cannot initialize map system after the page has been loaded! Please either manually include the script block provided by Google in your page or require() the GoogleMap widget before onload has fired");
+	}
+})();
+
+dojo.widget.html.GoogleMap=function(){
+	dojo.widget.HtmlWidget.call(this);
+	dojo.widget.GoogleMap.call(this);
+
+	var gm=dojo.widget.GoogleMap;
+
+	this.map=null;
+	this.data=[];
+	this.datasrc="";
+	// FIXME: this is pehraps the stupidest way to specify this enum I can think of
+	this.controls=[gm.Controls.LargeMap,gm.Controls.Scale,gm.Controls.MapType];
+};
+dojo.inherits(dojo.widget.html.GoogleMap, dojo.widget.HtmlWidget);
+
+dojo.lang.extend(dojo.widget.html.GoogleMap, {
+	templatePath:null,
+	templateCssPath:null,
+
+	setControls:function(){
+		var c=dojo.widget.GoogleMap.Controls;
+		for(var i=0; i<this.controls.length; i++){
+			var type=this.controls[i];
+			switch(type){
+				case c.LargeMap:{
+					this.map.addControl(new GLargeMapControl());
+					break;
+				}
+				case c.SmallMap:{
+					this.map.addControl(new GSmallMapControl());
+					break;
+				}
+				case c.SmallZoom:{
+					this.map.addControl(new GSmallZoomControl());
+					break;
+				}
+				case c.Scale:{
+					this.map.addControl(new GScaleControl());
+					break;
+				}
+				case c.MapType:{
+					this.map.addControl(new GMapTypeControl());
+					break;
+				}
+				case c.Overview:{
+					this.map.addControl(new GOverviewMapControl());
+					break;
+				}
+				default:{
+					break;
+				}
+			}
+		}
+	},
+	
+	findCenter:function(bounds){
+		var clat=(bounds.getNorthEast().lat()+bounds.getSouthWest().lat())/2;
+		var clng=(bounds.getNorthEast().lng()+bounds.getSouthWest().lng())/2;
+		return (new GLatLng(clat,clng));
+	},
+
+	createPinpoint:function(pt,overlay){
+		var m=new GMarker(pt);
+		if(overlay){
+			GEvent.addListener(m,"click",function(){
+				m.openInfoWindowHtml("<div>"+overlay+"</div>");
+			});
+		}
+		return m;
+	},
+
+	parse:function(table){
+		this.data=[];
+
+		//	get the column indices
+		var h=table.getElementsByTagName("thead")[0];
+		if(!h){
+			return;
+		}
+
+		var a=[];
+		var cols=h.getElementsByTagName("td");
+		if(cols.length==0){
+			cols=h.getElementsByTagName("th");
+		}
+		for(var i=0; i<cols.length; i++){
+			var c=cols[i].innerHTML.toLowerCase();
+			if(c=="long") c="lng";
+			a.push(c);
+		}
+		
+		//	parse the data
+		var b=table.getElementsByTagName("tbody")[0];
+		if(!b){
+			return;
+		}
+		for(var i=0; i<b.childNodes.length; i++){
+			if(!(b.childNodes[i].nodeName&&b.childNodes[i].nodeName.toLowerCase()=="tr")){
+				continue;
+			}
+			var cells=b.childNodes[i].getElementsByTagName("td");
+			var o={};
+			for(var j=0; j<a.length; j++){
+				var col=a[j];
+				if(col=="lat"||col=="lng"){
+					o[col]=parseFloat(cells[j].innerHTML);					
+				}else{
+					o[col]=cells[j].innerHTML;
+				}
+			}
+			this.data.push(o);
+		}
+	},
+	render:function(){
+		var bounds=new GLatLngBounds();
+		var d=this.data;
+		var pts=[];
+		for(var i=0; i<d.length; i++){
+			bounds.extend(new GLatLng(d[i].lat,d[i].lng));
+		}
+
+		this.map.setCenter(this.findCenter(bounds), this.map.getBoundsZoomLevel(bounds));
+
+		for(var i=0; i<this.data.length; i++){
+			var p=new GLatLng(this.data[i].lat,this.data[i].lng);
+			var d=this.data[i].description||null;
+			var m=this.createPinpoint(p,d);
+			this.map.addOverlay(m);
+		}
+	},
+	
+
+	initialize:function(args, frag){
+		if(!GMap2){
+			dojo.raise("dojo.widget.GoogleMap: The Google Map script must be included (with a proper API key) in order to use this widget.");
+		}
+		if(this.datasrc){
+			this.parse(dojo.byId(this.datasrc));
+		}
+		else if(this.domNode.getElementsByTagName("table")[0]){
+			this.parse(this.domNode.getElementsByTagName("table")[0]);
+		}
+	},
+	postCreate:function(){
+		//	clean the domNode before creating the map.
+		while(this.domNode.childNodes.length>0){
+			this.domNode.removeChild(this.domNode.childNodes[0]);
+		}
+		this.map=new GMap2(this.domNode);
+		this.render();
+		this.setControls();
+	}
+});
diff --git a/webapp/web/src/widget/html/LinkPane.js b/webapp/web/src/widget/html/LinkPane.js
index 764239b69..c0de04598 100644
--- a/webapp/web/src/widget/html/LinkPane.js
+++ b/webapp/web/src/widget/html/LinkPane.js
@@ -8,47 +8,47 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.LinkPane");
-dojo.provide("dojo.widget.html.LinkPane");
-
-//
-// a div that loads from a URL.  (Similar to an iframe, but
-// it's in the same environment as the main window)
-//
-
-dojo.require("dojo.widget.LinkPane");
-dojo.require("dojo.widget.*");
-dojo.require("dojo.event.*");
-dojo.require("dojo.io.*");
-dojo.require("dojo.widget.ContentPane");
-dojo.require("dojo.html");
-dojo.require("dojo.style");
-dojo.require("dojo.dom");
-dojo.require("dojo.string");
-
-
-dojo.widget.html.LinkPane = function(){
-	dojo.widget.html.ContentPane.call(this);
-}
-
-dojo.inherits(dojo.widget.html.LinkPane, dojo.widget.html.ContentPane);
-
-dojo.lang.extend(dojo.widget.html.LinkPane, {
-	widgetType: "LinkPane",
-
-	// I'm using a template because the user may specify the input as
-	// <a href="foo.html">label</a>, in which case we need to get rid of the
-	// <a> because we don't want a link.
-	templateString: '<div class="dojoLinkPane"></div>',
-
-	fillInTemplate: function(args, frag){
-		var source = this.getFragNodeRef(frag);
-
-		// If user has specified node contents, they become the label
-		// (the link must be plain text)
-		this.label += source.innerHTML;
-
-		var source = this.getFragNodeRef(frag);
-		dojo.html.copyStyle(this.domNode, source);
-	}
-});
+dojo.provide("dojo.widget.LinkPane");
+dojo.provide("dojo.widget.html.LinkPane");
+
+//
+// a div that loads from a URL.  (Similar to an iframe, but
+// it's in the same environment as the main window)
+//
+
+dojo.require("dojo.widget.LinkPane");
+dojo.require("dojo.widget.*");
+dojo.require("dojo.event.*");
+dojo.require("dojo.io.*");
+dojo.require("dojo.widget.ContentPane");
+dojo.require("dojo.html");
+dojo.require("dojo.style");
+dojo.require("dojo.dom");
+dojo.require("dojo.string");
+
+
+dojo.widget.html.LinkPane = function(){
+	dojo.widget.html.ContentPane.call(this);
+}
+
+dojo.inherits(dojo.widget.html.LinkPane, dojo.widget.html.ContentPane);
+
+dojo.lang.extend(dojo.widget.html.LinkPane, {
+	widgetType: "LinkPane",
+
+	// I'm using a template because the user may specify the input as
+	// <a href="foo.html">label</a>, in which case we need to get rid of the
+	// <a> because we don't want a link.
+	templateString: '<div class="dojoLinkPane"></div>',
+
+	fillInTemplate: function(args, frag){
+		var source = this.getFragNodeRef(frag);
+
+		// If user has specified node contents, they become the label
+		// (the link must be plain text)
+		this.label += source.innerHTML;
+
+		var source = this.getFragNodeRef(frag);
+		dojo.html.copyStyle(this.domNode, source);
+	}
+});
diff --git a/webapp/web/src/widget/html/TaskBar.js b/webapp/web/src/widget/html/TaskBar.js
index 89a19f88f..777a105e7 100644
--- a/webapp/web/src/widget/html/TaskBar.js
+++ b/webapp/web/src/widget/html/TaskBar.js
@@ -8,78 +8,78 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.html.TaskBar");
-dojo.provide("dojo.widget.html.TaskBarItem");
-
-dojo.require("dojo.widget.*");
-dojo.require("dojo.widget.FloatingPane");
-dojo.require("dojo.widget.HtmlWidget");
-dojo.require("dojo.event");
-
-// Icon associated w/a floating pane
-dojo.widget.html.TaskBarItem = function(){
-	dojo.widget.TaskBarItem.call(this);
-	dojo.widget.HtmlWidget.call(this);
-}
-dojo.inherits(dojo.widget.html.TaskBarItem, dojo.widget.HtmlWidget);
-
-dojo.lang.extend(dojo.widget.html.TaskBarItem, {
-	// constructor arguments
-	iconSrc: '',
-	caption: 'Untitled',
-	window: null,
-	templatePath: dojo.uri.dojoUri("src/widget/templates/HtmlTaskBarItemTemplate.html"),
-	templateCssPath: dojo.uri.dojoUri("src/widget/templates/HtmlTaskBar.css"),
-
-	fillInTemplate: function() {
-		if ( this.iconSrc != '' ) {
-			var img = document.createElement("img");
-			img.src = this.iconSrc;
-			this.domNode.appendChild(img);
-		}
-		this.domNode.appendChild(document.createTextNode(this.caption));
-		dojo.html.disableSelection(this.domNode);
-	},
-
-	postCreate: function() {
-		this.window=dojo.widget.getWidgetById(this.windowId);
-		this.window.explodeSrc = this.domNode;
-		dojo.event.connect(this.window, "destroy", this, "destroy")
-	},
-
-	onClick: function() {
-		this.window.show();
-	}
-});
-
-// Collection of widgets in a bar, like Windows task bar
-dojo.widget.html.TaskBar = function(){
-
-	dojo.widget.html.FloatingPane.call(this);
-	dojo.widget.TaskBar.call(this);
-	this._addChildStack = [];
-}
-
-dojo.inherits(dojo.widget.html.TaskBar, dojo.widget.html.FloatingPane);
-
-dojo.lang.extend(dojo.widget.html.TaskBar, {
-
-	resizable: false,
-	titleBarDisplay: "none",
-
-	addChild: function(child) {
-		if(!this.containerNode){ 
-			this._addChildStack.push(child);
-		}else if(this._addChildStack.length > 0){
-			var oarr = this._addChildStack;
-			this._addChildStack = [];
-			dojo.lang.forEach(oarr, this.addChild, this);
-		}
-		var tbi = dojo.widget.createWidget("TaskBarItem",
-			{	windowId: child.widgetId, 
-				caption: child.title, 
-				iconSrc: child.iconSrc
-			});
-		dojo.widget.html.TaskBar.superclass.addChild.call(this,tbi);
-	}
-});
+dojo.provide("dojo.widget.html.TaskBar");
+dojo.provide("dojo.widget.html.TaskBarItem");
+
+dojo.require("dojo.widget.*");
+dojo.require("dojo.widget.FloatingPane");
+dojo.require("dojo.widget.HtmlWidget");
+dojo.require("dojo.event");
+
+// Icon associated w/a floating pane
+dojo.widget.html.TaskBarItem = function(){
+	dojo.widget.TaskBarItem.call(this);
+	dojo.widget.HtmlWidget.call(this);
+}
+dojo.inherits(dojo.widget.html.TaskBarItem, dojo.widget.HtmlWidget);
+
+dojo.lang.extend(dojo.widget.html.TaskBarItem, {
+	// constructor arguments
+	iconSrc: '',
+	caption: 'Untitled',
+	window: null,
+	templatePath: dojo.uri.dojoUri("src/widget/templates/HtmlTaskBarItemTemplate.html"),
+	templateCssPath: dojo.uri.dojoUri("src/widget/templates/HtmlTaskBar.css"),
+
+	fillInTemplate: function() {
+		if ( this.iconSrc != '' ) {
+			var img = document.createElement("img");
+			img.src = this.iconSrc;
+			this.domNode.appendChild(img);
+		}
+		this.domNode.appendChild(document.createTextNode(this.caption));
+		dojo.html.disableSelection(this.domNode);
+	},
+
+	postCreate: function() {
+		this.window=dojo.widget.getWidgetById(this.windowId);
+		this.window.explodeSrc = this.domNode;
+		dojo.event.connect(this.window, "destroy", this, "destroy")
+	},
+
+	onClick: function() {
+		this.window.show();
+	}
+});
+
+// Collection of widgets in a bar, like Windows task bar
+dojo.widget.html.TaskBar = function(){
+
+	dojo.widget.html.FloatingPane.call(this);
+	dojo.widget.TaskBar.call(this);
+	this._addChildStack = [];
+}
+
+dojo.inherits(dojo.widget.html.TaskBar, dojo.widget.html.FloatingPane);
+
+dojo.lang.extend(dojo.widget.html.TaskBar, {
+
+	resizable: false,
+	titleBarDisplay: "none",
+
+	addChild: function(child) {
+		if(!this.containerNode){ 
+			this._addChildStack.push(child);
+		}else if(this._addChildStack.length > 0){
+			var oarr = this._addChildStack;
+			this._addChildStack = [];
+			dojo.lang.forEach(oarr, this.addChild, this);
+		}
+		var tbi = dojo.widget.createWidget("TaskBarItem",
+			{	windowId: child.widgetId, 
+				caption: child.title, 
+				iconSrc: child.iconSrc
+			});
+		dojo.widget.html.TaskBar.superclass.addChild.call(this,tbi);
+	}
+});
diff --git a/webapp/web/src/widget/html/TitlePane.js b/webapp/web/src/widget/html/TitlePane.js
index c3f7fd5f8..2137eb4f2 100644
--- a/webapp/web/src/widget/html/TitlePane.js
+++ b/webapp/web/src/widget/html/TitlePane.js
@@ -8,63 +8,63 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.html.TitlePane");
-dojo.require("dojo.widget.*");
-dojo.require("dojo.widget.HtmlWidget");
-dojo.require("dojo.lfx.*");
-
-dojo.widget.html.TitlePane = function(){
-	dojo.widget.HtmlWidget.call(this);
-	this.widgetType = "TitlePane";
-
-	this.labelNode="";
-	this.labelNodeClass="";
-	this.containerNodeClass="";
-	this.label="";
-
-	this.open=true;
-	this.templatePath = dojo.uri.dojoUri("src/widget/templates/TitlePane.html");
-}
-
-dojo.inherits(dojo.widget.html.TitlePane, dojo.widget.HtmlWidget);
-
-dojo.lang.extend(dojo.widget.html.TitlePane, {
-	isContainer: true,
-	postCreate: function() {
-		if (this.label) {
-			this.labelNode.appendChild(document.createTextNode(this.label));
-		}
-
-		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();
-		}
-	},
-
-	onLabelClick: function() {
-		if (this.open) {
-			dojo.lfx.wipeOut(this.containerNode,250).play();
-			this.open=false;
-		}else {
-			dojo.lfx.wipeIn(this.containerNode,250).play();
-			this.open=true;
-		}
-	},
-
-	setContent: function(content) {
-		this.containerNode.innerHTML=content;
-	},
-
-	setLabel: function(label) {
-		this.labelNode.innerHTML=label;
-	}
-});
-
-dojo.widget.tags.addParseTreeHandler("dojo:TitlePane");
+dojo.provide("dojo.widget.html.TitlePane");
+dojo.require("dojo.widget.*");
+dojo.require("dojo.widget.HtmlWidget");
+dojo.require("dojo.lfx.*");
+
+dojo.widget.html.TitlePane = function(){
+	dojo.widget.HtmlWidget.call(this);
+	this.widgetType = "TitlePane";
+
+	this.labelNode="";
+	this.labelNodeClass="";
+	this.containerNodeClass="";
+	this.label="";
+
+	this.open=true;
+	this.templatePath = dojo.uri.dojoUri("src/widget/templates/TitlePane.html");
+}
+
+dojo.inherits(dojo.widget.html.TitlePane, dojo.widget.HtmlWidget);
+
+dojo.lang.extend(dojo.widget.html.TitlePane, {
+	isContainer: true,
+	postCreate: function() {
+		if (this.label) {
+			this.labelNode.appendChild(document.createTextNode(this.label));
+		}
+
+		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();
+		}
+	},
+
+	onLabelClick: function() {
+		if (this.open) {
+			dojo.lfx.wipeOut(this.containerNode,250).play();
+			this.open=false;
+		}else {
+			dojo.lfx.wipeIn(this.containerNode,250).play();
+			this.open=true;
+		}
+	},
+
+	setContent: function(content) {
+		this.containerNode.innerHTML=content;
+	},
+
+	setLabel: function(label) {
+		this.labelNode.innerHTML=label;
+	}
+});
+
+dojo.widget.tags.addParseTreeHandler("dojo:TitlePane");
diff --git a/webapp/web/src/widget/html/Tooltip.js b/webapp/web/src/widget/html/Tooltip.js
index 4e3a7cc42..a875543c5 100644
--- a/webapp/web/src/widget/html/Tooltip.js
+++ b/webapp/web/src/widget/html/Tooltip.js
@@ -8,176 +8,176 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.html.Tooltip");
-dojo.require("dojo.widget.html.ContentPane");
-dojo.require("dojo.widget.Tooltip");
-dojo.require("dojo.uri");
-dojo.require("dojo.widget.*");
-dojo.require("dojo.event");
-dojo.require("dojo.style");
-dojo.require("dojo.html");
-
-dojo.widget.defineWidget(
-	"dojo.widget.html.Tooltip",
-	dojo.widget.html.ContentPane,
-	{
-		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);		
-			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
-				if(this.hideTimer) {
-					clearTimeout(this.hideTimer);
-					delete this.hideTimer;
-				}
-			} else {
-				// mouse has been moved off the element/tooltip
-				// note: can't use onMouseOut to detect this because the "explode" effect causes
-				// spurious onMouseOut/onMouseOver events (due to interference from outline)
-				if(this.showTimer){
-					clearTimeout(this.showTimer);
-					delete this.showTimer;
-				}
-				if((this.state=="displaying"||this.state=="displayed") && !this.hideTimer){
-					this.hideTimer = setTimeout(dojo.lang.hitch(this, "hide"), this.hideDelay);
-				}
-			}
-		},
-	
-		show: function() {
-			if(this.state=="erasing"){
-				// we are in the process of erasing; when that is finished, display it.
-				this.displayScheduled=true;
-				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){
-				this.hide();
-				this.eraseScheduled=false;
-			}
-		},
-	
-		hide: function() {
-			if(this.state=="displaying"){
-				// in the process of fading in.  wait until that is finished and then fade out
-				this.eraseScheduled=true;
-				return;
-			}
-			if ( this.state=="displayed" ) {
-				this.state="erasing";
-				if ( this.showTimer ) {
-					clearTimeout(this.showTimer);
-					delete this.showTimer;
-				}
-				if ( this.hideTimer ) {
-					clearTimeout(this.hideTimer);
-					delete this.hideTimer;
-				}
-				dojo.event.disconnect(document.documentElement, "onmousemove", this, "onMouseMove");
-				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){
-				this.display();
-				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
-				dojo.lang.setTimeout(this, this.position, 50);
-				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)
-			// so it can be safely ignored
-		}
-	}
-);
+dojo.provide("dojo.widget.html.Tooltip");
+dojo.require("dojo.widget.html.ContentPane");
+dojo.require("dojo.widget.Tooltip");
+dojo.require("dojo.uri");
+dojo.require("dojo.widget.*");
+dojo.require("dojo.event");
+dojo.require("dojo.style");
+dojo.require("dojo.html");
+
+dojo.widget.defineWidget(
+	"dojo.widget.html.Tooltip",
+	dojo.widget.html.ContentPane,
+	{
+		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);		
+			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
+				if(this.hideTimer) {
+					clearTimeout(this.hideTimer);
+					delete this.hideTimer;
+				}
+			} else {
+				// mouse has been moved off the element/tooltip
+				// note: can't use onMouseOut to detect this because the "explode" effect causes
+				// spurious onMouseOut/onMouseOver events (due to interference from outline)
+				if(this.showTimer){
+					clearTimeout(this.showTimer);
+					delete this.showTimer;
+				}
+				if((this.state=="displaying"||this.state=="displayed") && !this.hideTimer){
+					this.hideTimer = setTimeout(dojo.lang.hitch(this, "hide"), this.hideDelay);
+				}
+			}
+		},
+	
+		show: function() {
+			if(this.state=="erasing"){
+				// we are in the process of erasing; when that is finished, display it.
+				this.displayScheduled=true;
+				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){
+				this.hide();
+				this.eraseScheduled=false;
+			}
+		},
+	
+		hide: function() {
+			if(this.state=="displaying"){
+				// in the process of fading in.  wait until that is finished and then fade out
+				this.eraseScheduled=true;
+				return;
+			}
+			if ( this.state=="displayed" ) {
+				this.state="erasing";
+				if ( this.showTimer ) {
+					clearTimeout(this.showTimer);
+					delete this.showTimer;
+				}
+				if ( this.hideTimer ) {
+					clearTimeout(this.hideTimer);
+					delete this.hideTimer;
+				}
+				dojo.event.disconnect(document.documentElement, "onmousemove", this, "onMouseMove");
+				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){
+				this.display();
+				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
+				dojo.lang.setTimeout(this, this.position, 50);
+				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)
+			// so it can be safely ignored
+		}
+	}
+);
diff --git a/webapp/web/src/widget/html/YahooMap.js b/webapp/web/src/widget/html/YahooMap.js
index 4acdb1bb0..3fc996c4a 100644
--- a/webapp/web/src/widget/html/YahooMap.js
+++ b/webapp/web/src/widget/html/YahooMap.js
@@ -8,173 +8,173 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.html.YahooMap");
-dojo.require("dojo.event.*");
-dojo.require("dojo.html");
-dojo.require("dojo.math");
-dojo.require("dojo.widget.HtmlWidget");
-dojo.require("dojo.widget.YahooMap");
-
-(function(){
-	var yappid = djConfig["yAppId"]||djConfig["yahooAppId"]||"dojotoolkit";
-	if(!dojo.hostenv.post_load_){
-		if(yappid == "dojotoolkit"){
-			dojo.debug("please provide a unique Yahoo App ID in djConfig.yahooAppId when using the map widget");
-		}
-		var tag = "<scr"+"ipt src='http://api.maps.yahoo.com/ajaxymap?v=3.0&appid="+yappid+"'></scri"+"pt>";
-		if(!dj_global["YMap"]){
-			document.write(tag);
-		}
-	}else{
-		dojo.debug("cannot initialize map system after the page has been loaded! Please either manually include the script block provided by Yahoo in your page or require() the YahooMap widget before onload has fired");
-	}
-})();
-
-dojo.widget.html.YahooMap=function(){
-	dojo.widget.HtmlWidget.call(this);
-	dojo.widget.YahooMap.call(this);
-
-	this.map=null;
-	this.datasrc="";
-	this.data=[];
-	this.width=0;
-	this.height=0;
-	this.controls=["zoomlong","maptype","pan"];
-};
-dojo.inherits(dojo.widget.html.YahooMap, dojo.widget.HtmlWidget);
-
-dojo.lang.extend(dojo.widget.html.YahooMap, {
-	widgetType: "YahooMap",
-	templatePath:null,
-	templateCssPath:null,
-
-	findCenter:function(aPts){
-		var start=new YGeoPoint(37,-90);
-		if(aPts.length==0) return start;
-		var minLat,maxLat, minLon, maxLon, cLat, cLon;
-		minLat=maxLat=aPts[0].Lat;
-		minLon=maxLon=aPts[0].Lon;
-		for(var i=0; i<aPts.length; i++){
-			minLat=Math.min(minLat,aPts[i].Lat);
-			maxLat=Math.max(maxLat,aPts[i].Lat);
-			minLon=Math.min(minLon,aPts[i].Lon);
-			maxLon=Math.max(maxLon,aPts[i].Lon);
-		}
-		cLat=dojo.math.round((minLat+maxLat)/2,6);
-		cLon=dojo.math.round((minLon+maxLon)/2,6);
-		return new YGeoPoint(cLat,cLon);
-	},
-	setControls:function(){
-		var c=this.controls;
-		var t=dojo.widget.YahooMap.Controls;
-		for(var i=0; i<c.length; i++){
-			switch(c[i]){
-				case t.MapType:{
-					this.map.addTypeControl();
-					break;
-				}
-				case t.Pan:{
-					this.map.addPanControl();
-					break;
-				}
-				case t.ZoomLong:{
-					this.map.addZoomLong();
-					break;
-				}
-				case t.ZoomShort:{
-					this.map.addZoomShort();
-					break;
-				}
-			}
-		}
-	},
-	
-	parse:function(table){
-		this.data=[];
-
-		//	get the column indices
-		var h=table.getElementsByTagName("thead")[0];
-		if(!h){
-			return;
-		}
-
-		var a=[];
-		var cols=h.getElementsByTagName("td");
-		if(cols.length==0){
-			cols=h.getElementsByTagName("th");
-		}
-		for(var i=0; i<cols.length; i++){
-			var c=cols[i].innerHTML.toLowerCase();
-			if(c=="long") c="lng";
-			a.push(c);
-		}
-		
-		//	parse the data
-		var b=table.getElementsByTagName("tbody")[0];
-		if(!b){
-			return;
-		}
-		for(var i=0; i<b.childNodes.length; i++){
-			if(!(b.childNodes[i].nodeName&&b.childNodes[i].nodeName.toLowerCase()=="tr")){
-				continue;
-			}
-			var cells=b.childNodes[i].getElementsByTagName("td");
-			var o={};
-			for(var j=0; j<a.length; j++){
-				var col=a[j];
-				if(col=="lat"||col=="lng"){
-					o[col]=parseFloat(cells[j].innerHTML);					
-				}else{
-					o[col]=cells[j].innerHTML;
-				}
-			}
-			this.data.push(o);
-		}
-	},
-	render:function(){
-		var pts=[];
-		var d=this.data;
-		for(var i=0; i<d.length; i++){
-			var pt=new YGeoPoint(d[i].lat, d[i].lng);
-			pts.push(pt);
-			var icon=d[i].icon||null;
-			if(icon){
-				icon=new YImage(icon);
-			}
-			var m=new YMarker(pt,icon);
-			if(d[i].description){
-				m.addAutoExpand("<div>"+d[i].description+"</div>");
-			}
-			this.map.addOverlay(m);
-		}
-		var c=this.findCenter(pts);
-		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.");
-		}
-		if(this.datasrc){
-			this.parse(dojo.byId(this.datasrc));
-		}
-		else if(this.domNode.getElementsByTagName("table")[0]){
-			this.parse(this.domNode.getElementsByTagName("table")[0]);
-		}
-	},
-	postCreate:function(){
-		//	clean the domNode before creating the map.
-		while(this.domNode.childNodes.length>0){
-			this.domNode.removeChild(this.domNode.childNodes[0]);
-		}
-
-		if(this.width>0&&this.height>0){
-			this.map=new YMap(this.domNode, YAHOO_MAP_REG, new YSize(this.width, this.height));
-		}else{
-			this.map=new YMap(this.domNode);
-		}
-		this.setControls();
-		this.render();
-	}
-});
+dojo.provide("dojo.widget.html.YahooMap");
+dojo.require("dojo.event.*");
+dojo.require("dojo.html");
+dojo.require("dojo.math");
+dojo.require("dojo.widget.HtmlWidget");
+dojo.require("dojo.widget.YahooMap");
+
+(function(){
+	var yappid = djConfig["yAppId"]||djConfig["yahooAppId"]||"dojotoolkit";
+	if(!dojo.hostenv.post_load_){
+		if(yappid == "dojotoolkit"){
+			dojo.debug("please provide a unique Yahoo App ID in djConfig.yahooAppId when using the map widget");
+		}
+		var tag = "<scr"+"ipt src='http://api.maps.yahoo.com/ajaxymap?v=3.0&appid="+yappid+"'></scri"+"pt>";
+		if(!dj_global["YMap"]){
+			document.write(tag);
+		}
+	}else{
+		dojo.debug("cannot initialize map system after the page has been loaded! Please either manually include the script block provided by Yahoo in your page or require() the YahooMap widget before onload has fired");
+	}
+})();
+
+dojo.widget.html.YahooMap=function(){
+	dojo.widget.HtmlWidget.call(this);
+	dojo.widget.YahooMap.call(this);
+
+	this.map=null;
+	this.datasrc="";
+	this.data=[];
+	this.width=0;
+	this.height=0;
+	this.controls=["zoomlong","maptype","pan"];
+};
+dojo.inherits(dojo.widget.html.YahooMap, dojo.widget.HtmlWidget);
+
+dojo.lang.extend(dojo.widget.html.YahooMap, {
+	widgetType: "YahooMap",
+	templatePath:null,
+	templateCssPath:null,
+
+	findCenter:function(aPts){
+		var start=new YGeoPoint(37,-90);
+		if(aPts.length==0) return start;
+		var minLat,maxLat, minLon, maxLon, cLat, cLon;
+		minLat=maxLat=aPts[0].Lat;
+		minLon=maxLon=aPts[0].Lon;
+		for(var i=0; i<aPts.length; i++){
+			minLat=Math.min(minLat,aPts[i].Lat);
+			maxLat=Math.max(maxLat,aPts[i].Lat);
+			minLon=Math.min(minLon,aPts[i].Lon);
+			maxLon=Math.max(maxLon,aPts[i].Lon);
+		}
+		cLat=dojo.math.round((minLat+maxLat)/2,6);
+		cLon=dojo.math.round((minLon+maxLon)/2,6);
+		return new YGeoPoint(cLat,cLon);
+	},
+	setControls:function(){
+		var c=this.controls;
+		var t=dojo.widget.YahooMap.Controls;
+		for(var i=0; i<c.length; i++){
+			switch(c[i]){
+				case t.MapType:{
+					this.map.addTypeControl();
+					break;
+				}
+				case t.Pan:{
+					this.map.addPanControl();
+					break;
+				}
+				case t.ZoomLong:{
+					this.map.addZoomLong();
+					break;
+				}
+				case t.ZoomShort:{
+					this.map.addZoomShort();
+					break;
+				}
+			}
+		}
+	},
+	
+	parse:function(table){
+		this.data=[];
+
+		//	get the column indices
+		var h=table.getElementsByTagName("thead")[0];
+		if(!h){
+			return;
+		}
+
+		var a=[];
+		var cols=h.getElementsByTagName("td");
+		if(cols.length==0){
+			cols=h.getElementsByTagName("th");
+		}
+		for(var i=0; i<cols.length; i++){
+			var c=cols[i].innerHTML.toLowerCase();
+			if(c=="long") c="lng";
+			a.push(c);
+		}
+		
+		//	parse the data
+		var b=table.getElementsByTagName("tbody")[0];
+		if(!b){
+			return;
+		}
+		for(var i=0; i<b.childNodes.length; i++){
+			if(!(b.childNodes[i].nodeName&&b.childNodes[i].nodeName.toLowerCase()=="tr")){
+				continue;
+			}
+			var cells=b.childNodes[i].getElementsByTagName("td");
+			var o={};
+			for(var j=0; j<a.length; j++){
+				var col=a[j];
+				if(col=="lat"||col=="lng"){
+					o[col]=parseFloat(cells[j].innerHTML);					
+				}else{
+					o[col]=cells[j].innerHTML;
+				}
+			}
+			this.data.push(o);
+		}
+	},
+	render:function(){
+		var pts=[];
+		var d=this.data;
+		for(var i=0; i<d.length; i++){
+			var pt=new YGeoPoint(d[i].lat, d[i].lng);
+			pts.push(pt);
+			var icon=d[i].icon||null;
+			if(icon){
+				icon=new YImage(icon);
+			}
+			var m=new YMarker(pt,icon);
+			if(d[i].description){
+				m.addAutoExpand("<div>"+d[i].description+"</div>");
+			}
+			this.map.addOverlay(m);
+		}
+		var c=this.findCenter(pts);
+		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.");
+		}
+		if(this.datasrc){
+			this.parse(dojo.byId(this.datasrc));
+		}
+		else if(this.domNode.getElementsByTagName("table")[0]){
+			this.parse(this.domNode.getElementsByTagName("table")[0]);
+		}
+	},
+	postCreate:function(){
+		//	clean the domNode before creating the map.
+		while(this.domNode.childNodes.length>0){
+			this.domNode.removeChild(this.domNode.childNodes[0]);
+		}
+
+		if(this.width>0&&this.height>0){
+			this.map=new YMap(this.domNode, YAHOO_MAP_REG, new YSize(this.width, this.height));
+		}else{
+			this.map=new YMap(this.domNode);
+		}
+		this.setControls();
+		this.render();
+	}
+});
diff --git a/webapp/web/src/widget/html/stabile.js b/webapp/web/src/widget/html/stabile.js
index c5f10f151..7ae466687 100644
--- a/webapp/web/src/widget/html/stabile.js
+++ b/webapp/web/src/widget/html/stabile.js
@@ -8,206 +8,206 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-// Maintain state of widgets when user hits back/forward button
-
-dojo.provide("dojo.widget.html.stabile");
-
-dojo.widget.html.stabile = {
-	// Characters to quote in single-quoted regexprs
-	_sqQuotables: new RegExp("([\\\\'])", "g"),
-
-	// Current depth.
-	_depth: 0,
-
-	// Set to true when calling v.toString, to sniff for infinite
-	// recursion.
-	_recur: false,
-
-	// Levels of nesting of Array and object displays.
-	// If when >= depth, no display or array or object internals.
-	depthLimit: 2
-};
-
-
-
-
-
-//// PUBLIC METHODS
-
-// 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];
-}
-
-
-// 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;
-	if(isCommit){
-		dojo.widget.html.stabile.commit(dojo.widget.html.stabile.widgetState);
-	}
-}
-
-
-// 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;
-		dojo.widget.html.stabile.widgetState = text ? dj_eval("("+text+")") : {};
-	}
-}
-
-
-// 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);
-}
-
-// Return a JSON "description string" for the given value.
-// Supports only core JavaScript types with literals, plus Date,
-// and cyclic structures are unsupported.
-// showAll defaults to false -- if true, this becomes a simple symbolic
-// object dumper, but you cannot "eval" the output.
-//
-dojo.widget.html.stabile.description = function(v, showAll){
-	// Save and later restore dojo.widget.html.stabile._depth;
-	var depth = dojo.widget.html.stabile._depth;
-
-	var describeThis = function() {
-		 return this.description(this, true);
-	} 
-	
-	try {
-
-		if(v===void(0)){
-			return "undefined";
-		}
-		if(v===null){
-			return "null";
-		}
-		if(typeof(v)=="boolean" || typeof(v)=="number"
-		    || v instanceof Boolean || v instanceof Number){
-			return v.toString();
-		}
-
-		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"); 
-			v1 = v1.replace(/\n/g, "\\n");
-			v1 = v1.replace(/\r/g, "\\r");
-			// Any other important special cases?
-			return "'"+v1+"'";
-		}
-
-		if(v instanceof Date){
-			// Create a data constructor.
-			return "new Date("+d.getFullYear+","+d.getMonth()+","+d.getDate()+")";
-		}
-
-		var d;
-		if(v instanceof Array || v.push){
-			// "push" test needed for KHTML/Safari, don't know why -cp
-
-			if(depth>=dojo.widget.html.stabile.depthLimit)
-			  return "[ ... ]";
-
-			d = "[";
-			var first = true;
-			dojo.widget.html.stabile._depth++;
-			for(var i=0; i<v.length; i++){
-				// Skip functions and undefined values
-				// if(v[i]==undef || typeof(v[i])=="function")
-				//   continue;
-				if(first){
-					first = false;
-				}else{
-					d += ",";
-				}
-				d+=arguments.callee(v[i], showAll);
-			}
-			return d+"]";
-		}
-
-		if(v.constructor==Object
-		    || v.toString==describeThis){
-			if(depth>=dojo.widget.html.stabile.depthLimit)
-			  return "{ ... }";
-
-			// Instanceof Hash is good, or if we just use Objects,
-			// we can say v.constructor==Object.
-			// IE (5?) lacks hasOwnProperty, but perhaps objects do not always
-			// have prototypes??
-			if(typeof(v.hasOwnProperty)!="function" && v.prototype){
-				throw new Error("description: "+v+" not supported by script engine");
-			}
-			var first = true;
-			d = "{";
-			dojo.widget.html.stabile._depth++;
-			for(var key in v){
-				// Skip values that are functions or undefined.
-				if(v[key]==void(0) || typeof(v[key])=="function")
-					continue;
-				if(first){
-					first = false;
-				}else{
-					d += ", ";
-				}
-				var kd = key;
-				// If the key is not a legal identifier, use its description.
-				// For strings this will quote the stirng.
-				if(!kd.match(/^[a-zA-Z_][a-zA-Z0-9_]*$/)){
-					kd = arguments.callee(key, showAll);
-				}
-				d += kd+": "+arguments.callee(v[key], showAll);
-			}
-			return d+"}";
-		}
-
-		if(showAll){
-			if(dojo.widget.html.stabile._recur){
-				// Save the original definitions of toString;
-				var objectToString = Object.prototype.toString;
-				return objectToString.apply(v, []);
-			}else{
-				dojo.widget.html.stabile._recur = true;
-				return v.toString();
-			}
-		}else{
-			// log("Description? "+v.toString()+", "+typeof(v));
-			throw new Error("Unknown type: "+v);
-			return "'unknown'";
-		}
-
-	} finally {
-		// Always restore the global current depth.
-		dojo.widget.html.stabile._depth = depth;
-	}
-
-}
-
-
-
-//// 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;
-	}
-	var form = document.forms._dojo_form;
-	return dojo.widget.html.stabile.dataField = form ? form.stabile : {value: ""};
-}
-
+// Maintain state of widgets when user hits back/forward button
+
+dojo.provide("dojo.widget.html.stabile");
+
+dojo.widget.html.stabile = {
+	// Characters to quote in single-quoted regexprs
+	_sqQuotables: new RegExp("([\\\\'])", "g"),
+
+	// Current depth.
+	_depth: 0,
+
+	// Set to true when calling v.toString, to sniff for infinite
+	// recursion.
+	_recur: false,
+
+	// Levels of nesting of Array and object displays.
+	// If when >= depth, no display or array or object internals.
+	depthLimit: 2
+};
+
+
+
+
+
+//// PUBLIC METHODS
+
+// 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];
+}
+
+
+// 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;
+	if(isCommit){
+		dojo.widget.html.stabile.commit(dojo.widget.html.stabile.widgetState);
+	}
+}
+
+
+// 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;
+		dojo.widget.html.stabile.widgetState = text ? dj_eval("("+text+")") : {};
+	}
+}
+
+
+// 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);
+}
+
+// Return a JSON "description string" for the given value.
+// Supports only core JavaScript types with literals, plus Date,
+// and cyclic structures are unsupported.
+// showAll defaults to false -- if true, this becomes a simple symbolic
+// object dumper, but you cannot "eval" the output.
+//
+dojo.widget.html.stabile.description = function(v, showAll){
+	// Save and later restore dojo.widget.html.stabile._depth;
+	var depth = dojo.widget.html.stabile._depth;
+
+	var describeThis = function() {
+		 return this.description(this, true);
+	} 
+	
+	try {
+
+		if(v===void(0)){
+			return "undefined";
+		}
+		if(v===null){
+			return "null";
+		}
+		if(typeof(v)=="boolean" || typeof(v)=="number"
+		    || v instanceof Boolean || v instanceof Number){
+			return v.toString();
+		}
+
+		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"); 
+			v1 = v1.replace(/\n/g, "\\n");
+			v1 = v1.replace(/\r/g, "\\r");
+			// Any other important special cases?
+			return "'"+v1+"'";
+		}
+
+		if(v instanceof Date){
+			// Create a data constructor.
+			return "new Date("+d.getFullYear+","+d.getMonth()+","+d.getDate()+")";
+		}
+
+		var d;
+		if(v instanceof Array || v.push){
+			// "push" test needed for KHTML/Safari, don't know why -cp
+
+			if(depth>=dojo.widget.html.stabile.depthLimit)
+			  return "[ ... ]";
+
+			d = "[";
+			var first = true;
+			dojo.widget.html.stabile._depth++;
+			for(var i=0; i<v.length; i++){
+				// Skip functions and undefined values
+				// if(v[i]==undef || typeof(v[i])=="function")
+				//   continue;
+				if(first){
+					first = false;
+				}else{
+					d += ",";
+				}
+				d+=arguments.callee(v[i], showAll);
+			}
+			return d+"]";
+		}
+
+		if(v.constructor==Object
+		    || v.toString==describeThis){
+			if(depth>=dojo.widget.html.stabile.depthLimit)
+			  return "{ ... }";
+
+			// Instanceof Hash is good, or if we just use Objects,
+			// we can say v.constructor==Object.
+			// IE (5?) lacks hasOwnProperty, but perhaps objects do not always
+			// have prototypes??
+			if(typeof(v.hasOwnProperty)!="function" && v.prototype){
+				throw new Error("description: "+v+" not supported by script engine");
+			}
+			var first = true;
+			d = "{";
+			dojo.widget.html.stabile._depth++;
+			for(var key in v){
+				// Skip values that are functions or undefined.
+				if(v[key]==void(0) || typeof(v[key])=="function")
+					continue;
+				if(first){
+					first = false;
+				}else{
+					d += ", ";
+				}
+				var kd = key;
+				// If the key is not a legal identifier, use its description.
+				// For strings this will quote the stirng.
+				if(!kd.match(/^[a-zA-Z_][a-zA-Z0-9_]*$/)){
+					kd = arguments.callee(key, showAll);
+				}
+				d += kd+": "+arguments.callee(v[key], showAll);
+			}
+			return d+"}";
+		}
+
+		if(showAll){
+			if(dojo.widget.html.stabile._recur){
+				// Save the original definitions of toString;
+				var objectToString = Object.prototype.toString;
+				return objectToString.apply(v, []);
+			}else{
+				dojo.widget.html.stabile._recur = true;
+				return v.toString();
+			}
+		}else{
+			// log("Description? "+v.toString()+", "+typeof(v));
+			throw new Error("Unknown type: "+v);
+			return "'unknown'";
+		}
+
+	} finally {
+		// Always restore the global current depth.
+		dojo.widget.html.stabile._depth = depth;
+	}
+
+}
+
+
+
+//// 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;
+	}
+	var form = document.forms._dojo_form;
+	return dojo.widget.html.stabile.dataField = form ? form.stabile : {value: ""};
+}
+
diff --git a/webapp/web/src/widget/templates/HtmlCheckBox.html b/webapp/web/src/widget/templates/HtmlCheckBox.html
index b475a7686..b34be39fb 100644
--- a/webapp/web/src/widget/templates/HtmlCheckBox.html
+++ b/webapp/web/src/widget/templates/HtmlCheckBox.html
@@ -1,6 +1,6 @@
-<span>
-	<input type="checkbox" name="${this.name}" checked="${this.checked}" tabIndex="${this.tabIndex}" style="display: none"
-		dojoAttachPoint="inputNode">
-	<img src='${this.imgSrc}' class='dojoHtmlCheckbox'
-		dojoAttachPoint="imgNode" dojoAttachEvent="onMouseUp;onMouseOver;onMouseOut">
+<span>
+	<input type="checkbox" name="${this.name}" checked="${this.checked}" tabIndex="${this.tabIndex}" style="display: none"
+		dojoAttachPoint="inputNode">
+	<img src='${this.imgSrc}' class='dojoHtmlCheckbox'
+		dojoAttachPoint="imgNode" dojoAttachEvent="onMouseUp;onMouseOver;onMouseOut">
 </span>
\ No newline at end of file
diff --git a/webapp/web/src/widget/templates/HtmlComboButtonTemplate.html b/webapp/web/src/widget/templates/HtmlComboButtonTemplate.html
index 809c92ade..ec9c33e90 100644
--- a/webapp/web/src/widget/templates/HtmlComboButtonTemplate.html
+++ b/webapp/web/src/widget/templates/HtmlComboButtonTemplate.html
@@ -1,18 +1,18 @@
-<div class="dojoButton" style="position:relative;top:0px;left:0px; text-align:none;">
-
-	<div dojoAttachPoint="leftPart" class="dojoButtonLeftPart" style="position:absolute;left:0px;top:0px;"
-		dojoAttachEvent="onMouseOver:leftOver; onMouseOut:leftOut; onMouseUp:leftUp; onClick:leftClick;">
-		<div class="dojoButtonContents" dojoAttachPoint="containerNode" style="position:absolute;top:0px;right:0px;z-index:2;"></div>
-		<img dojoAttachPoint="leftImage" style="position:absolute;left:0px;top:0px;">
-		<img dojoAttachPoint="centerImage" style="position:absolute;right:0px;top:0px;z-index:1;">
-	</div>
-
-	<div dojoAttachPoint="rightPart" class="dojoButtonRightPart" style="position:absolute;top:0px;right:0px;"
-		dojoAttachEvent="onMouseOver:rightOver; onMouseOut:rightOut; onMouseUp:rightUp; onClick:rightClick;">
-		<img dojoAttachPoint="arrowBackgroundImage" style="position:absolute;top:0px;left:0px;z-index:1;">
-		<img src="${dojoRoot}src/widget/templates/images/whiteDownArrow.gif"
-		  		style="z-index:2;position:absolute;left:3px;top:50%;">
-		<img dojoAttachPoint="rightImage" style="position:absolute;top:0px;right:0px;">
-	</div>
-
-</div>
+<div class="dojoButton" style="position:relative;top:0px;left:0px; text-align:none;">
+
+	<div dojoAttachPoint="leftPart" class="dojoButtonLeftPart" style="position:absolute;left:0px;top:0px;"
+		dojoAttachEvent="onMouseOver:leftOver; onMouseOut:leftOut; onMouseUp:leftUp; onClick:leftClick;">
+		<div class="dojoButtonContents" dojoAttachPoint="containerNode" style="position:absolute;top:0px;right:0px;z-index:2;"></div>
+		<img dojoAttachPoint="leftImage" style="position:absolute;left:0px;top:0px;">
+		<img dojoAttachPoint="centerImage" style="position:absolute;right:0px;top:0px;z-index:1;">
+	</div>
+
+	<div dojoAttachPoint="rightPart" class="dojoButtonRightPart" style="position:absolute;top:0px;right:0px;"
+		dojoAttachEvent="onMouseOver:rightOver; onMouseOut:rightOut; onMouseUp:rightUp; onClick:rightClick;">
+		<img dojoAttachPoint="arrowBackgroundImage" style="position:absolute;top:0px;left:0px;z-index:1;">
+		<img src="${dojoRoot}src/widget/templates/images/whiteDownArrow.gif"
+		  		style="z-index:2;position:absolute;left:3px;top:50%;">
+		<img dojoAttachPoint="rightImage" style="position:absolute;top:0px;right:0px;">
+	</div>
+
+</div>
diff --git a/webapp/web/src/widget/templates/HtmlDropDownButtonTemplate.html b/webapp/web/src/widget/templates/HtmlDropDownButtonTemplate.html
index 2453e1ad9..a14822e34 100644
--- a/webapp/web/src/widget/templates/HtmlDropDownButtonTemplate.html
+++ b/webapp/web/src/widget/templates/HtmlDropDownButtonTemplate.html
@@ -1,9 +1,9 @@
-<button dojoAttachPoint="button" class="dojoButton dojoButtonNoHover" dojoAttachEvent="onMouseOver: ; onMouseOut: ; onClick: ;">
-  <table dojoAttachPoint="table" style="margin:0 0 0 0;"><tr>
-    <td class="label" dojoAttachPoint="labelCell"></td>
-    <td class="border" dojoAttachPoint="borderCell"></td>
-    <td class="downArrow" dojoAttachPoint="arrowCell">
-      <img dojoAttachPoint="arrow">
-    </td>
-  </tr></table>
+<button dojoAttachPoint="button" class="dojoButton dojoButtonNoHover" dojoAttachEvent="onMouseOver: ; onMouseOut: ; onClick: ;">
+  <table dojoAttachPoint="table" style="margin:0 0 0 0;"><tr>
+    <td class="label" dojoAttachPoint="labelCell"></td>
+    <td class="border" dojoAttachPoint="borderCell"></td>
+    <td class="downArrow" dojoAttachPoint="arrowCell">
+      <img dojoAttachPoint="arrow">
+    </td>
+  </tr></table>
 </button>
\ No newline at end of file
diff --git a/webapp/web/src/widget/templates/HtmlFisheyeList.css b/webapp/web/src/widget/templates/HtmlFisheyeList.css
index ca5ddde3c..749141e91 100644
--- a/webapp/web/src/widget/templates/HtmlFisheyeList.css
+++ b/webapp/web/src/widget/templates/HtmlFisheyeList.css
@@ -1,27 +1,27 @@
-.dojoHtmlFisheyeListItemLabel {
-	font-family: Arial, Helvetica, sans-serif;
-	background-color: #eee;
-	border: 2px solid #666;
-	padding: 2px;
-	text-align: center;
-	position: absolute;
-	display: none;
-}
-
-.dojoHtmlFisheyeListItemLabel.selected {
-	display: block;
-}
-
-.dojoHtmlFisheyeListItemImage {
-	border: 0px;
-	position: absolute;
-}
-
-.dojoHtmlFisheyeListItem {
-	position: absolute;
-	z-index: 2;
-}
-
-.dojoHtmlFisheyeListBar {
-	position: relative;
-}
+.dojoHtmlFisheyeListItemLabel {
+	font-family: Arial, Helvetica, sans-serif;
+	background-color: #eee;
+	border: 2px solid #666;
+	padding: 2px;
+	text-align: center;
+	position: absolute;
+	display: none;
+}
+
+.dojoHtmlFisheyeListItemLabel.selected {
+	display: block;
+}
+
+.dojoHtmlFisheyeListItemImage {
+	border: 0px;
+	position: absolute;
+}
+
+.dojoHtmlFisheyeListItem {
+	position: absolute;
+	z-index: 2;
+}
+
+.dojoHtmlFisheyeListBar {
+	position: relative;
+}
diff --git a/webapp/web/src/widget/templates/HtmlFloatingPane.html b/webapp/web/src/widget/templates/HtmlFloatingPane.html
index 9a019a761..20d62a347 100644
--- a/webapp/web/src/widget/templates/HtmlFloatingPane.html
+++ b/webapp/web/src/widget/templates/HtmlFloatingPane.html
@@ -1,18 +1,18 @@
-<div id="${this.widgetId}" class="dojoFloatingPane">
-	<div dojoAttachPoint="titleBar" class="dojoFloatingPaneTitleBar"  dojoAttachEvent="onMouseDown" style="display:none">
-	  	<img dojoAttachPoint="titleBarIcon"  class="dojoFloatingPaneTitleBarIcon">
-		<div dojoAttachPoint="closeAction" dojoAttachEvent="onClick:closeWindow"
-   	  		class="dojoFloatingPaneCloseIcon"></div>
-		<div dojoAttachPoint="restoreAction" dojoAttachEvent="onClick:restoreWindow"
-   	  		class="dojoFloatingPaneRestoreIcon"></div>
-		<div dojoAttachPoint="maximizeAction" dojoAttachEvent="onClick:maximizeWindow"
-   	  		class="dojoFloatingPaneMaximizeIcon"></div>
-		<div dojoAttachPoint="minimizeAction" dojoAttachEvent="onClick:minimizeWindow"
-   	  		class="dojoFloatingPaneMinimizeIcon"></div>
-	  	<div dojoAttachPoint="titleBarText" class="dojoFloatingPaneTitleText">${this.title}</div>
-	</div>
-
-	<div id="${this.widgetId}_container" dojoAttachPoint="containerNode" class="dojoFloatingPaneClient"></div>
-
-	<div dojoAttachPoint="resizeBar" class="dojoFloatingPaneResizebar" style="display:none"></div>
+<div id="${this.widgetId}" class="dojoFloatingPane">
+	<div dojoAttachPoint="titleBar" class="dojoFloatingPaneTitleBar"  dojoAttachEvent="onMouseDown" style="display:none">
+	  	<img dojoAttachPoint="titleBarIcon"  class="dojoFloatingPaneTitleBarIcon">
+		<div dojoAttachPoint="closeAction" dojoAttachEvent="onClick:closeWindow"
+   	  		class="dojoFloatingPaneCloseIcon"></div>
+		<div dojoAttachPoint="restoreAction" dojoAttachEvent="onClick:restoreWindow"
+   	  		class="dojoFloatingPaneRestoreIcon"></div>
+		<div dojoAttachPoint="maximizeAction" dojoAttachEvent="onClick:maximizeWindow"
+   	  		class="dojoFloatingPaneMaximizeIcon"></div>
+		<div dojoAttachPoint="minimizeAction" dojoAttachEvent="onClick:minimizeWindow"
+   	  		class="dojoFloatingPaneMinimizeIcon"></div>
+	  	<div dojoAttachPoint="titleBarText" class="dojoFloatingPaneTitleText">${this.title}</div>
+	</div>
+
+	<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
diff --git a/webapp/web/src/widget/templates/HtmlTabContainer.css b/webapp/web/src/widget/templates/HtmlTabContainer.css
index 910fd0417..4785b5235 100644
--- a/webapp/web/src/widget/templates/HtmlTabContainer.css
+++ b/webapp/web/src/widget/templates/HtmlTabContainer.css
@@ -1,173 +1,173 @@
-.dojoTabContainer {
-	position : relative;
-}
-
-.dojoTabPaneWrapper {
-	position : relative;
-	border : 1px solid #6290d2;
-	clear: both;
-}
-
-.dojoTabLabels-top {
-	position : absolute;
-	top : 0px;
-	left : 0px;
-	overflow : visible;
-	margin-bottom : -1px;
-	width : 100%;
-	z-index: 2;	/* so the bottom of the tab label will cover up the border of dojoTabPaneWrapper */
-}
-.dojoTabLabels-top-noLayout {
-	overflow : visible;
-	margin-bottom : -1px;
-	width : 100%;
-	z-index: 2;
-}
-
-.dojoTabPaneTab {
-	position : relative;
-	float : left;
-	padding-left : 9px;
-	border-bottom : 1px solid #6290d2;
-	background : url(images/tab_left.gif) no-repeat left top;
-	cursor: pointer;
-}
-
-.dojoTabPaneTab span {
-	display : block;
-	padding : 4px 15px 4px 6px;
-	background : url(images/tab_top_right.gif) no-repeat right top;
-	color : #333;
-	font-size : 90%;
-}
-
-.dojoTabPanePaneClose {
-	position : absolute;
-	bottom : 0px;
-	right : 6px;
-	height : 12px;
-	width : 12px;
-	background : url(images/tab_close.gif) no-repeat right top;
-}
-
-.dojoTabPanePaneCloseHover {
-	background-image : url(images/tab_close_h.gif);
-}
-
-.dojoTabPaneTabClose {
-	display : inline;
-	height : 12px;
-	width : 12px;
-	padding : 0 12px 0 0;
-	margin : 0 -10px 0 10px;
-	background : url(images/tab_close.gif) no-repeat right top;
-	cursor : default;
-}
-
-.dojoTabPaneTabCloseHover {
-	background-image : url(images/tab_close_h.gif);
-}
-
-.dojoTabPaneTab.current {
-	padding-bottom : 1px;
-	border-bottom : 0;
-	background-position : 0 -150px;
-}
-
-.dojoTabPaneTab.current span {
-	padding-bottom : 5px;
-	margin-bottom : -1px;
-	background-position : 100% -150px;
-}
-
-/* bottom tabs */
-
-.dojoTabLabels-bottom {
-	position : absolute;
-	bottom : 0px;
-	left : 0px;
-	overflow : visible;
-	margin-top : -1px;
-	width : 100%;
-	z-index: 2;
-}
-
-.dojoTabLabels-bottom .dojoTabPaneTab {
-	border-top :  1px solid #6290d2;
-	border-bottom : 0;
-	background : url(images/tab_bot_left.gif) no-repeat left bottom;
-}
-
-.dojoTabLabels-bottom .dojoTabPaneTab span {
-	background : url(images/tab_bot_right.gif) no-repeat right bottom;
-}
-
-.dojoTabLabels-bottom .dojoTabPaneTab.current {
-	padding-top : 1px;
-	border-top : 0;
-	background : url(images/tab_bot_left_curr.gif) no-repeat left bottom;
-}
-
-.dojoTabLabels-bottom .dojoTabPaneTab.current span {
-	padding-top : 5px;
-	margin-top : -1px;
-	background : url(images/tab_bot_right_curr.gif) no-repeat right bottom;
-}
-
-/* right-h tabs */
-
-.dojoTabLabels-right-h {
-	position : absolute;
-	top : 0px;
-	right : 0px;
-	overflow : visible;
-	margin-left : -1px;
-	z-index: 2;
-}
-
-.dojoTabLabels-right-h .dojoTabPaneTab {
-	padding-left : 0;
-	border-left :  1px solid #6290d2;
-	border-bottom : 0;
-	background : url(images/tab_bot_right.gif) no-repeat right bottom;
-	float : none;
-}
-
-.dojoTabLabels-right-h .dojoTabPaneTab span {
-	padding : 4px 15px 4px 15px;
-}
-
-.dojoTabLabels-right-h .dojoTabPaneTab.current {
-	border-left :  0;
-	border-bottom :  1px solid #6290d2;
-}
-
-/* left-h tabs */
-
-.dojoTabLabels-left-h {
-	position : absolute;
-	top : 0px;
-	left : 0px;
-	overflow : visible;
-	margin-right : -1px;
-	z-index: 2;
-}
-
-.dojoTabLabels-left-h .dojoTabPaneTab {
-	border-right :  1px solid #6290d2;
-	border-bottom : 0;
-	float : none;
-	background : url(images/tab_top_left.gif) no-repeat left top;
-}
-
-.dojoTabLabels-left-h .dojoTabPaneTab.current {
-	border-right : 0;
-	border-bottom :  1px solid #6290d2;
-	padding-bottom : 0;
-	background : url(images/tab_top_left.gif) no-repeat 0 -150px;
-}
-
-.dojoTabLabels-left-h .dojoTabPaneTab span {
-	background : 0;
-	border-bottom :  1px solid #6290d2;
-}
+.dojoTabContainer {
+	position : relative;
+}
+
+.dojoTabPaneWrapper {
+	position : relative;
+	border : 1px solid #6290d2;
+	clear: both;
+}
+
+.dojoTabLabels-top {
+	position : absolute;
+	top : 0px;
+	left : 0px;
+	overflow : visible;
+	margin-bottom : -1px;
+	width : 100%;
+	z-index: 2;	/* so the bottom of the tab label will cover up the border of dojoTabPaneWrapper */
+}
+.dojoTabLabels-top-noLayout {
+	overflow : visible;
+	margin-bottom : -1px;
+	width : 100%;
+	z-index: 2;
+}
+
+.dojoTabPaneTab {
+	position : relative;
+	float : left;
+	padding-left : 9px;
+	border-bottom : 1px solid #6290d2;
+	background : url(images/tab_left.gif) no-repeat left top;
+	cursor: pointer;
+}
+
+.dojoTabPaneTab span {
+	display : block;
+	padding : 4px 15px 4px 6px;
+	background : url(images/tab_top_right.gif) no-repeat right top;
+	color : #333;
+	font-size : 90%;
+}
+
+.dojoTabPanePaneClose {
+	position : absolute;
+	bottom : 0px;
+	right : 6px;
+	height : 12px;
+	width : 12px;
+	background : url(images/tab_close.gif) no-repeat right top;
+}
+
+.dojoTabPanePaneCloseHover {
+	background-image : url(images/tab_close_h.gif);
+}
+
+.dojoTabPaneTabClose {
+	display : inline;
+	height : 12px;
+	width : 12px;
+	padding : 0 12px 0 0;
+	margin : 0 -10px 0 10px;
+	background : url(images/tab_close.gif) no-repeat right top;
+	cursor : default;
+}
+
+.dojoTabPaneTabCloseHover {
+	background-image : url(images/tab_close_h.gif);
+}
+
+.dojoTabPaneTab.current {
+	padding-bottom : 1px;
+	border-bottom : 0;
+	background-position : 0 -150px;
+}
+
+.dojoTabPaneTab.current span {
+	padding-bottom : 5px;
+	margin-bottom : -1px;
+	background-position : 100% -150px;
+}
+
+/* bottom tabs */
+
+.dojoTabLabels-bottom {
+	position : absolute;
+	bottom : 0px;
+	left : 0px;
+	overflow : visible;
+	margin-top : -1px;
+	width : 100%;
+	z-index: 2;
+}
+
+.dojoTabLabels-bottom .dojoTabPaneTab {
+	border-top :  1px solid #6290d2;
+	border-bottom : 0;
+	background : url(images/tab_bot_left.gif) no-repeat left bottom;
+}
+
+.dojoTabLabels-bottom .dojoTabPaneTab span {
+	background : url(images/tab_bot_right.gif) no-repeat right bottom;
+}
+
+.dojoTabLabels-bottom .dojoTabPaneTab.current {
+	padding-top : 1px;
+	border-top : 0;
+	background : url(images/tab_bot_left_curr.gif) no-repeat left bottom;
+}
+
+.dojoTabLabels-bottom .dojoTabPaneTab.current span {
+	padding-top : 5px;
+	margin-top : -1px;
+	background : url(images/tab_bot_right_curr.gif) no-repeat right bottom;
+}
+
+/* right-h tabs */
+
+.dojoTabLabels-right-h {
+	position : absolute;
+	top : 0px;
+	right : 0px;
+	overflow : visible;
+	margin-left : -1px;
+	z-index: 2;
+}
+
+.dojoTabLabels-right-h .dojoTabPaneTab {
+	padding-left : 0;
+	border-left :  1px solid #6290d2;
+	border-bottom : 0;
+	background : url(images/tab_bot_right.gif) no-repeat right bottom;
+	float : none;
+}
+
+.dojoTabLabels-right-h .dojoTabPaneTab span {
+	padding : 4px 15px 4px 15px;
+}
+
+.dojoTabLabels-right-h .dojoTabPaneTab.current {
+	border-left :  0;
+	border-bottom :  1px solid #6290d2;
+}
+
+/* left-h tabs */
+
+.dojoTabLabels-left-h {
+	position : absolute;
+	top : 0px;
+	left : 0px;
+	overflow : visible;
+	margin-right : -1px;
+	z-index: 2;
+}
+
+.dojoTabLabels-left-h .dojoTabPaneTab {
+	border-right :  1px solid #6290d2;
+	border-bottom : 0;
+	float : none;
+	background : url(images/tab_top_left.gif) no-repeat left top;
+}
+
+.dojoTabLabels-left-h .dojoTabPaneTab.current {
+	border-right : 0;
+	border-bottom :  1px solid #6290d2;
+	padding-bottom : 0;
+	background : url(images/tab_top_left.gif) no-repeat 0 -150px;
+}
+
+.dojoTabLabels-left-h .dojoTabPaneTab span {
+	background : 0;
+	border-bottom :  1px solid #6290d2;
+}
diff --git a/webapp/web/src/widget/templates/HtmlTabContainer.html b/webapp/web/src/widget/templates/HtmlTabContainer.html
index e6d8dbf05..22013742f 100644
--- a/webapp/web/src/widget/templates/HtmlTabContainer.html
+++ b/webapp/web/src/widget/templates/HtmlTabContainer.html
@@ -1,4 +1,4 @@
-<div id="${this.widgetId}" class="dojoTabContainer" waiRole="tabpanel">
-	<div dojoAttachPoint="dojoTabLabels"></div>
-	<div class="dojoTabPaneWrapper" dojoAttachPoint="containerNode" ></div>
-</div>
+<div id="${this.widgetId}" class="dojoTabContainer" waiRole="tabpanel">
+	<div dojoAttachPoint="dojoTabLabels"></div>
+	<div class="dojoTabPaneWrapper" dojoAttachPoint="containerNode" ></div>
+</div>
diff --git a/webapp/web/src/widget/templates/HtmlTaskBar.css b/webapp/web/src/widget/templates/HtmlTaskBar.css
index 5e30805f9..5f55a7c93 100644
--- a/webapp/web/src/widget/templates/HtmlTaskBar.css
+++ b/webapp/web/src/widget/templates/HtmlTaskBar.css
@@ -1,29 +1,29 @@
-.dojoTaskBarItem {
-	display: inline-block;
-	background-color: ThreeDFace;
-	border: outset 2px;
-	margin-right: 5px;
-	cursor: pointer;
-	height: 35px;
-	width: 100px;
-	font-size: 10pt;
-	white-space: nowrap;
-	text-align: center;
-	float: left;
-	overflow: hidden;
-}
-
-.dojoTaskBarItem img {
-	vertical-align: middle;
-	margin-right: 5px;
-	margin-left: 5px;	
-	height: 32px;
-	width: 32px;
-}
-
-.dojoTaskBarItem a {
-	 color: black;
-	text-decoration: none;
-}
-
-
+.dojoTaskBarItem {
+	display: inline-block;
+	background-color: ThreeDFace;
+	border: outset 2px;
+	margin-right: 5px;
+	cursor: pointer;
+	height: 35px;
+	width: 100px;
+	font-size: 10pt;
+	white-space: nowrap;
+	text-align: center;
+	float: left;
+	overflow: hidden;
+}
+
+.dojoTaskBarItem img {
+	vertical-align: middle;
+	margin-right: 5px;
+	margin-left: 5px;	
+	height: 32px;
+	width: 32px;
+}
+
+.dojoTaskBarItem a {
+	 color: black;
+	text-decoration: none;
+}
+
+
diff --git a/webapp/web/src/widget/templates/HtmlTaskBarItemTemplate.html b/webapp/web/src/widget/templates/HtmlTaskBarItemTemplate.html
index ced4b3234..aeb19d627 100644
--- a/webapp/web/src/widget/templates/HtmlTaskBarItemTemplate.html
+++ b/webapp/web/src/widget/templates/HtmlTaskBarItemTemplate.html
@@ -1,2 +1,2 @@
-<div class="dojoTaskBarItem" dojoAttachEvent="onClick">
+<div class="dojoTaskBarItem" dojoAttachEvent="onClick">
 </div>
\ No newline at end of file
diff --git a/webapp/web/src/widget/templates/HtmlTooltipTemplate.css b/webapp/web/src/widget/templates/HtmlTooltipTemplate.css
index de9ee69d3..9800ebcfd 100644
--- a/webapp/web/src/widget/templates/HtmlTooltipTemplate.css
+++ b/webapp/web/src/widget/templates/HtmlTooltipTemplate.css
@@ -1,9 +1,9 @@
-.dojoTooltip {
-	border: solid black 1px;
-	background: beige;
-	color: black;
-	position: absolute;
-	font-size: small;
-	padding: 2px 2px 2px 2px;
-	z-index: 10;
-}
+.dojoTooltip {
+	border: solid black 1px;
+	background: beige;
+	color: black;
+	position: absolute;
+	font-size: small;
+	padding: 2px 2px 2px 2px;
+	z-index: 10;
+}
diff --git a/webapp/web/src/widget/templates/HtmlTooltipTemplate.html b/webapp/web/src/widget/templates/HtmlTooltipTemplate.html
index c44cb847f..5ed6a6785 100644
--- a/webapp/web/src/widget/templates/HtmlTooltipTemplate.html
+++ b/webapp/web/src/widget/templates/HtmlTooltipTemplate.html
@@ -1,2 +1,2 @@
-<div class='dojoTooltip' style="display:none" dojoAttachPoint="containerNode">
+<div class='dojoTooltip' style="display:none" dojoAttachPoint="containerNode">
 </div>
\ No newline at end of file
diff --git a/webapp/web/src/widget/templates/images/Tree/Tree.css b/webapp/web/src/widget/templates/images/Tree/Tree.css
index 4d47e2e88..571956318 100644
--- a/webapp/web/src/widget/templates/images/Tree/Tree.css
+++ b/webapp/web/src/widget/templates/images/Tree/Tree.css
@@ -1,36 +1,36 @@
-
-.dojoTree {
-	font: caption;
-	font-size: 11px;
-	font-weight: normal;
-	overflow: auto;
-}
-
-
-.dojoTreeNodeLabelTitle {
-	padding-left: 2px;
-	color: WindowText;
-}
-
-.dojoTreeNodeLabel {
-	cursor:hand;
-	cursor:pointer;
-}
-
-.dojoTreeNodeLabelTitle:hover {
-	text-decoration: underline;
-}
-
-.dojoTreeNodeLabelSelected {
-	background-color: Highlight;
-	color: HighlightText;
-}
-
-.dojoTree div {
-	white-space: nowrap;
-}
-
-.dojoTree img, .dojoTreeNodeLabel img {
-	vertical-align: middle;
-}
-
+
+.dojoTree {
+	font: caption;
+	font-size: 11px;
+	font-weight: normal;
+	overflow: auto;
+}
+
+
+.dojoTreeNodeLabelTitle {
+	padding-left: 2px;
+	color: WindowText;
+}
+
+.dojoTreeNodeLabel {
+	cursor:hand;
+	cursor:pointer;
+}
+
+.dojoTreeNodeLabelTitle:hover {
+	text-decoration: underline;
+}
+
+.dojoTreeNodeLabelSelected {
+	background-color: Highlight;
+	color: HighlightText;
+}
+
+.dojoTree div {
+	white-space: nowrap;
+}
+
+.dojoTree img, .dojoTreeNodeLabel img {
+	vertical-align: middle;
+}
+
diff --git a/webapp/web/src/widget/templates/images/no.svg b/webapp/web/src/widget/templates/images/no.svg
index 335092021..d53549bd1 100644
--- a/webapp/web/src/widget/templates/images/no.svg
+++ b/webapp/web/src/widget/templates/images/no.svg
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
-	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
-	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
-]>
-<svg  version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="15.433" height="15.433"
-	 viewBox="0 0 15.433 15.433" overflow="visible" enable-background="new 0 0 15.433 15.433" xml:space="preserve">
-<circle fill="none" stroke="#D02026" stroke-width="2" cx="7.716" cy="7.716" r="6.716"/>
-<line fill="none" stroke="#D02026" stroke-width="2" x1="3.02" y1="12.352" x2="12.639" y2="2.732"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_svg "http://www.w3.org/2000/svg">
+	<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
+]>
+<svg  version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="15.433" height="15.433"
+	 viewBox="0 0 15.433 15.433" overflow="visible" enable-background="new 0 0 15.433 15.433" xml:space="preserve">
+<circle fill="none" stroke="#D02026" stroke-width="2" cx="7.716" cy="7.716" r="6.716"/>
+<line fill="none" stroke="#D02026" stroke-width="2" x1="3.02" y1="12.352" x2="12.639" y2="2.732"/>
+</svg>
diff --git a/webapp/web/src/widget/templates/richtextframe.html b/webapp/web/src/widget/templates/richtextframe.html
index f0cac6b30..9f3a4e4f0 100644
--- a/webapp/web/src/widget/templates/richtextframe.html
+++ b/webapp/web/src/widget/templates/richtextframe.html
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
-<html>
-  <head>
-    <title></title>
-    <script type="text/javascript">
-    function init(){
-       document.designMode = 'On';
-       parentPageDomain = document.location.href.split('#')[1];
-       if (parentPageDomain) {
-          document.domain = parentPageDomain;
-       }
-    }
-    window.onload = init;
-    </script>
-  </head>
-  <body>
-  <br />
-  </body>
-</html>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <title></title>
+    <script type="text/javascript">
+    function init(){
+       document.designMode = 'On';
+       parentPageDomain = document.location.href.split('#')[1];
+       if (parentPageDomain) {
+          document.domain = parentPageDomain;
+       }
+    }
+    window.onload = init;
+    </script>
+  </head>
+  <body>
+  <br />
+  </body>
+</html>
diff --git a/webapp/web/src/widget/vml/Chart.js b/webapp/web/src/widget/vml/Chart.js
index ef9637874..33b01f4fa 100644
--- a/webapp/web/src/widget/vml/Chart.js
+++ b/webapp/web/src/widget/vml/Chart.js
@@ -8,419 +8,419 @@
 		http://dojotoolkit.org/community/licensing.shtml
 */
 
-dojo.provide("dojo.widget.vml.Chart");
-
-dojo.require("dojo.widget.HtmlWidget");
-dojo.require("dojo.widget.Chart");
-dojo.require("dojo.math");
-dojo.require("dojo.html");
-//dojo.require("dojo.vml");
-dojo.require("dojo.graphics.color");
-
-dojo.widget.vml.Chart=function(){
-	dojo.widget.Chart.call(this);
-	dojo.widget.HtmlWidget.call(this);
-};
-dojo.inherits(dojo.widget.vml.Chart, dojo.widget.HtmlWidget);
-dojo.lang.extend(dojo.widget.vml.Chart, {
-	//	widget props
-	templatePath:null,
-	templateCssPath:null,
-
-	//	state
-	_isInitialized:false,
-	hasData:false,
-
-	//	chart props
-	vectorNode:null,
-	plotArea:null,
-	dataGroup:null,
-	axisGroup:null,
-
-	properties:{
-		height:400,	//	defaults, will resize to the domNode.
-		width:600,
-		plotType:null,
-		padding:{
-			top:10,
-			bottom:2,
-			left:60,
-			right:30
-		},
-		axes:{
-			x:{
-				plotAt:0,
-				label:"",
-				unitLabel:"",
-				unitType:Number,
-				nUnitsToShow:10,
-				range:{
-					min:0,
-					max:200
-				}
-			},
-			y:{
-				plotAt:0,
-				label:"",
-				unitLabel:"",
-				unitType:Number,
-				nUnitsToShow:10,
-				range:{
-					min:0,
-					max:200
-				}
-			}
-		}
-	},
-	
-	fillInTemplate:function(args,frag){
-		this.initialize();
-		this.render();
-	},
-	parseData:function(){
-	},
-	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");
-		this.vectorNode.style.width=this.properties.width+"px";
-		this.vectorNode.style.height=this.properties.height+"px";
-		this.vectorNode.style.position="relative";
-		this.domNode.appendChild(this.vectorNode);
-
-		var plotWidth=this.properties.width-this.properties.padding.left-this.properties.padding.right;
-		var plotHeight=this.properties.height-this.properties.padding.top-this.properties.padding.bottom;
-
-		this.plotArea=document.createElement("div");
-		this.plotArea.style.position="absolute";
-		this.plotArea.style.backgroundColor="#fff";
-		this.plotArea.style.top=(this.properties.padding.top)-2+"px";
-		this.plotArea.style.left=(this.properties.padding.left-1)+"px";
-		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);
-
-		//	clipping rects, what a fucking pain.
-		var bg=this.domNode.style.backgroundColor;
-		var r=document.createElement("v:rect");
-		r.setAttribute("fillcolor", bg);
-		r.setAttribute("stroked", "false");
-		r.style.position="absolute";
-		r.style.top=(-1*this.properties.padding.top)-1+"px";
-		r.style.left=(-1*this.properties.padding.left)+"px";
-		r.style.width=(this.properties.width-3)+"px";
-		r.style.height=(this.properties.padding.top)-2+"px";
-		this.vectorNode.appendChild(r);
-
-		r=document.createElement("v:rect");
-		r.setAttribute("fillcolor", bg);
-		r.setAttribute("stroked", "false");
-		r.style.position="absolute";
-		r.style.top=plotHeight-2+"px";
-		r.style.left=(-1*this.properties.padding.left)+"px";
-		r.style.width=(this.properties.width-3)+"px";
-		r.style.height=(this.properties.padding.bottom)-2+"px"; // fixme: check this.
-		this.vectorNode.appendChild(r);
-
-		r=document.createElement("v:rect");
-		r.setAttribute("fillcolor", bg);
-		r.setAttribute("stroked", "false");
-		r.style.position="absolute";
-		r.style.top="-2px";
-		r.style.left=(-1*this.properties.padding.left)+"px";
-		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");
-		r.style.position="absolute";
-		r.style.top="-2px";
-		r.style.right=(-1*this.properties.padding.right)+1+"px";
-		r.style.width=(this.properties.padding.right-1)+"px";
-		r.style.height=plotHeight+"px";
-		this.vectorNode.appendChild(r);
-		//	end clipping rects.  god that sucks, i wish VML had clipping outside of that crap vmlframe...
-
-		this.axisGroup=document.createElement("div");
-		this.axisGroup.style.position="relative";
-		this.plotArea.appendChild(this.axisGroup);
-
-		var stroke=1;
-
-		//	x axis
-		var line=document.createElement("v:line");
-		var y=dojo.widget.vml.Chart.Plotter.getY(this.properties.axes.x.plotAt, this);
-		line.setAttribute("from", this.properties.padding.left-stroke + "," + y);
-		line.setAttribute("to", plotWidth + "," + y);
-		line.style.position="absolute";
-		line.style.antialias="false";
-		line.setAttribute("strokecolor", "#666");
-		line.setAttribute("strokeweight", stroke*2+"px");
-		this.axisGroup.appendChild(line);
-
-		//	y axis
-		var line=document.createElement("v:line");
-		var y=dojo.widget.vml.Chart.Plotter.getX(this.properties.axes.y.plotAt, this);
-		line.setAttribute("from", y+","+this.properties.padding.top);
-		line.setAttribute("to", y+","+this.properties.height-this.properties.padding.bottom);
-		line.style.position="absolute";
-		line.style.antialias="false";
-		line.setAttribute("strokecolor", "#666");
-		line.setAttribute("strokeweight", stroke*2+"px");
-		this.axisGroup.appendChild(line);
-		
-		//	labels
-		var size=10;
-
-		//	x axis labels.
-		var t=document.createElement("div");
-		t.style.position="absolute";
-		t.style.top=(this.properties.height-this.properties.padding.bottom+size+2)+"px";
-		t.style.left=this.properties.padding.left+"px";
-		t.style.fontFamily="sans-serif";
-		t.style.fontSize=size+"px";
-		t.innerHTML=dojo.math.round(parseFloat(this.properties.axes.x.range.min),2);
-		this.axisGroup.appendChild(t);
-
-		t=document.createElement("div");
-		t.style.position="absolute";
-		t.style.top=(this.properties.height-this.properties.padding.bottom+size+2)+"px";
-		t.style.left=(this.properties.width-this.properties.padding.right-(size/2))+"px";
-		t.style.fontFamily="sans-serif";
-		t.style.fontSize=size+"px";
-		t.innerHTML=dojo.math.round(parseFloat(this.properties.axes.x.range.max),2);
-		this.axisGroup.appendChild(t);
-
-		//	y axis labels.
-		t=document.createElement("div");
-		t.style.position="absolute";
-		t.style.top=-1*(size/2)+"px";
-		t.style.right=(plotWidth+4)+"px";
-		t.style.fontFamily="sans-serif";
-		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";
-		t.style.right=(plotWidth+4)+"px";
-		t.style.fontFamily="sans-serif";
-		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;
-	},
-	destroy:function(){
-		while(this.domNode.childNodes.length>0){
-			this.domNode.removeChild(this.domNode.childNodes[0]);
-		}
-		this.vectorNode=this.plotArea=this.dataGroup=this.axisGroup=null;
-	},
-	render:function(){
-		if (this.dataGroup){
-			while(this.dataGroup.childNodes.length>0){
-				this.dataGroup.removeChild(this.dataGroup.childNodes[0]);
-			}
-		} else {
-			this.initialize();
-		}
-		for(var i=0; i<this.series.length; i++){
-			dojo.widget.vml.Chart.Plotter.plot(this.series[i], this);
-		}
-	}
-});
-
-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;
-		var max=chart.properties.axes.x.range.max;
-		var ofst=0-min;
-		min+=ofst; max+=ofst; v+=ofst;
-
-		var xmin=chart.properties.padding.left;
-		var xmax=chart.properties.width-chart.properties.padding.right;
-		var x=(v*((xmax-xmin)/max))+xmin;
-		return x;
-	};
-	this.getY=function(value, chart){
-		var v=parseFloat(value);
-		var max=chart.properties.axes.y.range.max;
-		var min=chart.properties.axes.y.range.min;
-		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;
-		return y;
-	};
-
-	this.addPlotter=function(name, func){
-		plotters[name]=func;
-	};
-	this.plot=function(series, chart){
-		if (series.values.length==0) return;
-		if (series.plotType && plotters[series.plotType]){
-			return plotters[series.plotType](series, chart);
-		}
-		else if (chart.plotType && plotters[chart.plotType]){
-			return plotters[chart.plotType](series, chart);
-		}
-	};
-
-	//	plotting
-	plotters[types.Bar]=function(series, chart){
-		var space=1;
-		var lastW = 0;
-		for (var i=0; i<series.values.length; i++){
-			var x=_this.getX(series.values[i].x, chart);
-			var w;
-			if (i==series.values.length-1){
-				w=lastW;
-			} else{
-				w=_this.getX(series.values[i+1].x, chart)-x-space;
-				lastW=w;
-			}
-			x-=(w/2);
-
-			var yA=_this.getY(chart.properties.axes.x.plotAt, chart);
-			var y=_this.getY(series.values[i].value, chart);
-			var h=Math.abs(yA-y);
-			if (parseFloat(series.values[i].value)<chart.properties.axes.x.plotAt){
-				var oy=yA;
-				yA=y;
-				y=oy;
-			}
-
-			var bar=document.createElement("v:rect");
-			bar.style.position="absolute";
-			bar.style.top=x+"px";
-			bar.style.left=y+"px";
-			bar.style.width=w+"px";
-			bar.style.height=h+"px";
-			bar.setAttribute("fillColor", series.color);
-			bar.setAttribute("title", series.label + ": " + series.values[i].value);
-			bar.setAttribute("coordsize", chart.properties.width + "," + chart.properties.height);
-			var fill=document.createElement("v:fill");
-			fill.setAttribute("opacity", "0.9");
-			bar.appendChild(fill);
-			chart.dataGroup.appendChild(bar);
-		}
-	};	
-	plotters[types.Line]=function(series, chart){
-		var tension=3;
-
-		var line=document.createElement("v:shape");
-		line.setAttribute("strokeweight", "2px");
-		line.setAttribute("strokecolor", series.color);
-		line.setAttribute("fillcolor", "none");
-		line.setAttribute("filled", "false");
-		line.setAttribute("title", series.label);
-		line.setAttribute("coordsize", chart.properties.width + "," + chart.properties.height);
-		line.style.position="absolute";
-		line.style.top="0px";
-		line.style.left="0px";
-		line.style.width= chart.properties.width+"px";
-		line.style.height=chart.properties.height+"px";
-		var stroke=document.createElement("v:stroke");
-		stroke.setAttribute("opacity", "0.85");
-		line.appendChild(stroke);
-
-		var path = [];
-		for (var i=0; i<series.values.length; i++){
-			var x = _this.getX(series.values[i].x, chart)
-			var y = _this.getY(series.values[i].value, chart);
-
-			if (i==0){
-				path.push("m");
-				path.push(x+","+y);
-			}else{
-				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");
-				cx=x-(dx/tension);
-				path.push(cx+","+y-lasty);
-				path.push(dx, y-lasty);
-			}
-		}
-		line.setAttribute("path", path.join(" ")+" e");
-		chart.dataGroup.appendChild(line);
-	};
-	plotters[types.Scatter]=function(series, chart){
-		var r=8;
-		for (var i=0; i<series.values.length; i++){
-			var x=_this.getX(series.values[i].x, chart);
-			var y=_this.getY(series.values[i].value, chart);
-			var mod=r/2;
-
-			var point=document.createElement("v:rect");
-			point.setAttribute("fillcolor", series.color);
-			point.setAttribute("strokecolor", series.color);
-			point.setAttribute("title", series.label + ": " + series.values[i].value);
-			point.style.position="absolute";
-			point.style.rotation="45";
-			point.style.top=(y-mod)+"px";
-			point.style.left=(x-mod)+"px";
-			point.style.width=r+"px";
-			point.style.height=r+"px";
-			var fill=document.createElement("v:fill");
-			fill.setAttribute("opacity", "0.5");
-			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;
-		var ofst=0-min;
-
-		min+=ofst; max+=ofst;
-		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;
-			var mod=(parseFloat(size)*factor)/2;
-
-			var point=document.createElement("v:oval");
-			point.setAttribute("strokecolor", series.color);
-			point.setAttribute("fillcolor", series.color);
-			point.setAttribute("title", series.label + ": " + series.values[i].value + " (" + size + ")");
-			point.style.position="absolute";
-			point.style.top=(_this.getY(series.values[i].value, chart)-mod) + "px";
-			point.style.left=(_this.getX(series.values[i].x, chart)-mod) + "px";
-			point.style.width=mod+"px";
-			point.style.height=mod+"px";
-			chart.dataGroup.appendChild(point);
-		}
-	};
-}();
+dojo.provide("dojo.widget.vml.Chart");
+
+dojo.require("dojo.widget.HtmlWidget");
+dojo.require("dojo.widget.Chart");
+dojo.require("dojo.math");
+dojo.require("dojo.html");
+//dojo.require("dojo.vml");
+dojo.require("dojo.graphics.color");
+
+dojo.widget.vml.Chart=function(){
+	dojo.widget.Chart.call(this);
+	dojo.widget.HtmlWidget.call(this);
+};
+dojo.inherits(dojo.widget.vml.Chart, dojo.widget.HtmlWidget);
+dojo.lang.extend(dojo.widget.vml.Chart, {
+	//	widget props
+	templatePath:null,
+	templateCssPath:null,
+
+	//	state
+	_isInitialized:false,
+	hasData:false,
+
+	//	chart props
+	vectorNode:null,
+	plotArea:null,
+	dataGroup:null,
+	axisGroup:null,
+
+	properties:{
+		height:400,	//	defaults, will resize to the domNode.
+		width:600,
+		plotType:null,
+		padding:{
+			top:10,
+			bottom:2,
+			left:60,
+			right:30
+		},
+		axes:{
+			x:{
+				plotAt:0,
+				label:"",
+				unitLabel:"",
+				unitType:Number,
+				nUnitsToShow:10,
+				range:{
+					min:0,
+					max:200
+				}
+			},
+			y:{
+				plotAt:0,
+				label:"",
+				unitLabel:"",
+				unitType:Number,
+				nUnitsToShow:10,
+				range:{
+					min:0,
+					max:200
+				}
+			}
+		}
+	},
+	
+	fillInTemplate:function(args,frag){
+		this.initialize();
+		this.render();
+	},
+	parseData:function(){
+	},
+	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");
+		this.vectorNode.style.width=this.properties.width+"px";
+		this.vectorNode.style.height=this.properties.height+"px";
+		this.vectorNode.style.position="relative";
+		this.domNode.appendChild(this.vectorNode);
+
+		var plotWidth=this.properties.width-this.properties.padding.left-this.properties.padding.right;
+		var plotHeight=this.properties.height-this.properties.padding.top-this.properties.padding.bottom;
+
+		this.plotArea=document.createElement("div");
+		this.plotArea.style.position="absolute";
+		this.plotArea.style.backgroundColor="#fff";
+		this.plotArea.style.top=(this.properties.padding.top)-2+"px";
+		this.plotArea.style.left=(this.properties.padding.left-1)+"px";
+		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);
+
+		//	clipping rects, what a fucking pain.
+		var bg=this.domNode.style.backgroundColor;
+		var r=document.createElement("v:rect");
+		r.setAttribute("fillcolor", bg);
+		r.setAttribute("stroked", "false");
+		r.style.position="absolute";
+		r.style.top=(-1*this.properties.padding.top)-1+"px";
+		r.style.left=(-1*this.properties.padding.left)+"px";
+		r.style.width=(this.properties.width-3)+"px";
+		r.style.height=(this.properties.padding.top)-2+"px";
+		this.vectorNode.appendChild(r);
+
+		r=document.createElement("v:rect");
+		r.setAttribute("fillcolor", bg);
+		r.setAttribute("stroked", "false");
+		r.style.position="absolute";
+		r.style.top=plotHeight-2+"px";
+		r.style.left=(-1*this.properties.padding.left)+"px";
+		r.style.width=(this.properties.width-3)+"px";
+		r.style.height=(this.properties.padding.bottom)-2+"px"; // fixme: check this.
+		this.vectorNode.appendChild(r);
+
+		r=document.createElement("v:rect");
+		r.setAttribute("fillcolor", bg);
+		r.setAttribute("stroked", "false");
+		r.style.position="absolute";
+		r.style.top="-2px";
+		r.style.left=(-1*this.properties.padding.left)+"px";
+		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");
+		r.style.position="absolute";
+		r.style.top="-2px";
+		r.style.right=(-1*this.properties.padding.right)+1+"px";
+		r.style.width=(this.properties.padding.right-1)+"px";
+		r.style.height=plotHeight+"px";
+		this.vectorNode.appendChild(r);
+		//	end clipping rects.  god that sucks, i wish VML had clipping outside of that crap vmlframe...
+
+		this.axisGroup=document.createElement("div");
+		this.axisGroup.style.position="relative";
+		this.plotArea.appendChild(this.axisGroup);
+
+		var stroke=1;
+
+		//	x axis
+		var line=document.createElement("v:line");
+		var y=dojo.widget.vml.Chart.Plotter.getY(this.properties.axes.x.plotAt, this);
+		line.setAttribute("from", this.properties.padding.left-stroke + "," + y);
+		line.setAttribute("to", plotWidth + "," + y);
+		line.style.position="absolute";
+		line.style.antialias="false";
+		line.setAttribute("strokecolor", "#666");
+		line.setAttribute("strokeweight", stroke*2+"px");
+		this.axisGroup.appendChild(line);
+
+		//	y axis
+		var line=document.createElement("v:line");
+		var y=dojo.widget.vml.Chart.Plotter.getX(this.properties.axes.y.plotAt, this);
+		line.setAttribute("from", y+","+this.properties.padding.top);
+		line.setAttribute("to", y+","+this.properties.height-this.properties.padding.bottom);
+		line.style.position="absolute";
+		line.style.antialias="false";
+		line.setAttribute("strokecolor", "#666");
+		line.setAttribute("strokeweight", stroke*2+"px");
+		this.axisGroup.appendChild(line);
+		
+		//	labels
+		var size=10;
+
+		//	x axis labels.
+		var t=document.createElement("div");
+		t.style.position="absolute";
+		t.style.top=(this.properties.height-this.properties.padding.bottom+size+2)+"px";
+		t.style.left=this.properties.padding.left+"px";
+		t.style.fontFamily="sans-serif";
+		t.style.fontSize=size+"px";
+		t.innerHTML=dojo.math.round(parseFloat(this.properties.axes.x.range.min),2);
+		this.axisGroup.appendChild(t);
+
+		t=document.createElement("div");
+		t.style.position="absolute";
+		t.style.top=(this.properties.height-this.properties.padding.bottom+size+2)+"px";
+		t.style.left=(this.properties.width-this.properties.padding.right-(size/2))+"px";
+		t.style.fontFamily="sans-serif";
+		t.style.fontSize=size+"px";
+		t.innerHTML=dojo.math.round(parseFloat(this.properties.axes.x.range.max),2);
+		this.axisGroup.appendChild(t);
+
+		//	y axis labels.
+		t=document.createElement("div");
+		t.style.position="absolute";
+		t.style.top=-1*(size/2)+"px";
+		t.style.right=(plotWidth+4)+"px";
+		t.style.fontFamily="sans-serif";
+		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";
+		t.style.right=(plotWidth+4)+"px";
+		t.style.fontFamily="sans-serif";
+		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;
+	},
+	destroy:function(){
+		while(this.domNode.childNodes.length>0){
+			this.domNode.removeChild(this.domNode.childNodes[0]);
+		}
+		this.vectorNode=this.plotArea=this.dataGroup=this.axisGroup=null;
+	},
+	render:function(){
+		if (this.dataGroup){
+			while(this.dataGroup.childNodes.length>0){
+				this.dataGroup.removeChild(this.dataGroup.childNodes[0]);
+			}
+		} else {
+			this.initialize();
+		}
+		for(var i=0; i<this.series.length; i++){
+			dojo.widget.vml.Chart.Plotter.plot(this.series[i], this);
+		}
+	}
+});
+
+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;
+		var max=chart.properties.axes.x.range.max;
+		var ofst=0-min;
+		min+=ofst; max+=ofst; v+=ofst;
+
+		var xmin=chart.properties.padding.left;
+		var xmax=chart.properties.width-chart.properties.padding.right;
+		var x=(v*((xmax-xmin)/max))+xmin;
+		return x;
+	};
+	this.getY=function(value, chart){
+		var v=parseFloat(value);
+		var max=chart.properties.axes.y.range.max;
+		var min=chart.properties.axes.y.range.min;
+		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;
+		return y;
+	};
+
+	this.addPlotter=function(name, func){
+		plotters[name]=func;
+	};
+	this.plot=function(series, chart){
+		if (series.values.length==0) return;
+		if (series.plotType && plotters[series.plotType]){
+			return plotters[series.plotType](series, chart);
+		}
+		else if (chart.plotType && plotters[chart.plotType]){
+			return plotters[chart.plotType](series, chart);
+		}
+	};
+
+	//	plotting
+	plotters[types.Bar]=function(series, chart){
+		var space=1;
+		var lastW = 0;
+		for (var i=0; i<series.values.length; i++){
+			var x=_this.getX(series.values[i].x, chart);
+			var w;
+			if (i==series.values.length-1){
+				w=lastW;
+			} else{
+				w=_this.getX(series.values[i+1].x, chart)-x-space;
+				lastW=w;
+			}
+			x-=(w/2);
+
+			var yA=_this.getY(chart.properties.axes.x.plotAt, chart);
+			var y=_this.getY(series.values[i].value, chart);
+			var h=Math.abs(yA-y);
+			if (parseFloat(series.values[i].value)<chart.properties.axes.x.plotAt){
+				var oy=yA;
+				yA=y;
+				y=oy;
+			}
+
+			var bar=document.createElement("v:rect");
+			bar.style.position="absolute";
+			bar.style.top=x+"px";
+			bar.style.left=y+"px";
+			bar.style.width=w+"px";
+			bar.style.height=h+"px";
+			bar.setAttribute("fillColor", series.color);
+			bar.setAttribute("title", series.label + ": " + series.values[i].value);
+			bar.setAttribute("coordsize", chart.properties.width + "," + chart.properties.height);
+			var fill=document.createElement("v:fill");
+			fill.setAttribute("opacity", "0.9");
+			bar.appendChild(fill);
+			chart.dataGroup.appendChild(bar);
+		}
+	};	
+	plotters[types.Line]=function(series, chart){
+		var tension=3;
+
+		var line=document.createElement("v:shape");
+		line.setAttribute("strokeweight", "2px");
+		line.setAttribute("strokecolor", series.color);
+		line.setAttribute("fillcolor", "none");
+		line.setAttribute("filled", "false");
+		line.setAttribute("title", series.label);
+		line.setAttribute("coordsize", chart.properties.width + "," + chart.properties.height);
+		line.style.position="absolute";
+		line.style.top="0px";
+		line.style.left="0px";
+		line.style.width= chart.properties.width+"px";
+		line.style.height=chart.properties.height+"px";
+		var stroke=document.createElement("v:stroke");
+		stroke.setAttribute("opacity", "0.85");
+		line.appendChild(stroke);
+
+		var path = [];
+		for (var i=0; i<series.values.length; i++){
+			var x = _this.getX(series.values[i].x, chart)
+			var y = _this.getY(series.values[i].value, chart);
+
+			if (i==0){
+				path.push("m");
+				path.push(x+","+y);
+			}else{
+				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");
+				cx=x-(dx/tension);
+				path.push(cx+","+y-lasty);
+				path.push(dx, y-lasty);
+			}
+		}
+		line.setAttribute("path", path.join(" ")+" e");
+		chart.dataGroup.appendChild(line);
+	};
+	plotters[types.Scatter]=function(series, chart){
+		var r=8;
+		for (var i=0; i<series.values.length; i++){
+			var x=_this.getX(series.values[i].x, chart);
+			var y=_this.getY(series.values[i].value, chart);
+			var mod=r/2;
+
+			var point=document.createElement("v:rect");
+			point.setAttribute("fillcolor", series.color);
+			point.setAttribute("strokecolor", series.color);
+			point.setAttribute("title", series.label + ": " + series.values[i].value);
+			point.style.position="absolute";
+			point.style.rotation="45";
+			point.style.top=(y-mod)+"px";
+			point.style.left=(x-mod)+"px";
+			point.style.width=r+"px";
+			point.style.height=r+"px";
+			var fill=document.createElement("v:fill");
+			fill.setAttribute("opacity", "0.5");
+			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;
+		var ofst=0-min;
+
+		min+=ofst; max+=ofst;
+		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;
+			var mod=(parseFloat(size)*factor)/2;
+
+			var point=document.createElement("v:oval");
+			point.setAttribute("strokecolor", series.color);
+			point.setAttribute("fillcolor", series.color);
+			point.setAttribute("title", series.label + ": " + series.values[i].value + " (" + size + ")");
+			point.style.position="absolute";
+			point.style.top=(_this.getY(series.values[i].value, chart)-mod) + "px";
+			point.style.left=(_this.getX(series.values[i].x, chart)-mod) + "px";
+			point.style.width=mod+"px";
+			point.style.height=mod+"px";
+			chart.dataGroup.appendChild(point);
+		}
+	};
+}();
diff --git a/webapp/web/templates/README.txt b/webapp/web/templates/README.txt
index 75a0647c3..298eacb6e 100755
--- a/webapp/web/templates/README.txt
+++ b/webapp/web/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.
-
+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
diff --git a/webapp/web/templates/alpha/alphaIndex.jsp b/webapp/web/templates/alpha/alphaIndex.jsp
index 812a491f5..f3ce94e57 100644
--- a/webapp/web/templates/alpha/alphaIndex.jsp
+++ b/webapp/web/templates/alpha/alphaIndex.jsp
@@ -1,35 +1,35 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ page import="org.apache.commons.logging.Log" %>
-<%@ page import="org.apache.commons.logging.LogFactory" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %><%/* this odd thing points to something in web.xml */ %>
-<%@ 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
-        **********************************************/
-       
+<%@ page import="org.apache.commons.logging.Log" %>
+<%@ page import="org.apache.commons.logging.LogFactory" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %><%/* this odd thing points to something in web.xml */ %>
+<%@ 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: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:url var="url" value=".${requestScope.servlet}">
                 <c:param name="alpha">${letter}</c:param>
-            </c:url>
+            </c:url>
             <a href='<c:url value="${url}&amp;${requestScope.controllerParam}"/>'>${letter} </a>
-         </c:if> 
+         </c:if> 
     </c:forEach> 
     
     <%  if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)request.getAttribute("alpha"))) {  %>         
@@ -39,6 +39,6 @@
         </c:if>    
      <% }else{ %>
         (${requestScope.count})      
-     <% } %>             
-</div>
+     <% } %>             
+</div>
 </c:if>
\ No newline at end of file
diff --git a/webapp/web/templates/edit/autogenerated.jsp b/webapp/web/templates/edit/autogenerated.jsp
index 83d6db603..5cdbe85e3 100644
--- a/webapp/web/templates/edit/autogenerated.jsp
+++ b/webapp/web/templates/edit/autogenerated.jsp
@@ -1,3 +1,3 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-${formHtml}
+${formHtml}
diff --git a/webapp/web/templates/edit/fetch/vertical.jsp b/webapp/web/templates/edit/fetch/vertical.jsp
index ab87d1184..ee855927d 100644
--- a/webapp/web/templates/edit/fetch/vertical.jsp
+++ b/webapp/web/templates/edit/fetch/vertical.jsp
@@ -1,114 +1,114 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ page isThreadSafe = "false" %>
-<%@ page import="java.util.*,java.lang.String.*" %>
-
-<% if (request.getAttribute("title") != null) { %>
-  <h2><%=request.getAttribute("title")%></h2>
-<% } %>
-
-<%
-String headerStr = (String)request.getAttribute("header");
-if ( headerStr == null || (!headerStr.equalsIgnoreCase("noheader")) ) { %>
-<%  } %>
-<jsp:useBean id="results" class="java.util.ArrayList" scope="request" />
-<%
-int rows = 0;
-
-String minEditRoleStr = (String)request.getAttribute("min_edit_role");
-
-String firstValue = "null";
-Integer columnCount = (Integer)request.getAttribute("columncount");
-rows = columnCount.intValue();
-
-String clickSortStr = (String)request.getAttribute("clicksort");
-
-if ( rows > 0  && results.size() > rows ) { // avoid divide by zero error in next statement
-    String suppressStr = null;
-    int columns = results.size() / rows;
-    if ( ( suppressStr = (String)request.getAttribute("suppressquery")) == null ) { // only inserted into request if true %>
-        <p><i><b><%= columns - 1 %></b> results were retrieved in <b><%= rows %></b> rows for query "<%=request.getAttribute("querystring")%>".</i></p>
-<%  }
-    if ( clickSortStr != null && clickSortStr.equals("true")) {
-        if ( columns > 2 ) { %>
-            <p><i>Click on the row header to sort columns by that row.</i></p>
-<%      }
-    }  %>
-    <table border="0" cellpadding="2" cellspacing="0" width="100%">
-<%  String[] resultsArray = new String[results.size()]; // see Core Java Vol. 1 p.216
-    results.toArray( resultsArray );
-    firstValue = resultsArray[ rows ];
-    request.setAttribute("firstvalue",firstValue);
-    //secondValue= resultsArray[ rows + 1 ];
-    String classString = "";
-    boolean[] postQHeaderCols = new boolean[ columns ];
-    for ( int eachcol=0; eachcol < columns; eachcol++ ) {
-        postQHeaderCols[ eachcol ] = false;
-    }
-    for ( int thisrow = 0; thisrow < rows; thisrow++ ) {
-        //int currentPostQCol = 0;
-        boolean dropRow = false;
-            for ( int thiscol = 0; thiscol < columns; thiscol++ ) {
-            String thisResult= resultsArray[ (rows * thiscol) + thisrow ];
-            if ( "+".equals(thisResult) ) { /* occurs all in first row, so postQHeaderCols should be correctly initialized */
-                classString = "postheaderright";
-                postQHeaderCols[ thiscol ] = true;
-                //++currentPostQCol;
-                thisResult="&nbsp;";
-            } else if ( thisResult != null && thisResult.indexOf("@@")== 0) {
-                classString="postheadercenter";
-                thisResult ="query values"; //leave as follows for diagnostics: thisResult.substring(2);
-                thisResult = thisResult.substring(2);
-            } else {
-                if ( postQHeaderCols[ thiscol ] == true )
-                    classString = "postheaderright";
-                else if ( thiscol == 1 && thisrow < 1 ) // jc55 was thisrow<2
-                    classString = "rowbold";
-                else
-                    classString = "row";
-                if ( thisResult == null ||  "".equals(thisResult) )
-                    thisResult="&nbsp;";
-            }
-            if ( thiscol == 0 ) { // 1st column of new row
-                if ( thisrow > 0 ) { // first must close prior row %>
-                    </tr>
-                        <%                  if ("XX".equals(thisResult) ) {
-                        dropRow = true;
-                    } %>
-                    <tr valign="top" class="rowvert">  <!-- okay to start even a dropRow because it will get no <td> elements -->
-<%              } else { %>
-                    <tr valign="top" class="header">  <!-- okay to start even a dropRow because it will get no <td> elements -->
-<%              }
-                if ( !dropRow ) { %>
-                    <td width="15%" class="verticalfieldlabel">
-                    <%=thisResult%>
-<%              }
-            } else { // 2nd or higher column
-                if ( !dropRow ) { %>
-                    <td class="<%=classString%>" >
-                        <%                  if ("XX".equals(thisResult) ) { %>
-                        <%="&nbsp;"%>
-<%                  } else { %>
-                        <%=thisResult%>
-<%                  }
-                }
-            }
-            if ( !dropRow ) { %>
-                </td>
-<%          }
-        }
-    }  %>
-    </tr>
-    </table>
-<%
-} else {
-    System.out.println("No results reported when " + rows + " rows and a result array size of " + results.size()); %>
-    No results retrieved for query "<%=request.getAttribute("querystring")%>".
-<%  Iterator errorIter = results.iterator();
-    while ( errorIter.hasNext()) {
-        String errorResult = (String)errorIter.next(); %>
-        <p>Error returned: <%= errorResult%></p>
-<%  }
-} %>
-
-
+<%@ page isThreadSafe = "false" %>
+<%@ page import="java.util.*,java.lang.String.*" %>
+
+<% if (request.getAttribute("title") != null) { %>
+  <h2><%=request.getAttribute("title")%></h2>
+<% } %>
+
+<%
+String headerStr = (String)request.getAttribute("header");
+if ( headerStr == null || (!headerStr.equalsIgnoreCase("noheader")) ) { %>
+<%  } %>
+<jsp:useBean id="results" class="java.util.ArrayList" scope="request" />
+<%
+int rows = 0;
+
+String minEditRoleStr = (String)request.getAttribute("min_edit_role");
+
+String firstValue = "null";
+Integer columnCount = (Integer)request.getAttribute("columncount");
+rows = columnCount.intValue();
+
+String clickSortStr = (String)request.getAttribute("clicksort");
+
+if ( rows > 0  && results.size() > rows ) { // avoid divide by zero error in next statement
+    String suppressStr = null;
+    int columns = results.size() / rows;
+    if ( ( suppressStr = (String)request.getAttribute("suppressquery")) == null ) { // only inserted into request if true %>
+        <p><i><b><%= columns - 1 %></b> results were retrieved in <b><%= rows %></b> rows for query "<%=request.getAttribute("querystring")%>".</i></p>
+<%  }
+    if ( clickSortStr != null && clickSortStr.equals("true")) {
+        if ( columns > 2 ) { %>
+            <p><i>Click on the row header to sort columns by that row.</i></p>
+<%      }
+    }  %>
+    <table border="0" cellpadding="2" cellspacing="0" width="100%">
+<%  String[] resultsArray = new String[results.size()]; // see Core Java Vol. 1 p.216
+    results.toArray( resultsArray );
+    firstValue = resultsArray[ rows ];
+    request.setAttribute("firstvalue",firstValue);
+    //secondValue= resultsArray[ rows + 1 ];
+    String classString = "";
+    boolean[] postQHeaderCols = new boolean[ columns ];
+    for ( int eachcol=0; eachcol < columns; eachcol++ ) {
+        postQHeaderCols[ eachcol ] = false;
+    }
+    for ( int thisrow = 0; thisrow < rows; thisrow++ ) {
+        //int currentPostQCol = 0;
+        boolean dropRow = false;
+            for ( int thiscol = 0; thiscol < columns; thiscol++ ) {
+            String thisResult= resultsArray[ (rows * thiscol) + thisrow ];
+            if ( "+".equals(thisResult) ) { /* occurs all in first row, so postQHeaderCols should be correctly initialized */
+                classString = "postheaderright";
+                postQHeaderCols[ thiscol ] = true;
+                //++currentPostQCol;
+                thisResult="&nbsp;";
+            } else if ( thisResult != null && thisResult.indexOf("@@")== 0) {
+                classString="postheadercenter";
+                thisResult ="query values"; //leave as follows for diagnostics: thisResult.substring(2);
+                thisResult = thisResult.substring(2);
+            } else {
+                if ( postQHeaderCols[ thiscol ] == true )
+                    classString = "postheaderright";
+                else if ( thiscol == 1 && thisrow < 1 ) // jc55 was thisrow<2
+                    classString = "rowbold";
+                else
+                    classString = "row";
+                if ( thisResult == null ||  "".equals(thisResult) )
+                    thisResult="&nbsp;";
+            }
+            if ( thiscol == 0 ) { // 1st column of new row
+                if ( thisrow > 0 ) { // first must close prior row %>
+                    </tr>
+                        <%                  if ("XX".equals(thisResult) ) {
+                        dropRow = true;
+                    } %>
+                    <tr valign="top" class="rowvert">  <!-- okay to start even a dropRow because it will get no <td> elements -->
+<%              } else { %>
+                    <tr valign="top" class="header">  <!-- okay to start even a dropRow because it will get no <td> elements -->
+<%              }
+                if ( !dropRow ) { %>
+                    <td width="15%" class="verticalfieldlabel">
+                    <%=thisResult%>
+<%              }
+            } else { // 2nd or higher column
+                if ( !dropRow ) { %>
+                    <td class="<%=classString%>" >
+                        <%                  if ("XX".equals(thisResult) ) { %>
+                        <%="&nbsp;"%>
+<%                  } else { %>
+                        <%=thisResult%>
+<%                  }
+                }
+            }
+            if ( !dropRow ) { %>
+                </td>
+<%          }
+        }
+    }  %>
+    </tr>
+    </table>
+<%
+} else {
+    System.out.println("No results reported when " + rows + " rows and a result array size of " + results.size()); %>
+    No results retrieved for query "<%=request.getAttribute("querystring")%>".
+<%  Iterator errorIter = results.iterator();
+    while ( errorIter.hasNext()) {
+        String errorResult = (String)errorIter.next(); %>
+        <p>Error returned: <%= errorResult%></p>
+<%  }
+} %>
+
+
diff --git a/webapp/web/templates/edit/formBasic.js b/webapp/web/templates/edit/formBasic.js
index fcd040c51..50fe3ab82 100644
--- a/webapp/web/templates/edit/formBasic.js
+++ b/webapp/web/templates/edit/formBasic.js
@@ -1,7 +1,7 @@
-<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<script language="JavaScript" type="text/javascript">
-function confirmDelete() {
-    var msg="Are you SURE you want to delete this record? If in doubt, CANCEL."
-    return confirm(msg);
-}
+<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+<script language="JavaScript" type="text/javascript">
+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
diff --git a/webapp/web/templates/edit/formBasic.jsp b/webapp/web/templates/edit/formBasic.jsp
index cb76b6b62..cdf0818a4 100644
--- a/webapp/web/templates/edit/formBasic.jsp
+++ b/webapp/web/templates/edit/formBasic.jsp
@@ -1,74 +1,74 @@
-<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
-
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<div class="editingForm">
-
-<c:set var="colspan">
-	<c:out value="${colspan}" default="3"/>
-</c:set>
-
-<c:set var="onSubmit">
-   <c:out value="${formOnSubmit}" default="return true;"/>
-</c:set>
-
-<c:set var="action">
-    <c:out value="${editAction}" default="doEdit"/>
-</c:set>
-
-<form id="editForm" name="editForm" action="${action}" method="post" onsubmit="${onSubmit}">
-    <input type="hidden" name="_epoKey" value="${epoKey}" />
-
-<table cellpadding="4" cellspacing="2"  style="background-color:#fff">
-	<tr><th colspan="${colspan}">
-	<div>
-		<h2>${title}</h2>
-			<c:choose>
-				<c:when test='${_action == "insert"}'>
-					<h3 class="blue">Creating New Record
-				</c:when>
-				<c:otherwise>
-					<h3 class="blue">Editing Existing Record
-				</c:otherwise>
-			</c:choose>
-	 <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>		
-    				<input id="primaryAction" type="submit" class="submit" name="_update" value="Submit Changes"/>
-                    <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"/> 
-                </c:when>
-                <c:otherwise>
-		            <input type="submit" class="delete" name="_cancel" value="Cancel"/>
-                </c:otherwise>
-            </c:choose>
-		</td>
-	</tr>
-</table>
-
-</form>
-
-</div><!--editingform-->
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+<div class="editingForm">
+
+<c:set var="colspan">
+	<c:out value="${colspan}" default="3"/>
+</c:set>
+
+<c:set var="onSubmit">
+   <c:out value="${formOnSubmit}" default="return true;"/>
+</c:set>
+
+<c:set var="action">
+    <c:out value="${editAction}" default="doEdit"/>
+</c:set>
+
+<form id="editForm" name="editForm" action="${action}" method="post" onsubmit="${onSubmit}">
+    <input type="hidden" name="_epoKey" value="${epoKey}" />
+
+<table cellpadding="4" cellspacing="2"  style="background-color:#fff">
+	<tr><th colspan="${colspan}">
+	<div>
+		<h2>${title}</h2>
+			<c:choose>
+				<c:when test='${_action == "insert"}'>
+					<h3 class="blue">Creating New Record
+				</c:when>
+				<c:otherwise>
+					<h3 class="blue">Editing Existing Record
+				</c:otherwise>
+			</c:choose>
+	 <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>		
+    				<input id="primaryAction" type="submit" class="submit" name="_update" value="Submit Changes"/>
+                    <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"/> 
+                </c:when>
+                <c:otherwise>
+		            <input type="submit" class="delete" name="_cancel" value="Cancel"/>
+                </c:otherwise>
+            </c:choose>
+		</td>
+	</tr>
+</table>
+
+</form>
+
+</div><!--editingform-->
diff --git a/webapp/web/templates/edit/specific/class2classes_retry.jsp b/webapp/web/templates/edit/specific/class2classes_retry.jsp
index 60f5ba62d..8f18df92e 100644
--- a/webapp/web/templates/edit/specific/class2classes_retry.jsp
+++ b/webapp/web/templates/edit/specific/class2classes_retry.jsp
@@ -1,22 +1,22 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
-
-    <tr class="editformcell">
-        <td valign="top">
-            <b>Superclass<sup>*</sup></b><br/>
-			<select name="SuperclassURI">
-				<form:option name="SuperclassURI"/>
-			</select>
-			<span class="warning"><form:error name="SuperclassURI"/></span>
-        </td>
-    </tr>
-    <tr class="editformcell">
-        <td valign="top">
-            <b>Subclass<sup>*</sup></b><br/>
-            <select name="SubclassURI" >
-            	<form:option name="SubclassURI"/>
-            </select>
-            <span class="warning"><form:error name="SubclassURI"/></span>
-        </td>
-    </tr>
+<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
+
+    <tr class="editformcell">
+        <td valign="top">
+            <b>Superclass<sup>*</sup></b><br/>
+			<select name="SuperclassURI">
+				<form:option name="SuperclassURI"/>
+			</select>
+			<span class="warning"><form:error name="SuperclassURI"/></span>
+        </td>
+    </tr>
+    <tr class="editformcell">
+        <td valign="top">
+            <b>Subclass<sup>*</sup></b><br/>
+            <select name="SubclassURI" >
+            	<form:option name="SubclassURI"/>
+            </select>
+            <span class="warning"><form:error name="SubclassURI"/></span>
+        </td>
+    </tr>
diff --git a/webapp/web/templates/edit/specific/classes_edit.jsp b/webapp/web/templates/edit/specific/classes_edit.jsp
index 605810f1f..1030ec536 100644
--- a/webapp/web/templates/edit/specific/classes_edit.jsp
+++ b/webapp/web/templates/edit/specific/classes_edit.jsp
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<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"/>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<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"/>
 <jsp:directive.page import="edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary"/>
-
-<div class="editingForm">
-
-<jsp:include page="/templates/edit/fetch/vertical.jsp"/>
-
-<!--
-/**
- *
- * @version 1.00
- * @author Jon Corson-Rikert
- *
- * UPDATES:
- * JCR 2005-11-06 : added code to show properties of parent class(es) as adapted from props_retry.jsp
- * BJL 2007-07-XX : general overhaul to remove database tags and scriptlets
- */
--->
-<div align="center">
-<table class="form-background" border="0" cellpadding="2" cellspacing="2">
-<tr valign="bottom" align="center">
-	<td valign="bottom">
-		<form action="listVClassWebapps" method="get">
-			<input type="submit" class="form-button" value="Show All Classes"/>
-		</form>
-                <form action="showClassHierarchy" method="get">
-                        <input type="submit" class="form-button" value="Show Class Hierarchy"/>
-                </form>
+
+<div class="editingForm">
+
+<jsp:include page="/templates/edit/fetch/vertical.jsp"/>
+
+<!--
+/**
+ *
+ * @version 1.00
+ * @author Jon Corson-Rikert
+ *
+ * UPDATES:
+ * JCR 2005-11-06 : added code to show properties of parent class(es) as adapted from props_retry.jsp
+ * BJL 2007-07-XX : general overhaul to remove database tags and scriptlets
+ */
+-->
+<div align="center">
+<table class="form-background" border="0" cellpadding="2" cellspacing="2">
+<tr valign="bottom" align="center">
+	<td valign="bottom">
+		<form action="listVClassWebapps" method="get">
+			<input type="submit" class="form-button" value="Show All Classes"/>
+		</form>
+                <form action="showClassHierarchy" method="get">
+                        <input type="submit" class="form-button" value="Show Class Hierarchy"/>
+                </form>
                 <form action="showClassHierarchy" method="get">
                         <input type="hidden" name="vclassUri" value="${VClass.URI}"/>
                         <input type="submit" class="form-button" value="Show Hierarchy below This Class"/>
                 </form>
-                <form action="listIndividuals" method="get">
-                    <input type="hidden" name="VClassURI" value="${VClass.URI}" />
-                    <input type="submit" class="form-button" value="Show All Individuals in This Class"/>
+                <form action="listIndividuals" method="get">
+                    <input type="hidden" name="VClassURI" value="${VClass.URI}" />
+                    <input type="submit" class="form-button" value="Show All Individuals in This Class"/>
                 </form>
                 <form action="listIndividuals" method="get">
                     <input type="hidden" name="VClassURI" value="${VClass.URI}" />
                     <input type="hidden" name="assertedOnly" value="true"/>
                     <input type="submit" class="form-button" value="Show Individuals Asserted To Be in This Class"/>
-                </form>
-	</td>
-	<td valign="bottom" align="center">
-		<form action="vclass_retry" method="get">
-			<input name="uri" type = "hidden" value="${VClass.URI}" />
-			<input type="submit" class="form-button" value="Edit Class"/>
-		</form>
-	</td>
-	<td valign="bottom">
-		<form action="vclass_retry" method="get">
-			<input type="submit" class="form-button" value="Add New Class"/>
-		</form>
-		<form action="editForm" method="get">
-			<input type="submit" class="form-button" value="Add New Individual in This Class"/>
-       		<input type="hidden" name="controller" value="Entity"/>
-       		<input type="hidden" name="VClassURI" value="${VClass.URI}"/>
+                </form>
+	</td>
+	<td valign="bottom" align="center">
+		<form action="vclass_retry" method="get">
+			<input name="uri" type = "hidden" value="${VClass.URI}" />
+			<input type="submit" class="form-button" value="Edit Class"/>
+		</form>
+	</td>
+	<td valign="bottom">
+		<form action="vclass_retry" method="get">
+			<input type="submit" class="form-button" value="Add New Class"/>
+		</form>
+		<form action="editForm" method="get">
+			<input type="submit" class="form-button" value="Add New Individual in This Class"/>
+       		<input type="hidden" name="controller" value="Entity"/>
+       		<input type="hidden" name="VClassURI" value="${VClass.URI}"/>
 		</form>
 		<form action="editForm" method="get">
            	<input type="submit" class="form-button" value="Change URI"/>
@@ -71,31 +71,31 @@
         </form>
        	<form action="editForm" method="get">
            	<input type="submit" class="form-button" value="Move Instances to Another Class"/>
-           	<input type="hidden" name="VClassURI" value="${VClass.URI}"/>
-			<c:choose>
-				<c:when test="${VClass.namespace eq 'http://vitro.mannlib.cornell.edu/ns/bnode#'}">
-					<input type="hidden" name="VClassName" value="this anonymous class"/>
-				</c:when>
-				<c:otherwise>
-           			<input type="hidden" name="VClassName" value="${VClass.localNameWithPrefix}"/>
-				</c:otherwise>
+           	<input type="hidden" name="VClassURI" value="${VClass.URI}"/>
+			<c:choose>
+				<c:when test="${VClass.namespace eq 'http://vitro.mannlib.cornell.edu/ns/bnode#'}">
+					<input type="hidden" name="VClassName" value="this anonymous class"/>
+				</c:when>
+				<c:otherwise>
+           			<input type="hidden" name="VClassName" value="${VClass.localNameWithPrefix}"/>
+				</c:otherwise>
 			</c:choose>
            	<input type="hidden" name="mode" value="moveInstances"/>
           	<input type="hidden" name="controller" value="Refactor"/>
-        </form>
-	</td>
-</tr>
-<tr><td colspan="3"><hr/></td></tr>
-<!-- _____________________________________________ superclasses __________________________________________ -->
-<tr valign="bottom" align="center">
-	<td colspan="2" valign="bottom" align="left">
-	   <c:if test="${!empty superclasses}">
-		<form action="classes2ClassesOp" method="post">
-			<ul style="list-style-type:none;">
-			<c:forEach var="superclass" items="${superclasses}">
-			<c:url var="superclassURL" value="vclassEdit">
-				<c:param name="uri" value="${superclass.URI}"/>
-			</c:url>
+        </form>
+	</td>
+</tr>
+<tr><td colspan="3"><hr/></td></tr>
+<!-- _____________________________________________ superclasses __________________________________________ -->
+<tr valign="bottom" align="center">
+	<td colspan="2" valign="bottom" align="left">
+	   <c:if test="${!empty superclasses}">
+		<form action="classes2ClassesOp" method="post">
+			<ul style="list-style-type:none;">
+			<c:forEach var="superclass" items="${superclasses}">
+			<c:url var="superclassURL" value="vclassEdit">
+				<c:param name="uri" value="${superclass.URI}"/>
+			</c:url>
 				<li><input type="checkbox" name="SuperclassURI" value="${superclass.URI}" class="form-item"/>
 					<c:choose>
 						<c:when test="${!superclass.anonymous}">
@@ -105,35 +105,35 @@
 							${superclass.localNameWithPrefix}
 						</c:otherwise>
 					</c:choose>
-				</li>
-			</c:forEach>
-			</ul>
-			<input type="hidden" name="SubclassURI" value="${VClass.URI}"/>
-			<input type="hidden" name="operation" value="remove"/>
-			<input type="hidden" name="_epoKey" value="${epoKey}"/>
-			<input type="submit" class="form-button" value="Remove Checked Superclass Links"/>
-		</form>
-	    </c:if>
-	</td>
-	<td>
-		<form action="editForm" method="get">
-			<input type="hidden" name="SubclassURI" value="${VClass.URI}"/>
-			<input type="hidden" name="controller" value="Classes2Classes"/>
-			<input type="submit" class="form-button" value="New Link to Superclass"/>
-		</form>
-	</td>
-</tr>
-<tr><td colspan="3"><hr/></td></tr>			
-<!-- _______________________________________________ subclasses _____________________________________________ -->
-<tr valign="bottom" align="center">
-	<td colspan="2" valign="bottom" align="left">
-	    <c:if test="${!empty subclasses}">
-		<form action="classes2ClassesOp" method="post">
-			<ul style="list-style-type:none;">
-			<c:forEach var="subclass" items="${subclasses}">
-				<c:url var="subclassURL" value="vclassEdit">
-					<c:param name="uri" value="${subclass.URI}"/>
-				</c:url>
+				</li>
+			</c:forEach>
+			</ul>
+			<input type="hidden" name="SubclassURI" value="${VClass.URI}"/>
+			<input type="hidden" name="operation" value="remove"/>
+			<input type="hidden" name="_epoKey" value="${epoKey}"/>
+			<input type="submit" class="form-button" value="Remove Checked Superclass Links"/>
+		</form>
+	    </c:if>
+	</td>
+	<td>
+		<form action="editForm" method="get">
+			<input type="hidden" name="SubclassURI" value="${VClass.URI}"/>
+			<input type="hidden" name="controller" value="Classes2Classes"/>
+			<input type="submit" class="form-button" value="New Link to Superclass"/>
+		</form>
+	</td>
+</tr>
+<tr><td colspan="3"><hr/></td></tr>			
+<!-- _______________________________________________ subclasses _____________________________________________ -->
+<tr valign="bottom" align="center">
+	<td colspan="2" valign="bottom" align="left">
+	    <c:if test="${!empty subclasses}">
+		<form action="classes2ClassesOp" method="post">
+			<ul style="list-style-type:none;">
+			<c:forEach var="subclass" items="${subclasses}">
+				<c:url var="subclassURL" value="vclassEdit">
+					<c:param name="uri" value="${subclass.URI}"/>
+				</c:url>
 				<li><input type="checkbox" name="SubclassURI" value="${subclass.URI}" class="form-item"/>
 					<c:choose>
 					    <c:when test="${!subclass.anonymous}">
@@ -144,28 +144,28 @@
 					    </c:otherwise>
 				        </c:choose>
 				</li>						
-			</c:forEach>	
-			</ul>
-			<input type="hidden" name="SuperclassURI" value="${VClass.URI}"/>
-			<input type="submit" class="form-button" value="Remove Checked Subclass Links"/>
-			<input type="hidden" name="operation" value="remove"/>
-			<input type="hidden" name="_epoKey" value="${epoKey}"/>
-		</form>
-             </c:if>
-	</td>
-	<td valign="bottom">
-		<form action="editForm" method="get">
-			<input type="hidden" name="controller" value="Classes2Classes"/>
-			<input type="hidden" name="SuperclassURI" value="${VClass.URI}"/>
-			<input type="submit" class="form-button" value="New Link to Subclass"/>
-		</form>
-		<form action="vclass_retry" method="get">
-			<input type="hidden" name="superclassUri" value="${VClass.URI}" />
-			<input type="submit" class="form-button" value="Add New Subclass of This Class"/>
-		</form>
-	</td>
-</tr>
-<tr><td colspan="3"><hr/></td></tr>
+			</c:forEach>	
+			</ul>
+			<input type="hidden" name="SuperclassURI" value="${VClass.URI}"/>
+			<input type="submit" class="form-button" value="Remove Checked Subclass Links"/>
+			<input type="hidden" name="operation" value="remove"/>
+			<input type="hidden" name="_epoKey" value="${epoKey}"/>
+		</form>
+             </c:if>
+	</td>
+	<td valign="bottom">
+		<form action="editForm" method="get">
+			<input type="hidden" name="controller" value="Classes2Classes"/>
+			<input type="hidden" name="SuperclassURI" value="${VClass.URI}"/>
+			<input type="submit" class="form-button" value="New Link to Subclass"/>
+		</form>
+		<form action="vclass_retry" method="get">
+			<input type="hidden" name="superclassUri" value="${VClass.URI}" />
+			<input type="submit" class="form-button" value="Add New Subclass of This Class"/>
+		</form>
+	</td>
+</tr>
+<tr><td colspan="3"><hr/></td></tr>
 
 <!-- _______________________________________________ equivalent classes _____________________________________________ -->
 <tr valign="bottom" align="center">
@@ -249,30 +249,30 @@
 	</td>
 </tr>
 <tr><td colspan="3"><hr/></td></tr>
-
-<!-- ___________________________________________ domain properties ___________________________________ -->
-<tr valign="top" align="center">
-	<td>
-		<form action="listPropertyWebapps" method="get">
-			<input type="submit" class="form-button" value="Show All Object Properties Applicable to This Class"/>
-			<input type="hidden" name="vclassUri" value="${VClass.URI}"/>
-			<input type="hidden" name="propsForClass" value="true"/>
-		</form><br/>
-		<form action="listDatatypeProperties" method="get">
-			<input type="submit" class="form-button" value="Show All Data Properties Applicable to This Class"/>
-			<input type="hidden" name="vclassUri" value="${VClass.URI}"/>
-			<input type="hidden" name="propsForClass" value="true"/>
+
+<!-- ___________________________________________ domain properties ___________________________________ -->
+<tr valign="top" align="center">
+	<td>
+		<form action="listPropertyWebapps" method="get">
+			<input type="submit" class="form-button" value="Show All Object Properties Applicable to This Class"/>
+			<input type="hidden" name="vclassUri" value="${VClass.URI}"/>
+			<input type="hidden" name="propsForClass" value="true"/>
 		</form><br/>
-	</td>
-	<td></td>
-	<td valign="bottom">
-		<form action="editForm" method="get">
-			<input type="hidden" name="domainClassUri" value="${VClass.URI}"/>
-			<input type="hidden" name="controller" value="Property"/>
-			<input type="submit" class="form-button" value="Define New Domain Property at This Class"/>
-		</form>
-	</td>
-    </tr>
+		<form action="listDatatypeProperties" method="get">
+			<input type="submit" class="form-button" value="Show All Data Properties Applicable to This Class"/>
+			<input type="hidden" name="vclassUri" value="${VClass.URI}"/>
+			<input type="hidden" name="propsForClass" value="true"/>
+		</form><br/>
+	</td>
+	<td></td>
+	<td valign="bottom">
+		<form action="editForm" method="get">
+			<input type="hidden" name="domainClassUri" value="${VClass.URI}"/>
+			<input type="hidden" name="controller" value="Property"/>
+			<input type="submit" class="form-button" value="Define New Domain Property at This Class"/>
+		</form>
+	</td>
+    </tr>
     <tr>
         <td colspan="2">
                 <form action="editForm" method="get">
@@ -286,15 +286,15 @@
                         <option value="cardinality">exact cardinality</option>
                     </select>
                     <input type="submit" class="form-button" value="Apply Restriction"/>
-                    <input type="hidden" name="VClassURI" value="${VClass.URI}"/>
-                    <p>Restrict: 
-                        <input type="radio" name="propertyType" value="object" checked="checked"/> object property
-                        <input type="radio" name="propertyType" value="data"/> data property
+                    <input type="hidden" name="VClassURI" value="${VClass.URI}"/>
+                    <p>Restrict: 
+                        <input type="radio" name="propertyType" value="object" checked="checked"/> object property
+                        <input type="radio" name="propertyType" value="data"/> data property
                     </p>
                 </form>       
         </td>
 </tr>
-</table>
-</div>
-</div>
-</jsp:root>
+</table>
+</div>
+</div>
+</jsp:root>
diff --git a/webapp/web/templates/edit/specific/dataprops_edit.jsp b/webapp/web/templates/edit/specific/dataprops_edit.jsp
index 904c84122..e7d2a04ec 100644
--- a/webapp/web/templates/edit/specific/dataprops_edit.jsp
+++ b/webapp/web/templates/edit/specific/dataprops_edit.jsp
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
-          xmlns:c  ="http://java.sun.com/jsp/jstl/core"
-          xmlns:fn ="http://java.sun.com/jsp/jstl/functions">
-
-<div class="editingForm">
-
-<jsp:include page="/templates/edit/fetch/vertical.jsp"/>
-
-<!--    
-/**
- *
- * @version 0.8
- * @author bjl23
- *
- */
--->
-
-<div align="center">
-<table class="form-background" border="0" cellpadding="2" cellspacing="2">
-<tr valign="bottom" align="center">
-	<td>
-        <form action="showDataPropertyHierarchy" method="get">
-            <input type="submit" class="form-button" value="Data Property Hierarchy"/>
-        </form>
-		<form action="listDatatypeProperties" method="get">
-			<input type="submit" class="form-button" value="All Data Properties"/>
+
+<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"
+          xmlns:c  ="http://java.sun.com/jsp/jstl/core"
+          xmlns:fn ="http://java.sun.com/jsp/jstl/functions">
+
+<div class="editingForm">
+
+<jsp:include page="/templates/edit/fetch/vertical.jsp"/>
+
+<!--    
+/**
+ *
+ * @version 0.8
+ * @author bjl23
+ *
+ */
+-->
+
+<div align="center">
+<table class="form-background" border="0" cellpadding="2" cellspacing="2">
+<tr valign="bottom" align="center">
+	<td>
+        <form action="showDataPropertyHierarchy" method="get">
+            <input type="submit" class="form-button" value="Data Property Hierarchy"/>
+        </form>
+		<form action="listDatatypeProperties" method="get">
+			<input type="submit" class="form-button" value="All Data Properties"/>
 		</form>
 	    <form action="listVClassWebapps" method="get">
 			<input type="hidden" name="showPropertyRestrictions" value="true"/>
@@ -40,18 +40,18 @@
         	to <input type="text" name="endAt" value="50" size="3"/><br/>
         	<input type="submit" class="form-button" value="Show Examples of Statements Using This Property"/>
         </form>
-	</td>
-	<td valign="bottom" align="center">
-		<form action="editForm" method="get">
-			<input type="hidden" name="controller" value="Dataprop"/>
-			<input type="hidden" name="uri" value="${datatypeProperty.URI}"/>
-			<input type="submit" class="form-button" value="Edit this Data Property"/>
-		</form>
-	</td>
-	<td valign="bottom">
-		<form action="editForm" method="get">
-			<input type="hidden" name="controller" value="Dataprop"/>
-			<input type="submit" class="form-button" value="Add New Data Property"/>
+	</td>
+	<td valign="bottom" align="center">
+		<form action="editForm" method="get">
+			<input type="hidden" name="controller" value="Dataprop"/>
+			<input type="hidden" name="uri" value="${datatypeProperty.URI}"/>
+			<input type="submit" class="form-button" value="Edit this Data Property"/>
+		</form>
+	</td>
+	<td valign="bottom">
+		<form action="editForm" method="get">
+			<input type="hidden" name="controller" value="Dataprop"/>
+			<input type="submit" class="form-button" value="Add New Data Property"/>
 		</form>
 		<form action="editForm" method="get">
             <input type="submit" class="form-button" value="Change URI"/>
@@ -65,113 +65,113 @@
             <input type="hidden" name="mode" value="movePropertyStatements"/>
             <input type="hidden" name="propertyType" value="DataProperty"/>
             <input type="hidden" name="controller" value="Refactor"/>
-        </form>
-	</td>
-</tr>
-
-<tr><td colspan="3"><hr/></td></tr>
-<!-- _____________________________________________ superproperties __________________________________________ -->
-<tr valign="bottom" align="center">
-    <td colspan="2" valign="bottom" align="left">
-       <c:if test="${!empty superproperties}">
-        <form action="props2PropsOp" method="post">
-            <ul style="list-style-type:none;">
-            <c:forEach var="superproperty" items="${superproperties}">
-            <c:url var="superpropertyURL" value="datapropEdit">
-                <c:param name="uri" value="${superproperty.URI}"/>
-            </c:url>
-                <li><input type="checkbox" name="SuperpropertyURI" value="${superproperty.URI}" class="form-item"/>
-                    <a href="${superpropertyURL}">${superproperty.localNameWithPrefix}</a>
-                </li>
-            </c:forEach>
-            </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="submit" class="form-button" value="Remove Checked Superproperty Links"/>
-        </form>
-        </c:if>
-    </td>
-    <td>
-        <form action="editForm" method="get">
-            <input type="hidden" name="SubpropertyURI" value="${datatypeProperty.URI}"/>
-            <input type="hidden" name="opMode" value="superproperty"/>
-            <input type="hidden" name="controller" value="Properties2Properties"/>
-            <input type="hidden" name="propertyType" value="data"/>
-            <input type="submit" class="form-button" value="New Link to Superproperty"/>
-        </form>
-    </td>
-</tr>
-<tr><td colspan="3"><hr/></td></tr>         
-<!-- _______________________________________________ subproperties _____________________________________________ -->
-<tr valign="bottom" align="center">
-    <td colspan="2" valign="bottom" align="left">
-        <c:if test="${!empty subproperties}">
-        <form action="props2PropsOp" method="post">
-            <ul style="list-style-type:none;">
-            <c:forEach var="subproperty" items="${subproperties}">
-                <c:url var="subpropertyURL" value="datapropEdit">
-                    <c:param name="uri" value="${subproperty.URI}"/>
-                </c:url>
-                <li><input type="checkbox" name="SubpropertyURI" value="${subproperty.URI}" class="form-item"/>
-                     <a href="${subpropertyURL}"> ${subproperty.localNameWithPrefix} </a>
-                </li>                       
-            </c:forEach>    
-            </ul>
-            <input type="hidden" name="SuperpropertyURI" value="${datatypeProperty.URI}"/>
-            <input type="submit" class="form-button" value="Remove Checked Subproperty Links"/>
-            <input type="hidden" name="_epoKey" value="${epoKey}"/>
-            <input type="hidden" name="operation" value="remove"/>
-        </form>
-             </c:if>
-    </td>
-    <td valign="bottom">
-        <form action="editForm" method="get">
-            <input type="hidden" name="controller" value="Properties2Properties"/>
-            <input type="hidden" name="SuperpropertyURI" value="${datatypeProperty.URI}"/>
-            <input type="hidden" name="opMode" value="subproperty"/>
-            <input type="hidden" name="propertyType" value="data"/>
-            <input type="submit" class="form-button" value="New Link to Subproperty"/>
-        </form>
-    </td>
-</tr>
-
-<!-- _______________________________________________ equivalent properties _____________________________________________ -->
-<tr valign="bottom" align="center">
-    <td colspan="2" valign="bottom" align="left">
-        <c:if test="${!empty equivalentProperties}">
-        <form action="props2PropsOp" method="post">
-            <ul style="list-style-type:none;">
-            <c:forEach var="eqproperty" items="${equivalentProperties}">
-                <c:url var="eqpropertyURL" value="datapropEdit">
-                    <c:param name="uri" value="${eqproperty.URI}"/>
-                </c:url>
-                <li><input type="checkbox" name="SubpropertyURI" value="${eqproperty.URI}" class="form-item"/>
-                     <a href="${eqpropertyURL}"> ${eqproperty.localNameWithPrefix} </a>
-                </li>                       
-            </c:forEach>    
-            </ul>
-            <input type="hidden" name="SuperpropertyURI" value="${datatypeProperty.URI}"/>
-            <input type="submit" class="form-button" value="Remove Checked Equivalent Property Links"/>
-            <input type="hidden" name="_epoKey" value="${epoKey}"/>
-            <input type="hidden" name="operation" value="remove"/>
-            <input type="hidden" name="opMode" value="equivalentProperty"/>
-        </form>
-             </c:if>
-    </td>
-    <td valign="bottom">
-        <form action="editForm" method="get">
-            <input type="hidden" name="controller" value="Properties2Properties"/>
-            <input type="hidden" name="SuperpropertyURI" value="${datatypeProperty.URI}"/>
-            <input type="hidden" name="opMode" value="equivalentProperty"/>
-            <input type="hidden" name="propertyType" value="data"/>
-            <input type="submit" class="form-button" value="New Link to Equivalent Property"/>
-        </form>
-    </td>
-</tr>
-
-</table>
-</div>
-</div>
-
-</jsp:root>
+        </form>
+	</td>
+</tr>
+
+<tr><td colspan="3"><hr/></td></tr>
+<!-- _____________________________________________ superproperties __________________________________________ -->
+<tr valign="bottom" align="center">
+    <td colspan="2" valign="bottom" align="left">
+       <c:if test="${!empty superproperties}">
+        <form action="props2PropsOp" method="post">
+            <ul style="list-style-type:none;">
+            <c:forEach var="superproperty" items="${superproperties}">
+            <c:url var="superpropertyURL" value="datapropEdit">
+                <c:param name="uri" value="${superproperty.URI}"/>
+            </c:url>
+                <li><input type="checkbox" name="SuperpropertyURI" value="${superproperty.URI}" class="form-item"/>
+                    <a href="${superpropertyURL}">${superproperty.localNameWithPrefix}</a>
+                </li>
+            </c:forEach>
+            </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="submit" class="form-button" value="Remove Checked Superproperty Links"/>
+        </form>
+        </c:if>
+    </td>
+    <td>
+        <form action="editForm" method="get">
+            <input type="hidden" name="SubpropertyURI" value="${datatypeProperty.URI}"/>
+            <input type="hidden" name="opMode" value="superproperty"/>
+            <input type="hidden" name="controller" value="Properties2Properties"/>
+            <input type="hidden" name="propertyType" value="data"/>
+            <input type="submit" class="form-button" value="New Link to Superproperty"/>
+        </form>
+    </td>
+</tr>
+<tr><td colspan="3"><hr/></td></tr>         
+<!-- _______________________________________________ subproperties _____________________________________________ -->
+<tr valign="bottom" align="center">
+    <td colspan="2" valign="bottom" align="left">
+        <c:if test="${!empty subproperties}">
+        <form action="props2PropsOp" method="post">
+            <ul style="list-style-type:none;">
+            <c:forEach var="subproperty" items="${subproperties}">
+                <c:url var="subpropertyURL" value="datapropEdit">
+                    <c:param name="uri" value="${subproperty.URI}"/>
+                </c:url>
+                <li><input type="checkbox" name="SubpropertyURI" value="${subproperty.URI}" class="form-item"/>
+                     <a href="${subpropertyURL}"> ${subproperty.localNameWithPrefix} </a>
+                </li>                       
+            </c:forEach>    
+            </ul>
+            <input type="hidden" name="SuperpropertyURI" value="${datatypeProperty.URI}"/>
+            <input type="submit" class="form-button" value="Remove Checked Subproperty Links"/>
+            <input type="hidden" name="_epoKey" value="${epoKey}"/>
+            <input type="hidden" name="operation" value="remove"/>
+        </form>
+             </c:if>
+    </td>
+    <td valign="bottom">
+        <form action="editForm" method="get">
+            <input type="hidden" name="controller" value="Properties2Properties"/>
+            <input type="hidden" name="SuperpropertyURI" value="${datatypeProperty.URI}"/>
+            <input type="hidden" name="opMode" value="subproperty"/>
+            <input type="hidden" name="propertyType" value="data"/>
+            <input type="submit" class="form-button" value="New Link to Subproperty"/>
+        </form>
+    </td>
+</tr>
+
+<!-- _______________________________________________ equivalent properties _____________________________________________ -->
+<tr valign="bottom" align="center">
+    <td colspan="2" valign="bottom" align="left">
+        <c:if test="${!empty equivalentProperties}">
+        <form action="props2PropsOp" method="post">
+            <ul style="list-style-type:none;">
+            <c:forEach var="eqproperty" items="${equivalentProperties}">
+                <c:url var="eqpropertyURL" value="datapropEdit">
+                    <c:param name="uri" value="${eqproperty.URI}"/>
+                </c:url>
+                <li><input type="checkbox" name="SubpropertyURI" value="${eqproperty.URI}" class="form-item"/>
+                     <a href="${eqpropertyURL}"> ${eqproperty.localNameWithPrefix} </a>
+                </li>                       
+            </c:forEach>    
+            </ul>
+            <input type="hidden" name="SuperpropertyURI" value="${datatypeProperty.URI}"/>
+            <input type="submit" class="form-button" value="Remove Checked Equivalent Property Links"/>
+            <input type="hidden" name="_epoKey" value="${epoKey}"/>
+            <input type="hidden" name="operation" value="remove"/>
+            <input type="hidden" name="opMode" value="equivalentProperty"/>
+        </form>
+             </c:if>
+    </td>
+    <td valign="bottom">
+        <form action="editForm" method="get">
+            <input type="hidden" name="controller" value="Properties2Properties"/>
+            <input type="hidden" name="SuperpropertyURI" value="${datatypeProperty.URI}"/>
+            <input type="hidden" name="opMode" value="equivalentProperty"/>
+            <input type="hidden" name="propertyType" value="data"/>
+            <input type="submit" class="form-button" value="New Link to Equivalent Property"/>
+        </form>
+    </td>
+</tr>
+
+</table>
+</div>
+</div>
+
+</jsp:root>
diff --git a/webapp/web/templates/edit/specific/datatype_retry.jsp b/webapp/web/templates/edit/specific/datatype_retry.jsp
index b0aebd15b..4758d99e1 100644
--- a/webapp/web/templates/edit/specific/datatype_retry.jsp
+++ b/webapp/web/templates/edit/specific/datatype_retry.jsp
@@ -1,17 +1,17 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
-
-<tr class="editformcell">
-	<td valign="top" colspan="2">
-		<b>Name</b>
-		<input name="Name" value="<form:value name="Name"/>"/>
-	</td>
-</tr>
-
-<tr class="editformcell">
-	<td valign="top" colspan="2">
-		<b>URI</b>
-		<input size="90%" name="Uri" value="<form:value name="Uri"/>"/>
-	</td>
-</tr>
+<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
+
+<tr class="editformcell">
+	<td valign="top" colspan="2">
+		<b>Name</b>
+		<input name="Name" value="<form:value name="Name"/>"/>
+	</td>
+</tr>
+
+<tr class="editformcell">
+	<td valign="top" colspan="2">
+		<b>URI</b>
+		<input size="90%" name="Uri" value="<form:value name="Uri"/>"/>
+	</td>
+</tr>
diff --git a/webapp/web/templates/edit/specific/datatypes_edit.jsp b/webapp/web/templates/edit/specific/datatypes_edit.jsp
index 76882677b..d41c4dbb7 100644
--- a/webapp/web/templates/edit/specific/datatypes_edit.jsp
+++ b/webapp/web/templates/edit/specific/datatypes_edit.jsp
@@ -1,33 +1,33 @@
-<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
-
-<div class="editingForm">
-
-<jsp:include page="/templates/edit/fetch/vertical.jsp"/>
-
-<hr/>
-<p/>
-<div align=center>
-<table class="form-background" border="0" cellpadding="2" cellspacing="2">
-<tr valign="bottom" align="center">
-	<td>
-		<form action="fetch" method="post">
-			<input type="submit" class="form-button" value="See All Datatypes"/>
-			<input type="hidden" name="queryspec" value="private_datatypes"/>
-			<input type="hidden" name="header" value="titleonly"/>
-		</form>
-	</td>
-	<td valign="bottom" align="center">
-		<form action="datatype_retry" method="get">
-			<input type="hidden" name="id" value="<%=request.getAttribute("firstvalue")%>"/>
-			<input type="submit" class="form-button" value="Edit This Datatype"/>
-		</form>
-	</td>
-	<td valign="bottom">
-		<form action="datatype_retry" method="get">
-			<input type="submit" class="form-button" value="Add New Datatype"/>
-		</form>
-	</td>
-</tr>
-</table>
-</div>
-</div>
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+
+<div class="editingForm">
+
+<jsp:include page="/templates/edit/fetch/vertical.jsp"/>
+
+<hr/>
+<p/>
+<div align=center>
+<table class="form-background" border="0" cellpadding="2" cellspacing="2">
+<tr valign="bottom" align="center">
+	<td>
+		<form action="fetch" method="post">
+			<input type="submit" class="form-button" value="See All Datatypes"/>
+			<input type="hidden" name="queryspec" value="private_datatypes"/>
+			<input type="hidden" name="header" value="titleonly"/>
+		</form>
+	</td>
+	<td valign="bottom" align="center">
+		<form action="datatype_retry" method="get">
+			<input type="hidden" name="id" value="<%=request.getAttribute("firstvalue")%>"/>
+			<input type="submit" class="form-button" value="Edit This Datatype"/>
+		</form>
+	</td>
+	<td valign="bottom">
+		<form action="datatype_retry" method="get">
+			<input type="submit" class="form-button" value="Add New Datatype"/>
+		</form>
+	</td>
+</tr>
+</table>
+</div>
+</div>
diff --git a/webapp/web/templates/edit/specific/disjointClasses_retry.jsp b/webapp/web/templates/edit/specific/disjointClasses_retry.jsp
index 3ae26847c..ed03d0aa0 100644
--- a/webapp/web/templates/edit/specific/disjointClasses_retry.jsp
+++ b/webapp/web/templates/edit/specific/disjointClasses_retry.jsp
@@ -1,26 +1,26 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
-
-   <input type="hidden" value="disjointWith" name="opMode"/>
-   <input type="hidden" value="add" name="operation"/>
-
-    <tr class="editformcell">
-        <td valign="top">
-			<select name="SuperclassURI">
-				<form:option name="SuperclassURI"/>
-			</select>
-			<span class="warning"><form:error name="SuperclassURI"/></span>
-        </td>
-    </tr>
-    <tr class="editformcell">
-        <td><p><strong>disjoint with</strong></p></td>
-    </tr>
-    <tr class="editformcell">
-        <td valign="top">
-            <select name="SubclassURI" >
-            	<form:option name="SubclassURI"/>
-            </select>
-            <span class="warning"><form:error name="SubclassURI"/></span>
-        </td>
-    </tr>
+<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
+
+   <input type="hidden" value="disjointWith" name="opMode"/>
+   <input type="hidden" value="add" name="operation"/>
+
+    <tr class="editformcell">
+        <td valign="top">
+			<select name="SuperclassURI">
+				<form:option name="SuperclassURI"/>
+			</select>
+			<span class="warning"><form:error name="SuperclassURI"/></span>
+        </td>
+    </tr>
+    <tr class="editformcell">
+        <td><p><strong>disjoint with</strong></p></td>
+    </tr>
+    <tr class="editformcell">
+        <td valign="top">
+            <select name="SubclassURI" >
+            	<form:option name="SubclassURI"/>
+            </select>
+            <span class="warning"><form:error name="SubclassURI"/></span>
+        </td>
+    </tr>
diff --git a/webapp/web/templates/edit/specific/entity_retry.jsp b/webapp/web/templates/edit/specific/entity_retry.jsp
index 73ac96565..570fb1947 100644
--- a/webapp/web/templates/edit/specific/entity_retry.jsp
+++ b/webapp/web/templates/edit/specific/entity_retry.jsp
@@ -1,30 +1,30 @@
-<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
-
-<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-
-    <tr class="editformcell" id="entityNameTr">
-        <td valign="bottom" id="entityNameTd" colspan="2">
-			<b>Individual Name *</b><br/>
-            <input style="width:80%;" type="text" name="Name" value="<form:value name="Name"/>" />
-           <c:set var="NameError"><form:error name="Name"/></c:set>
-            <c:if test="${!empty NameError}">
-                <span class="notice"><c:out value="${NameError}"/></span>
-            </c:if>
-        </td>
-    </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">
-	        <form:dynamicFields type="dataprops" usePage="entity_retry_dataprops.jsp"/>
-            </ul>
-	</td>
-    </tr>
-
-    <!-- end datatype properties section -->    
-
-
-
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+
+<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+    <tr class="editformcell" id="entityNameTr">
+        <td valign="bottom" id="entityNameTd" colspan="2">
+			<b>Individual Name *</b><br/>
+            <input style="width:80%;" type="text" name="Name" value="<form:value name="Name"/>" />
+           <c:set var="NameError"><form:error name="Name"/></c:set>
+            <c:if test="${!empty NameError}">
+                <span class="notice"><c:out value="${NameError}"/></span>
+            </c:if>
+        </td>
+    </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">
+	        <form:dynamicFields type="dataprops" usePage="entity_retry_dataprops.jsp"/>
+            </ul>
+	</td>
+    </tr>
+
+    <!-- end datatype properties section -->    
+
+
+
diff --git a/webapp/web/templates/edit/specific/entity_retry_dataprops.jsp b/webapp/web/templates/edit/specific/entity_retry_dataprops.jsp
index 44ceb1d63..6a7106fb4 100644
--- a/webapp/web/templates/edit/specific/entity_retry_dataprops.jsp
+++ b/webapp/web/templates/edit/specific/entity_retry_dataprops.jsp
@@ -1,42 +1,42 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<!-- this is a page set up to be parsed by the dynamicFields tag -->
-<!-- the datapropsNN, $$, $foo, and @x symbols are special notations understood by this tag and are not part of JSP -->
-
-<!-- @pre -->
-
-<li style="padding-top:0.8em;padding-bottom:0.5em;" id="datapropsNNsuper">
-<strong>$fieldName</strong><a id="datapropsNNaddLink" style="margin-left:0.5em;font-style:italic;font-weight:bold;" href="#" onClick="addLine(this, 'dataprops');return false;">add</a>
-
-<span id="datapropsNNgenTaName" style="display:none;">$genTaName</span>
-
-<ul id="datapropsNNul">
-
-<li style="display:none;">This is a dummy li to make sure the ul has at least one child.</li>
-
-<!-- @template -->
-
-<li id="datapropsNN" style="margin-left:0em;margin-top:0.4em;margin-bottom:0.4em;">
-    <div id="datapropsNNcontent">
-        <span id="datapropsNNcontentValue">$$</span>
-        <a id="datapropsNNeditLink" href="#" style="margin-left:0.8em;font-style:italic" onClick="convertLiToTextarea(this, 'dataprops');return false;">edit</a>
-        <a id="datapropsNNdeleteLink" href="#" style="margin-left:0.8em;font-style:italic" onClick="deleteLine(this, 'dataprops');return false;">remove</a>
-	<a id="datapropsNNundeleteLink" href="#" style="display:none;margin-left:0.8em;font-style:italic" onClick="undeleteLine(this, 'dataprops');return false;">restore</a>
-    </div>
-    <div id="datapropsNNta" style="display:none;">
-        <div style="padding:0;margin:0;">
-            <textarea style="margin:0;padding:0;width:95%;height:16ex;" id="datapropsNNtata" name="$taName">$$</textarea>
-        </div>
-        <div style="padding:0;margin:0;">
-            <input id="datapropsNNokLink" style="margin:0;padding:0;" type="button" onClick="backToLi(this);return false;" value='OK'/>
-            <input id="datapropsNNcancelLink" style="margin:0;padding:0;" type="button" onClick="cancelBackToLi(this);return false;" value='cancel'/>
-            <input id="datapropsNNosLink" style="margin-left:5em;padding:0;" type="button" onClick="backToLi(this);submitPage();return false;" value='OK & save all changes'/>
-        </div>
-    </div>
-</li>
-
-<!-- @post -->
-
-</ul>
-</li>
-
+<!-- this is a page set up to be parsed by the dynamicFields tag -->
+<!-- the datapropsNN, $$, $foo, and @x symbols are special notations understood by this tag and are not part of JSP -->
+
+<!-- @pre -->
+
+<li style="padding-top:0.8em;padding-bottom:0.5em;" id="datapropsNNsuper">
+<strong>$fieldName</strong><a id="datapropsNNaddLink" style="margin-left:0.5em;font-style:italic;font-weight:bold;" href="#" onClick="addLine(this, 'dataprops');return false;">add</a>
+
+<span id="datapropsNNgenTaName" style="display:none;">$genTaName</span>
+
+<ul id="datapropsNNul">
+
+<li style="display:none;">This is a dummy li to make sure the ul has at least one child.</li>
+
+<!-- @template -->
+
+<li id="datapropsNN" style="margin-left:0em;margin-top:0.4em;margin-bottom:0.4em;">
+    <div id="datapropsNNcontent">
+        <span id="datapropsNNcontentValue">$$</span>
+        <a id="datapropsNNeditLink" href="#" style="margin-left:0.8em;font-style:italic" onClick="convertLiToTextarea(this, 'dataprops');return false;">edit</a>
+        <a id="datapropsNNdeleteLink" href="#" style="margin-left:0.8em;font-style:italic" onClick="deleteLine(this, 'dataprops');return false;">remove</a>
+	<a id="datapropsNNundeleteLink" href="#" style="display:none;margin-left:0.8em;font-style:italic" onClick="undeleteLine(this, 'dataprops');return false;">restore</a>
+    </div>
+    <div id="datapropsNNta" style="display:none;">
+        <div style="padding:0;margin:0;">
+            <textarea style="margin:0;padding:0;width:95%;height:16ex;" id="datapropsNNtata" name="$taName">$$</textarea>
+        </div>
+        <div style="padding:0;margin:0;">
+            <input id="datapropsNNokLink" style="margin:0;padding:0;" type="button" onClick="backToLi(this);return false;" value='OK'/>
+            <input id="datapropsNNcancelLink" style="margin:0;padding:0;" type="button" onClick="cancelBackToLi(this);return false;" value='cancel'/>
+            <input id="datapropsNNosLink" style="margin-left:5em;padding:0;" type="button" onClick="backToLi(this);submitPage();return false;" value='OK & save all changes'/>
+        </div>
+    </div>
+</li>
+
+<!-- @post -->
+
+</ul>
+</li>
+
diff --git a/webapp/web/templates/edit/specific/entity_retry_init.jsp b/webapp/web/templates/edit/specific/entity_retry_init.jsp
index 8fd9fbe43..4dc73e5ed 100644
--- a/webapp/web/templates/edit/specific/entity_retry_init.jsp
+++ b/webapp/web/templates/edit/specific/entity_retry_init.jsp
@@ -1,32 +1,32 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
+<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-
-    <tr class="editformcell" id="entityNameTr">
-        <td valign="bottom" id="entityNameTd" colspan="1">
-			<b>Individual Name</b><br/>
-                <input type="text" name="field1Value" value="<form:value name="Name"/>" size="80" maxlength="255" />
+
+    <tr class="editformcell" id="entityNameTr">
+        <td valign="bottom" id="entityNameTd" colspan="1">
+			<b>Individual Name</b><br/>
+                <input type="text" name="field1Value" value="<form:value name="Name"/>" size="80" maxlength="255" />
             <c:set var="NameError"><form:error name="Name"/></c:set>
             <c:if test="${!empty NameError}">
                 <span class="notice"><c:out value="${NameError}"/></span>
-            </c:if>
-        </td>
-        <td valign="top" id="displayStatusTd" colspan="1">
-			<b>Display Status</b><br/>
-		    <select name="StatusId" >
-				<form:option name="StatusId"/>
-			</select>
-        </td>
-    </tr>
-    <tr class='editformcell' id='GenericTypeTr'>
-        <td valign="top" id="genericTypeTd" colspan="2">
-			<b>Generic Type<br/>
-			<select id="VclassId" name="VClassId" onChange="update();">
-				<% // need to implement form:optgroup %>
-					<form:option name="VClassId"/>
-			</select>
-        </td>
-    </tr>
-    
-
+            </c:if>
+        </td>
+        <td valign="top" id="displayStatusTd" colspan="1">
+			<b>Display Status</b><br/>
+		    <select name="StatusId" >
+				<form:option name="StatusId"/>
+			</select>
+        </td>
+    </tr>
+    <tr class='editformcell' id='GenericTypeTr'>
+        <td valign="top" id="genericTypeTd" colspan="2">
+			<b>Generic Type<br/>
+			<select id="VclassId" name="VClassId" onChange="update();">
+				<% // need to implement form:optgroup %>
+					<form:option name="VClassId"/>
+			</select>
+        </td>
+    </tr>
+    
+
diff --git a/webapp/web/templates/edit/specific/ents2data_retry.jsp b/webapp/web/templates/edit/specific/ents2data_retry.jsp
index 95998c5a5..a15d28301 100644
--- a/webapp/web/templates/edit/specific/ents2data_retry.jsp
+++ b/webapp/web/templates/edit/specific/ents2data_retry.jsp
@@ -1,19 +1,19 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
-
-    <tr class="editformcell">
-        <td valign="top">
-            <b>Individual<sup>*</sup></b><br/>
-			<select name="_" disabled="disabled">
-				<form:option name="IndividualURI"/>
-			</select>
-        </td>
-    </tr>
-    <tr class="editformcell">
-        <td valign="top" colspan="3">
-            <b><form:value name="Dataprop"/><sup>*</sup></b><br/>
-            <textarea name="Data" rows="6" cols="64"><form:value name="Data"/></textarea>
-            <span class="warning"><form:error name="Data"/></span>
-        </td>
-    </tr>
+<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
+
+    <tr class="editformcell">
+        <td valign="top">
+            <b>Individual<sup>*</sup></b><br/>
+			<select name="_" disabled="disabled">
+				<form:option name="IndividualURI"/>
+			</select>
+        </td>
+    </tr>
+    <tr class="editformcell">
+        <td valign="top" colspan="3">
+            <b><form:value name="Dataprop"/><sup>*</sup></b><br/>
+            <textarea name="Data" rows="6" cols="64"><form:value name="Data"/></textarea>
+            <span class="warning"><form:error name="Data"/></span>
+        </td>
+    </tr>
diff --git a/webapp/web/templates/edit/specific/ents2ents_retry_domainSide.jsp b/webapp/web/templates/edit/specific/ents2ents_retry_domainSide.jsp
index 88ca194a1..bc8b7a550 100644
--- a/webapp/web/templates/edit/specific/ents2ents_retry_domainSide.jsp
+++ b/webapp/web/templates/edit/specific/ents2ents_retry_domainSide.jsp
@@ -1,23 +1,23 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
-
-    <tr class="editformcell">
-        <td valign="top">
-            <b>Subject Individual<sup>*</sup></b><br/>
-			<select disabled="disabled" name="SubjectEntURI">
-				<form:option name="SubjectEntURI"/>
-			</select>
-			<span class="warning"><form:error name="SubjectEntURI"/></span>
-        </td>
-    </tr>
-    <tr class="editformcell">
-        <td valign="top" colspan="3">
-            <b><form:value name="Prop"/><sup>*</sup></b><br/>
-            <b>Object Individual<sup>*</sup></b><br/>
-			         <select name="ObjectEntURI">
-                                   <form:option name="ObjectEntURI"/>
-                                 </select>
-			            <span class="warning"><form:error name="ObjectEntURI"/></span>
-        </td>
-    </tr>
+<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
+
+    <tr class="editformcell">
+        <td valign="top">
+            <b>Subject Individual<sup>*</sup></b><br/>
+			<select disabled="disabled" name="SubjectEntURI">
+				<form:option name="SubjectEntURI"/>
+			</select>
+			<span class="warning"><form:error name="SubjectEntURI"/></span>
+        </td>
+    </tr>
+    <tr class="editformcell">
+        <td valign="top" colspan="3">
+            <b><form:value name="Prop"/><sup>*</sup></b><br/>
+            <b>Object Individual<sup>*</sup></b><br/>
+			         <select name="ObjectEntURI">
+                                   <form:option name="ObjectEntURI"/>
+                                 </select>
+			            <span class="warning"><form:error name="ObjectEntURI"/></span>
+        </td>
+    </tr>
diff --git a/webapp/web/templates/edit/specific/ents2ents_retry_rangeSide.jsp b/webapp/web/templates/edit/specific/ents2ents_retry_rangeSide.jsp
index 57c819bbe..3d5330469 100644
--- a/webapp/web/templates/edit/specific/ents2ents_retry_rangeSide.jsp
+++ b/webapp/web/templates/edit/specific/ents2ents_retry_rangeSide.jsp
@@ -1,22 +1,22 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
-
-    <tr class="editformcell">
-        <td valign="top">
-            <b>Subject Individual<sup>*</sup></b><br/>
-			<select name="RangeId">
-				<form:option name="RangeId"/>
-			</select>
-			<span class="warning"><form:error name="RangeId"/></span>
-        </td>
-    </tr>
-    <tr class="editformcell">
-        <td valign="top" colspan="3">
-            <b><form:value name="Prop"/><sup>*</sup></b><br/>
-            <b>Subject Individual<sup>*</sup></b><br/>
-			<select name="DomainId">
-				<form:option name="DomainId"/>
-			</select>            <span class="warning"><form:error name="DomainId"/></span>
-        </td>
-    </tr>
+<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
+
+    <tr class="editformcell">
+        <td valign="top">
+            <b>Subject Individual<sup>*</sup></b><br/>
+			<select name="RangeId">
+				<form:option name="RangeId"/>
+			</select>
+			<span class="warning"><form:error name="RangeId"/></span>
+        </td>
+    </tr>
+    <tr class="editformcell">
+        <td valign="top" colspan="3">
+            <b><form:value name="Prop"/><sup>*</sup></b><br/>
+            <b>Subject Individual<sup>*</sup></b><br/>
+			<select name="DomainId">
+				<form:option name="DomainId"/>
+			</select>            <span class="warning"><form:error name="DomainId"/></span>
+        </td>
+    </tr>
diff --git a/webapp/web/templates/edit/specific/ents_edit.jsp b/webapp/web/templates/edit/specific/ents_edit.jsp
index 75c6e1a99..7dabfd0e8 100644
--- a/webapp/web/templates/edit/specific/ents_edit.jsp
+++ b/webapp/web/templates/edit/specific/ents_edit.jsp
@@ -1,12 +1,12 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<% /* 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" 
-          xmlns:c="http://java.sun.com/jsp/jstl/core"
-          xmlns:form="http://vitro.mannlib.cornell.edu/edit/tags"
-          version="2.0"> */ %> 
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<% /* 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" 
+          xmlns:c="http://java.sun.com/jsp/jstl/core"
+          xmlns:form="http://vitro.mannlib.cornell.edu/edit/tags"
+          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" %>
 <%@page import="edu.cornell.mannlib.vitro.webapp.auth.permissions.SimplePermission" %>
@@ -16,19 +16,19 @@
 		request.setAttribute("isEditor", Boolean.TRUE);
 	}
 %>
-
-<div name="anybody" class="editingForm">
-<jsp:include page="/templates/edit/fetch/vertical.jsp"/>
-<c:set var='individual' value='${requestScope.entityWebapp}'/>
 
-<c:if test="${isEditor}">
-	<div name="authorized" align="center">
-	<table class="form-background" border="0" cellpadding="2" cellspacing="2" width="100%">
-    	<tr valign="top" align="center">
-    	<td>
-        	<form action="entity" method="get">
-            	<input type="submit" class="form-button" value="Display This Individual (public)"/>
-            	<input type="hidden" name="uri" value="${individual.URI}"/>
+<div name="anybody" class="editingForm">
+<jsp:include page="/templates/edit/fetch/vertical.jsp"/>
+<c:set var='individual' value='${requestScope.entityWebapp}'/>
+
+<c:if test="${isEditor}">
+	<div name="authorized" align="center">
+	<table class="form-background" border="0" cellpadding="2" cellspacing="2" width="100%">
+    	<tr valign="top" align="center">
+    	<td>
+        	<form action="entity" method="get">
+            	<input type="submit" class="form-button" value="Display This Individual (public)"/>
+            	<input type="hidden" name="uri" value="${individual.URI}"/>
         	</form>
         	
         	<c:set var="query" 
@@ -70,47 +70,47 @@
             <input type="hidden" name="resultFormat" value="RS_TEXT"/>
             <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">
-            	<input name="uri" type = "hidden" value="${individual.URI}" />
-            	<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}"> 
-	        	<form action="editForm" method="get">
-	            	<select name="multiplexedParam" class="form-item">
-	            		<form:option name="externalIds"/>
-	            	</select><br/>
-                    <input type="hidden" name="IndividualURI" value="${individual.URI}"/>
-	            	<input type="submit" class="form-button" value="Edit External Identifiers"/>
-	            	<input type="hidden" name="controller" value="ExternalId"/>
-	        	</form>
-	    	</c:if>
-    	</td>
-    	<td valign="bottom">
-       		<form name="newEntityForm" action="editForm" method="get">
-            	<select id="VClassURI" name="VClassURI" class="form-item">
-                	<form:option name="VClassURI"/>
-            	</select><br/>
-            	<input type="submit" class="form-button" value="Add New Individual of above Type"/>
-            	<input type="hidden" name="controller" value="Entity"/>
-        	</form>
-        	<form action="editForm" method="get">
-            	<input type="submit" class="form-button" value="Add an External Identifier"/>
-            	<input type="hidden" name="IndividualURI" value="${individual.URI}"/>
-            	<input type="hidden" name="controller" value="ExternalId"/>
+        	
+    	</td>
+    	<td valign="bottom" align="center">
+        	<form action="editForm" method="get">
+            	<input name="uri" type = "hidden" value="${individual.URI}" />
+            	<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}"> 
+	        	<form action="editForm" method="get">
+	            	<select name="multiplexedParam" class="form-item">
+	            		<form:option name="externalIds"/>
+	            	</select><br/>
+                    <input type="hidden" name="IndividualURI" value="${individual.URI}"/>
+	            	<input type="submit" class="form-button" value="Edit External Identifiers"/>
+	            	<input type="hidden" name="controller" value="ExternalId"/>
+	        	</form>
+	    	</c:if>
+    	</td>
+    	<td valign="bottom">
+       		<form name="newEntityForm" action="editForm" method="get">
+            	<select id="VClassURI" name="VClassURI" class="form-item">
+                	<form:option name="VClassURI"/>
+            	</select><br/>
+            	<input type="submit" class="form-button" value="Add New Individual of above Type"/>
+            	<input type="hidden" name="controller" value="Entity"/>
+        	</form>
+        	<form action="editForm" method="get">
+            	<input type="submit" class="form-button" value="Add an External Identifier"/>
+            	<input type="hidden" name="IndividualURI" value="${individual.URI}"/>
+            	<input type="hidden" name="controller" value="ExternalId"/>
         	</form>
         	<form action="editForm" method="get">
             	<input type="submit" class="form-button" value="Change URI"/>
             	<input type="hidden" name="oldURI" value="${individual.URI}"/>
             	<input type="hidden" name="mode" value="renameResource"/>
             	<input type="hidden" name="controller" value="Refactor"/>
-        	</form>
-    	</td>
-    </tr>
+        	</form>
+    	</td>
+    </tr>
     <tr><td colspan="3"><hr/></td></tr>
     
     <!-- TYPES --> 
@@ -123,9 +123,9 @@
 			<c:forEach var="type" items="${types}">
 				<c:url var="individualURL" value="entityEdit">
 					<c:param name="uri" value="${type.URI}"/>
-				</c:url>
-				<c:url var="typeURL" value="/vclassEdit">
-					<c:param name="uri" value="${type.URI}"/>
+				</c:url>
+				<c:url var="typeURL" value="/vclassEdit">
+					<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.localNameWithPrefix} </a></li>
 			</c:forEach>	
@@ -148,76 +148,76 @@
 </td>
 
 </tr>
-  
-	</table>
-
-	<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%">
-            	<tr><td colspan="3" align="center"><h2>Object (individual-to-individual) Property Statements</h2></td></tr>
-            	<tr><td><input id="newPropButton" class="form-button" type="button" value="add new statement" onclick="newProp();"/></td>
-                	<td><input class="form-button" type="button" value="refresh list" onclick="update();"/></td>
-            	</tr>
-        	</table>
-    		</div>
-    		<div align="center">
-        	<!-- ____________________ properties table using dwr ____________________ -->
-        	<div id="propertyTableDiv">
-            	<table class="form-background" border="1" width="100%" align="center">
-                	<thead class="form-table-head">
-                	<tr><th rowspan="1" colspan="1">Subject</th>
-                    	<th rowspan="1" colspan="1">Predicate</th>
-                    	<th rowspan="1" colspan="1">Object</th>
-                    	<th colspan="3" rowspan="1">actions</th>
-                	</tr>
-                	</thead>
-                	<tbody id="propbody">
-                    <tr><td>test</td><td>values</td><td>test</td><td>values</td></tr>
-                	</tbody>
-            	</table>
-        	</div>
-<!-- ____________________  End of properties table ______________________ -->
-
-<!--  _____________________ Start of hidden area ____________________ -->
-<!-- This is hidden and a copy gets put into the table when editing happens  -->
-        	<div id="propeditdiv" style="display:none" class ="form-editingRow">
-            	<table width="100%">
-                	<tr><td>Predicate:</td>
-                    	<td colspan="9">
-                    		<select id="propertyList" class="form-item"
-                                    onchange="fillRangeVClassList();">
-                            	<option value="">select property</option>
-                            </select>
-                        </td>
-                    </tr>
-                	<tr><td>Object Class:</td>
-                    	<td colspan="9">
-                    		<select id="vClassList" class="form-item" onchange="fillEntsList();">
-                            	<option value="">select type</option>
-                            </select>
-                        </td>
-                	</tr>
-                	<tr><td>Object Individual:</td>
-                    	<td colspan="9"><select id="entitiesList" class="form-item"><option>select individual</option></select></td>
+  
+	</table>
+
+	<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%">
+            	<tr><td colspan="3" align="center"><h2>Object (individual-to-individual) Property Statements</h2></td></tr>
+            	<tr><td><input id="newPropButton" class="form-button" type="button" value="add new statement" onclick="newProp();"/></td>
+                	<td><input class="form-button" type="button" value="refresh list" onclick="update();"/></td>
+            	</tr>
+        	</table>
+    		</div>
+    		<div align="center">
+        	<!-- ____________________ properties table using dwr ____________________ -->
+        	<div id="propertyTableDiv">
+            	<table class="form-background" border="1" width="100%" align="center">
+                	<thead class="form-table-head">
+                	<tr><th rowspan="1" colspan="1">Subject</th>
+                    	<th rowspan="1" colspan="1">Predicate</th>
+                    	<th rowspan="1" colspan="1">Object</th>
+                    	<th colspan="3" rowspan="1">actions</th>
+                	</tr>
+                	</thead>
+                	<tbody id="propbody">
+                    <tr><td>test</td><td>values</td><td>test</td><td>values</td></tr>
+                	</tbody>
+            	</table>
+        	</div>
+<!-- ____________________  End of properties table ______________________ -->
+
+<!--  _____________________ Start of hidden area ____________________ -->
+<!-- This is hidden and a copy gets put into the table when editing happens  -->
+        	<div id="propeditdiv" style="display:none" class ="form-editingRow">
+            	<table width="100%">
+                	<tr><td>Predicate:</td>
+                    	<td colspan="9">
+                    		<select id="propertyList" class="form-item"
+                                    onchange="fillRangeVClassList();">
+                            	<option value="">select property</option>
+                            </select>
+                        </td>
+                    </tr>
+                	<tr><td>Object Class:</td>
+                    	<td colspan="9">
+                    		<select id="vClassList" class="form-item" onchange="fillEntsList();">
+                            	<option value="">select type</option>
+                            </select>
+                        </td>
+                	</tr>
+                	<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>
-                    	<td><input type="button" id="dismissButt" class="form-button" value="cancel"
-                                   onclick="update()"/></td>
-                	</tr>
-            	</table>
-        	</div>
-			<div id="buildArea" style="display:none"></div>
-		</div><!-- END div "entityUriForDwr" -->
-<!-- _________  End hidden area _________ -->
-
-	</c:if> <!-- end dwr section -->
-
-	</div><!-- END div "authorized" -->
-</c:if><!-- end if (securityLevel less than MIN_EDIT_ROLE) -->
-</div><!-- END div "anybody" -->
-
+                	
+                	<tr>
+                    	<td><input type="button" id="saveButt" class="form-button"
+                               	   value="Save" onclick="writeProp()"/></td>
+                    	<td><input type="button" id="dismissButt" class="form-button" value="cancel"
+                                   onclick="update()"/></td>
+                	</tr>
+            	</table>
+        	</div>
+			<div id="buildArea" style="display:none"></div>
+		</div><!-- END div "entityUriForDwr" -->
+<!-- _________  End hidden area _________ -->
+
+	</c:if> <!-- end dwr section -->
+
+	</div><!-- END div "authorized" -->
+</c:if><!-- end if (securityLevel less than MIN_EDIT_ROLE) -->
+</div><!-- END div "anybody" -->
+
diff --git a/webapp/web/templates/edit/specific/ents_edit_head.jsp b/webapp/web/templates/edit/specific/ents_edit_head.jsp
index 0f07b1a35..31bf303fb 100644
--- a/webapp/web/templates/edit/specific/ents_edit_head.jsp
+++ b/webapp/web/templates/edit/specific/ents_edit_head.jsp
@@ -1,37 +1,37 @@
-<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
-
-<%
-
-request.setAttribute("dwrDisabled", new Boolean(false));
-String context = request.getContextPath();
-
-%>
-
-
-<%
-if (!(Boolean)request.getAttribute("dwrDisabled")) {
-%>
-<script type="text/javascript">
-    // relinquish jQuery's control of the $ variable to avoid conflicts with DWR
-    jQuery.noConflict();
-</script>
-
-<script type="text/javascript" xml:space="preserve">
-    var gEntityURI="${entity.URI}";
-</script> <!-- There has got to be a better way to pass this to the js -->
-
-<script type="text/javascript" src="<%=context%>/dwr/interface/PropertyDWR.js"></script>
-<script type="text/javascript" src="<%=context%>/dwr/interface/EntityDWR.js"></script>
-<script type="text/javascript" src="<%=context%>/dwr/interface/VClassDWR.js"></script>
-<script type="text/javascript" src="<%=context%>/dwr/engine.js"></script>
-<script type="text/javascript" src="<%=context%>/dwr/util.js"></script>
-<script type="text/javascript" src="<%=context%>/js/betterDateInput.js"></script>
-<script type="text/javascript" src="<%=context%>/js/vitro.js"></script>
-<script type="text/javascript" src="<%=context%>/dojo.js"></script>
-<script type="text/javascript" src="<%=context%>/js/ents_edit.js"></script>
-<script type="text/javascript" src="<%=context%>/js/detect.js"></script>
-<script type="text/javascript" src="<%=context%>/js/toggle.js"></script>
-
-<%
-} %>
-
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+
+<%
+
+request.setAttribute("dwrDisabled", new Boolean(false));
+String context = request.getContextPath();
+
+%>
+
+
+<%
+if (!(Boolean)request.getAttribute("dwrDisabled")) {
+%>
+<script type="text/javascript">
+    // relinquish jQuery's control of the $ variable to avoid conflicts with DWR
+    jQuery.noConflict();
+</script>
+
+<script type="text/javascript" xml:space="preserve">
+    var gEntityURI="${entity.URI}";
+</script> <!-- There has got to be a better way to pass this to the js -->
+
+<script type="text/javascript" src="<%=context%>/dwr/interface/PropertyDWR.js"></script>
+<script type="text/javascript" src="<%=context%>/dwr/interface/EntityDWR.js"></script>
+<script type="text/javascript" src="<%=context%>/dwr/interface/VClassDWR.js"></script>
+<script type="text/javascript" src="<%=context%>/dwr/engine.js"></script>
+<script type="text/javascript" src="<%=context%>/dwr/util.js"></script>
+<script type="text/javascript" src="<%=context%>/js/betterDateInput.js"></script>
+<script type="text/javascript" src="<%=context%>/js/vitro.js"></script>
+<script type="text/javascript" src="<%=context%>/dojo.js"></script>
+<script type="text/javascript" src="<%=context%>/js/ents_edit.js"></script>
+<script type="text/javascript" src="<%=context%>/js/detect.js"></script>
+<script type="text/javascript" src="<%=context%>/js/toggle.js"></script>
+
+<%
+} %>
+
diff --git a/webapp/web/templates/edit/specific/equivalentClasses_retry.jsp b/webapp/web/templates/edit/specific/equivalentClasses_retry.jsp
index 2ee5752e5..b0440d1e3 100644
--- a/webapp/web/templates/edit/specific/equivalentClasses_retry.jsp
+++ b/webapp/web/templates/edit/specific/equivalentClasses_retry.jsp
@@ -1,26 +1,26 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
-
-   <input type="hidden" value="equivalentClass" name="opMode"/>
-   <input type="hidden" value="add" name="operation"/>
-
-    <tr class="editformcell">
-        <td valign="top">
-			<select name="SuperclassURI">
-				<form:option name="SuperclassURI"/>
-			</select>
-			<span class="warning"><form:error name="SuperclassURI"/></span>
-        </td>
-    </tr>
-    <tr class="editformcell">
-        <td><p><strong>equivalent to</strong></p></td>
-    </tr>
-    <tr class="editformcell">
-        <td valign="top">
-            <select name="SubclassURI" >
-            	<form:option name="SubclassURI"/>
-            </select>
-            <span class="warning"><form:error name="SubclassURI"/></span>
-        </td>
-    </tr>
+<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
+
+   <input type="hidden" value="equivalentClass" name="opMode"/>
+   <input type="hidden" value="add" name="operation"/>
+
+    <tr class="editformcell">
+        <td valign="top">
+			<select name="SuperclassURI">
+				<form:option name="SuperclassURI"/>
+			</select>
+			<span class="warning"><form:error name="SuperclassURI"/></span>
+        </td>
+    </tr>
+    <tr class="editformcell">
+        <td><p><strong>equivalent to</strong></p></td>
+    </tr>
+    <tr class="editformcell">
+        <td valign="top">
+            <select name="SubclassURI" >
+            	<form:option name="SubclassURI"/>
+            </select>
+            <span class="warning"><form:error name="SubclassURI"/></span>
+        </td>
+    </tr>
diff --git a/webapp/web/templates/edit/specific/individualType_retry.jsp b/webapp/web/templates/edit/specific/individualType_retry.jsp
index 2925441c6..e3a552488 100644
--- a/webapp/web/templates/edit/specific/individualType_retry.jsp
+++ b/webapp/web/templates/edit/specific/individualType_retry.jsp
@@ -1,23 +1,23 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
-
-   <input type="hidden" value="add" name="operation"/>
-   <input type="hidden" value="${individual.URI}" name="individualURI"/>
-
-    <tr class="editformcell">
-        <td valign="top">
-			${individual.name}
-        </td>
-    </tr>
-    <tr class="editformcell">
-        <td><p><strong>has type</strong></p></td>
-    </tr>
-    <tr class="editformcell">
-        <td valign="top">
-            <select name="TypeURI" >
-            	<form:option name="types"/>
-            </select>
-            <span class="warning"><form:error name="TypeURI"/></span>
-        </td>
-    </tr>
+<%@ taglib prefix="form" uri="http://vitro.mannlib.cornell.edu/edit/tags" %>
+
+   <input type="hidden" value="add" name="operation"/>
+   <input type="hidden" value="${individual.URI}" name="individualURI"/>
+
+    <tr class="editformcell">
+        <td valign="top">
+			${individual.name}
+        </td>
+    </tr>
+    <tr class="editformcell">
+        <td><p><strong>has type</strong></p></td>
+    </tr>
+    <tr class="editformcell">
+        <td valign="top">
+            <select name="TypeURI" >
+            	<form:option name="types"/>
+            </select>
+            <span class="warning"><form:error name="TypeURI"/></span>
+        </td>
+    </tr>
diff --git a/webapp/web/templates/edit/specific/namespaces_edit.jsp b/webapp/web/templates/edit/specific/namespaces_edit.jsp
index 1c8991216..b959a3bc8 100644
--- a/webapp/web/templates/edit/specific/namespaces_edit.jsp
+++ b/webapp/web/templates/edit/specific/namespaces_edit.jsp
@@ -1,36 +1,36 @@
-<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
-
-<div class="editingForm">
-
-<jsp:include page="/templates/edit/fetch/vertical.jsp"/>
-
-<hr/>
-<p/>
-<div align=center>
-<table class="form-background" border="0" cellpadding="2" cellspacing="2">
-<tr valign="bottom" align="center">
-	<td>
-		<form action="fetch" method="get">
-			<input type="submit" class="form-button" value="See All Namespaces"/>
-			<input type="hidden" name="queryspec" value="private_namespaces"/>
-			<input type="hidden" name="header" value="titleonly"/>
-		</form>
-	</td>
-	<td valign="bottom" align="center">
-		<form action="editForm" method="get">
-			<input type="submit" class="form-button" value="Edit Namespace <%=request.getAttribute("firstvalue")%>"/>
-			<input name="id" type = "hidden" value="<%=request.getAttribute("firstvalue")%>" />
-			<input type="hidden" name="controller" value="Namespace"/>
-		</form>
-	</td>
-	<td valign="bottom">
-		<form action="editForm" method="get">
-			<input type="submit" class="form-button" value="Add New Namespace"/>
-			<input type="hidden" name="controller" value="Namespace"/>
-		</form>
-	</td>
-</tr>
-</table>
-</div>
-</div>
-
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+
+<div class="editingForm">
+
+<jsp:include page="/templates/edit/fetch/vertical.jsp"/>
+
+<hr/>
+<p/>
+<div align=center>
+<table class="form-background" border="0" cellpadding="2" cellspacing="2">
+<tr valign="bottom" align="center">
+	<td>
+		<form action="fetch" method="get">
+			<input type="submit" class="form-button" value="See All Namespaces"/>
+			<input type="hidden" name="queryspec" value="private_namespaces"/>
+			<input type="hidden" name="header" value="titleonly"/>
+		</form>
+	</td>
+	<td valign="bottom" align="center">
+		<form action="editForm" method="get">
+			<input type="submit" class="form-button" value="Edit Namespace <%=request.getAttribute("firstvalue")%>"/>
+			<input name="id" type = "hidden" value="<%=request.getAttribute("firstvalue")%>" />
+			<input type="hidden" name="controller" value="Namespace"/>
+		</form>
+	</td>
+	<td valign="bottom">
+		<form action="editForm" method="get">
+			<input type="submit" class="form-button" value="Add New Namespace"/>
+			<input type="hidden" name="controller" value="Namespace"/>
+		</form>
+	</td>
+</tr>
+</table>
+</div>
+</div>
+
diff --git a/webapp/web/templates/edit/specific/user_retry.jsp b/webapp/web/templates/edit/specific/user_retry.jsp
index 15ff882f1..a540ce387 100644
--- a/webapp/web/templates/edit/specific/user_retry.jsp
+++ b/webapp/web/templates/edit/specific/user_retry.jsp
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<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">
-
-	<tr class="editformcell">
-		<td valign="bottom" colspan="2">
-			<b>Email address*</b><br/>
-			<input type="text" name="Username" value="${formValue['Username']}" size="60" maxlength="120" />
-			<span class="warning"><form:error name="Username"/></span>
-		</td>
-	</tr>
-	<tr class="editformcell">
-		<td valign="bottom" colspan="1">
-			<b>First Name*</b><br/>
-                        <input type="text" name="FirstName" value="${formValue['FirstName']}" size="30" maxlength="120"/>
-			<span class="warning"><form:error name="FirstName"/></span>
-		</td>
-                <td valign="bottom" colspan="1">
-                        <b>Last Name*</b><br/>
-                        <input type="text" name="LastName" value="${formValue['LastName']}" size="30" maxlength="120"/>
-                        <span class="warning"><form:error name="LastName"/></span>
-                </td>
-	</tr>
-	<tr class="editformcell">
-                <td valign="bottom" colspan="2">
-                        <b>Role*</b><br/>
-                        <select name="RoleURI">
-                            <form:option name="Role"/>
-                        </select>
-                        <span class="warning"><form:error name="Role"/></span>
-                </td>
-	</tr>
-        <c:if test="${empty user.md5password}">
-          <tr class="editformcell">
-              <td valign="bottom" colspan="2">
-                      <b>Temporary Password* (6-12 characters; must be changed on first login)</b><br/>
-                      <input type="password" name="Md5password" value="${formValue['Md5password']}" size="64" maxlength="128"/>
-                      <span class="warning"><form:error name="Md5password"/></span>
-              </td>
-          </tr>
-          <tr class="editformcell">
-              <td valign="bottom" colspan="2">
-                      <b>Confirm password*</b><br/>
-                      <input type="password" name="passwordConfirmation" value="${formValue['passwordConfirmation']}" size="64" maxlength="128"/>
-                      <span class="warning"><form:error name="passwordConfirmation"/></span>
-              </td>
-          </tr>
-        </c:if>
-</jsp:root>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<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">
+
+	<tr class="editformcell">
+		<td valign="bottom" colspan="2">
+			<b>Email address*</b><br/>
+			<input type="text" name="Username" value="${formValue['Username']}" size="60" maxlength="120" />
+			<span class="warning"><form:error name="Username"/></span>
+		</td>
+	</tr>
+	<tr class="editformcell">
+		<td valign="bottom" colspan="1">
+			<b>First Name*</b><br/>
+                        <input type="text" name="FirstName" value="${formValue['FirstName']}" size="30" maxlength="120"/>
+			<span class="warning"><form:error name="FirstName"/></span>
+		</td>
+                <td valign="bottom" colspan="1">
+                        <b>Last Name*</b><br/>
+                        <input type="text" name="LastName" value="${formValue['LastName']}" size="30" maxlength="120"/>
+                        <span class="warning"><form:error name="LastName"/></span>
+                </td>
+	</tr>
+	<tr class="editformcell">
+                <td valign="bottom" colspan="2">
+                        <b>Role*</b><br/>
+                        <select name="RoleURI">
+                            <form:option name="Role"/>
+                        </select>
+                        <span class="warning"><form:error name="Role"/></span>
+                </td>
+	</tr>
+        <c:if test="${empty user.md5password}">
+          <tr class="editformcell">
+              <td valign="bottom" colspan="2">
+                      <b>Temporary Password* (6-12 characters; must be changed on first login)</b><br/>
+                      <input type="password" name="Md5password" value="${formValue['Md5password']}" size="64" maxlength="128"/>
+                      <span class="warning"><form:error name="Md5password"/></span>
+              </td>
+          </tr>
+          <tr class="editformcell">
+              <td valign="bottom" colspan="2">
+                      <b>Confirm password*</b><br/>
+                      <input type="password" name="passwordConfirmation" value="${formValue['passwordConfirmation']}" size="64" maxlength="128"/>
+                      <span class="warning"><form:error name="passwordConfirmation"/></span>
+              </td>
+          </tr>
+        </c:if>
+</jsp:root>
diff --git a/webapp/web/templates/entity/entityListForTabs.jsp b/webapp/web/templates/entity/entityListForTabs.jsp
index 136688b03..3f597d43b 100644
--- a/webapp/web/templates/entity/entityListForTabs.jsp
+++ b/webapp/web/templates/entity/entityListForTabs.jsp
@@ -1,87 +1,87 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%><%/* this odd thing points to something in web.xml */ %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
-<%@ page errorPage="/error.jsp"%>
-<%  /***********************************************
-        Display a list of entities for a tab.
-
-         request.attributes:
-         a List of Entity objects with the name "entities"
-
-         request.parameters:
-         None yet.
-
-          Consider sticking < % = MiscWebUtils.getReqInfo(request) % > in the html output for debugging info.
-
-         bdc34 2006-01-27 created
-    **********************************************/
-        if (request.getAttribute("entities") == null){
-            String e="entityListForTabs.jsp expects that request attribute 'entities' be set to a List of Entity objects.";
-            throw new JspException(e);
-        }
-%>
-<c:set var="searchViewPrefix" value="/templates/search/"/>
-<c:set var='entities' value='${requestScope.entities}' /><%/* just moving this into page scope for easy use */ %>
-<c:set var='IMG_WIDTH' value='75'/>
-<jsp:include page="/templates/alpha/alphaIndex.jsp"/>
-<ul class='tabEntities entityListForTab'>
-    <c:forEach items='${entities}' var='ent'>
-	<c:url var="entHref" value="/entity">
-		<c:param name="uri" value="${ent.URI}"/>
-	</c:url>
-        <li>
-            <a href='<c:out value="${entHref}"/>'>${ent.name}</a> 
-			<c:if test="${!empty ent.moniker}">
-			  <span class="tab-moniker">
-				| <c:out value="${ent.moniker}"/>
-  			</span>
-			</c:if>
-    	    <c:if test="${!empty ent.VClasses}">
-                <c:forEach items="${ent.VClasses}" var="type">
-					<c:if test="${!empty type.customSearchView}">
-						<c:set var="customSearchView" value="${type.customSearchView}"/>
- 					</c:if>
-				</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}">
-                    <c:set scope="request" var="individualURL" value="${ent.url}"/>
-                </c:if>
-                <jsp:include page="${searchViewPrefix}${customSearchView}" flush="true"/>
-                <c:remove var="individual"/>
-                <c:remove var="individualURL"/>
-                <c:remove var="anchorText"/>
-			</c:if>		
-			
-            <c:if test="${!empty anchorText}">
-              <span class="tab-extLink"> |
-                <c:choose>
-                    <c:when test="${!empty ent.url}">
-	                    <c:url var="entUrl" value="${ent.url}"/>
-                        <a class="externalLink" href="<c:out value="${entUrl}"/>">${anchorText}</a>
-                    </c:when>
-                    <c:otherwise>
-                        <span style="font-style: italic; text-size: 0.75em;">${anchorText}</span>
-                    </c:otherwise>
-                </c:choose>
-              </span>
-            </c:if>
-            <c:forEach items='${ent.linksList}' var="entLink"><span class="tab-extLink"> | <c:url var="entLinkUrl" value="${entLink.url}"/><a class="externalLink" href="<c:out value="${entLinkUrl}"/>">${entLink.anchor}</a></span></c:forEach>
-            <c:choose>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%><%/* this odd thing points to something in web.xml */ %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@ page errorPage="/error.jsp"%>
+<%  /***********************************************
+        Display a list of entities for a tab.
+
+         request.attributes:
+         a List of Entity objects with the name "entities"
+
+         request.parameters:
+         None yet.
+
+          Consider sticking < % = MiscWebUtils.getReqInfo(request) % > in the html output for debugging info.
+
+         bdc34 2006-01-27 created
+    **********************************************/
+        if (request.getAttribute("entities") == null){
+            String e="entityListForTabs.jsp expects that request attribute 'entities' be set to a List of Entity objects.";
+            throw new JspException(e);
+        }
+%>
+<c:set var="searchViewPrefix" value="/templates/search/"/>
+<c:set var='entities' value='${requestScope.entities}' /><%/* just moving this into page scope for easy use */ %>
+<c:set var='IMG_WIDTH' value='75'/>
+<jsp:include page="/templates/alpha/alphaIndex.jsp"/>
+<ul class='tabEntities entityListForTab'>
+    <c:forEach items='${entities}' var='ent'>
+	<c:url var="entHref" value="/entity">
+		<c:param name="uri" value="${ent.URI}"/>
+	</c:url>
+        <li>
+            <a href='<c:out value="${entHref}"/>'>${ent.name}</a> 
+			<c:if test="${!empty ent.moniker}">
+			  <span class="tab-moniker">
+				| <c:out value="${ent.moniker}"/>
+  			</span>
+			</c:if>
+    	    <c:if test="${!empty ent.VClasses}">
+                <c:forEach items="${ent.VClasses}" var="type">
+					<c:if test="${!empty type.customSearchView}">
+						<c:set var="customSearchView" value="${type.customSearchView}"/>
+ 					</c:if>
+				</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}">
+                    <c:set scope="request" var="individualURL" value="${ent.url}"/>
+                </c:if>
+                <jsp:include page="${searchViewPrefix}${customSearchView}" flush="true"/>
+                <c:remove var="individual"/>
+                <c:remove var="individualURL"/>
+                <c:remove var="anchorText"/>
+			</c:if>		
+			
+            <c:if test="${!empty anchorText}">
+              <span class="tab-extLink"> |
+                <c:choose>
+                    <c:when test="${!empty ent.url}">
+	                    <c:url var="entUrl" value="${ent.url}"/>
+                        <a class="externalLink" href="<c:out value="${entUrl}"/>">${anchorText}</a>
+                    </c:when>
+                    <c:otherwise>
+                        <span style="font-style: italic; text-size: 0.75em;">${anchorText}</span>
+                    </c:otherwise>
+                </c:choose>
+              </span>
+            </c:if>
+            <c:forEach items='${ent.linksList}' var="entLink"><span class="tab-extLink"> | <c:url var="entLinkUrl" value="${entLink.url}"/><a class="externalLink" href="<c:out value="${entLinkUrl}"/>">${entLink.anchor}</a></span></c:forEach>
+            <c:choose>
             <c:when test='${not empty ent.thumbUrl }'>
-            	<c:url var="imageHref" value="entity">
-    						<c:param name="uri" value="${ent.URI}"/>
-    					</c:url>
+            	<c:url var="imageHref" value="entity">
+    						<c:param name="uri" value="${ent.URI}"/>
+    					</c:url>
                   <div class="tab-image"><a class="image" href="<c:out value="${imageHref}"/>"><img width="${IMG_WIDTH}" src="${pageContext.request.contextPath}${ent.thumbUrl}" title="${ent.name}" alt="" /></a></div>
-            </c:when>
-            <c:otherwise>
-            </c:otherwise>
-            </c:choose>
-        </li>
+            </c:when>
+            <c:otherwise>
+            </c:otherwise>
+            </c:choose>
+        </li>
     </c:forEach>
 </ul>
 
@@ -113,7 +113,7 @@ if( request.getAttribute("alpha") != null && ! "all".equalsIgnoreCase((String)re
 	   </c:if>   
 	</c:forEach>
     </div>
-</c:if>
+</c:if>
 
 <jsp:include page="/templates/entity/entityListPages.jsp"/>
 
diff --git a/webapp/web/templates/error/entityNotFound.jsp b/webapp/web/templates/error/entityNotFound.jsp
index f30465b2f..8d6c52edb 100644
--- a/webapp/web/templates/error/entityNotFound.jsp
+++ b/webapp/web/templates/error/entityNotFound.jsp
@@ -1,3 +1,3 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<div class="error"><h4>No matching entity was found in the system.</h4> </div>
+<div class="error"><h4>No matching entity was found in the system.</h4> </div>
diff --git a/webapp/web/templates/error/error404.jsp b/webapp/web/templates/error/error404.jsp
index 3fc3a2ab2..4606e4a93 100644
--- a/webapp/web/templates/error/error404.jsp
+++ b/webapp/web/templates/error/error404.jsp
@@ -1,18 +1,18 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@page isErrorPage="true" %>
-
-<% if ( pageContext.getErrorData().getRequestURI().indexOf("/images/") < 0 ) {
-    request.setAttribute("bodyJsp", "/templates/error/error404content.jsp");
-    request.setAttribute("title", "Not Found");
+
+<% if ( pageContext.getErrorData().getRequestURI().indexOf("/images/") < 0 ) {
+    request.setAttribute("bodyJsp", "/templates/error/error404content.jsp");
+    request.setAttribute("title", "Not Found");
 %>
 
-<jsp:forward page="/templates/page/basicPage.jsp">
-  <jsp:param name="uriStr" value="${pageContext.errorData.requestURI}"/>
+<jsp:forward page="/templates/page/basicPage.jsp">
+  <jsp:param name="uriStr" value="${pageContext.errorData.requestURI}"/>
 </jsp:forward>
 
-<% } %>
-
-
-
+<% } %>
+
+
+
diff --git a/webapp/web/templates/error/error404content.jsp b/webapp/web/templates/error/error404content.jsp
index efaa57f3b..45a0e1e78 100644
--- a/webapp/web/templates/error/error404content.jsp
+++ b/webapp/web/templates/error/error404content.jsp
@@ -1,21 +1,21 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %><%/* this odd thing points to something in web.xml */ %>
-<div class="contents">
-
-<h1>Page Not Found</h1>
-
-<p class="warning">The page you requested is not available.  It may have been deleted or moved to another location.</p>
-
-<p>Try the search box above to locate the information you are looking for.</p>
-
-<p>If you reached this page by following a link within this website, please consider <a href="<c:url value="comments"/>">contacting us</a> and telling us what link you clicked.</p>
-
-<!-- _______________________________Exception__________________________________
-
-404
-Request URI:  ${param.uriStr}
-___________________________________________________________________________ -->
-
-</div><!-- contents -->
-
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %><%/* this odd thing points to something in web.xml */ %>
+<div class="contents">
+
+<h1>Page Not Found</h1>
+
+<p class="warning">The page you requested is not available.  It may have been deleted or moved to another location.</p>
+
+<p>Try the search box above to locate the information you are looking for.</p>
+
+<p>If you reached this page by following a link within this website, please consider <a href="<c:url value="comments"/>">contacting us</a> and telling us what link you clicked.</p>
+
+<!-- _______________________________Exception__________________________________
+
+404
+Request URI:  ${param.uriStr}
+___________________________________________________________________________ -->
+
+</div><!-- contents -->
+
diff --git a/webapp/web/templates/error/error500.jsp b/webapp/web/templates/error/error500.jsp
index f0b5d2ee0..dc6937e74 100644
--- a/webapp/web/templates/error/error500.jsp
+++ b/webapp/web/templates/error/error500.jsp
@@ -1,44 +1,44 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ page import="java.lang.Integer" %>
-<%@page isErrorPage="true" %>
-
-<html>
-<head>
-	<title>Internal Server Error</title>
-</head>
-
-<body style="margin:2%;font-family:Arial, Helvetica, sans-serif;">
-<div class="contents">
-
-<h1>Internal Server Error</h1>
-
-<p style="color:red;">An internal error has occurred in the server.</p>
-
-<p>Please try again later.</p>
-
-<p>If the problem persists, please consider <a href="<c:url value="comments"/>">contacting us</a> and telling us how you arrived here.</p>
-
-</div><!-- contents -->
-
-<div id="hiddenErrorDiv" style="display:none;">
-_______________________________Exception__________________________________
-
-500
-Request URI:  ${param.uriStr}
-Exception:    ${param.errStr}
-Stack trace:
-<c:forEach var="trace" items="${pageContext.exception.stackTrace}">
-  ${trace} <%="\n"%>
-</c:forEach>
-___________________________________________________________________________ 
-
-</div><!-- hiddenErrorDiv -->
-
-</body>
-</html>
-
-
-
-
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ page import="java.lang.Integer" %>
+<%@page isErrorPage="true" %>
+
+<html>
+<head>
+	<title>Internal Server Error</title>
+</head>
+
+<body style="margin:2%;font-family:Arial, Helvetica, sans-serif;">
+<div class="contents">
+
+<h1>Internal Server Error</h1>
+
+<p style="color:red;">An internal error has occurred in the server.</p>
+
+<p>Please try again later.</p>
+
+<p>If the problem persists, please consider <a href="<c:url value="comments"/>">contacting us</a> and telling us how you arrived here.</p>
+
+</div><!-- contents -->
+
+<div id="hiddenErrorDiv" style="display:none;">
+_______________________________Exception__________________________________
+
+500
+Request URI:  ${param.uriStr}
+Exception:    ${param.errStr}
+Stack trace:
+<c:forEach var="trace" items="${pageContext.exception.stackTrace}">
+  ${trace} <%="\n"%>
+</c:forEach>
+___________________________________________________________________________ 
+
+</div><!-- hiddenErrorDiv -->
+
+</body>
+</html>
+
+
+
+
diff --git a/webapp/web/templates/error/error500content.jsp b/webapp/web/templates/error/error500content.jsp
index f7b4bc488..b221101e9 100644
--- a/webapp/web/templates/error/error500content.jsp
+++ b/webapp/web/templates/error/error500content.jsp
@@ -1,27 +1,27 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-
-<div class="contents">
-
-<h1>Internal Server Error</h1>
-
-<p class="warning">An internal error has occurred in the server</p>
-
-<p>Please try again later.</p>
-
-<p>If the problem persists, please consider <a href="<c:url value="comments"/>">contacting us</a> and telling us how you arrived here.</p>
-
-<!-- _______________________________Exception__________________________________
-
-500
-Request URI:  ${param.uriStr}
-Exception:    ${param.errStr}
-Stack trace:
-<c:forEach var="trace" items="${pageContext.exception.stackTrace}">
-  ${trace} <%="\n"%>
-</c:forEach>
-___________________________________________________________________________ -->
-
-</div><!-- contents -->
-
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+
+<div class="contents">
+
+<h1>Internal Server Error</h1>
+
+<p class="warning">An internal error has occurred in the server</p>
+
+<p>Please try again later.</p>
+
+<p>If the problem persists, please consider <a href="<c:url value="comments"/>">contacting us</a> and telling us how you arrived here.</p>
+
+<!-- _______________________________Exception__________________________________
+
+500
+Request URI:  ${param.uriStr}
+Exception:    ${param.errStr}
+Stack trace:
+<c:forEach var="trace" items="${pageContext.exception.stackTrace}">
+  ${trace} <%="\n"%>
+</c:forEach>
+___________________________________________________________________________ -->
+
+</div><!-- contents -->
+
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedEmail.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedEmail.ftl
index a855f13c8..b02c2e415 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedEmail.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedEmail.ftl
@@ -1,23 +1,23 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Confirmation that an account has been created. -->
-
-<#assign strings = i18n() />
-
-<#assign subject = strings.account_created(siteName) />
-
-<#assign html = strings.account_created_email_html(siteName, 
-                                                   subject, 
-                                                   userAccount.firstName, 
-                                                   userAccount.lastName, 
-                                                   userAccount.emailAddress, 
-                                                   passwordLink) />
-
-<#assign text = strings.account_created_email_text(siteName, 
-                                                   subject, 
-                                                   userAccount.firstName, 
-                                                   userAccount.lastName, 
-                                                   userAccount.emailAddress, 
-                                                   passwordLink) />
-
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Confirmation that an account has been created. -->
+
+<#assign strings = i18n() />
+
+<#assign subject = strings.account_created(siteName) />
+
+<#assign html = strings.account_created_email_html(siteName, 
+                                                   subject, 
+                                                   userAccount.firstName, 
+                                                   userAccount.lastName, 
+                                                   userAccount.emailAddress, 
+                                                   passwordLink) />
+
+<#assign text = strings.account_created_email_text(siteName, 
+                                                   subject, 
+                                                   userAccount.firstName, 
+                                                   userAccount.lastName, 
+                                                   userAccount.emailAddress, 
+                                                   passwordLink) />
+
 <@email subject=subject html=html text=text />
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedExternalOnlyEmail.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedExternalOnlyEmail.ftl
index a6bc6f0e9..9b787983c 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedExternalOnlyEmail.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-acctCreatedExternalOnlyEmail.ftl
@@ -1,19 +1,19 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Confirmation that an account has been created. -->
-
-<#assign subject = strings.account_created(siteName) />
-
-<#assign html = strings.account_created_external_email_html(siteName, 
-                                                   subject, 
-                                                   userAccount.firstName, 
-                                                   userAccount.lastName, 
-                                                   userAccount.emailAddress) />
-
-<#assign text = string.account_created_external_email_text(siteName, 
-                                                   subject, 
-                                                   userAccount.firstName, 
-                                                   userAccount.lastName, 
-                                                   userAccount.emailAddress) />
-
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Confirmation that an account has been created. -->
+
+<#assign subject = strings.account_created(siteName) />
+
+<#assign html = strings.account_created_external_email_html(siteName, 
+                                                   subject, 
+                                                   userAccount.firstName, 
+                                                   userAccount.lastName, 
+                                                   userAccount.emailAddress) />
+
+<#assign text = string.account_created_external_email_text(siteName, 
+                                                   subject, 
+                                                   userAccount.firstName, 
+                                                   userAccount.lastName, 
+                                                   userAccount.emailAddress) />
+
 <@email subject=subject html=html text=text />
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
index a062882b3..84e538a08 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
@@ -1,81 +1,81 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Template for adding a user account -->
-
-<#assign strings = i18n() />
-
-<h3><a class="account-menu" href="accountsAdmin" title="${strings.user_accounts_title}">${strings.user_accounts_link}</a> > ${strings.add_new_account}</h3>
-
-    <#if errorEmailIsEmpty??>
-        <#assign errorMessage = strings.error_no_email />
-    <#elseif errorEmailInUse??>
-        <#assign errorMessage = strings.error_email_already_exists />
-    <#elseif errorEmailInvalidFormat??>
-        <#assign errorMessage = strings.error_invalid_email(emailAddress) />
-    <#elseif errorExternalAuthIdInUse??>
-        <#assign errorMessage = strings.error_external_auth_already_exists />
-    <#elseif errorFirstNameIsEmpty??>
-        <#assign errorMessage = strings.error_no_first_name />
-    <#elseif errorLastNameIsEmpty??>
-        <#assign errorMessage = strings.error_no_last_name />
-    <#elseif errorNoRoleSelected??>
-        <#assign errorMessage = strings.error_no_role />
-    <#elseif errorPasswordIsEmpty??>
-        <#assign errorMessage = strings.error_no_password />
-    <#elseif errorPasswordIsWrongLength??>
-        <#assign errorMessage = strings.error_password_length(minimumLength, maximumLength) />
-    <#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}" />
-            <p>${errorMessage}</p>
-        </section>
-    </#if>
-
-<section id="add-account" role="region">
-    <form method="POST" action="${formUrls.add}" class="customForm" role="add new account">
-        <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> 
-        <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
-
-        <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">
-
-        <p><input id="externalAuthChkBox" type="checkbox" name="externalAuthOnly" <#if externalAuthOnly?? >checked</#if> />${strings.external_auth_only}</p>
-        <p>${strings.roles}<span class="requiredHint"> *</span></p>
-        <#list roles as role>
-            <input type="radio" name="role" value="${role.uri}" role="radio" ${selectedRoles?seq_contains(role.uri)?string("checked", "")} />
-            <label class="inline" for="${role.label}"> ${role.label}</label>
-            <br />
-        </#list>
-
-        <#if emailIsEnabled??>
-            <p class="note">${strings.new_account_note}</p>
-        <#else>
-            <section id="passwordContainer" role="region">
-                <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)}</p>
-                
-                <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>
-    </form>
-</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" />')}
-
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for adding a user account -->
+
+<#assign strings = i18n() />
+
+<h3><a class="account-menu" href="accountsAdmin" title="${strings.user_accounts_title}">${strings.user_accounts_link}</a> > ${strings.add_new_account}</h3>
+
+    <#if errorEmailIsEmpty??>
+        <#assign errorMessage = strings.error_no_email />
+    <#elseif errorEmailInUse??>
+        <#assign errorMessage = strings.error_email_already_exists />
+    <#elseif errorEmailInvalidFormat??>
+        <#assign errorMessage = strings.error_invalid_email(emailAddress) />
+    <#elseif errorExternalAuthIdInUse??>
+        <#assign errorMessage = strings.error_external_auth_already_exists />
+    <#elseif errorFirstNameIsEmpty??>
+        <#assign errorMessage = strings.error_no_first_name />
+    <#elseif errorLastNameIsEmpty??>
+        <#assign errorMessage = strings.error_no_last_name />
+    <#elseif errorNoRoleSelected??>
+        <#assign errorMessage = strings.error_no_role />
+    <#elseif errorPasswordIsEmpty??>
+        <#assign errorMessage = strings.error_no_password />
+    <#elseif errorPasswordIsWrongLength??>
+        <#assign errorMessage = strings.error_password_length(minimumLength, maximumLength) />
+    <#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}" />
+            <p>${errorMessage}</p>
+        </section>
+    </#if>
+
+<section id="add-account" role="region">
+    <form method="POST" action="${formUrls.add}" class="customForm" role="add new account">
+        <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> 
+        <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
+
+        <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">
+
+        <p><input id="externalAuthChkBox" type="checkbox" name="externalAuthOnly" <#if externalAuthOnly?? >checked</#if> />${strings.external_auth_only}</p>
+        <p>${strings.roles}<span class="requiredHint"> *</span></p>
+        <#list roles as role>
+            <input type="radio" name="role" value="${role.uri}" role="radio" ${selectedRoles?seq_contains(role.uri)?string("checked", "")} />
+            <label class="inline" for="${role.label}"> ${role.label}</label>
+            <br />
+        </#list>
+
+        <#if emailIsEnabled??>
+            <p class="note">${strings.new_account_note}</p>
+        <#else>
+            <section id="passwordContainer" role="region">
+                <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)}</p>
+                
+                <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>
+    </form>
+</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" />')}
+
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/account/accountExternalAuthFlag.js"></script>')}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl
index 3cf0bedff..d768e6355 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-associateProfilePanel.ftl
@@ -1,91 +1,91 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Template for setting the account reference field, which can also associate a profile with the user account -->
-
-<#assign strings = i18n() />
-
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/autocomplete.css" />',
-                   '<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" />')}
-<section id="externalAuthMatchId">
-    <div id="associateProfileBackgroundOne">
-        <div id="alignExternalAuthId">
-        <#if showAssociation??>
-             <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> 
-            <input type="text" name="externalAuthId" value="${externalAuthId}" id="externalAuthId" role="input "/>
-            <span id="externalAuthIdInUse" >${strings.auth_id_in_use}</span>
-        </#if>
-        </div>
-    </div>
-    </section>
-    <#-- If there is an associated profile, show these -->
-    <section id="associated">
-        <div id="associateProfileBackgroundTwo">
-            <p>
-                <label for="associatedProfileName">${strings.associated_profile_label}</label>
-                <span class="acSelectionInfo" id="associatedProfileName"></span>
-                <a href="" id="verifyProfileLink" title="${strings.verify_this_match_title}">(${strings.verify_this_match})</a>
-                <a href="" id="changeProfileLink" title="${strings.change_profile_title}">(${strings.change_profile})</a>
-            </p>
-            <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">
-            <p>
-                <label for="associateProfileName">${strings.select_associated_profile}</label>
-                <input type="text" id="associateProfileName" name="associateProfileName" class="acSelector" size="35">
-            </p>
-        </div>
-        <div id="associateProfileBackgroundFour">
-            <p> - ${strings.or} - </p>
-            <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>    
-            </p>
-        </div>
-    </section>
-
-<script type="text/javascript">
-var associateProfileFieldsData = {
-    <#if userUri??>
-        userUri: '${userUri}' ,
-    <#else>    
-        userUri: '' ,
-    </#if>
-    
-    <#if associationIsReset??>
-        associationIsReset: 'true' ,
-    </#if>
-    
-    <#if associatedProfileInfo??>
-        associatedProfileInfo: {
-            label: '${associatedProfileInfo.label}',
-            uri: '${associatedProfileInfo.uri}',
-            url: '${associatedProfileInfo.url}'
-        },
-    </#if>
-    
-    <#if showAssociation??>
-        associationEnabled: true ,
-    </#if>
-
-    ajaxUrl: '${formUrls.accountsAjax}'
-};
-</script>
-
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/account/accountAssociateProfile.js"></script>')}   
-
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for setting the account reference field, which can also associate a profile with the user account -->
+
+<#assign strings = i18n() />
+
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/autocomplete.css" />',
+                   '<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" />')}
+<section id="externalAuthMatchId">
+    <div id="associateProfileBackgroundOne">
+        <div id="alignExternalAuthId">
+        <#if showAssociation??>
+             <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> 
+            <input type="text" name="externalAuthId" value="${externalAuthId}" id="externalAuthId" role="input "/>
+            <span id="externalAuthIdInUse" >${strings.auth_id_in_use}</span>
+        </#if>
+        </div>
+    </div>
+    </section>
+    <#-- If there is an associated profile, show these -->
+    <section id="associated">
+        <div id="associateProfileBackgroundTwo">
+            <p>
+                <label for="associatedProfileName">${strings.associated_profile_label}</label>
+                <span class="acSelectionInfo" id="associatedProfileName"></span>
+                <a href="" id="verifyProfileLink" title="${strings.verify_this_match_title}">(${strings.verify_this_match})</a>
+                <a href="" id="changeProfileLink" title="${strings.change_profile_title}">(${strings.change_profile})</a>
+            </p>
+            <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">
+            <p>
+                <label for="associateProfileName">${strings.select_associated_profile}</label>
+                <input type="text" id="associateProfileName" name="associateProfileName" class="acSelector" size="35">
+            </p>
+        </div>
+        <div id="associateProfileBackgroundFour">
+            <p> - ${strings.or} - </p>
+            <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>    
+            </p>
+        </div>
+    </section>
+
+<script type="text/javascript">
+var associateProfileFieldsData = {
+    <#if userUri??>
+        userUri: '${userUri}' ,
+    <#else>    
+        userUri: '' ,
+    </#if>
+    
+    <#if associationIsReset??>
+        associationIsReset: 'true' ,
+    </#if>
+    
+    <#if associatedProfileInfo??>
+        associatedProfileInfo: {
+            label: '${associatedProfileInfo.label}',
+            uri: '${associatedProfileInfo.uri}',
+            url: '${associatedProfileInfo.url}'
+        },
+    </#if>
+    
+    <#if showAssociation??>
+        associationEnabled: true ,
+    </#if>
+
+    ajaxUrl: '${formUrls.accountsAjax}'
+};
+</script>
+
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/account/accountAssociateProfile.js"></script>')}   
+
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-confirmEmailChangedEmail.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-confirmEmailChangedEmail.ftl
index 79844eaf0..d091af468 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-confirmEmailChangedEmail.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-confirmEmailChangedEmail.ftl
@@ -1,21 +1,21 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Confirmation that the user has changed his email account. -->
-
-<#assign strings = i18n() />
-
-<#assign subject = strings.email_changed_subject(siteName) />
-
-<#assign html = strings.email_changed_html(siteName, 
-                                           subject, 
-                                           userAccount.firstName, 
-                                           userAccount.lastName, 
-                                           userAccount.emailAddress) />
-
-<#assign text = strings.email_changed_text(siteName, 
-                                           subject, 
-                                           userAccount.firstName, 
-                                           userAccount.lastName, 
-                                           userAccount.emailAddress) />
-
-<@email subject=subject html=html text=text />
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Confirmation that the user has changed his email account. -->
+
+<#assign strings = i18n() />
+
+<#assign subject = strings.email_changed_subject(siteName) />
+
+<#assign html = strings.email_changed_html(siteName, 
+                                           subject, 
+                                           userAccount.firstName, 
+                                           userAccount.lastName, 
+                                           userAccount.emailAddress) />
+
+<#assign text = strings.email_changed_text(siteName, 
+                                           subject, 
+                                           userAccount.firstName, 
+                                           userAccount.lastName, 
+                                           userAccount.emailAddress) />
+
+<@email subject=subject html=html text=text />
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
index 457ddb8d2..0a80aa63c 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
@@ -1,46 +1,46 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Template for adding a user account -->
-
-<#assign strings = i18n() />
-
-<h3>${strings.create_your_password}</h3>
-
-<#if errorPasswordIsEmpty??>
-    <#assign errorMessage = strings.error_no_password />
-<#elseif errorPasswordIsWrongLength??>
-    <#assign errorMessage = strings.error_password_length(minimumLength, maximumLength) />
-<#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}"/>
-        <p>${errorMessage}</p>
-    </section>
-</#if>
-
-<section id="create-password" role="region">
-    <p>${strings.enter_new_password(userAccount.emailAddress)}</p>
-
-    <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)}</p>
-
-        <label for="confirm-password">${strings.confirm_password}<span class="requiredHint"> *</span></label>
-        <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
-
-        <p><input type="submit" name="submit" value="${strings.save_changes}" class="submit"/></p>
-
-        <p class="requiredHint">* ${strings.required_fields}</p>
-    </form>
-</section>
-
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for adding a user account -->
+
+<#assign strings = i18n() />
+
+<h3>${strings.create_your_password}</h3>
+
+<#if errorPasswordIsEmpty??>
+    <#assign errorMessage = strings.error_no_password />
+<#elseif errorPasswordIsWrongLength??>
+    <#assign errorMessage = strings.error_password_length(minimumLength, maximumLength) />
+<#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}"/>
+        <p>${errorMessage}</p>
+    </section>
+</#if>
+
+<section id="create-password" role="region">
+    <p>${strings.enter_new_password(userAccount.emailAddress)}</p>
+
+    <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)}</p>
+
+        <label for="confirm-password">${strings.confirm_password}<span class="requiredHint"> *</span></label>
+        <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
+
+        <p><input type="submit" name="submit" value="${strings.save_changes}" class="submit"/></p>
+
+        <p class="requiredHint">* ${strings.required_fields}</p>
+    </form>
+</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
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
index df5ad40c6..b993f225e 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
@@ -1,95 +1,95 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Template for editing a user account -->
-
-<#assign strings = i18n() />
-
-<h3><a class="account-menu" href="accountsAdmin" title="${strings.user_accounts_title}">${strings.user_accounts_link}</a> > ${strings.edit_account}</h3>
-
-    <#if errorEmailIsEmpty??>
-        <#assign errorMessage = strings.error_no_email />
-    <#elseif errorEmailInUse??>
-        <#assign errorMessage = strings.error_email_already_exists />
-    <#elseif errorEmailInvalidFormat??>
-        <#assign errorMessage = strings.error_invalid_email(emailAddress) />
-    <#elseif errorExternalAuthIdInUse??>
-        <#assign errorMessage = strings.error_external_auth_already_exists />
-    <#elseif errorFirstNameIsEmpty??>
-        <#assign errorMessage = strings.error_no_first_name />
-    <#elseif errorLastNameIsEmpty??>
-        <#assign errorMessage = strings.error_no_last_name />
-    <#elseif errorNoRoleSelected??>
-        <#assign errorMessage = strings.error_no_role />
-    <#elseif errorPasswordIsEmpty??>
-        <#assign errorMessage = strings.error_no_password />
-    <#elseif errorPasswordIsWrongLength??>
-        <#assign errorMessage = strings.error_password_length(minimumLength, maximumLength) />
-    <#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}" />
-            <p>${errorMessage}</p>
-        </section>
-    </#if>
-
-<section id="edit-account" role="region">
-    <form method="POST" action="${formUrls.edit}" id="userAccountForm" class="customForm" role="edit account">
-        <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> 
-        <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
-
-        <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??>
-            <#include "userAccounts-associateProfilePanel.ftl">
-
-            <p><input id="externalAuthChkBox" type="checkbox" name="externalAuthOnly"  <#if externalAuthOnly?? >checked</#if>  />${strings.external_auth_only}</p>
-        </#if>
-
-        <#if roles?has_content>
-            <p>${strings.roles}<span class="requiredHint"> *</span></p>
-            <#list roles as role>
-                <input type="radio" name="role" value="${role.uri}" role="radio" ${selectedRoles?seq_contains(role.uri)?string("checked", "")} />
-                <label class="inline" for="${role.label}"> ${role.label}</label>
-                <br />
-            </#list>
-        </#if>
-
-        <#if emailIsEnabled??>
-            <section id="pwdResetContainer" <#if externalAuthOnly?? >class="hidden"</#if> role="region">
-                <input type="checkbox" name="resetPassword" value="" id="reset-password" role="checkbox" <#if resetPassword??>checked</#if> />
-                <label  class="inline" for="reset-password">${strings.reset_password}</label>
-
-                <p class="note">${strings.reset_password_note}</p>
-            </section>
-        <#else>
-            <section id="passwordContainer" <#if externalAuthOnly?? >class="hidden"</#if> role="region">
-                <label for="new-password">${strings.new_password}</label>
-                <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
-                <p class="note">${strings.minimum_password_length(minimumLength)}<br />
-                ${strings.leave_password_unchanged}</p>
-                
-                <label for="confirm-password">${strings.confirm_password}</label> 
-                <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
-            </section>
-        </#if>
-
-        <p><input type="submit" id="submitMyAccount" name="submitEdit" value="${strings.save_changes}" class="submit" disabled /> ${strings.or} <a class="cancel" href="${formUrls.list}" title="${strings.cancel_title}">${strings.cancel_link}</a></p>
-
-        <p class="requiredHint">* ${strings.required_fields}</p>
-    </form>
-</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" />')}
-
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/account/accountExternalAuthFlag.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/account/accountListenerSetup.js"></script>')}
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for editing a user account -->
+
+<#assign strings = i18n() />
+
+<h3><a class="account-menu" href="accountsAdmin" title="${strings.user_accounts_title}">${strings.user_accounts_link}</a> > ${strings.edit_account}</h3>
+
+    <#if errorEmailIsEmpty??>
+        <#assign errorMessage = strings.error_no_email />
+    <#elseif errorEmailInUse??>
+        <#assign errorMessage = strings.error_email_already_exists />
+    <#elseif errorEmailInvalidFormat??>
+        <#assign errorMessage = strings.error_invalid_email(emailAddress) />
+    <#elseif errorExternalAuthIdInUse??>
+        <#assign errorMessage = strings.error_external_auth_already_exists />
+    <#elseif errorFirstNameIsEmpty??>
+        <#assign errorMessage = strings.error_no_first_name />
+    <#elseif errorLastNameIsEmpty??>
+        <#assign errorMessage = strings.error_no_last_name />
+    <#elseif errorNoRoleSelected??>
+        <#assign errorMessage = strings.error_no_role />
+    <#elseif errorPasswordIsEmpty??>
+        <#assign errorMessage = strings.error_no_password />
+    <#elseif errorPasswordIsWrongLength??>
+        <#assign errorMessage = strings.error_password_length(minimumLength, maximumLength) />
+    <#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}" />
+            <p>${errorMessage}</p>
+        </section>
+    </#if>
+
+<section id="edit-account" role="region">
+    <form method="POST" action="${formUrls.edit}" id="userAccountForm" class="customForm" role="edit account">
+        <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> 
+        <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
+
+        <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??>
+            <#include "userAccounts-associateProfilePanel.ftl">
+
+            <p><input id="externalAuthChkBox" type="checkbox" name="externalAuthOnly"  <#if externalAuthOnly?? >checked</#if>  />${strings.external_auth_only}</p>
+        </#if>
+
+        <#if roles?has_content>
+            <p>${strings.roles}<span class="requiredHint"> *</span></p>
+            <#list roles as role>
+                <input type="radio" name="role" value="${role.uri}" role="radio" ${selectedRoles?seq_contains(role.uri)?string("checked", "")} />
+                <label class="inline" for="${role.label}"> ${role.label}</label>
+                <br />
+            </#list>
+        </#if>
+
+        <#if emailIsEnabled??>
+            <section id="pwdResetContainer" <#if externalAuthOnly?? >class="hidden"</#if> role="region">
+                <input type="checkbox" name="resetPassword" value="" id="reset-password" role="checkbox" <#if resetPassword??>checked</#if> />
+                <label  class="inline" for="reset-password">${strings.reset_password}</label>
+
+                <p class="note">${strings.reset_password_note}</p>
+            </section>
+        <#else>
+            <section id="passwordContainer" <#if externalAuthOnly?? >class="hidden"</#if> role="region">
+                <label for="new-password">${strings.new_password}</label>
+                <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
+                <p class="note">${strings.minimum_password_length(minimumLength)}<br />
+                ${strings.leave_password_unchanged}</p>
+                
+                <label for="confirm-password">${strings.confirm_password}</label> 
+                <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
+            </section>
+        </#if>
+
+        <p><input type="submit" id="submitMyAccount" name="submitEdit" value="${strings.save_changes}" class="submit" disabled /> ${strings.or} <a class="cancel" href="${formUrls.list}" title="${strings.cancel_title}">${strings.cancel_link}</a></p>
+
+        <p class="requiredHint">* ${strings.required_fields}</p>
+    </form>
+</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" />')}
+
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/account/accountExternalAuthFlag.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/account/accountListenerSetup.js"></script>')}
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
index d5aaf65a6..cbbcf39cb 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
@@ -1,58 +1,58 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Template for creating an account for the first time an external user logs in. -->
-
-<#assign strings = i18n() />
-
-<h3>${strings.first_time_login}</h3>
-
-    <#if errorEmailIsEmpty??>
-        <#assign errorMessage = strings.error_no_email />
-    <#elseif errorEmailInUse??>
-        <#assign errorMessage = strings.error_email_already_exists />
-    <#elseif errorEmailInvalidFormat??>
-        <#assign errorMessage = strings.error_invalid_email(emailAddress) />
-    <#elseif errorFirstNameIsEmpty??>
-        <#assign errorMessage = strings.error_no_first_name />
-    <#elseif errorLastNameIsEmpty??>
-        <#assign errorMessage = strings.error_no_last_name />
-    </#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}" />
-            <p>${errorMessage}</p>
-        </section>
-    </#if>
-
-<section id="first-time-login" role="region">
-    <p>${strings.please_provide_contact_information}</p>
-
-    <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> 
-        <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
-
-        <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>
-        <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
-
-        <#if emailIsEnabled??>
-            <p class="note">${strings.first_time_login_note}</p>
-        </#if>
-
-        <p><input type="submit" name="submit" value="${strings.create_account}" class="submit"/>
-            ${strings.or} 
-            <a class="cancel" href="${urls.home}" title="${strings.cancel_title}">${strings.cancel_link}</a>
-        </p>
-
-        <p class="requiredHint">* ${strings.required_fields}</p>
-    </form>
-</section>
-
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for creating an account for the first time an external user logs in. -->
+
+<#assign strings = i18n() />
+
+<h3>${strings.first_time_login}</h3>
+
+    <#if errorEmailIsEmpty??>
+        <#assign errorMessage = strings.error_no_email />
+    <#elseif errorEmailInUse??>
+        <#assign errorMessage = strings.error_email_already_exists />
+    <#elseif errorEmailInvalidFormat??>
+        <#assign errorMessage = strings.error_invalid_email(emailAddress) />
+    <#elseif errorFirstNameIsEmpty??>
+        <#assign errorMessage = strings.error_no_first_name />
+    <#elseif errorLastNameIsEmpty??>
+        <#assign errorMessage = strings.error_no_last_name />
+    </#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}" />
+            <p>${errorMessage}</p>
+        </section>
+    </#if>
+
+<section id="first-time-login" role="region">
+    <p>${strings.please_provide_contact_information}</p>
+
+    <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> 
+        <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
+
+        <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>
+        <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
+
+        <#if emailIsEnabled??>
+            <p class="note">${strings.first_time_login_note}</p>
+        </#if>
+
+        <p><input type="submit" name="submit" value="${strings.create_account}" class="submit"/>
+            ${strings.or} 
+            <a class="cancel" href="${urls.home}" title="${strings.cancel_title}">${strings.cancel_link}</a>
+        </p>
+
+        <p class="requiredHint">* ${strings.required_fields}</p>
+    </form>
+</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
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternalEmail.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternalEmail.ftl
index 247cc42b4..27cb200d7 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternalEmail.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternalEmail.ftl
@@ -1,21 +1,21 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Confirmation that an account has been created for an externally-authenticated user. -->
-
-<#assign strings = i18n() />
-
-<#assign subject = strings.account_created(siteName) />
-
-<#assign html = strings.first_time_external_email_html(siteName, 
-                                                   subject, 
-                                                   userAccount.firstName, 
-                                                   userAccount.lastName, 
-                                                   userAccount.emailAddress) />
-
-<#assign text = strings.first_time_external_email_text(siteName, 
-                                                   subject, 
-                                                   userAccount.firstName, 
-                                                   userAccount.lastName, 
-                                                   userAccount.emailAddress) />
-
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Confirmation that an account has been created for an externally-authenticated user. -->
+
+<#assign strings = i18n() />
+
+<#assign subject = strings.account_created(siteName) />
+
+<#assign html = strings.first_time_external_email_html(siteName, 
+                                                   subject, 
+                                                   userAccount.firstName, 
+                                                   userAccount.lastName, 
+                                                   userAccount.emailAddress) />
+
+<#assign text = strings.first_time_external_email_text(siteName, 
+                                                   subject, 
+                                                   userAccount.firstName, 
+                                                   userAccount.lastName, 
+                                                   userAccount.emailAddress) />
+
 <@email subject=subject html=html text=text />
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
index d9c5aa06c..e31644e2d 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
@@ -1,189 +1,189 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Template for displaying list of user accounts -->
-
-<#import "userAccounts-accountsNav.ftl" as p>
-
-<#assign strings = i18n() />
-
-<form method="POST" action="${formUrls.add}" id="add-account" class="customForm" role="Add account">
-    <h3><span>${strings.user_accounts_link} | </span><input type="submit" class="submit add-account" value="${strings.add_new_account}" /></h3>
-</form>
-
-<#if newUserAccount?? >
-    <section class="account-feedback">
-        <p>
-            ${strings.new_account_1}
-            <a href="${newUserAccount.editUrl}" title="${strings.new_account_title}">${newUserAccount.firstName} ${newUserAccount.lastName}</a>
-            ${strings.new_account_2}
-            <#if emailWasSent?? >${strings.new_account_notification(newUserAccount.emailAddress)}</#if>
-        </p>
-    </section>
-</#if>
-
-<#if updatedUserAccount?? >
-    <section class="account-feedback">
-        <p>
-            ${strings.updated_account_1}
-            <a href="${updatedUserAccount.editUrl}" title="${strings.updated_account_title}}">${updatedUserAccount.firstName} ${updatedUserAccount.lastName}</a>
-            ${strings.updated_account_2}
-            <#if emailWasSent?? >${strings.updated_account_notification(updatedUserAccount.emailAddress)}</#if>
-        </p>
-    </section>
-</#if>
-
-<#if deletedAccountCount?? >
-    <section class="account-feedback">
-        <p>
-            ${strings.deleted_accounts(deletedAccountCount)}
-        </p>
-    </section>
-</#if>
-
-<section id="filter-roles">
-    <form method="POST" action="${formUrls.list}" class="customForm" role="filter by roles">
-        <select name="roleFilterUri" id="roleFilterUri">
-            <option value="" <#if roleFilterUri = "">selected</#if> >${strings.filter_by_roles}</option>
-            <#list roles as role>
-            <option value="${formUrls.list}?roleFilterUri=${role.uri?url}" <#if roleFilterUri = role.uri>selected</#if> >${role.label}</option>
-            </#list>
-            <!--
-            When roleFilterUri or searchTerm changes,
-            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>
-    </form>
-</section>
-
-<section id="search-accounts">
-    <form method="POST" action="${formUrls.list}" class="customForm" role="search accounts">
-        <input type="text" name="searchTerm" />
-        <input class="submit" type="submit" value="${strings.search_accounts_button}"/>
-        <!--
-            When searchTerm changes, 
-            set pageIndex to 1
-            set orderDirection to "ASC"
-            set orderField to "email" 
-            submit the form (submit action is "list") 
-        -->
-    </form>
-</section>
-<#if searchTerm?has_content>
-<section id="search-feedback">
-    <p>${strings.accounts_search_results} "<strong>${searchTerm}</strong>" | <span><a href="${formUrls.list}" title="${strings.view_all_accounts_title}">${strings.view_all_accounts}</a></span></p>
-</section>
-</#if>
-<form method="POST" action="${formUrls.list}" id="account-display" class="customForm" role="accounts display">
-    <@p.accountsNav />
-    
-    <table id="account">
-        <caption>${strings.account_management}</caption>
-
-        <thead>
-            <tr>
-               <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-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-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-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-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-desc" href="?accountsPerPage=${accountsPerPage}&orderField=count&orderDirection=DESC" title="${strings.descending_order}"></a>
-                    </nav>
-                </th>
-
-                <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-desc" href="?accountsPerPage=${accountsPerPage}&orderField=lastLogin&orderDirection=DESC" title="${strings.descending_order}"></a>
-                    </nav>
-                </th>
-            </tr>
-        </thead>
-    
-        <tbody>
-            <#list accounts as account>
-                <tr>
-                    <td>
-                        <#if account.deletable>
-                            <input type="checkbox" name="deleteAccount" value="${account.uri}" title="${strings.select_account_to_delete}"/>
-                            <#assign disableDeleteAccount = '' />
-                            <!-- ignored unless submit action is formUrls.delete -->
-                        <#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. -->
-                        <#else>
-                            ${account.emailAddress}
-                        </#if>
-                    </td>
-                    <td>${account.firstName}</td>
-                    <td>${account.lastName}</td>
-                    <td>${account.status}</td>
-                    <td>
-                        <#list account.permissionSets as permissionSet>
-                            <div>${permissionSet}</div>
-                        </#list>
-                    </td>
-                    <td>${account.loginCount}</td>
-                    <td>
-                        <#if account.lastLoginTime??>
-                            ${account.lastLoginTime?date?string.medium}
-                            <br />${account.lastLoginTime?time?string.short}
-                        </#if>
-                    </td>
-                </tr>
-            </#list>
-        </tbody>
-    </table>
-    
-    <@p.accountsNav />
-</form>
-
-<script type="text/javascript">
-    confirm_delete_account_singular = "${strings.confirm_delete_account_singular}"
-    confirm_delete_account_plural = "${strings.confirm_delete_account_plural}"
-</script>
-
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for displaying list of user accounts -->
+
+<#import "userAccounts-accountsNav.ftl" as p>
+
+<#assign strings = i18n() />
+
+<form method="POST" action="${formUrls.add}" id="add-account" class="customForm" role="Add account">
+    <h3><span>${strings.user_accounts_link} | </span><input type="submit" class="submit add-account" value="${strings.add_new_account}" /></h3>
+</form>
+
+<#if newUserAccount?? >
+    <section class="account-feedback">
+        <p>
+            ${strings.new_account_1}
+            <a href="${newUserAccount.editUrl}" title="${strings.new_account_title}">${newUserAccount.firstName} ${newUserAccount.lastName}</a>
+            ${strings.new_account_2}
+            <#if emailWasSent?? >${strings.new_account_notification(newUserAccount.emailAddress)}</#if>
+        </p>
+    </section>
+</#if>
+
+<#if updatedUserAccount?? >
+    <section class="account-feedback">
+        <p>
+            ${strings.updated_account_1}
+            <a href="${updatedUserAccount.editUrl}" title="${strings.updated_account_title}}">${updatedUserAccount.firstName} ${updatedUserAccount.lastName}</a>
+            ${strings.updated_account_2}
+            <#if emailWasSent?? >${strings.updated_account_notification(updatedUserAccount.emailAddress)}</#if>
+        </p>
+    </section>
+</#if>
+
+<#if deletedAccountCount?? >
+    <section class="account-feedback">
+        <p>
+            ${strings.deleted_accounts(deletedAccountCount)}
+        </p>
+    </section>
+</#if>
+
+<section id="filter-roles">
+    <form method="POST" action="${formUrls.list}" class="customForm" role="filter by roles">
+        <select name="roleFilterUri" id="roleFilterUri">
+            <option value="" <#if roleFilterUri = "">selected</#if> >${strings.filter_by_roles}</option>
+            <#list roles as role>
+            <option value="${formUrls.list}?roleFilterUri=${role.uri?url}" <#if roleFilterUri = role.uri>selected</#if> >${role.label}</option>
+            </#list>
+            <!--
+            When roleFilterUri or searchTerm changes,
+            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>
+    </form>
+</section>
+
+<section id="search-accounts">
+    <form method="POST" action="${formUrls.list}" class="customForm" role="search accounts">
+        <input type="text" name="searchTerm" />
+        <input class="submit" type="submit" value="${strings.search_accounts_button}"/>
+        <!--
+            When searchTerm changes, 
+            set pageIndex to 1
+            set orderDirection to "ASC"
+            set orderField to "email" 
+            submit the form (submit action is "list") 
+        -->
+    </form>
+</section>
+<#if searchTerm?has_content>
+<section id="search-feedback">
+    <p>${strings.accounts_search_results} "<strong>${searchTerm}</strong>" | <span><a href="${formUrls.list}" title="${strings.view_all_accounts_title}">${strings.view_all_accounts}</a></span></p>
+</section>
+</#if>
+<form method="POST" action="${formUrls.list}" id="account-display" class="customForm" role="accounts display">
+    <@p.accountsNav />
+    
+    <table id="account">
+        <caption>${strings.account_management}</caption>
+
+        <thead>
+            <tr>
+               <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-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-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-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-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-desc" href="?accountsPerPage=${accountsPerPage}&orderField=count&orderDirection=DESC" title="${strings.descending_order}"></a>
+                    </nav>
+                </th>
+
+                <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-desc" href="?accountsPerPage=${accountsPerPage}&orderField=lastLogin&orderDirection=DESC" title="${strings.descending_order}"></a>
+                    </nav>
+                </th>
+            </tr>
+        </thead>
+    
+        <tbody>
+            <#list accounts as account>
+                <tr>
+                    <td>
+                        <#if account.deletable>
+                            <input type="checkbox" name="deleteAccount" value="${account.uri}" title="${strings.select_account_to_delete}"/>
+                            <#assign disableDeleteAccount = '' />
+                            <!-- ignored unless submit action is formUrls.delete -->
+                        <#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. -->
+                        <#else>
+                            ${account.emailAddress}
+                        </#if>
+                    </td>
+                    <td>${account.firstName}</td>
+                    <td>${account.lastName}</td>
+                    <td>${account.status}</td>
+                    <td>
+                        <#list account.permissionSets as permissionSet>
+                            <div>${permissionSet}</div>
+                        </#list>
+                    </td>
+                    <td>${account.loginCount}</td>
+                    <td>
+                        <#if account.lastLoginTime??>
+                            ${account.lastLoginTime?date?string.medium}
+                            <br />${account.lastLoginTime?time?string.short}
+                        </#if>
+                    </td>
+                </tr>
+            </#list>
+        </tbody>
+    </table>
+    
+    <@p.accountsNav />
+</form>
+
+<script type="text/javascript">
+    confirm_delete_account_singular = "${strings.confirm_delete_account_singular}"
+    confirm_delete_account_plural = "${strings.confirm_delete_account_plural}"
+</script>
+
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}
 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/account/accountUtils.js"></script>')}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
index 346269405..fa583d5ec 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
@@ -1,91 +1,91 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Template for editing a user account -->
-
-<#assign strings = i18n() />
-
-<h3>${strings.myAccount_heading}</h3>
-
-    <#if errorEmailIsEmpty??>
-        <#assign errorMessage = strings.error_no_email />
-    <#elseif errorEmailInUse??>
-        <#assign errorMessage = strings.error_email_already_exists />
-    <#elseif errorEmailInvalidFormat??>
-        <#assign errorMessage = strings.error_invalid_email(emailAddress) />
-    <#elseif errorFirstNameIsEmpty??>
-        <#assign errorMessage = strings.error_no_first_name />
-    <#elseif errorLastNameIsEmpty??>
-        <#assign errorMessage = strings.error_no_last_name />
-    <#elseif errorNoRoleSelected??>
-        <#assign errorMessage = strings.error_no_role />
-    <#elseif errorPasswordIsEmpty??>
-        <#assign errorMessage = strings.error_no_password />
-    <#elseif errorPasswordIsWrongLength??>
-        <#assign errorMessage = strings.error_password_length(minimumLength, maximumLength) />
-    <#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}" />
-            <p>${errorMessage}</p>
-        </section>
-    </#if>
-
-    <#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>
-        </section>
-    </#if>
-
-<section id="my-account" role="region">
-    <form id="main-form" method="POST" action="${formUrls.myAccount}" class="customForm" role="my account">
-        <#if showProxyPanel?? >
-            <#include "userAccounts-myProxiesPanel.ftl">
-        </#if>
-
-        <label for="email-address">${strings.email_address}<span class="requiredHint"> *</span></label>
-        <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> 
-        <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
-
-        <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??>
-            <label for="new-password">${strings.new_password}</label>
-            <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
-
-            <p class="note">${strings.minimum_password_length(minimumLength)}<br />${strings.leave_password_unchanged}</p>
-
-            <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} 
-            <a class="cancel" href="${urls.referringPage}" title="${strings.cancel_title}">${strings.cancel_link}</a>
-        </p>
-
-        <p class="requiredHint">* ${strings.required_fields}</p>
-    </form>
-</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" />')}
-
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>',
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for editing a user account -->
+
+<#assign strings = i18n() />
+
+<h3>${strings.myAccount_heading}</h3>
+
+    <#if errorEmailIsEmpty??>
+        <#assign errorMessage = strings.error_no_email />
+    <#elseif errorEmailInUse??>
+        <#assign errorMessage = strings.error_email_already_exists />
+    <#elseif errorEmailInvalidFormat??>
+        <#assign errorMessage = strings.error_invalid_email(emailAddress) />
+    <#elseif errorFirstNameIsEmpty??>
+        <#assign errorMessage = strings.error_no_first_name />
+    <#elseif errorLastNameIsEmpty??>
+        <#assign errorMessage = strings.error_no_last_name />
+    <#elseif errorNoRoleSelected??>
+        <#assign errorMessage = strings.error_no_role />
+    <#elseif errorPasswordIsEmpty??>
+        <#assign errorMessage = strings.error_no_password />
+    <#elseif errorPasswordIsWrongLength??>
+        <#assign errorMessage = strings.error_password_length(minimumLength, maximumLength) />
+    <#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}" />
+            <p>${errorMessage}</p>
+        </section>
+    </#if>
+
+    <#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>
+        </section>
+    </#if>
+
+<section id="my-account" role="region">
+    <form id="main-form" method="POST" action="${formUrls.myAccount}" class="customForm" role="my account">
+        <#if showProxyPanel?? >
+            <#include "userAccounts-myProxiesPanel.ftl">
+        </#if>
+
+        <label for="email-address">${strings.email_address}<span class="requiredHint"> *</span></label>
+        <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> 
+        <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
+
+        <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??>
+            <label for="new-password">${strings.new_password}</label>
+            <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
+
+            <p class="note">${strings.minimum_password_length(minimumLength)}<br />${strings.leave_password_unchanged}</p>
+
+            <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} 
+            <a class="cancel" href="${urls.referringPage}" title="${strings.cancel_title}">${strings.cancel_link}</a>
+        </p>
+
+        <p class="requiredHint">* ${strings.required_fields}</p>
+    </form>
+</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" />')}
+
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>',
               '<script type="text/javascript" src="${urls.base}/js/account/accountListenerSetup.js"></script>')}
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordCreatedEmail.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordCreatedEmail.ftl
index 1a4941549..60cc436d7 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordCreatedEmail.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordCreatedEmail.ftl
@@ -1,21 +1,21 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Confirmation that an password has been created. -->
-
-<#assign strings = i18n() />
-
-<#assign subject = strings.password_created_subject(siteName) />
-
-<#assign html = strings.password_created_email_html(siteName, 
-                                                   subject, 
-                                                   userAccount.firstName, 
-                                                   userAccount.lastName, 
-                                                   userAccount.emailAddress) />
-
-<#assign text = strings.password_created_email_text(siteName, 
-                                                   subject, 
-                                                   userAccount.firstName, 
-                                                   userAccount.lastName, 
-                                                   userAccount.emailAddress) />
-
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Confirmation that an password has been created. -->
+
+<#assign strings = i18n() />
+
+<#assign subject = strings.password_created_subject(siteName) />
+
+<#assign html = strings.password_created_email_html(siteName, 
+                                                   subject, 
+                                                   userAccount.firstName, 
+                                                   userAccount.lastName, 
+                                                   userAccount.emailAddress) />
+
+<#assign text = strings.password_created_email_text(siteName, 
+                                                   subject, 
+                                                   userAccount.firstName, 
+                                                   userAccount.lastName, 
+                                                   userAccount.emailAddress) />
+
 <@email subject=subject html=html text=text />
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetCompleteEmail.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetCompleteEmail.ftl
index 8badf9f3b..55af25bfa 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetCompleteEmail.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-passwordResetCompleteEmail.ftl
@@ -1,21 +1,21 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Confirmation that a password has been reset. -->
-
-<#assign strings = i18n() />
-
-<#assign subject = strings.password_reset_complete_subject(siteName) />
-
-<#assign html = strings.password_reset_complete_email_html(siteName, 
-                                                   subject, 
-                                                   userAccount.firstName, 
-                                                   userAccount.lastName, 
-                                                   userAccount.emailAddress) />
-
-<#assign text = strings.password_reset_complete_email_text(siteName, 
-                                                   subject, 
-                                                   userAccount.firstName, 
-                                                   userAccount.lastName, 
-                                                   userAccount.emailAddress) />
-
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Confirmation that a password has been reset. -->
+
+<#assign strings = i18n() />
+
+<#assign subject = strings.password_reset_complete_subject(siteName) />
+
+<#assign html = strings.password_reset_complete_email_html(siteName, 
+                                                   subject, 
+                                                   userAccount.firstName, 
+                                                   userAccount.lastName, 
+                                                   userAccount.emailAddress) />
+
+<#assign text = strings.password_reset_complete_email_text(siteName, 
+                                                   subject, 
+                                                   userAccount.firstName, 
+                                                   userAccount.lastName, 
+                                                   userAccount.emailAddress) />
+
 <@email subject=subject html=html text=text />
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl b/webapp/web/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl
index 80fb7cc18..3479016e4 100644
--- a/webapp/web/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl
+++ b/webapp/web/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl
@@ -1,46 +1,46 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Template for adding a user account -->
-
-<#assign strings = i18n() />
-
-<h3>${strings.reset_your_password}</h3>
-
-<p>${strings.enter_new_password(userAccount.emailAddress)}</p>
-
-<#if errorPasswordIsEmpty??>
-    <#assign errorMessage = strings.error_no_password />
-<#elseif errorPasswordIsWrongLength??>
-    <#assign errorMessage = strings.error_password_length(minimumLength, maximumLength) />
-<#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}"/>
-        <p>${errorMessage}</p>
-    </section>
-</#if>
-
-<section id="reset-password" role="region">
-    <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)}</p>
-
-        <label for="confirm-password">${strings.confirm_password}<span class="requiredHint"> *</span></label>
-        <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
-
-        <p><input type="submit" name="submit" value="${strings.save_changes}" class="submit"/></p>
-
-        <p class="requiredHint">* ${strings.required_fields}</p>
-    </form>
-</section>
-
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for adding a user account -->
+
+<#assign strings = i18n() />
+
+<h3>${strings.reset_your_password}</h3>
+
+<p>${strings.enter_new_password(userAccount.emailAddress)}</p>
+
+<#if errorPasswordIsEmpty??>
+    <#assign errorMessage = strings.error_no_password />
+<#elseif errorPasswordIsWrongLength??>
+    <#assign errorMessage = strings.error_password_length(minimumLength, maximumLength) />
+<#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}"/>
+        <p>${errorMessage}</p>
+    </section>
+</#if>
+
+<section id="reset-password" role="region">
+    <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)}</p>
+
+        <label for="confirm-password">${strings.confirm_password}<span class="requiredHint"> *</span></label>
+        <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
+
+        <p><input type="submit" name="submit" value="${strings.save_changes}" class="submit"/></p>
+
+        <p class="requiredHint">* ${strings.required_fields}</p>
+    </form>
+</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
diff --git a/webapp/web/templates/freemarker/body/admin/admin-showAuth.ftl b/webapp/web/templates/freemarker/body/admin/admin-showAuth.ftl
index 5a4b06714..e0d159e60 100644
--- a/webapp/web/templates/freemarker/body/admin/admin-showAuth.ftl
+++ b/webapp/web/templates/freemarker/body/admin/admin-showAuth.ftl
@@ -1,85 +1,85 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Template viewing the authorization mechanisms: current identifiers, factories, policies, etc. -->
-
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" />')}
-
-<h2>Authorization Info</h2>
-
-<section id="show-auth" role="region">
-    <h4>${i18n().current_user}</h4>
-    <table summary="Information about the current user">
-    <#if currentUser?has_content>
-            <tr><th>URI:</th><td>${currentUser.uri}</td></tr>
-            <tr><th>${i18n().first_name}:</th><td>${currentUser.firstName}</td></tr>
-            <tr><th>${i18n().last_name}:</th><td>${currentUser.lastName}</td></tr>
-            <tr><th>${i18n().email_address}:</th><td>${currentUser.emailAddress}</td></tr>
-            <tr><th>${i18n().external_auth_id}:</th><td>${currentUser.externalAuthId}</td></tr>
-            <tr><th>${i18n().login_count}:</th><td>${currentUser.loginCount}</td></tr>
-            <#list currentUser.permissionSetUris as role>
-                <tr><th>${i18n().user_role}:</th><td>${role}</td></tr>
-            </#list>
-    <#else>
-        <tr><th>${i18n().not_logged_in}</th></tr>
-    </#if>
-    </table>
-   
-    <h4>${i18n().identifiers}:</h4>
-    <table summary="Identifiers">
-        <#list identifiers as identifier>
-            <tr>
-                <td>${identifier}</td>
-            </tr>
-        </#list>
-    </table>
-
-    <h4>
-        ${i18n().associated_individuals}: 
-        <#if matchingProperty??>
-            (${i18n().match_by(matchingProperty)})
-        <#else>
-            (${i18n().matching_prop_not_defined})
-        </#if>
-    </h4>
-    <table summary="Associated Individuals">
-        <#if associatedIndividuals?has_content>
-            <#list associatedIndividuals as associatedIndividual>
-                <tr>
-                    <td>${associatedIndividual.uri}</td>
-                    <#if associatedIndividual.editable>
-                        <td>${i18n().may_edit}</td>
-                    <#else>
-                        <td>${i18n().may_not_edit}</td>
-                    </#if>
-                </tr>
-            </#list>
-        <#else>
-            <tr><td>${i18n().none}</td></tr>
-        </#if>
-    </table>
-
-    <h4>${i18n().identifier_factories}:</h4>
-    <table summary="Active Identifier Factories">
-        <#list factories as factory>
-            <tr>
-                <td>${factory}</td>
-            </tr>
-        </#list>
-    </table>
-
-    <h4>${i18n().policies}:</h4>
-    <table summary="Policies" width="100%">
-        <#list policies as policy>
-            <tr>
-                <td>${policy}</td>
-            </tr>
-        </#list>
-    </table>
-
-    <h4>${i18n().authenticator}:</h4>
-    <table summary="Authenticator" width="100%">
-        <tr>
-            <td>${authenticator}</td>
-        </tr>
-    </table>
-</section>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template viewing the authorization mechanisms: current identifiers, factories, policies, etc. -->
+
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/showAuth.css" />')}
+
+<h2>Authorization Info</h2>
+
+<section id="show-auth" role="region">
+    <h4>${i18n().current_user}</h4>
+    <table summary="Information about the current user">
+    <#if currentUser?has_content>
+            <tr><th>URI:</th><td>${currentUser.uri}</td></tr>
+            <tr><th>${i18n().first_name}:</th><td>${currentUser.firstName}</td></tr>
+            <tr><th>${i18n().last_name}:</th><td>${currentUser.lastName}</td></tr>
+            <tr><th>${i18n().email_address}:</th><td>${currentUser.emailAddress}</td></tr>
+            <tr><th>${i18n().external_auth_id}:</th><td>${currentUser.externalAuthId}</td></tr>
+            <tr><th>${i18n().login_count}:</th><td>${currentUser.loginCount}</td></tr>
+            <#list currentUser.permissionSetUris as role>
+                <tr><th>${i18n().user_role}:</th><td>${role}</td></tr>
+            </#list>
+    <#else>
+        <tr><th>${i18n().not_logged_in}</th></tr>
+    </#if>
+    </table>
+   
+    <h4>${i18n().identifiers}:</h4>
+    <table summary="Identifiers">
+        <#list identifiers as identifier>
+            <tr>
+                <td>${identifier}</td>
+            </tr>
+        </#list>
+    </table>
+
+    <h4>
+        ${i18n().associated_individuals}: 
+        <#if matchingProperty??>
+            (${i18n().match_by(matchingProperty)})
+        <#else>
+            (${i18n().matching_prop_not_defined})
+        </#if>
+    </h4>
+    <table summary="Associated Individuals">
+        <#if associatedIndividuals?has_content>
+            <#list associatedIndividuals as associatedIndividual>
+                <tr>
+                    <td>${associatedIndividual.uri}</td>
+                    <#if associatedIndividual.editable>
+                        <td>${i18n().may_edit}</td>
+                    <#else>
+                        <td>${i18n().may_not_edit}</td>
+                    </#if>
+                </tr>
+            </#list>
+        <#else>
+            <tr><td>${i18n().none}</td></tr>
+        </#if>
+    </table>
+
+    <h4>${i18n().identifier_factories}:</h4>
+    <table summary="Active Identifier Factories">
+        <#list factories as factory>
+            <tr>
+                <td>${factory}</td>
+            </tr>
+        </#list>
+    </table>
+
+    <h4>${i18n().policies}:</h4>
+    <table summary="Policies" width="100%">
+        <#list policies as policy>
+            <tr>
+                <td>${policy}</td>
+            </tr>
+        </#list>
+    </table>
+
+    <h4>${i18n().authenticator}:</h4>
+    <table summary="Authenticator" width="100%">
+        <tr>
+            <td>${authenticator}</td>
+        </tr>
+    </table>
+</section>
diff --git a/webapp/web/templates/freemarker/body/admin/admin-showThreads.ftl b/webapp/web/templates/freemarker/body/admin/admin-showThreads.ftl
index d9b5d8e38..70043a9d5 100644
--- a/webapp/web/templates/freemarker/body/admin/admin-showThreads.ftl
+++ b/webapp/web/templates/freemarker/body/admin/admin-showThreads.ftl
@@ -1,31 +1,31 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Template viewing the authorization mechanisms: current identifiers, factories, policies, etc. -->
-
-<style media="screen" type="text/css">
-table.threadInfo {
-    margin: 10px 10px 10px 10px;
-    border: medium groove black;
-    text-align: left;
-}
-table.threadInfo th, td {
-    padding: 4px 10px 4px 10px;
-}
-table.threadInfo th {
-    font-weight: bolder;
-}
-</style>
-
-
-<h2>${i18n().background_threads}</h2>
-
-<section id="show-threads" role="region">
-    <#list threads as threadInfo>
-        <table class="threadInfo ${threadInfo.workLevel}" summary="Thread ${threadInfo.name}">
-            <tr><th>${i18n().name}</th><td>${threadInfo.name}</td></tr>
-            <tr><th>${i18n().work_level}</th><td>${threadInfo.workLevel}</td></tr>
-            <tr><th>${i18n().since}</th><td>${threadInfo.since}</td></tr>
-            <tr><th>${i18n().flags}</th><td>${threadInfo.flags}</td></tr>
-        </table>
-    </#list>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template viewing the authorization mechanisms: current identifiers, factories, policies, etc. -->
+
+<style media="screen" type="text/css">
+table.threadInfo {
+    margin: 10px 10px 10px 10px;
+    border: medium groove black;
+    text-align: left;
+}
+table.threadInfo th, td {
+    padding: 4px 10px 4px 10px;
+}
+table.threadInfo th {
+    font-weight: bolder;
+}
+</style>
+
+
+<h2>${i18n().background_threads}</h2>
+
+<section id="show-threads" role="region">
+    <#list threads as threadInfo>
+        <table class="threadInfo ${threadInfo.workLevel}" summary="Thread ${threadInfo.name}">
+            <tr><th>${i18n().name}</th><td>${threadInfo.name}</td></tr>
+            <tr><th>${i18n().work_level}</th><td>${threadInfo.workLevel}</td></tr>
+            <tr><th>${i18n().since}</th><td>${threadInfo.since}</td></tr>
+            <tr><th>${i18n().flags}</th><td>${threadInfo.flags}</td></tr>
+        </table>
+    </#list>
 </section>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/admin/startupStatus-display.ftl b/webapp/web/templates/freemarker/body/admin/startupStatus-display.ftl
index 1d8288d33..6f8d97897 100644
--- a/webapp/web/templates/freemarker/body/admin/startupStatus-display.ftl
+++ b/webapp/web/templates/freemarker/body/admin/startupStatus-display.ftl
@@ -1,68 +1,68 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- 
-    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.
--->
-
-<#macro statusItem item>
-    <#if item.level = "FATAL">
-        <#assign color = "error" >
-    <#elseif item.level = "WARNING">
-        <#assign color = "warning" >
-    <#elseif item.level = "INFO">
-        <#assign color = "info" >
-    <#elseif item.level = "NOT_EXECUTED">
-        <#assign color = "not_executed" >
-    <#else>
-        <#assign color = "" >
-    </#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>
-            <#if item.cause?has_content>
-            <li role="listitem"><pre>${item.cause}</pre></li>
-            </#if>
-        </ul>
-    </li>
-</#macro>
-
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/startupStatus.css" />')}
-
-<#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 />
-    </#list>
-    </ul>
-</#if>
-
-<#if status.warningItems?has_content>
-    <h2>${i18n().warning}</h2>
-    
-    <p>${i18n().warning_issued(applicationName)}</p>
-    
-    <ul id="startup-trace" cellspacing="0" class="trace" role="navigation"><#list status.warningItems as item>
-      <@statusItem item=item />
-    </#list>
-    </ul>
-</#if>
-
-<h2>${i18n().startup_trace}</h2>
-
-<p>${i18n().full_list_startup}</p>
-
-<ul id="startup-trace" cellspacing="0" class="trace" role="navigation">
-      <#list status.statusItems as item>
-          <@statusItem item=item />
-      </#list>
-</ul>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- 
+    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.
+-->
+
+<#macro statusItem item>
+    <#if item.level = "FATAL">
+        <#assign color = "error" >
+    <#elseif item.level = "WARNING">
+        <#assign color = "warning" >
+    <#elseif item.level = "INFO">
+        <#assign color = "info" >
+    <#elseif item.level = "NOT_EXECUTED">
+        <#assign color = "not_executed" >
+    <#else>
+        <#assign color = "" >
+    </#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>
+            <#if item.cause?has_content>
+            <li role="listitem"><pre>${item.cause}</pre></li>
+            </#if>
+        </ul>
+    </li>
+</#macro>
+
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/startupStatus.css" />')}
+
+<#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 />
+    </#list>
+    </ul>
+</#if>
+
+<#if status.warningItems?has_content>
+    <h2>${i18n().warning}</h2>
+    
+    <p>${i18n().warning_issued(applicationName)}</p>
+    
+    <ul id="startup-trace" cellspacing="0" class="trace" role="navigation"><#list status.warningItems as item>
+      <@statusItem item=item />
+    </#list>
+    </ul>
+</#if>
+
+<h2>${i18n().startup_trace}</h2>
+
+<p>${i18n().full_list_startup}</p>
+
+<ul id="startup-trace" cellspacing="0" class="trace" role="navigation">
+      <#list status.statusItems as item>
+          <@statusItem item=item />
+      </#list>
+</ul>
diff --git a/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl b/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl
index ce638c1fb..731f6a0df 100644
--- a/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl
+++ b/webapp/web/templates/freemarker/body/admin/startupStatus-displayRaw.ftl
@@ -1,118 +1,118 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#--
-    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.
--->
-
-<#macro statusItem item>
-    <#if item.level = "FATAL">
-        <#assign color = "error" >
-    <#elseif item.level = "WARNING">
-        <#assign color = "warning" >
-    <#elseif item.level = "INFO">
-        <#assign color = "info" >
-    <#elseif item.level = "NOT_EXECUTED">
-        <#assign color = "not_executed" >
-    <#else>
-        <#assign color = "" >
-    </#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>
-            <#if item.cause?has_content>
-            <li role="listitem"><pre>${item.cause}</pre></li>
-            </#if>
-        </ul>
-    </li>
-</#macro>
-
-<!DOCTYPE html>
-
-<html lang="en">
-    <head>
-        <title>Startup Status</title>
-        
-        <style TYPE="text/css">
-           #startup-trace {
-               width: 100%;
-           }
-           #startup-trace h4 {
-               padding: .5em;
-               margin-bottom: 0;
-               padding-bottom: .5em;
-               padding-top: 1em;
-           }
-           #startup-trace ul.item-spec {
-               margin-bottom: 1em;
-           }
-           #startup-trace ul.item-spec li{
-               padding-left: .5em;
-               padding-bottom: .4em;
-           }
-           #startup-trace li.error {
-               background-color: #FFDDDD;
-           }
-           #startup-trace li.warning{
-               background-color: #FFFFDD;
-           }
-           #startup-trace li.info {
-               background-color: #DDFFDD;
-           }
-           #startup-trace li.not_executed {
-               background-color: #F3F3F0;
-           }
-           
-        </style>
-    </head>
-
-    <body>
-        <#if status.errorItems?has_content>
-            <h2>Fatal error</h2>
-
-            <p>${applicationName} detected a fatal error during startup.</p>
-
-            <ul id="startup-trace" cellspacing="0" class="trace" role="navigation">
-            <#list status.errorItems as item>
-              <@statusItem item=item />
-            </#list>
-            </ul>
-        </#if>
-
-        <#if status.warningItems?has_content>
-            <h2>Warning</h2>
-
-            <p>${applicationName} issued warnings during startup.</p>
-
-            <ul id="startup-trace" cellspacing="0" class="trace" role="navigation"><#list status.warningItems as item>
-              <@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>
-
-        <p>The full list of startup events and messages.</p>
-
-        <ul id="startup-trace" cellspacing="0" class="trace" role="navigation">
-              <#list status.statusItems as item>
-                  <@statusItem item=item />
-              </#list>
-        </ul>
-    </body>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#--
+    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.
+-->
+
+<#macro statusItem item>
+    <#if item.level = "FATAL">
+        <#assign color = "error" >
+    <#elseif item.level = "WARNING">
+        <#assign color = "warning" >
+    <#elseif item.level = "INFO">
+        <#assign color = "info" >
+    <#elseif item.level = "NOT_EXECUTED">
+        <#assign color = "not_executed" >
+    <#else>
+        <#assign color = "" >
+    </#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>
+            <#if item.cause?has_content>
+            <li role="listitem"><pre>${item.cause}</pre></li>
+            </#if>
+        </ul>
+    </li>
+</#macro>
+
+<!DOCTYPE html>
+
+<html lang="en">
+    <head>
+        <title>Startup Status</title>
+        
+        <style TYPE="text/css">
+           #startup-trace {
+               width: 100%;
+           }
+           #startup-trace h4 {
+               padding: .5em;
+               margin-bottom: 0;
+               padding-bottom: .5em;
+               padding-top: 1em;
+           }
+           #startup-trace ul.item-spec {
+               margin-bottom: 1em;
+           }
+           #startup-trace ul.item-spec li{
+               padding-left: .5em;
+               padding-bottom: .4em;
+           }
+           #startup-trace li.error {
+               background-color: #FFDDDD;
+           }
+           #startup-trace li.warning{
+               background-color: #FFFFDD;
+           }
+           #startup-trace li.info {
+               background-color: #DDFFDD;
+           }
+           #startup-trace li.not_executed {
+               background-color: #F3F3F0;
+           }
+           
+        </style>
+    </head>
+
+    <body>
+        <#if status.errorItems?has_content>
+            <h2>Fatal error</h2>
+
+            <p>${applicationName} detected a fatal error during startup.</p>
+
+            <ul id="startup-trace" cellspacing="0" class="trace" role="navigation">
+            <#list status.errorItems as item>
+              <@statusItem item=item />
+            </#list>
+            </ul>
+        </#if>
+
+        <#if status.warningItems?has_content>
+            <h2>Warning</h2>
+
+            <p>${applicationName} issued warnings during startup.</p>
+
+            <ul id="startup-trace" cellspacing="0" class="trace" role="navigation"><#list status.warningItems as item>
+              <@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>
+
+        <p>The full list of startup events and messages.</p>
+
+        <ul id="startup-trace" cellspacing="0" class="trace" role="navigation">
+              <#list status.statusItems as item>
+                  <@statusItem item=item />
+              </#list>
+        </ul>
+    </body>
 </html>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl
index bd8d7b5b0..6d9f7ec10 100644
--- a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl
+++ b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-cropImage.ftl
@@ -1,60 +1,60 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Crop the replacement main image for an Individual, to produce a thumbnail. -->
-
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jcrop/jquery.Jcrop.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/imageUpload/cropImage.js"></script>')}
-
-${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 
-	the height will be in proportion to the new height-->
-
-<#--<#macro newImageSize>
-<#if (imageWidth >= 500)>
-		width="500" height="${(500*imageHeight)/imageWidth}" 
-</#if>	   
-</#macro>-->
-
-
-<#assign i18n = i18n() >
-
-<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
-</section>
-
-<div class="clear"></div>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Crop the replacement main image for an Individual, to produce a thumbnail. -->
+
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jcrop/jquery.Jcrop.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/imageUpload/cropImage.js"></script>')}
+
+${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 
+	the height will be in proportion to the new height-->
+
+<#--<#macro newImageSize>
+<#if (imageWidth >= 500)>
+		width="500" height="${(500*imageHeight)/imageWidth}" 
+</#if>	   
+</#macro>-->
+
+
+<#assign i18n = i18n() >
+
+<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
+</section>
+
+<div class="clear"></div>
diff --git a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
index cf9a6b204..970eca691 100644
--- a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
+++ b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
@@ -1,41 +1,41 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Upload a replacement main image for an Individual. -->
-
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}
-
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/uploadImages.css" />')}
-
-<#assign i18n = i18n() >
-
-<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>
-        </section>
-    </#if>
-
-    <section id="photoUploadDefaultImage" role="region">
-        <h3>${i18n.current_photo}</h3>
-        
-        <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>
-
-<script type="text/javascript">
-    i18n_confirmDelete = ${i18n.confirm_delete}
-</script>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Upload a replacement main image for an Individual. -->
+
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}
+
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/uploadImages.css" />')}
+
+<#assign i18n = i18n() >
+
+<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>
+        </section>
+    </#if>
+
+    <section id="photoUploadDefaultImage" role="region">
+        <h3>${i18n.current_photo}</h3>
+        
+        <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>
+
+<script type="text/javascript">
+    i18n_confirmDelete = ${i18n.confirm_delete}
+</script>
diff --git a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
index cc5a9b7bd..d4adf239e 100644
--- a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
+++ b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
@@ -1,42 +1,42 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Upload a replacement main image for an Individual. -->
-
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery.js"></script>',
-              '<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}
-
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/uploadImages.css" />')}
-
-<#assign i18n = i18n() >
-
-<section id="photoUpload" 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>
-        </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>
-
-    <form id="photoUploadForm" action="${formAction}" enctype="multipart/form-data" method="post" role="form">
-        <label>${i18n.replace_photo} <span>${i18n.photo_types}</span></label>
-
-        <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}"> 
-
-        <span class="or"> ${i18n.or} <a class="cancel"  href="${cancelUrl}" title="${i18n.cancel_title}">${i18n.cancel_link}</a></span>
-     </form>
-</section>
-
-<script type="text/javascript">
-    i18n_confirmDelete = "${i18n.confirm_delete}"
-</script>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Upload a replacement main image for an Individual. -->
+
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery.js"></script>',
+              '<script type="text/javascript" src="${urls.base}/js/imageUpload/imageUploadUtils.js"></script>')}
+
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/uploadImages.css" />')}
+
+<#assign i18n = i18n() >
+
+<section id="photoUpload" 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>
+        </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>
+
+    <form id="photoUploadForm" action="${formAction}" enctype="multipart/form-data" method="post" role="form">
+        <label>${i18n.replace_photo} <span>${i18n.photo_types}</span></label>
+
+        <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}"> 
+
+        <span class="or"> ${i18n.or} <a class="cancel"  href="${cancelUrl}" title="${i18n.cancel_title}">${i18n.cancel_link}</a></span>
+     </form>
+</section>
+
+<script type="text/javascript">
+    i18n_confirmDelete = "${i18n.confirm_delete}"
+</script>
diff --git a/webapp/web/templates/freemarker/body/login/adminLogin.ftl b/webapp/web/templates/freemarker/body/login/adminLogin.ftl
index 152b827ee..120f3b6fb 100644
--- a/webapp/web/templates/freemarker/body/login/adminLogin.ftl
+++ b/webapp/web/templates/freemarker/body/login/adminLogin.ftl
@@ -1,71 +1,71 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Template for login using internal vitro account (even when external auth is enabled). Accessible at /admin/login -->
-
-<section id="internalLogin" role="region">
-    <h2>${i18n().internal_login}</h2>
-
-    <#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>
-        <p>${i18n().change_password}</p>
-    </#if>
-
-	<form method="post" action="${controllerUrl}">
-        <#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>
-            <label for="email">${i18n().email_capitalized}</label>
-            <input id="email" name="email" class="text-field focus" type="text" value="${email!}" required autofocus />
-
-        	<label for="password">${i18n().password_capitalized}</label>
-            <input id="password" name="password" class="text-field" type="password" required />
-        </#if>
-
-		<p class="submit"><input name="loginForm" type="submit" class="green button" value="${i18n().login_button}"/></p>
-	</form>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for login using internal vitro account (even when external auth is enabled). Accessible at /admin/login -->
+
+<section id="internalLogin" role="region">
+    <h2>${i18n().internal_login}</h2>
+
+    <#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>
+        <p>${i18n().change_password}</p>
+    </#if>
+
+	<form method="post" action="${controllerUrl}">
+        <#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>
+            <label for="email">${i18n().email_capitalized}</label>
+            <input id="email" name="email" class="text-field focus" type="text" value="${email!}" required autofocus />
+
+        	<label for="password">${i18n().password_capitalized}</label>
+            <input id="password" name="password" class="text-field" type="password" required />
+        </#if>
+
+		<p class="submit"><input name="loginForm" type="submit" class="green button" value="${i18n().login_button}"/></p>
+	</form>
 </section>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/login/fakeExternalAuth.ftl b/webapp/web/templates/freemarker/body/login/fakeExternalAuth.ftl
index f1576b906..816475ce5 100644
--- a/webapp/web/templates/freemarker/body/login/fakeExternalAuth.ftl
+++ b/webapp/web/templates/freemarker/body/login/fakeExternalAuth.ftl
@@ -1,19 +1,19 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Template for the Fake External Authentication page. -->
-
-<section role="region">
-    <h2>${i18n().fake_external_auth}</h2>
-    
-    <p>
-      ${i18n().enter_id_to_login}
-    </p>
-
-		<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}" /> 
-		</form>
-    <br/>
-</section>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for the Fake External Authentication page. -->
+
+<section role="region">
+    <h2>${i18n().fake_external_auth}</h2>
+    
+    <p>
+      ${i18n().enter_id_to_login}
+    </p>
+
+		<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}" /> 
+		</form>
+    <br/>
+</section>
diff --git a/webapp/web/templates/freemarker/body/menupage/menupage--defaultFixedHtml.ftl b/webapp/web/templates/freemarker/body/menupage/menupage--defaultFixedHtml.ftl
index ea783a5ad..edab7e3da 100644
--- a/webapp/web/templates/freemarker/body/menupage/menupage--defaultFixedHtml.ftl
+++ b/webapp/web/templates/freemarker/body/menupage/menupage--defaultFixedHtml.ftl
@@ -1,15 +1,15 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#--Save to variable indicated in generator -->
-
-<#assign htmlExists = false/>
-<#if variableName?has_content>
-	<#assign htmlExists = true />
-</#if>
-<#if htmlExists>
-	${.globals[variableName]}
-<#else>
-	${i18n().no_html_specified}  
-</#if>
-
-
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#--Save to variable indicated in generator -->
+
+<#assign htmlExists = false/>
+<#if variableName?has_content>
+	<#assign htmlExists = true />
+</#if>
+<#if htmlExists>
+	${.globals[variableName]}
+<#else>
+	${i18n().no_html_specified}  
+</#if>
+
+
diff --git a/webapp/web/templates/freemarker/body/menupage/menupage--defaultSolrIndividuals.ftl b/webapp/web/templates/freemarker/body/menupage/menupage--defaultSolrIndividuals.ftl
index 9e73c2446..554e78203 100644
--- a/webapp/web/templates/freemarker/body/menupage/menupage--defaultSolrIndividuals.ftl
+++ b/webapp/web/templates/freemarker/body/menupage/menupage--defaultSolrIndividuals.ftl
@@ -1,53 +1,53 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- List individuals in the requested class. -->
-
-<#import "lib-list.ftl" as l>
-
-<#include "individualList-checkForData.ftl">
-
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css" />')}
-
-<section class="individualList">
-    <h2>${title} 
-    </h2>
-    <#if subtitle?has_content>
-        <h4>${subtitle}</h4>
-    </#if>
-    
-    <#if (!noData)>
-        <#if errorMessage?has_content>
-            <p>${errorMessage}</p>
-        <#else>
-            <#assign pagination>
-                <#if (pages?has_content && pages?size > 1)>
-                    ${i18n().pages}:
-                    <ul class="pagination">
-                        <#list pages as page>
-                            <#if page.selected>
-                                <li class="selectedNavPage">${page.text}</li>
-                            <#else>
-                                <#-- RY Ideally the urls would be generated by the controller; see search-pagedResults.ftl -->
-                                <li><a href="${urls.base}/individuallist?${page.param}&vclassId=${vclassId?url}" title="${i18n().page_text}">${page.text}</a></li>
-                            </#if>
-                        </#list>
-                    </ul>
-                </#if>
-            </#assign>
-            
-            ${pagination}
-            
-            <ul>
-                <#list individuals as individual>
-                    <li>       
-                        <@shortView uri=individual.uri viewContext="index" />
-                    </li>
-                </#list>
-            </ul>
-            
-            ${pagination}
-        </#if>
-    <#else>
-        ${noDataNotification}
-    </#if>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- List individuals in the requested class. -->
+
+<#import "lib-list.ftl" as l>
+
+<#include "individualList-checkForData.ftl">
+
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css" />')}
+
+<section class="individualList">
+    <h2>${title} 
+    </h2>
+    <#if subtitle?has_content>
+        <h4>${subtitle}</h4>
+    </#if>
+    
+    <#if (!noData)>
+        <#if errorMessage?has_content>
+            <p>${errorMessage}</p>
+        <#else>
+            <#assign pagination>
+                <#if (pages?has_content && pages?size > 1)>
+                    ${i18n().pages}:
+                    <ul class="pagination">
+                        <#list pages as page>
+                            <#if page.selected>
+                                <li class="selectedNavPage">${page.text}</li>
+                            <#else>
+                                <#-- RY Ideally the urls would be generated by the controller; see search-pagedResults.ftl -->
+                                <li><a href="${urls.base}/individuallist?${page.param}&vclassId=${vclassId?url}" title="${i18n().page_text}">${page.text}</a></li>
+                            </#if>
+                        </#list>
+                    </ul>
+                </#if>
+            </#assign>
+            
+            ${pagination}
+            
+            <ul>
+                <#list individuals as individual>
+                    <li>       
+                        <@shortView uri=individual.uri viewContext="index" />
+                    </li>
+                </#list>
+            </ul>
+            
+            ${pagination}
+        </#if>
+    <#else>
+        ${noDataNotification}
+    </#if>
 </section> <!-- .individualList -->
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/menupage/menupage--defaultSparql.ftl b/webapp/web/templates/freemarker/body/menupage/menupage--defaultSparql.ftl
index 2d9acfce3..bd9223dfc 100644
--- a/webapp/web/templates/freemarker/body/menupage/menupage--defaultSparql.ftl
+++ b/webapp/web/templates/freemarker/body/menupage/menupage--defaultSparql.ftl
@@ -1,38 +1,38 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#--Save to variable is sparqlResults -->
-<#assign resultsExist = false/>
-<#if variableName?has_content>
-	<#assign resultsExist = true/>
-	<#--This will retrieve the results stored in the variable name being returned from the sparql query.
-	For example, if "results" was specified as the variable storing the sparql results, the value
-	of "results" will not be assigned to "sparqlResults" below. -->
-	<#assign sparqlResults = .globals[variableName]/>
-</#if>
-
-<h3>${i18n().sparql_query_results}</h3>
-<#if resultsExist>
-	<#assign numberRows = sparqlResults?size/>
-	<#assign firstRow = false/>
-	<#list sparqlResults as resultRow>
-		<#assign resultKeys = resultRow?keys />
-		<#if firstRow = false>
-			<div class="resultHeading resultRow">
-			<#list resultKeys as resultKey>
-					<div class="resultCell">${resultKey}</div>
-			</#list>	
-			</div>
-			<#assign firstRow = true/>
-		</#if>
-		<div class="resultRow">
-			<#list resultKeys as resultKey>
-				<div class="resultCell">${resultRow[resultKey]}</div>
-			</#list>
-		</div>
-	</#list>
-<#else>
-	${i18n().no_results_returned} 
-</#if>
-
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/menupage/sparqlresults.css" />')}
-
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#--Save to variable is sparqlResults -->
+<#assign resultsExist = false/>
+<#if variableName?has_content>
+	<#assign resultsExist = true/>
+	<#--This will retrieve the results stored in the variable name being returned from the sparql query.
+	For example, if "results" was specified as the variable storing the sparql results, the value
+	of "results" will not be assigned to "sparqlResults" below. -->
+	<#assign sparqlResults = .globals[variableName]/>
+</#if>
+
+<h3>${i18n().sparql_query_results}</h3>
+<#if resultsExist>
+	<#assign numberRows = sparqlResults?size/>
+	<#assign firstRow = false/>
+	<#list sparqlResults as resultRow>
+		<#assign resultKeys = resultRow?keys />
+		<#if firstRow = false>
+			<div class="resultHeading resultRow">
+			<#list resultKeys as resultKey>
+					<div class="resultCell">${resultKey}</div>
+			</#list>	
+			</div>
+			<#assign firstRow = true/>
+		</#if>
+		<div class="resultRow">
+			<#list resultKeys as resultKey>
+				<div class="resultCell">${resultRow[resultKey]}</div>
+			</#list>
+		</div>
+	</#list>
+<#else>
+	${i18n().no_results_returned} 
+</#if>
+
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/menupage/sparqlresults.css" />')}
+
diff --git a/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl b/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl
index 426a175e5..9e49075bd 100644
--- a/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl
+++ b/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl
@@ -1,89 +1,89 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<section id="pageList">
-    <div class="tab">
-        <h2>${i18n().page_management}</h2>
-    </div>
-
-
-<#if pages?has_content >  
-<table id="pageList" style="margin-bottom:2px">  <caption>${i18n().page_management}</caption>
-  
-    <thead>
-      <tr>
-        <th scope="col">${i18n().title_capitalized}</th>
-        <!--th scope="col">${i18n().type_capitalized}</th-->
-        <th scope="col">URL</th>
-        <th scope="col">${i18n().custom_template}</th>
-        <th id="isMenuPage" scope="col" >${i18n().menu_page}</th>
-        <th id="iconColumns" scope="col">${i18n().controls}</th>
-      </tr>
-    </thead>
-    
-    <tbody>
-    <#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} 
-            	</#if>
-            </td>                  
-            <!--td> {pagex.dataGetterLabel}</td-->
-            <td>${pagex.listedPageUrlMapping}</td>
-            <td>${(pagex.listedPageTemplate)!''}</td>
-            <td style="text-align:center">
-            <#if pagex.listedPageMenuItem?has_content>
-            	<div class="menuFlag"></div>
-            </#if>
-            </td>
-            <td>
-                <a href="${urls.base}/editRequestDispatch?subjectUri=${pagex.listedPageUri?url}&switchToDisplayModel=1&editForm=edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator" title=""><img src="${urls.images!}/individual/editIcon.gif" alt="${i18n().edit_page}"></a>
-                &nbsp;&nbsp;
-                <a href="${urls.base}/individual?uri=${pagex.listedPageUri?url}&switchToDisplayModel=1" title="${i18n().view_profile_for_page}"><img src="${urls.images!}/profile-page-icon.png" alt="${i18n().view_profile_for_page}"></a>
-                &nbsp;&nbsp;
-                <#if !pagex.listedPageCannotDeletePage?has_content >
-                    <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> 
-  </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="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" >
-  </form>
-  <br />
- <p style="margin-top:10px">${i18n().use_capitalized} <a id="menuMgmtLink" href="${urls.base}/individual?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fontologies%2Fdisplay%2F1.1%23DefaultMenu&switchToDisplayModel=true&previous=pageManagement" title="">${i18n().menu_orering}</a> ${i18n().to_order_menu_items}</p>
-</section>
-
-<script>
-    var i18nStrings = {
-        confirmPageDeletion: '${i18n().confirm_page_deletion}'
-    };
-</script>
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" />',
-				'<link rel="stylesheet" href="${urls.base}/css/menupage/pageList.css" />')}
-
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>')}
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>')}
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>')}
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/pageDeletion.js"></script>')}
-
-
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<section id="pageList">
+    <div class="tab">
+        <h2>${i18n().page_management}</h2>
+    </div>
+
+
+<#if pages?has_content >  
+<table id="pageList" style="margin-bottom:2px">  <caption>${i18n().page_management}</caption>
+  
+    <thead>
+      <tr>
+        <th scope="col">${i18n().title_capitalized}</th>
+        <!--th scope="col">${i18n().type_capitalized}</th-->
+        <th scope="col">URL</th>
+        <th scope="col">${i18n().custom_template}</th>
+        <th id="isMenuPage" scope="col" >${i18n().menu_page}</th>
+        <th id="iconColumns" scope="col">${i18n().controls}</th>
+      </tr>
+    </thead>
+    
+    <tbody>
+    <#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} 
+            	</#if>
+            </td>                  
+            <!--td> {pagex.dataGetterLabel}</td-->
+            <td>${pagex.listedPageUrlMapping}</td>
+            <td>${(pagex.listedPageTemplate)!''}</td>
+            <td style="text-align:center">
+            <#if pagex.listedPageMenuItem?has_content>
+            	<div class="menuFlag"></div>
+            </#if>
+            </td>
+            <td>
+                <a href="${urls.base}/editRequestDispatch?subjectUri=${pagex.listedPageUri?url}&switchToDisplayModel=1&editForm=edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator" title=""><img src="${urls.images!}/individual/editIcon.gif" alt="${i18n().edit_page}"></a>
+                &nbsp;&nbsp;
+                <a href="${urls.base}/individual?uri=${pagex.listedPageUri?url}&switchToDisplayModel=1" title="${i18n().view_profile_for_page}"><img src="${urls.images!}/profile-page-icon.png" alt="${i18n().view_profile_for_page}"></a>
+                &nbsp;&nbsp;
+                <#if !pagex.listedPageCannotDeletePage?has_content >
+                    <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> 
+  </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="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" >
+  </form>
+  <br />
+ <p style="margin-top:10px">${i18n().use_capitalized} <a id="menuMgmtLink" href="${urls.base}/individual?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fontologies%2Fdisplay%2F1.1%23DefaultMenu&switchToDisplayModel=true&previous=pageManagement" title="">${i18n().menu_orering}</a> ${i18n().to_order_menu_items}</p>
+</section>
+
+<script>
+    var i18nStrings = {
+        confirmPageDeletion: '${i18n().confirm_page_deletion}'
+    };
+</script>
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" />',
+				'<link rel="stylesheet" href="${urls.base}/css/menupage/pageList.css" />')}
+
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js"></script>')}
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/customFormUtils.js"></script>')}
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>')}
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/pageDeletion.js"></script>')}
+
+
diff --git a/webapp/web/templates/freemarker/body/revisionInfo.ftl b/webapp/web/templates/freemarker/body/revisionInfo.ftl
index ee7a72bd9..0b3881dbc 100644
--- a/webapp/web/templates/freemarker/body/revisionInfo.ftl
+++ b/webapp/web/templates/freemarker/body/revisionInfo.ftl
@@ -1,35 +1,35 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Template for the Revision Information page. -->
-
-${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>
-                <th>${i18n().revision}</th>
-            </tr>
-            <#list revisionInfoBean.levelInfos as level>
-                <tr>
-                    <td>${level.name}</td>
-                    <td>${level.release}</td>
-                    <td>${level.revision}</td>
-                </tr>
-            </#list>
-        </table>
-    </section>
-    
-    <section id="revision-build-date" role="region">
-        <h3>${i18n().build_date}:</h3>
-    
-        <p>${revisionInfoBean.buildDate?datetime?string.full}</p>
-    </section>
-</section>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for the Revision Information page. -->
+
+${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>
+                <th>${i18n().revision}</th>
+            </tr>
+            <#list revisionInfoBean.levelInfos as level>
+                <tr>
+                    <td>${level.name}</td>
+                    <td>${level.release}</td>
+                    <td>${level.revision}</td>
+                </tr>
+            </#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/web/templates/freemarker/body/unrecognizedUser.ftl b/webapp/web/templates/freemarker/body/unrecognizedUser.ftl
index 398df7e74..8ad90a277 100644
--- a/webapp/web/templates/freemarker/body/unrecognizedUser.ftl
+++ b/webapp/web/templates/freemarker/body/unrecognizedUser.ftl
@@ -1,14 +1,14 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Template for the Unrecognized User page. -->
-
-<section role="region">
-    <h2>${i18n().unrecognized_user}</h2>
-    
-    <p>
-      ${i18n().no_individual_associated_with_id}
-    </p>
-
-    <br/>
-    <a href="${urls.home}" title="${i18n().continue}">${i18n().continue}</a>
-</section>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for the Unrecognized User page. -->
+
+<section role="region">
+    <h2>${i18n().unrecognized_user}</h2>
+    
+    <p>
+      ${i18n().no_individual_associated_with_id}
+    </p>
+
+    <br/>
+    <a href="${urls.home}" title="${i18n().continue}">${i18n().continue}</a>
+</section>
diff --git a/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
index 263c73053..dbb6ef811 100644
--- a/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
@@ -1,51 +1,51 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#assign toBeDeletedClass = "dataProp" />
-
-<#if editConfiguration.objectProperty = true>
-    <#assign toBeDeletedClass = "objProp" />
-    <#if editConfiguration.objectStatementDisplay?has_content>
-    	<#assign statement = editConfiguration.objectStatementDisplay />
-    	<#--Reviewer and editor role list views required object property template model object for property-->
-    	<#assign property = editConfiguration.objectPropertyStatementDisplayPropertyModel />
-    </#if>
-<#else>
-	<#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}  
-        </#if>
-    </p>
-    
-    <input type="hidden" name="subjectUri"   value="${editConfiguration.subjectUri}" role="input" />
-    <input type="hidden" name="predicateUri" value="${editConfiguration.predicateUri}" role="input" />
-    
-    <#if editConfiguration.dataProperty = true>
-        <input type="hidden" name="datapropKey" value="${editConfiguration.datapropKey}" role="input" />
-        <input type="hidden" name="vitroNsProp" value="${editConfiguration.vitroNsProperty}" role="input" />
-    <#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 
-        <a class="cancel" title="${i18n().cancel_title}" href="${editConfiguration.cancelUrl}">${i18n().cancel_link}</a>
-    <#if editConfiguration.objectProperty = true>
-    </p>
-    </#if>
-</form>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#assign toBeDeletedClass = "dataProp" />
+
+<#if editConfiguration.objectProperty = true>
+    <#assign toBeDeletedClass = "objProp" />
+    <#if editConfiguration.objectStatementDisplay?has_content>
+    	<#assign statement = editConfiguration.objectStatementDisplay />
+    	<#--Reviewer and editor role list views required object property template model object for property-->
+    	<#assign property = editConfiguration.objectPropertyStatementDisplayPropertyModel />
+    </#if>
+<#else>
+	<#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}  
+        </#if>
+    </p>
+    
+    <input type="hidden" name="subjectUri"   value="${editConfiguration.subjectUri}" role="input" />
+    <input type="hidden" name="predicateUri" value="${editConfiguration.predicateUri}" role="input" />
+    
+    <#if editConfiguration.dataProperty = true>
+        <input type="hidden" name="datapropKey" value="${editConfiguration.datapropKey}" role="input" />
+        <input type="hidden" name="vitroNsProp" value="${editConfiguration.vitroNsProperty}" role="input" />
+    <#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 
+        <a class="cancel" title="${i18n().cancel_title}" href="${editConfiguration.cancelUrl}">${i18n().cancel_link}</a>
+    <#if editConfiguration.objectProperty = true>
+    </p>
+    </#if>
+</form>
diff --git a/webapp/web/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl b/webapp/web/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
index 794874164..d0d68b75d 100644
--- a/webapp/web/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
@@ -1,25 +1,25 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#assign formTitle>
- "${editConfiguration.propertyPublicDomainTitle}" entry for ${editConfiguration.subjectName}
-</#assign>
-<#if editConfiguration.objectUri?has_content>
-    <#assign formTitle>${i18n().edit_capitalized} ${formTitle} </#assign>
-    <#assign submitLabel>${i18n().save_changes}</#assign>
-<#else>
-    <#assign formTitle>${i18n().create_capitalized} ${formTitle} </#assign>
-    <#assign submitLabel>${i18n().create_capitalized} "${editConfiguration.propertyPublicDomainTitle}" ${i18n().entry}</#assign>
-</#if>
-
-<h2>${formTitle}</h2>
-
-<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>     
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#assign formTitle>
+ "${editConfiguration.propertyPublicDomainTitle}" entry for ${editConfiguration.subjectName}
+</#assign>
+<#if editConfiguration.objectUri?has_content>
+    <#assign formTitle>${i18n().edit_capitalized} ${formTitle} </#assign>
+    <#assign submitLabel>${i18n().save_changes}</#assign>
+<#else>
+    <#assign formTitle>${i18n().create_capitalized} ${formTitle} </#assign>
+    <#assign submitLabel>${i18n().create_capitalized} "${editConfiguration.propertyPublicDomainTitle}" ${i18n().entry}</#assign>
+</#if>
+
+<h2>${formTitle}</h2>
+
+<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
diff --git a/webapp/web/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl
index 2314c3fc4..f542b2286 100644
--- a/webapp/web/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl
@@ -1,56 +1,56 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#--If edit submission exists, then retrieve validation errors if they exist-->
-<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content>
-    <#assign submissionErrors = editSubmission.validationErrors/>
-</#if>
-
-
-<h2>${editConfiguration.formTitle}</h2>
-
-<#--Display error messages if any-->
-<#if submissionErrors?has_content>
-    <section id="error-alert" role="alert">
-        <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
-        <p>
-        
-        <#list submissionErrors?keys as errorFieldName>
-            ${submissionErrors[errorFieldName]}
-        </#list>
-                        
-        </p>
-    </section>
-</#if>
-
-<#assign literalValues = "${editConfiguration.dataLiteralValuesAsString}" />
-
-<form class="editForm" action = "${submitUrl}" method="post">
-    <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input" />
-    <#if editConfiguration.dataPredicatePublicDescription?has_content>
-       <label for="${editConfiguration.dataLiteral}"><p class="propEntryHelpText">${editConfiguration.dataPredicatePublicDescription}</p></label>
-    </#if>   
-
-    
-    <textarea rows="2"  id="literal" name="literal" value="" class="useTinyMce" role="textarea">${literalValues}</textarea>
-
-    <br />
-    <#--The submit label should be set within the template itself, right now
-    the default label for default data/object property editing is returned from Edit Configuration Template Model,
-    but that method may not return the correct result for other custom forms-->
-    <input type="submit" id="submit" value="${editConfiguration.submitLabel}" role="button"/>
-    <span class="or"> or </span>
-    <a title="${i18n().cancel_title}" href="${cancelUrl}">${i18n().cancel_link}</a>
-
-</form>
-
-<#if editConfiguration.includeDeletionForm = true>
-<#include "defaultDeletePropertyForm.ftl">
-</#if>
-
-<#include "defaultFormScripts.ftl">     
-
-<script type="text/javascript">
-$(document).ready(function(){
-    defaultDataPropertyUtils.onLoad();
-});
-</script> 
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#--If edit submission exists, then retrieve validation errors if they exist-->
+<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content>
+    <#assign submissionErrors = editSubmission.validationErrors/>
+</#if>
+
+
+<h2>${editConfiguration.formTitle}</h2>
+
+<#--Display error messages if any-->
+<#if submissionErrors?has_content>
+    <section id="error-alert" role="alert">
+        <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
+        <p>
+        
+        <#list submissionErrors?keys as errorFieldName>
+            ${submissionErrors[errorFieldName]}
+        </#list>
+                        
+        </p>
+    </section>
+</#if>
+
+<#assign literalValues = "${editConfiguration.dataLiteralValuesAsString}" />
+
+<form class="editForm" action = "${submitUrl}" method="post">
+    <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input" />
+    <#if editConfiguration.dataPredicatePublicDescription?has_content>
+       <label for="${editConfiguration.dataLiteral}"><p class="propEntryHelpText">${editConfiguration.dataPredicatePublicDescription}</p></label>
+    </#if>   
+
+    
+    <textarea rows="2"  id="literal" name="literal" value="" class="useTinyMce" role="textarea">${literalValues}</textarea>
+
+    <br />
+    <#--The submit label should be set within the template itself, right now
+    the default label for default data/object property editing is returned from Edit Configuration Template Model,
+    but that method may not return the correct result for other custom forms-->
+    <input type="submit" id="submit" value="${editConfiguration.submitLabel}" role="button"/>
+    <span class="or"> or </span>
+    <a title="${i18n().cancel_title}" href="${cancelUrl}">${i18n().cancel_link}</a>
+
+</form>
+
+<#if editConfiguration.includeDeletionForm = true>
+<#include "defaultDeletePropertyForm.ftl">
+</#if>
+
+<#include "defaultFormScripts.ftl">     
+
+<script type="text/javascript">
+$(document).ready(function(){
+    defaultDataPropertyUtils.onLoad();
+});
+</script> 
diff --git a/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl b/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
index a0108959a..0ad052d88 100644
--- a/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/defaultDeletePropertyForm.ftl
@@ -1,36 +1,36 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<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="cmd"          value="delete"/>
-    <input type="hidden" name="editKey" value="${editConfiguration.editKey}"/>
-    <#if editConfiguration.dataProperty = true>
-        <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.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> 
-        </#if>
-        
-        <#if editConfiguration.propertySelectFromExisting = true || editConfiguration.propertyOfferCreateNewOption = true>
-            <p>
-                <input type="submit" id="delete" value="${i18n().delete_button}" role="button "/>
-            </p>      
-        </#if>
-    </#if>
-</form>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<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="cmd"          value="delete"/>
+    <input type="hidden" name="editKey" value="${editConfiguration.editKey}"/>
+    <#if editConfiguration.dataProperty = true>
+        <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.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> 
+        </#if>
+        
+        <#if editConfiguration.propertySelectFromExisting = true || editConfiguration.propertyOfferCreateNewOption = true>
+            <p>
+                <input type="submit" id="delete" value="${i18n().delete_button}" role="button "/>
+            </p>      
+        </#if>
+    </#if>
+</form>
diff --git a/webapp/web/templates/freemarker/edit/forms/defaultFormScripts.ftl b/webapp/web/templates/freemarker/edit/forms/defaultFormScripts.ftl
index 5b575c819..0a9d8d60c 100644
--- a/webapp/web/templates/freemarker/edit/forms/defaultFormScripts.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/defaultFormScripts.ftl
@@ -1,71 +1,71 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Template to setup and call scripts for form editing -->
-
-<#-- 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 defaultToolbarLocation = "top" />
-<#if !height?has_content>
-	<#assign height=defaultHeight/>
-</#if>
-
-<#if !width?has_content>
-	<#assign width=defaultWidth />
-</#if>
-
-<#if !buttons?has_content>
-	<#assign buttons = defaultButton />
-</#if>
-
-<#if !toolbarLocation?has_content>
-	<#assign toolbarLocation = defaultToolbarLocation />
-</#if>
-
-<#-- Set up data -->
-<script type="text/javascript">
-    var customFormData = {
-    	tinyMCEData : {
-                theme : "advanced",
-                mode : "textareas",
-                theme_advanced_buttons1 : "${buttons}",
-                theme_advanced_buttons2 : "",
-                theme_advanced_buttons3 : "",
-                theme_advanced_toolbar_location : "${toolbarLocation}",
-                theme_advanced_toolbar_align : "left",
-                theme_advanced_statusbar_location : "bottom",
-                theme_advanced_path : false,
-                theme_advanced_resizing : true,
-                height : "${height}",
-                width  : "${width}",
-                valid_elements : "a[href|name|title],br,p,i,em,cite,strong/b,u,sub,sup,ul,ol,li",
-                fix_list_elements : true,
-                fix_nesting : true,
-                cleanup_on_startup : true,
-                gecko_spellcheck : true,
-                forced_root_block: false
-                // plugins: "paste",
-                // theme_advanced_buttons1_add : "pastetext,pasteword,selectall",
-                // paste_create_paragraphs: false,
-                // paste_create_linebreaks: false,
-                // paste_use_dialog : true,
-                // paste_auto_cleanup_on_paste: true,
-                // paste_convert_headers_to_strong : true,
-                // save_callback : "customSave",
-                // content_css : "example_advanced.css",
-                // extended_valid_elements : "a[href|target|name]"
-                // plugins : "table",
-                // theme_advanced_buttons3_add_before : "tablecontrols,separator",
-                // 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 to enable browsing individuals within a class -->
-<#--'<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/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>',
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template to setup and call scripts for form editing -->
+
+<#-- 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 defaultToolbarLocation = "top" />
+<#if !height?has_content>
+	<#assign height=defaultHeight/>
+</#if>
+
+<#if !width?has_content>
+	<#assign width=defaultWidth />
+</#if>
+
+<#if !buttons?has_content>
+	<#assign buttons = defaultButton />
+</#if>
+
+<#if !toolbarLocation?has_content>
+	<#assign toolbarLocation = defaultToolbarLocation />
+</#if>
+
+<#-- Set up data -->
+<script type="text/javascript">
+    var customFormData = {
+    	tinyMCEData : {
+                theme : "advanced",
+                mode : "textareas",
+                theme_advanced_buttons1 : "${buttons}",
+                theme_advanced_buttons2 : "",
+                theme_advanced_buttons3 : "",
+                theme_advanced_toolbar_location : "${toolbarLocation}",
+                theme_advanced_toolbar_align : "left",
+                theme_advanced_statusbar_location : "bottom",
+                theme_advanced_path : false,
+                theme_advanced_resizing : true,
+                height : "${height}",
+                width  : "${width}",
+                valid_elements : "a[href|name|title],br,p,i,em,cite,strong/b,u,sub,sup,ul,ol,li",
+                fix_list_elements : true,
+                fix_nesting : true,
+                cleanup_on_startup : true,
+                gecko_spellcheck : true,
+                forced_root_block: false
+                // plugins: "paste",
+                // theme_advanced_buttons1_add : "pastetext,pasteword,selectall",
+                // paste_create_paragraphs: false,
+                // paste_create_linebreaks: false,
+                // paste_use_dialog : true,
+                // paste_auto_cleanup_on_paste: true,
+                // paste_convert_headers_to_strong : true,
+                // save_callback : "customSave",
+                // content_css : "example_advanced.css",
+                // extended_valid_elements : "a[href|target|name]"
+                // plugins : "table",
+                // theme_advanced_buttons3_add_before : "tablecontrols,separator",
+                // 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 to enable browsing individuals within a class -->
+<#--'<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/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
diff --git a/webapp/web/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl b/webapp/web/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl
index baead0177..578f017c6 100644
--- a/webapp/web/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl
@@ -1,36 +1,36 @@
- <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
- 
- <#if rangeOptionsExist  = true >
-        <p>${i18n().no_appropriate_entry}:</p>
- <#else>
-        <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" />      
-    <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" />  
-    <#if rangeOptionsExist  = false >
-        <span class="or"> ${i18n().or} </span>
-        <a title="${i18n().cancel_title}" class="cancel" href="${cancelUrl}">${i18n().cancel_link}</a>
-    </#if>
-</form>          
-
+ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+ 
+ <#if rangeOptionsExist  = true >
+        <p>${i18n().no_appropriate_entry}:</p>
+ <#else>
+        <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" />      
+    <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" />  
+    <#if rangeOptionsExist  = false >
+        <span class="or"> ${i18n().or} </span>
+        <a title="${i18n().cancel_title}" class="cancel" href="${cancelUrl}">${i18n().cancel_link}</a>
+    </#if>
+</form>          
+
                
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/edit/forms/menuManagement--classIntersections.ftl b/webapp/web/templates/freemarker/edit/forms/menuManagement--classIntersections.ftl
index 6f3d1ae54..623f56e6d 100644
--- a/webapp/web/templates/freemarker/edit/forms/menuManagement--classIntersections.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/menuManagement--classIntersections.ftl
@@ -1,3 +1,3 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
 <#-- Placeholder for class intersection segment of menu management form. This file is deliberately empty for vitro. -->
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl b/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
index a186a765d..54e9c6196 100644
--- a/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/menuManagement.ftl
@@ -1,115 +1,115 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#--Template for adding and editing menu items -->
-
-<#-- some additional processing here which shows or hides the class group selection and classes based on initial action-->
-<#assign existingClassGroupStyle = " " />
-<#assign selectClassGroupStyle = 'class="hidden"' />
-<#-- Reveal the class group and hide the class selects if adding a new menu item or editing an existing menu item with an empty class group (no classes)-->
-<#if menuAction == "Add" || !classGroup?has_content>
-    <#assign existingClassGroupStyle = 'class="hidden"' />
-    <#assign selectClassGroupStyle = " " />
-</#if>
-<section id="error-alert" role="alert" class="hidden">
-    <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
-    <p></p>
-</section>
-
-<h3>${menuAction} ${i18n().menu_item}</h3>
-
-<section id="${menuAction?lower_case}-menu-item" role="region">
-    <form method="POST" action="${formUrls}" class="customForm" role="${menuAction} menu item">
-        <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> 
-        <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>
-                <span id="selectedContentTypeValue" name="selectedContentTypeValue">${associatedPage}</span>
-                <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">     
-           <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 id="classesInSelectedGroup" name="classesInSelectedGroup" ${existingClassGroupStyle}>
-            <#-- 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">
-                    <input type="checkbox" name="allSelected" id="allSelected" value="all" <#if !isIndividualsForClassesPage?has_content>checked</#if> />
-                    <label class="inline" for="All"> ${i18n().all_capitalized}</label>
-                </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> 
-                     <#if isIndividualsForClassesPage?has_content>
-                            <#list includeClasses as includeClass>
-                                <#if includeClass = classInClassGroup.URI>
-                                    checked
-                                </#if>
-                            </#list>
-                    </#if> />
-                    <label class="inline" for="${classInClassGroup.name}"> ${classInClassGroup.name}</label>
-                    <#-- PLACEHOLDER - not yet implemented) -->
-                    <span class="ui-icon-sortable"></span> <#--sortable icon for dragging and dropping menu items-->
-                </li>
-                </#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>
-    </form>
-</section>
-<script>
-    var i18nStrings = {
-        supplyName: '${i18n().supply_name}',
-        supplyPrettyUrl: '${i18n().supply_url}',
-        startUrlWithSlash: '${i18n().start_url_with_slash}',
-        supplyTemplate: '${i18n().supply_template}',
-        supplyContentType: '${i18n().supply_content_type}',
-        selectContentType: '${i18n().select_content_type}',
-        allCapitalized: '${i18n().all_capitalized}'
-    };
-</script>
-${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/menupage/menuManagement.css" />')}
-${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>')}
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#--Template for adding and editing menu items -->
+
+<#-- some additional processing here which shows or hides the class group selection and classes based on initial action-->
+<#assign existingClassGroupStyle = " " />
+<#assign selectClassGroupStyle = 'class="hidden"' />
+<#-- Reveal the class group and hide the class selects if adding a new menu item or editing an existing menu item with an empty class group (no classes)-->
+<#if menuAction == "Add" || !classGroup?has_content>
+    <#assign existingClassGroupStyle = 'class="hidden"' />
+    <#assign selectClassGroupStyle = " " />
+</#if>
+<section id="error-alert" role="alert" class="hidden">
+    <img src="${urls.images}/iconAlert.png" width="24" height="24" alt="${i18n().error_alert_icon}" />
+    <p></p>
+</section>
+
+<h3>${menuAction} ${i18n().menu_item}</h3>
+
+<section id="${menuAction?lower_case}-menu-item" role="region">
+    <form method="POST" action="${formUrls}" class="customForm" role="${menuAction} menu item">
+        <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> 
+        <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>
+                <span id="selectedContentTypeValue" name="selectedContentTypeValue">${associatedPage}</span>
+                <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">     
+           <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 id="classesInSelectedGroup" name="classesInSelectedGroup" ${existingClassGroupStyle}>
+            <#-- 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">
+                    <input type="checkbox" name="allSelected" id="allSelected" value="all" <#if !isIndividualsForClassesPage?has_content>checked</#if> />
+                    <label class="inline" for="All"> ${i18n().all_capitalized}</label>
+                </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> 
+                     <#if isIndividualsForClassesPage?has_content>
+                            <#list includeClasses as includeClass>
+                                <#if includeClass = classInClassGroup.URI>
+                                    checked
+                                </#if>
+                            </#list>
+                    </#if> />
+                    <label class="inline" for="${classInClassGroup.name}"> ${classInClassGroup.name}</label>
+                    <#-- PLACEHOLDER - not yet implemented) -->
+                    <span class="ui-icon-sortable"></span> <#--sortable icon for dragging and dropping menu items-->
+                </li>
+                </#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>
+    </form>
+</section>
+<script>
+    var i18nStrings = {
+        supplyName: '${i18n().supply_name}',
+        supplyPrettyUrl: '${i18n().supply_url}',
+        startUrlWithSlash: '${i18n().start_url_with_slash}',
+        supplyTemplate: '${i18n().supply_template}',
+        supplyContentType: '${i18n().supply_content_type}',
+        selectContentType: '${i18n().select_content_type}',
+        allCapitalized: '${i18n().all_capitalized}'
+    };
+</script>
+${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/menupage/menuManagement.css" />')}
+${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
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl
index 2a318e12a..80bd71446 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroups.ftl
@@ -1,69 +1,69 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#--Browse Class Groups Section-->
-<#-----------Variable assignment-------------->
-<#--Requires Menu action be defined in parent template-->
-
-<#assign classGroup = pageData.classGroup />
-<#assign classGroups = pageData.classGroups />
-<#-- some additional processing here which shows or hides the class group selection and classes based on initial action-->
-<#assign existingClassGroupStyle = " " />
-<#assign selectClassGroupStyle = 'class="hidden"' />
-<#-- Reveal the class group and hide the class selects if adding a new menu item or editing an existing menu item with an empty class group (no classes)-->
-<#-- Menu action needs to be sent from  main template-->
-<#if menuAction == "Add" || !classGroup?has_content>
-    <#assign existingClassGroupStyle = 'class="hidden"' />
-    <#assign selectClassGroupStyle = " " />
-</#if>
-
-
-<#--HTML Portion-->
- <section id="browseClassGroup" class="contentSectionContainer">
-                       
-                <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>
-                        <#list classGroups as aClassGroup>
-                            <option value="${aClassGroup.URI}"  role="option">${aClassGroup.publicName}</option>
-                        </#list>
-                    </select>
-                </section>
-                
-                
-                <section id="classesInSelectedGroup" name="classesInSelectedGroup" ${existingClassGroupStyle}>
-                    <#-- Select classes in a class group -->    
-                    <p id="selectClassesMessage" name="selectClassesMessage">${i18n().select_content_display}<span class="requiredHint"> *</span></p>
-
-                    <#include "pageManagement--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">
-                            <input type="checkbox" name="allSelected" id="allSelected" value="all" checked="checked" />
-                            <label class="inline" for="All"> ${i18n().all_capitalized}</label>
-                        </li>
-                        <#list classGroup as classInClassGroup>
-                        <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> 
-                        </li>
-                        </#list>
-                    </ul><br />
-                    <input  type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="${i18n().save_this_content}" />
-                    <#if menuAction == "Add">
-                        <span id="cancelContent"> ${i18n().or} <a class="cancel" href="javascript:"  id="cancelContentLink" title="${i18n().cancel_title}">${i18n().cancel_link}</a></span>
-                    </#if>
-                </section>
-            </section>
-<script>
-    var i18nStringsBrowseGroups = {
-        browseClassGroup: '${i18n().browse_class_group}',
-        allCapitalized: '${i18n().all_capitalized}',
-        supplyClassGroup: '${i18n().supply_class_group}',
-        selectClasses: '${i18n().select_classes_to_display}'
-    };
-</script>
- <#--Include JavaScript specific to the types of data getters related to this content-->           
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+<#--Browse Class Groups Section-->
+<#-----------Variable assignment-------------->
+<#--Requires Menu action be defined in parent template-->
+
+<#assign classGroup = pageData.classGroup />
+<#assign classGroups = pageData.classGroups />
+<#-- some additional processing here which shows or hides the class group selection and classes based on initial action-->
+<#assign existingClassGroupStyle = " " />
+<#assign selectClassGroupStyle = 'class="hidden"' />
+<#-- Reveal the class group and hide the class selects if adding a new menu item or editing an existing menu item with an empty class group (no classes)-->
+<#-- Menu action needs to be sent from  main template-->
+<#if menuAction == "Add" || !classGroup?has_content>
+    <#assign existingClassGroupStyle = 'class="hidden"' />
+    <#assign selectClassGroupStyle = " " />
+</#if>
+
+
+<#--HTML Portion-->
+ <section id="browseClassGroup" class="contentSectionContainer">
+                       
+                <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>
+                        <#list classGroups as aClassGroup>
+                            <option value="${aClassGroup.URI}"  role="option">${aClassGroup.publicName}</option>
+                        </#list>
+                    </select>
+                </section>
+                
+                
+                <section id="classesInSelectedGroup" name="classesInSelectedGroup" ${existingClassGroupStyle}>
+                    <#-- Select classes in a class group -->    
+                    <p id="selectClassesMessage" name="selectClassesMessage">${i18n().select_content_display}<span class="requiredHint"> *</span></p>
+
+                    <#include "pageManagement--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">
+                            <input type="checkbox" name="allSelected" id="allSelected" value="all" checked="checked" />
+                            <label class="inline" for="All"> ${i18n().all_capitalized}</label>
+                        </li>
+                        <#list classGroup as classInClassGroup>
+                        <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> 
+                        </li>
+                        </#list>
+                    </ul><br />
+                    <input  type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="${i18n().save_this_content}" />
+                    <#if menuAction == "Add">
+                        <span id="cancelContent"> ${i18n().or} <a class="cancel" href="javascript:"  id="cancelContentLink" title="${i18n().cancel_title}">${i18n().cancel_link}</a></span>
+                    </#if>
+                </section>
+            </section>
+<script>
+    var i18nStringsBrowseGroups = {
+        browseClassGroup: '${i18n().browse_class_group}',
+        allCapitalized: '${i18n().all_capitalized}',
+        supplyClassGroup: '${i18n().supply_class_group}',
+        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
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl
index c1a14f2b4..e917bd64f 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement--browseClassGroupsScripts.ftl
@@ -1,5 +1,5 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Scripts for class group browsing -->
-<#--Replaces Vitro's processing for individuals for classes with VIVO's processing internal classes-->
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processClassGroupDataGetterContent.js"></script>')}
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processIndividualsForClassesDataGetterContent.js"></script>')}
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+<#-- Scripts for class group browsing -->
+<#--Replaces Vitro's processing for individuals for classes with VIVO's processing internal classes-->
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processClassGroupDataGetterContent.js"></script>')}
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processIndividualsForClassesDataGetterContent.js"></script>')}
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement--classIntersections.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement--classIntersections.ftl
index aebc00d54..c67884618 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement--classIntersections.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement--classIntersections.ftl
@@ -1,2 +1,2 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement--contentTemplates.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement--contentTemplates.ftl
index b0f2d37e1..68984cbfa 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement--contentTemplates.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement--contentTemplates.ftl
@@ -1,5 +1,5 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#--These are the different content templates that will be cloned and used within page management-->
-<#include "pageManagement--browseClassGroups.ftl">
-<#include "pageManagement--sparqlQuery.ftl">
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+<#--These are the different content templates that will be cloned and used within page management-->
+<#include "pageManagement--browseClassGroups.ftl">
+<#include "pageManagement--sparqlQuery.ftl">
 <#include "pageManagement--fixedHtml.ftl">
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl
index 91eecca59..313c6e74f 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement--customDataScript.ftl
@@ -1,18 +1,18 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#--Sets up script for custom form data. Including here instead of as separate javascript
-file to ensure this script is always loaded first.  Can also make sure placed first in 
-scripts list.-->
-
-<script type="text/javascript">
-    var customFormData = {
-      menuAction:"${menuAction}",
-      addMenuItem:"${addMenuItem}",
-      dataGetterLabelToURI:{
-      		//maps labels to URIs
-      		"browseClassGroup": "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData",
-      		"individualsForClasses": "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter",
-      		"sparqlQuery":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter",
-      		"fixedHtml":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter"
-      }
-    };
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+<#--Sets up script for custom form data. Including here instead of as separate javascript
+file to ensure this script is always loaded first.  Can also make sure placed first in 
+scripts list.-->
+
+<script type="text/javascript">
+    var customFormData = {
+      menuAction:"${menuAction}",
+      addMenuItem:"${addMenuItem}",
+      dataGetterLabelToURI:{
+      		//maps labels to URIs
+      		"browseClassGroup": "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData",
+      		"individualsForClasses": "java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter",
+      		"sparqlQuery":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter",
+      		"fixedHtml":"java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter"
+      }
+    };
 </script>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl
index 74001fa1f..09fc0e92d 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl
@@ -1,23 +1,23 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#--This contains the template for the fixed HTML content type that is to be cloned and used in page management-->
-
-<section id="fixedHtml" class="contentSectionContainer">
-    <label id="fixedHTMLVariableLabel" for="fixedHTMLVariable">${i18n().variable_name_all_caps}<span class="requiredHint"> *</span></label>
-    <input type="text" name="saveToVar" size="20" value="" id="fixedHTMLSaveToVar" role="input" />
-    <label id="fixedHTMLValueLabel" for="fixedHTMLValue">${i18n().enter_fixed_html_here}<span id="fixedHTMLValueSpan"></span><span class="requiredHint"> *</span></label>
-    <textarea id="fixedHTMLValue" name="htmlValue" cols="70" rows="15" style="margin-bottom:7px"></textarea><br />
-    <input  type="button" id="doneWithContent" name="doneWithContent" value="${i18n().save_this_content}" class="doneWithContent" />
-    <#if menuAction == "Add">
-        <span id="cancelContent"> ${i18n().or} <a class="cancel" href="javascript:"  id="cancelContentLink" title="${i18n().cancel_title}">${i18n().cancel_link}</a></span>
-    </#if>
-</section>
-<script>
-    var i18nStringsFixedHtml = {
-        fixedHtml: '${i18n().fixed_html}',
-        supplyVariableName: '${i18n().supply_variable_name}',
-        noApostrophes: '${i18n().apostrophe_not_allowed}',
-        noDoubleQuotes: '${i18n().double_quote_note_allowed}',
-        supplyHtml: '${i18n().supply_html}'
-    };
-</script>
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processFixedHTMLDataGetterContent.js"></script>')}
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+<#--This contains the template for the fixed HTML content type that is to be cloned and used in page management-->
+
+<section id="fixedHtml" class="contentSectionContainer">
+    <label id="fixedHTMLVariableLabel" for="fixedHTMLVariable">${i18n().variable_name_all_caps}<span class="requiredHint"> *</span></label>
+    <input type="text" name="saveToVar" size="20" value="" id="fixedHTMLSaveToVar" role="input" />
+    <label id="fixedHTMLValueLabel" for="fixedHTMLValue">${i18n().enter_fixed_html_here}<span id="fixedHTMLValueSpan"></span><span class="requiredHint"> *</span></label>
+    <textarea id="fixedHTMLValue" name="htmlValue" cols="70" rows="15" style="margin-bottom:7px"></textarea><br />
+    <input  type="button" id="doneWithContent" name="doneWithContent" value="${i18n().save_this_content}" class="doneWithContent" />
+    <#if menuAction == "Add">
+        <span id="cancelContent"> ${i18n().or} <a class="cancel" href="javascript:"  id="cancelContentLink" title="${i18n().cancel_title}">${i18n().cancel_link}</a></span>
+    </#if>
+</section>
+<script>
+    var i18nStringsFixedHtml = {
+        fixedHtml: '${i18n().fixed_html}',
+        supplyVariableName: '${i18n().supply_variable_name}',
+        noApostrophes: '${i18n().apostrophe_not_allowed}',
+        noDoubleQuotes: '${i18n().double_quote_note_allowed}',
+        supplyHtml: '${i18n().supply_html}'
+    };
+</script>
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processFixedHTMLDataGetterContent.js"></script>')}
diff --git a/webapp/web/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl b/webapp/web/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl
index 19f5e6394..78454866a 100644
--- a/webapp/web/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl
@@ -1,25 +1,25 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#--This contains the template for the Sparql Query content type that is to be cloned and used in page management-->
-<section id="sparqlQuery" class="contentSectionContainer">
-    <label id="variableLabel" for="variable">${i18n().variable_name_all_caps}<span class="requiredHint"> *</span></label>
-    <input type="text" name="saveToVar" size="20" value="" id="saveToVar" role="input" />
-    <#--Hiding query model for now-->
-    <#-- <label id="queryModelLabel" for="queryModel">${i18n().query_model}</label>  -->
-    <input type="text" name="queryModel" size="20" value="" id="queryModel" role="input" style="display:none"/>
-    <label id="queryLabel" for="queryLabel"><span id="querySpan">${i18n().enter_sparql_query_here}</span><span class="requiredHint"> *</span></label>
-    <textarea id="query" name="query" cols="70" rows="15" style="margin-bottom:7px"></textarea><br />
-    <input  type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="${i18n().save_this_content}" />
-    <#if menuAction == "Add">
-        <span id="cancelContent"> or <a class="cancel" href="javascript:"  id="cancelContentLink" title="${i18n().cancel_title}">${i18n().cancel_link}</a></span>
-    </#if>
-</section>
-<script>
-    var i18nStringsSparqlQuery = {
-        sparqlResults: '${i18n().sparql_query_results}',
-        supplyQueryVariable: '${i18n().supply_query_variable}',
-        noApostrophes: '${i18n().apostrophe_not_allowed}',
-        noDoubleQuotes: '${i18n().double_quote_note_allowed}',
-        supplyQuery: '${i18n().supply_sparql_query}'
-    };
-</script>
-${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processSparqlDataGetterContent.js"></script>')}
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+<#--This contains the template for the Sparql Query content type that is to be cloned and used in page management-->
+<section id="sparqlQuery" class="contentSectionContainer">
+    <label id="variableLabel" for="variable">${i18n().variable_name_all_caps}<span class="requiredHint"> *</span></label>
+    <input type="text" name="saveToVar" size="20" value="" id="saveToVar" role="input" />
+    <#--Hiding query model for now-->
+    <#-- <label id="queryModelLabel" for="queryModel">${i18n().query_model}</label>  -->
+    <input type="text" name="queryModel" size="20" value="" id="queryModel" role="input" style="display:none"/>
+    <label id="queryLabel" for="queryLabel"><span id="querySpan">${i18n().enter_sparql_query_here}</span><span class="requiredHint"> *</span></label>
+    <textarea id="query" name="query" cols="70" rows="15" style="margin-bottom:7px"></textarea><br />
+    <input  type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="${i18n().save_this_content}" />
+    <#if menuAction == "Add">
+        <span id="cancelContent"> or <a class="cancel" href="javascript:"  id="cancelContentLink" title="${i18n().cancel_title}">${i18n().cancel_link}</a></span>
+    </#if>
+</section>
+<script>
+    var i18nStringsSparqlQuery = {
+        sparqlResults: '${i18n().sparql_query_results}',
+        supplyQueryVariable: '${i18n().supply_query_variable}',
+        noApostrophes: '${i18n().apostrophe_not_allowed}',
+        noDoubleQuotes: '${i18n().double_quote_note_allowed}',
+        supplyQuery: '${i18n().supply_sparql_query}'
+    };
+</script>
+${scripts.add('<script type="text/javascript" src="${urls.base}/js/menupage/processSparqlDataGetterContent.js"></script>')}
diff --git a/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl b/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl
index feeb89d6d..bd87c6117 100644
--- a/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl
+++ b/webapp/web/templates/freemarker/edit/forms/rdfsLabelForm.ftl
@@ -1,27 +1,27 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#assign actionText = "${i18n().add_new}" />
-<#if editConfiguration.dataPropertyStatement?has_content>
-    <#assign actionText = "${i18n().edit_capitalized}"/>
-</#if>
-<#assign submitLabel>${actionText} ${i18n().label}</#assign>
-
-<h2>${actionText} <em>${i18n().label}</em> for ${editConfiguration.subjectName}</h2>
-
-<#assign literalValues = "${editConfiguration.dataLiteralValuesAsString}" />
-
-<form class="editForm" action = "${submitUrl}" method="post">
-    <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. 
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#assign actionText = "${i18n().add_new}" />
+<#if editConfiguration.dataPropertyStatement?has_content>
+    <#assign actionText = "${i18n().edit_capitalized}"/>
+</#if>
+<#assign submitLabel>${actionText} ${i18n().label}</#assign>
+
+<h2>${actionText} <em>${i18n().label}</em> for ${editConfiguration.subjectName}</h2>
+
+<#assign literalValues = "${editConfiguration.dataLiteralValuesAsString}" />
+
+<form class="editForm" action = "${submitUrl}" method="post">
+    <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
diff --git a/webapp/web/templates/freemarker/lib/lib-vitro-form.ftl b/webapp/web/templates/freemarker/lib/lib-vitro-form.ftl
index 3a552afc2..b9a76058c 100644
--- a/webapp/web/templates/freemarker/lib/lib-vitro-form.ftl
+++ b/webapp/web/templates/freemarker/lib/lib-vitro-form.ftl
@@ -1,94 +1,94 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-
-<#-- Macros and functions for form controls -->
-
-<#-- Output: html notifying the user that the browser is an unsupported version -->
-<#macro unsupportedBrowser  urlsBase>
-<div id="ie67DisableWrapper">
-    <div id="ie67DisableContent">
-	    <img src="${urlsBase}/images/iconAlertBig.png" alt="${i18n().alert_icon}"/>
-	    <p>${i18n().unsupported_ie_version}</p>
-    </div>
-</div>
-</#macro>
-
-<#--Given an edit configuration template object, get the current value for a uri field using the field name-->
-
-
-<#function getEditConfigLiteralValue config varName>
-	<#local literalValues = config.existingLiteralValues >
-	<#if (literalValues?keys?seq_contains(varName)) && (literalValues[varName]?size > 0)>
-		<#return literalValues[varName][0] >
-	</#if>
-	<#return "">
-</#function>
-
-<#--Given an edit configuration template object, get the current value for a literal field using the field name-->
-
-<#function getEditConfigUriValue config varName>
- 	<#local uriValues = config.existingUriValues />
-  <#if (uriValues?keys?seq_contains(varName)) && (uriValues[varName]?size > 0)>
-		<#return uriValues[varName][0] >
-	</#if>
-	<#return "">
-</#function>
-
-<#--Now check whether a given value returns either a uri or a literal value, if one empty then use other and
-return - returns empty string if no value found-->
-<#function getEditConfigValue config varName>
-	<#local returnValue = getEditConfigUriValue(config, varName) />
-	<#if (returnValue?length = 0)>
-		<#local returnValue = getEditConfigLiteralValue(config, varName) />
-	</#if>
-	<#return returnValue>
-</#function>
-
-
-<#--Given edit submission object find values-->
-<#function getEditSubmissionLiteralValue submission varName>
-	<#local literalValues = submission.literalsFromForm >
-	<#if (literalValues?keys?seq_contains(varName)) && (literalValues[varName]?size > 0)>
-		<#return literalValues[varName][0] >
-	</#if>
-	<#return "">
-</#function>
-
-<#--Given an edit configuration template object, get the current value for a literal field using the field name-->
-
-<#function getEditSubmissionUriValue submission varName>
- 	<#local uriValues = submission.urisFromForm />
-  <#if (uriValues?keys?seq_contains(varName)) && (uriValues[varName]?size > 0)>
-		<#return uriValues[varName][0] >
-	</#if>
-	<#return "">
-</#function>
-
-<#--Get edit submission value for either literal or uri-->
-<#function getEditSubmissionValue submission varName>
-	<#local returnValue = getEditSubmissionUriValue(submission, varName) />
-	<#if (returnValue?length = 0)>
-		<#local returnValue = getEditSubmissionLiteralValue(submission, varName) />
-	</#if> 
-	<#return returnValue>
-</#function>
-
-<#--Get the value for the form field, checking edit submission first and then edit configuration-->
-<#function getFormFieldValue submission config varName>
-	<#local returnValue = "">
-	<#if submission?has_content && submission.submissionExists = true>
-		<#local returnValue = getEditSubmissionValue(submission varName)>
-	<#else>
-		<#local returnValue = getEditConfigValue(config varName)>
-	</#if>
-	<#return returnValue>
-</#function>
-
-<#--Check if submission error exists for a field name-->
-<#function submissionErrorExists editSubmission fieldName>
-	<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content>
-		<#if editSubmission.validationErrors?keys?seq_contains(fieldName)>
-			<#return true>
-		</#if>
-	</#if>
-	<#return false>
-</#function>
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Macros and functions for form controls -->
+
+<#-- Output: html notifying the user that the browser is an unsupported version -->
+<#macro unsupportedBrowser  urlsBase>
+<div id="ie67DisableWrapper">
+    <div id="ie67DisableContent">
+	    <img src="${urlsBase}/images/iconAlertBig.png" alt="${i18n().alert_icon}"/>
+	    <p>${i18n().unsupported_ie_version}</p>
+    </div>
+</div>
+</#macro>
+
+<#--Given an edit configuration template object, get the current value for a uri field using the field name-->
+
+
+<#function getEditConfigLiteralValue config varName>
+	<#local literalValues = config.existingLiteralValues >
+	<#if (literalValues?keys?seq_contains(varName)) && (literalValues[varName]?size > 0)>
+		<#return literalValues[varName][0] >
+	</#if>
+	<#return "">
+</#function>
+
+<#--Given an edit configuration template object, get the current value for a literal field using the field name-->
+
+<#function getEditConfigUriValue config varName>
+ 	<#local uriValues = config.existingUriValues />
+  <#if (uriValues?keys?seq_contains(varName)) && (uriValues[varName]?size > 0)>
+		<#return uriValues[varName][0] >
+	</#if>
+	<#return "">
+</#function>
+
+<#--Now check whether a given value returns either a uri or a literal value, if one empty then use other and
+return - returns empty string if no value found-->
+<#function getEditConfigValue config varName>
+	<#local returnValue = getEditConfigUriValue(config, varName) />
+	<#if (returnValue?length = 0)>
+		<#local returnValue = getEditConfigLiteralValue(config, varName) />
+	</#if>
+	<#return returnValue>
+</#function>
+
+
+<#--Given edit submission object find values-->
+<#function getEditSubmissionLiteralValue submission varName>
+	<#local literalValues = submission.literalsFromForm >
+	<#if (literalValues?keys?seq_contains(varName)) && (literalValues[varName]?size > 0)>
+		<#return literalValues[varName][0] >
+	</#if>
+	<#return "">
+</#function>
+
+<#--Given an edit configuration template object, get the current value for a literal field using the field name-->
+
+<#function getEditSubmissionUriValue submission varName>
+ 	<#local uriValues = submission.urisFromForm />
+  <#if (uriValues?keys?seq_contains(varName)) && (uriValues[varName]?size > 0)>
+		<#return uriValues[varName][0] >
+	</#if>
+	<#return "">
+</#function>
+
+<#--Get edit submission value for either literal or uri-->
+<#function getEditSubmissionValue submission varName>
+	<#local returnValue = getEditSubmissionUriValue(submission, varName) />
+	<#if (returnValue?length = 0)>
+		<#local returnValue = getEditSubmissionLiteralValue(submission, varName) />
+	</#if> 
+	<#return returnValue>
+</#function>
+
+<#--Get the value for the form field, checking edit submission first and then edit configuration-->
+<#function getFormFieldValue submission config varName>
+	<#local returnValue = "">
+	<#if submission?has_content && submission.submissionExists = true>
+		<#local returnValue = getEditSubmissionValue(submission varName)>
+	<#else>
+		<#local returnValue = getEditConfigValue(config varName)>
+	</#if>
+	<#return returnValue>
+</#function>
+
+<#--Check if submission error exists for a field name-->
+<#function submissionErrorExists editSubmission fieldName>
+	<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content>
+		<#if editSubmission.validationErrors?keys?seq_contains(fieldName)>
+			<#return true>
+		</#if>
+	</#if>
+	<#return false>
+</#function>
diff --git a/webapp/web/templates/page/blankPage.jsp b/webapp/web/templates/page/blankPage.jsp
index 383848315..e7abdd0b3 100644
--- a/webapp/web/templates/page/blankPage.jsp
+++ b/webapp/web/templates/page/blankPage.jsp
@@ -1,41 +1,41 @@
-<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
-
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-
-<%  /***********************************************
-         Display a single Page  in the most basic fashion.
-         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:                    
-            "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        
-        **********************************************/
-        /*
-        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";           
-        }         
-        if (request.getAttribute("title") == null){
-            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";            
-        }         
-        if( e.length() > 0 ){
-            throw new JspException(e);
-        }
-        */
-%>
-
-<c:set var="bodyJsp"><c:out value="${requestScope.bodyJsp}" default="/debug.jsp"/></c:set>
-<c:import url="${bodyJsp}"/>
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<%  /***********************************************
+         Display a single Page  in the most basic fashion.
+         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:                    
+            "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        
+        **********************************************/
+        /*
+        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";           
+        }         
+        if (request.getAttribute("title") == null){
+            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";            
+        }         
+        if( e.length() > 0 ){
+            throw new JspException(e);
+        }
+        */
+%>
+
+<c:set var="bodyJsp"><c:out value="${requestScope.bodyJsp}" default="/debug.jsp"/></c:set>
+<c:import url="${bodyJsp}"/>
diff --git a/webapp/web/templates/page/debug.jsp b/webapp/web/templates/page/debug.jsp
index a08cecc4e..b7a284252 100644
--- a/webapp/web/templates/page/debug.jsp
+++ b/webapp/web/templates/page/debug.jsp
@@ -1,15 +1,15 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%@ 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) %>
-</div>
+<%@ 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) %>
+</div>
diff --git a/webapp/web/templates/parts/emailUsers.jsp b/webapp/web/templates/parts/emailUsers.jsp
index 44b00b313..47b2bd39b 100644
--- a/webapp/web/templates/parts/emailUsers.jsp
+++ b/webapp/web/templates/parts/emailUsers.jsp
@@ -1,41 +1,41 @@
-<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
-
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-
-<div id="content" class="staticPageBackground">
-
-<div class="feedbackForm">
-
-<h2>${siteName} Email Users Form </h2>
-
-
-
-<hr/>
-
-		<form name = "contact_form" action="mailusers" method="post">
-		<input type="hidden" name="RequiredFields" value="comments"/>
-		<input type="hidden" name="RequiredFieldsNames" value="Comments"/>
-		<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>
-		<div>
-  		<input type="submit" id="submit" value="Send Mail" />
-  		<input type="reset" class="delete" value="Clear Form" />
-		</div
-
-		<p style="font-weight: bold; margin-top: 1em">Thank you!</p>
-		</form>
-
-</div><!--feedbackForm-->
-
-</div><!--content, staticPageBackground-->
+<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
+
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<div id="content" class="staticPageBackground">
+
+<div class="feedbackForm">
+
+<h2>${siteName} Email Users Form </h2>
+
+
+
+<hr/>
+
+		<form name = "contact_form" action="mailusers" method="post">
+		<input type="hidden" name="RequiredFields" value="comments"/>
+		<input type="hidden" name="RequiredFieldsNames" value="Comments"/>
+		<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>
+		<div>
+  		<input type="submit" id="submit" value="Send Mail" />
+  		<input type="reset" class="delete" value="Clear Form" />
+		</div
+
+		<p style="font-weight: bold; margin-top: 1em">Thank you!</p>
+		</form>
+
+</div><!--feedbackForm-->
+
+</div><!--content, staticPageBackground-->